[MDEV-12203] build fails, multiple errors, in xtradb/handler - Jira

XML

Word

Printable

Details

Type: Bug
Status: Closed (View Workflow)
Priority: Major
Resolution: Fixed
Affects Version/s: 10.2
Fix Version/s: 10.2.5
Component/s: Storage Engine - XtraDB
Labels:
None

Description

building 10.2-branch on linux64

after recent git pulls to

git log | head

	commit 3b30031d03225ba8488ef847ee9fcdd3006c61c9

	Author: Vladislav Vaintroub <wlad@mariadb.com>

	Date:   Tue Mar 7 21:22:25 2017 +0000

	    MDEV-12202 Do not package embedded in MSI

	    Also get rid of example ini files, they do not provide any value,

	    just confusion

	commit 2bca41265c802dc9a3e8852bb2b3cda720a5d44a

make fails in xtradb/handler code

make

...

[ 48%] Building CXX object storage/xtradb/CMakeFiles/xtradb.dir/fts/fts0tlex.cc.o

[ 48%] Building CXX object storage/xtradb/CMakeFiles/xtradb.dir/handler/ha_innodb.cc.o

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc: In function ‘my_bool innobase_check_identifier_length(const char*)’:

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc:2466:25: error: ‘MY_CHARSET_HANDLER {aka const struct my_charset_handler_st}’ has no member named ‘well_formed_len’; did you mean ‘well_formed_char_length’?

  size_t len = cs->cset->well_formed_len(

                         ^~~~~~~~~~~~~~~

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc: In function ‘int innobase_mysql_cmp(int, uint, const unsigned char*, unsigned int, const unsigned char*, unsigned int)’:

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc:6953:40: error: too many arguments to function

    charset, a, a_length, b, b_length, 0);

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc: In function ‘int innobase_mysql_cmp_prefix(int, uint, const unsigned char*, unsigned int, const unsigned char*, unsigned int)’:

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc:7047:32: error: too many arguments to function ‘int ha_compare_text(CHARSET_INFO*, const uchar*, uint, const uchar*, uint, my_bool)’

      (uchar*) b, b_length, 1, 0);

In file included from /usr/local/src/mariadb_10_2/sql/handler.h:41:0,

                 from /usr/local/src/mariadb_10_2/sql/log.h:20,

                 from /usr/local/src/mariadb_10_2/sql/sql_class.h:28,

                 from /usr/local/src/mariadb_10_2/sql/sql_acl.h:22,

                 from /usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc:41:

/usr/local/src/mariadb_10_2/include/my_compare.h:110:12: note: declared here

 extern int ha_compare_text(CHARSET_INFO *, const uchar *, uint,

            ^~~~~~~~~~~~~~~

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc: In function ‘int innobase_fts_text_cmp(const void*, const void*, const void*)’:

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc:7067:48: error: too many arguments to function ‘int ha_compare_text(CHARSET_INFO*, const uchar*, uint, const uchar*, uint, my_bool)’

   s2->f_str, static_cast<uint>(s2->f_len), 0, 0));

In file included from /usr/local/src/mariadb_10_2/sql/handler.h:41:0,

                 from /usr/local/src/mariadb_10_2/sql/log.h:20,

                 from /usr/local/src/mariadb_10_2/sql/sql_class.h:28,

                 from /usr/local/src/mariadb_10_2/sql/sql_acl.h:22,

                 from /usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc:41:

/usr/local/src/mariadb_10_2/include/my_compare.h:110:12: note: declared here

 extern int ha_compare_text(CHARSET_INFO *, const uchar *, uint,

            ^~~~~~~~~~~~~~~

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc: In function ‘int innobase_fts_text_case_cmp(const void*, const void*, const void*)’:

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc:7090:45: error: too many arguments to function ‘int ha_compare_text(CHARSET_INFO*, const uchar*, uint, const uchar*, uint, my_bool)’

   s2->f_str, static_cast<uint>(newlen), 0, 0));

In file included from /usr/local/src/mariadb_10_2/sql/handler.h:41:0,

                 from /usr/local/src/mariadb_10_2/sql/log.h:20,

                 from /usr/local/src/mariadb_10_2/sql/sql_class.h:28,

                 from /usr/local/src/mariadb_10_2/sql/sql_acl.h:22,

                 from /usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc:41:

/usr/local/src/mariadb_10_2/include/my_compare.h:110:12: note: declared here

 extern int ha_compare_text(CHARSET_INFO *, const uchar *, uint,

            ^~~~~~~~~~~~~~~

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc: In function ‘int innobase_fts_text_cmp_prefix(const void*, const void*, const void*)’:

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc:7138:48: error: too many arguments to function ‘int ha_compare_text(CHARSET_INFO*, const uchar*, uint, const uchar*, uint, my_bool)’

   s1->f_str, static_cast<uint>(s1->f_len), 1, 0);

In file included from /usr/local/src/mariadb_10_2/sql/handler.h:41:0,

                 from /usr/local/src/mariadb_10_2/sql/log.h:20,

                 from /usr/local/src/mariadb_10_2/sql/sql_class.h:28,

                 from /usr/local/src/mariadb_10_2/sql/sql_acl.h:22,

                 from /usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc:41:

/usr/local/src/mariadb_10_2/include/my_compare.h:110:12: note: declared here

 extern int ha_compare_text(CHARSET_INFO *, const uchar *, uint,

            ^~~~~~~~~~~~~~~

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc: In function ‘uint wsrep_store_key_val_for_row(THD*, TABLE*, uint, char*, uint, const uchar*, row_prebuilt_t*, ulint*)’:

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc:7483:34: error: ‘MY_CHARSET_HANDLER {aka const struct my_charset_handler_st}’ has no member named ‘well_formed_len’; did you mean ‘well_formed_char_length’?

     true_len = (ulint) cs->cset->well_formed_len(cs,

                                  ^~~~~~~~~~~~~~~

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc:7570:34: error: ‘MY_CHARSET_HANDLER {aka const struct my_charset_handler_st}’ has no member named ‘well_formed_len’; did you mean ‘well_formed_char_length’?

     true_len = (ulint) cs->cset->well_formed_len(cs,

                                  ^~~~~~~~~~~~~~~

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc:7659:17: error: ‘MY_CHARSET_HANDLER {aka const struct my_charset_handler_st}’ has no member named ‘well_formed_len’; did you mean ‘well_formed_char_length’?

       cs->cset->well_formed_len(cs,

                 ^~~~~~~~~~~~~~~

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc: In member function ‘uint ha_innobase::store_key_val_for_row(uint, char*, uint, const uchar*)’:

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc:7794:34: error: ‘MY_CHARSET_HANDLER {aka const struct my_charset_handler_st}’ has no member named ‘well_formed_len’; did you mean ‘well_formed_char_length’?

     true_len = (ulint) cs->cset->well_formed_len(cs,

                                  ^~~~~~~~~~~~~~~

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc:7865:34: error: ‘MY_CHARSET_HANDLER {aka const struct my_charset_handler_st}’ has no member named ‘well_formed_len’; did you mean ‘well_formed_char_length’?

     true_len = (ulint) cs->cset->well_formed_len(cs,

                                  ^~~~~~~~~~~~~~~

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc:7937:17: error: ‘MY_CHARSET_HANDLER {aka const struct my_charset_handler_st}’ has no member named ‘well_formed_len’; did you mean ‘well_formed_char_length’?

       cs->cset->well_formed_len(cs,

                 ^~~~~~~~~~~~~~~

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc: In member function ‘void ha_innobase::build_template(bool)’:

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc:8296:35: error: cannot convert ‘Field::stored_in_db’ from type ‘bool (Field::)() const’ to type ‘bool’

    while (!table->field[sql_idx]->stored_in_db) {

                                   ^~~~~~~~~~~~

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc:8296:35: error: in argument to unary !

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc:8415:35: error: cannot convert ‘Field::stored_in_db’ from type ‘bool (Field::)() const’ to type ‘bool’

    while (!table->field[sql_idx]->stored_in_db) {

                                   ^~~~~~~~~~~~

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc:8415:35: error: in argument to unary !

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc:8455:35: error: cannot convert ‘Field::stored_in_db’ from type ‘bool (Field::)() const’ to type ‘bool’

    while (!table->field[sql_idx]->stored_in_db) {

                                   ^~~~~~~~~~~~

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc:8455:35: error: in argument to unary !

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc: In member function ‘virtual int ha_innobase::write_row(uchar*)’:

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc:8651:45: error: ‘ha_statistic_increment’ was not declared in this scope

  ha_statistic_increment(&SSV::ha_write_count);

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc: In function ‘dberr_t calc_row_difference(upd_t*, uchar*, uchar*, TABLE*, uchar*, ulint, row_prebuilt_t*, THD*)’:

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc:9063:15: error: cannot convert ‘Field::stored_in_db’ from type ‘bool (Field::)() const’ to type ‘bool’

   if (!field->stored_in_db)

               ^~~~~~~~~~~~

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc:9063:15: error: in argument to unary !

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc:9202:26: error: cannot convert ‘Field::stored_in_db’ from type ‘bool (Field::)() const’ to type ‘bool’

   if (field->stored_in_db)

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc: In member function ‘virtual int ha_innobase::update_row(const uchar*, uchar*)’:

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc:9418:46: error: ‘ha_statistic_increment’ was not declared in this scope

  ha_statistic_increment(&SSV::ha_update_count);

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc: In member function ‘virtual int ha_innobase::delete_row(const uchar*)’:

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc:9571:46: error: ‘ha_statistic_increment’ was not declared in this scope

  ha_statistic_increment(&SSV::ha_delete_count);

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc: In member function ‘virtual int ha_innobase::index_read(uchar*, const uchar*, uint, ha_rkey_function)’:

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc:9865:48: error: ‘ha_statistic_increment’ was not declared in this scope

  ha_statistic_increment(&SSV::ha_read_key_count);

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc: In function ‘int create_table_def(trx_t*, const TABLE*, const char*, const char*, const char*, ulint, ulint, fil_encryption_t, ulint)’:

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc:11456:15: error: cannot convert ‘Field::stored_in_db’ from type ‘bool (Field::)() const’ to type ‘bool’

   if (!field->stored_in_db)

               ^~~~~~~~~~~~

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc:11456:15: error: in argument to unary !

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc: In function ‘FOREIGN_KEY_INFO* get_foreign_key_info(THD*, dict_foreign_t*)’:

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc:15071:36: error: cannot convert ‘enum_fk_option’ to ‘MYSQL_LEX_STRING* {aka st_mysql_lex_string*}’ for argument ‘2’ to ‘MYSQL_LEX_STRING* thd_make_lex_string(THD*, MYSQL_LEX_STRING*, const char*, unsigned int, int)’

   static_cast<unsigned int>(len), 1);

/usr/local/src/mariadb_10_2/storage/xtradb/handler/ha_innodb.cc:15089:36: error: cannot convert ‘enum_fk_option’ to ‘MYSQL_LEX_STRING* {aka st_mysql_lex_string*}’ for argument ‘2’ to ‘MYSQL_LEX_STRING* thd_make_lex_string(THD*, MYSQL_LEX_STRING*, const char*, unsigned int, int)’

   static_cast<unsigned int>(len), 1);

storage/xtradb/CMakeFiles/xtradb.dir/build.make:1190: recipe for target 'storage/xtradb/CMakeFiles/xtradb.dir/handler/ha_innodb.cc.o' failed

make[2]: *** [storage/xtradb/CMakeFiles/xtradb.dir/handler/ha_innodb.cc.o] Error 1

CMakeFiles/Makefile2:1433: recipe for target 'storage/xtradb/CMakeFiles/xtradb.dir/all' failed

make[1]: *** [storage/xtradb/CMakeFiles/xtradb.dir/all] Error 2

Makefile:149: recipe for target 'all' failed

make: *** [all] Error 2

Attachments

Activity

People

Assignee:: Sergei Golubchik

Reporter:: pgnd

Votes:: 0 Vote for this issue

Watchers:: 1 Start watching this issue

Dates

Created:: 2017-03-07 23:02

Updated:: 2017-03-29 08:41

Resolved:: 2017-03-29 08:41

Git Integration

Error rendering 'com.xiplink.jira.git.jira_git_plugin:git-issue-webpanel'. Please contact your Jira administrators.