An error occurred fetching the project authors.
  1. 24 Feb, 2005 1 commit
  2. 21 Feb, 2005 2 commits
  3. 18 Feb, 2005 1 commit
  4. 17 Feb, 2005 2 commits
    • unknown's avatar
      making XA tree to compile (and pass tests) in -max build · e31ffa24
      unknown authored
      sql/ha_ndbcluster.cc:
        incorporating changes from Martin
      sql/ha_ndbcluster.h:
        incorporating changes from Martin
      sql/item_func.h:
        remove a warning
      sql/sql_yacc.yy:
        remove a warning
      e31ffa24
    • unknown's avatar
      BUG#8547: Wrong errormessage when dropping table that does not exist in NDB · 329076db
      unknown authored
       - Added tescases
       - Added handling of HA_ERR_NO_SUCH_TABLE in mysql_rm_table_part2 so that 
         error messages now are consistent
      
      
      mysql-test/r/ndb_autodiscover.result:
        Added tess for dropping tables that does not exists in engine
      mysql-test/t/ndb_autodiscover.test:
        Added tess for dropping tables that does not exists in engine
      sql/ha_ndbcluster.cc:
        Updated delete_table and drop_table to retrn HA_ERR_NO_SUCH_TABLE if table was not found in engine.
        Clear error after calling mysql_rm_table_part2 from mysql_find_files
      sql/sql_table.cc:
        Added handling of the case when table does not exist in storage engine but on disk as .frm file.
      329076db
  5. 16 Feb, 2005 2 commits
    • unknown's avatar
      ndb - fix new decimal type mysql vs. ndb · fced35f7
      unknown authored
      mysql-test/r/ndb_index_ordered.result:
        fix new decimal mysql vs. ndb
      mysql-test/t/ndb_index_ordered.test:
        fix new decimal mysql vs. ndb
      ndb/include/kernel/signaldata/DictTabInfo.hpp:
        fix new decimal mysql vs. ndb
      ndb/include/ndb_constants.h:
        fix new decimal mysql vs. ndb
      ndb/include/ndbapi/NdbDictionary.hpp:
        fix new decimal mysql vs. ndb
      ndb/include/util/NdbSqlUtil.hpp:
        fix new decimal mysql vs. ndb
      ndb/src/common/util/NdbSqlUtil.cpp:
        fix new decimal mysql vs. ndb
      ndb/src/ndbapi/NdbDictionary.cpp:
        fix new decimal mysql vs. ndb
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        fix new decimal mysql vs. ndb
      ndb/src/ndbapi/NdbRecAttr.cpp:
        fix new decimal mysql vs. ndb
      ndb/test/include/NdbSchemaOp.hpp:
        fix new decimal mysql vs. ndb
      ndb/test/src/HugoCalculator.cpp:
        fix new decimal mysql vs. ndb
      ndb/tools/restore/consumer.cpp:
        fix new decimal mysql vs. ndb
      sql/ha_ndbcluster.cc:
        fix new decimal mysql vs. ndb
      fced35f7
    • unknown's avatar
      ndb - fix old decimal type mysql vs ndb · dbff1150
      unknown authored
      mysql-test/r/ndb_index_ordered.result:
        fix old decimal type mysql vs ndb (re-commit 3)
      mysql-test/t/ndb_index_ordered.test:
        fix old decimal type mysql vs ndb (re-commit 3)
      ndb/include/kernel/signaldata/DictTabInfo.hpp:
        fix old decimal type mysql vs ndb (re-commit 3)
      ndb/include/ndbapi/NdbDictionary.hpp:
        fix old decimal type mysql vs ndb (re-commit 3)
      ndb/include/util/NdbSqlUtil.hpp:
        fix old decimal type mysql vs ndb (re-commit 3)
      ndb/src/common/util/NdbSqlUtil.cpp:
        fix old decimal type mysql vs ndb (re-commit 3)
      ndb/src/ndbapi/NdbDictionary.cpp:
        fix old decimal type mysql vs ndb (re-commit 3)
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        fix old decimal type mysql vs ndb (re-commit 3)
      ndb/src/ndbapi/NdbRecAttr.cpp:
        fix old decimal type mysql vs ndb (re-commit 3)
      ndb/test/include/NdbSchemaOp.hpp:
        fix old decimal type mysql vs ndb (re-commit 3)
      ndb/tools/restore/consumer.cpp:
        fix old decimal type mysql vs ndb (re-commit 3)
      sql/ha_ndbcluster.cc:
        fix old decimal type mysql vs ndb (re-commit 3)
      dbff1150
  6. 09 Feb, 2005 2 commits
  7. 07 Feb, 2005 3 commits
  8. 04 Feb, 2005 4 commits
    • unknown's avatar
      Updated after review. · 9e92b63a
      unknown authored
      sql/ha_ndbcluster.cc:
        Fixing spaces in parameter list.
      9e92b63a
    • unknown's avatar
      ha_ndbcluster.cc: · 58fd4d94
      unknown authored
        fixed change in struct in 4.1->5.0 merge
      
      
      sql/ha_ndbcluster.cc:
        fixed change in struct in 4.1->5.0 merge
      58fd4d94
    • unknown's avatar
      added test to trigger drifferent fragmentations in ndb · 48e2d224
      unknown authored
          corrected documentation on fragmentation
          set "fragmentation medium" to mean 2 fragments per node instead of 1
          set default fragmentation to small instead of medium
          bug#8284 adjust fragmentation to max_rows
      
      
      mysql-test/r/ndb_basic.result:
        added test to trigger drifferent fragmentations in ndb
      mysql-test/t/ndb_basic.test:
        added test to trigger drifferent fragmentations in ndb
      ndb/include/ndbapi/NdbDictionary.hpp:
        corrected documentation on fragmentation
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        set "fragmentation medium" to mean 2 fragments per node instead of 1
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        set default fragmentation to small instead of medium
      sql/ha_ndbcluster.cc:
        bug#8284 adjust fragmentation to max_rows
      48e2d224
    • unknown's avatar
      Merge of query cache from 4.1 to 5.0 · 03bc5997
      unknown authored
      mysql-test/r/ndb_cache.result:
        Added 'order by' to select's
      mysql-test/r/ndb_cache2.result:
        Added 'order by' to select's
      mysql-test/t/ndb_cache.test:
        Added 'order by' to select's
      mysql-test/t/ndb_cache2.test:
        Added 'order by' to select's
      sql/ha_innodb.h:
        Changed function name
      sql/ha_ndbcluster.cc:
        Merge from query cache from 4.1 to 5.0
        Added better comments
        ndb_get_table_statistics had changed, so there where some adaptions to make
      sql/ha_ndbcluster.h:
        Changed name of function
      sql/handler.h:
        Changed name of function
      sql/sql_cache.cc:
        Changed name of function
      03bc5997
  9. 01 Feb, 2005 1 commit
    • unknown's avatar
      WL#2269 Enable query cache for NDB · 38e395aa
      unknown authored
      - Added a thread that fetches commit_count for open tables. This
      will mean that NDB will not have to be contacted for every use of a cached query. 
      
      
      sql/ha_ndbcluster.cc:
        Added a thread that periodically will fetch commit_count 
        for open tables and store that value in share. 
        The commit count value is then used when query cache 
        asks if a cached query can be used. 
        The thread activation interval is regulated by the 
        config variable ndb_cache_check_time, it's default value is 0
        which means that NDB is contacted every time a cached query is reused.
      sql/ha_ndbcluster.h:
        Added commit_count to share
        Added ndb_cache_check_time
      sql/mysqld.cc:
        Added config variable ndb_cache_check_time
      sql/set_var.cc:
        Added config variable ndb_cache_check_time
      38e395aa
  10. 27 Jan, 2005 1 commit
    • unknown's avatar
      ndb - make YEAR and TIMESTAMP into ndb types · 1ed40339
      unknown authored
      mysql-test/r/ndb_index_ordered.result:
        make YEAR and TIMESTAMP into ndb types
      mysql-test/t/ndb_index_ordered.test:
        make YEAR and TIMESTAMP into ndb types
      ndb/include/kernel/signaldata/DictTabInfo.hpp:
        make YEAR and TIMESTAMP into ndb types
      ndb/include/ndbapi/NdbDictionary.hpp:
        make YEAR and TIMESTAMP into ndb types
      ndb/include/util/NdbSqlUtil.hpp:
        make YEAR and TIMESTAMP into ndb types
      ndb/src/common/util/NdbSqlUtil.cpp:
        make YEAR and TIMESTAMP into ndb types
      ndb/src/ndbapi/NdbDictionary.cpp:
        make YEAR and TIMESTAMP into ndb types
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        make YEAR and TIMESTAMP into ndb types
      ndb/src/ndbapi/NdbRecAttr.cpp:
        make YEAR and TIMESTAMP into ndb types
      ndb/test/include/NdbSchemaOp.hpp:
        make YEAR and TIMESTAMP into ndb types
      sql/ha_ndbcluster.cc:
        make YEAR and TIMESTAMP into ndb types
      1ed40339
  11. 26 Jan, 2005 1 commit
  12. 25 Jan, 2005 1 commit
  13. 20 Jan, 2005 2 commits
  14. 19 Jan, 2005 1 commit
    • unknown's avatar
      bug#7693 - ndb · 153160d1
      unknown authored
        when using shm transporter, set sigmask on each thread using pthread_sigmask
      
      
      configure.in:
        Add more functions needed for SHM
      ndb/src/common/portlib/NdbThread.c:
        1) Create thread wrapper function
        2) block SIGUSR1 #ifdef NDB_SHM_TRANSPORTER
      ndb/src/common/transporter/TransporterRegistry.cpp:
        (un)block SIGUSR1 #ifdef NDB_SHM_TRANSPORTER
      sql/ha_ndbcluster.cc:
        cast pointer to UintPtr before printout
      153160d1
  15. 18 Jan, 2005 1 commit
  16. 14 Jan, 2005 2 commits
    • unknown's avatar
      Merge problem · d6747f96
      unknown authored
      FC3 fix
      
      
      sql/ha_ndbcluster.cc:
        Fixed merge problem, that occured when m_ndb where removed. 
        Fix fo FC3 compile problem.
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      d6747f96
    • unknown's avatar
      added support for 'show status like 'Ndb%'' · 9d9d7582
      unknown authored
      added number_of_replicas printout in show table status
      
      
      mysql-test/r/ndb_alter_table.result:
        added number_of_replicas to show table status printout
      mysql-test/r/ndb_autodiscover.result:
        added number_of_replicas to show table status printout
      ndb/include/ndbapi/NdbDictionary.hpp:
        added get method for replica count
      ndb/include/ndbapi/ndb_cluster_connection.hpp:
        added get method of node id
      ndb/src/ndbapi/NdbDictionary.cpp:
        added get method for replica count
      ndb/src/ndbapi/ndb_cluster_connection.cpp:
        added get method of node id
      9d9d7582
  17. 13 Jan, 2005 1 commit
    • unknown's avatar
      To get correct values in SHOW TABLE STATUS · 2f77a22a
      unknown authored
          Added pseudo column fragment memory
          changed ndb_get_table_statistics to take struct 
          and read row_size and fragment_memory
      
      
      ndb/include/kernel/AttributeHeader.hpp:
        Added pseudo column fragment memory
      ndb/include/ndbapi/NdbDictionary.hpp:
        Added pseudo column fragment memory
      ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
        Added pseudo column fragment memory
      ndb/src/ndbapi/NdbDictionary.cpp:
        Added pseudo column fragment memory
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Added pseudo column fragment memory
      sql/ha_ndbcluster.cc:
        changed ndb_get_table_statistics to take struct 
        and read row_size and fragment_memory
      sql/ha_ndbcluster.h:
        partially implemented update_table_comment
      2f77a22a
  18. 11 Jan, 2005 2 commits
  19. 08 Jan, 2005 2 commits
    • unknown's avatar
      ndb - wl-1442 fix Time ordering · 3186b340
      unknown authored
      mysql-test/r/ndb_index_ordered.result:
        wl-1442 fix Time.  adds new type id 25
      mysql-test/t/ndb_index_ordered.test:
        wl-1442 fix Time.  adds new type id 25
      ndb/include/kernel/signaldata/DictTabInfo.hpp:
        wl-1442 fix Time.  adds new type id 25
      ndb/include/ndbapi/NdbDictionary.hpp:
        wl-1442 fix Time.  adds new type id 25
      ndb/include/util/NdbSqlUtil.hpp:
        wl-1442 fix Time.  adds new type id 25
      ndb/src/common/util/NdbSqlUtil.cpp:
        wl-1442 fix Time.  adds new type id 25
      ndb/src/ndbapi/NdbDictionary.cpp:
        wl-1442 fix Time.  adds new type id 25
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        wl-1442 fix Time.  adds new type id 25
      ndb/test/include/NdbSchemaOp.hpp:
        wl-1442 fix Time.  adds new type id 25
      ndb/tools/restore/consumer.cpp:
        wl-1442 fix Time.  adds new type id 25
      sql/ha_ndbcluster.cc:
        wl-1442 fix Time.  adds new type id 25
      3186b340
    • unknown's avatar
      ndb - wl-1442 fix Date ordering · 633ee9b0
      unknown authored
      mysql-test/r/ndb_index_ordered.result:
        wl-1442 fix Date.  reuses old unused Timespec type id
      mysql-test/t/ndb_index_ordered.test:
        wl-1442 fix Date.  reuses old unused Timespec type id
      ndb/include/kernel/signaldata/DictTabInfo.hpp:
        wl-1442 fix Date.  reuses old unused Timespec type id
      ndb/include/ndbapi/NdbDictionary.hpp:
        wl-1442 fix Date.  reuses old unused Timespec type id
      ndb/include/util/NdbSqlUtil.hpp:
        wl-1442 fix Date.  reuses old unused Timespec type id
      ndb/src/common/util/NdbSqlUtil.cpp:
        wl-1442 fix Date.  reuses old unused Timespec type id
      ndb/src/ndbapi/NdbDictionary.cpp:
        wl-1442 fix Date.  reuses old unused Timespec type id
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        wl-1442 fix Date.  reuses old unused Timespec type id
      ndb/test/include/NdbSchemaOp.hpp:
        wl-1442 fix Date.  reuses old unused Timespec type id
      ndb/tools/restore/consumer.cpp:
        wl-1442 fix Date.  reuses old unused Timespec type id
      sql/ha_ndbcluster.cc:
        wl-1442 fix Date.  reuses old unused Timespec type id
      633ee9b0
  20. 07 Jan, 2005 3 commits
    • unknown's avatar
      ndb - wl-1442 minor · 0338a61c
      unknown authored
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        wl-1442 minor
      ndb/test/ndbapi/testOIBasic.cpp:
        wl-1442 minor
      sql/ha_ndbcluster.cc:
        wl-1442 minor
      0338a61c
    • unknown's avatar
      ndb - wl-1442 new varchar · 23313449
      unknown authored
      mysql-test/r/ndb_alter_table.result:
        wl-1442 new varchar
      mysql-test/r/ndb_bitfield.result:
        wl-1442 new varchar
      mysql-test/r/ndb_charset.result:
        wl-1442 new varchar
      mysql-test/t/ndb_charset.test:
        wl-1442 new varchar
      ndb/include/kernel/signaldata/DictTabInfo.hpp:
        wl-1442 new varchar
      ndb/include/ndb_constants.h:
        wl-1442 new varchar
      ndb/include/ndbapi/NdbDictionary.hpp:
        wl-1442 new varchar
      ndb/include/util/NdbSqlUtil.hpp:
        wl-1442 new varchar
      ndb/src/common/util/NdbSqlUtil.cpp:
        wl-1442 new varchar
      ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
        wl-1442 new varchar
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        wl-1442 new varchar
      ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
        wl-1442 new varchar
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        wl-1442 new varchar
      ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
        wl-1442 new varchar
      ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
        wl-1442 new varchar
      ndb/src/ndbapi/NdbDictionary.cpp:
        wl-1442 new varchar
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        wl-1442 new varchar
      ndb/src/ndbapi/NdbDictionaryImpl.hpp:
        wl-1442 new varchar
      ndb/src/ndbapi/NdbOperationDefine.cpp:
        wl-1442 new varchar
      ndb/src/ndbapi/NdbOperationSearch.cpp:
        wl-1442 new varchar
      ndb/src/ndbapi/NdbRecAttr.cpp:
        wl-1442 new varchar
      ndb/src/ndbapi/NdbTransaction.cpp:
        wl-1442 new varchar
      ndb/test/ndbapi/testOIBasic.cpp:
        wl-1442 new varchar
      sql/ha_ndbcluster.cc:
        wl-1442 new varchar
      23313449
    • unknown's avatar
      merge · 9bb36aa3
      unknown authored
      9bb36aa3
  21. 06 Jan, 2005 1 commit
    • unknown's avatar
      First stage of table definition cache · acf76e3b
      unknown authored
      Split TABLE to TABLE and TABLE_SHARE (TABLE_SHARE is still allocated as part of table, will be fixed soon)
      Created Field::make_field() and made Field_num::make_field() to call this
      Added 'TABLE_SHARE->db' that points to database name; Changed all usage of table_cache_key as database name to use this instead
      Changed field->table_name to point to pointer to alias. This allows us to change alias for a table by just updating one pointer.
      Renamed TABLE_SHARE->real_name to table_name
      Renamed TABLE->table_name to alias
      Renamed TABLE_LIST->real_name to table_name
      
      
      include/myisam.h:
        Added const before names
      mysql-test/r/group_min_max.result:
        Make results repeatable
      mysql-test/t/group_min_max.test:
        Make results repeatable
      sql/field.cc:
        Created Field::make_field() and made Field_num::make_field() to call this
        Use TABLE_SHARE
        Use sql_strmake() instead of sql_memdup() to simplify code
      sql/field.h:
        Changed table_name to be pointer to table_name. This allows us to change alias for all fields by just changing one pointer.
        Use TABLE_SHARE
      sql/field_conv.cc:
        Use TABLE_SHARE
      sql/filesort.cc:
        Use TABLE_SHARE
      sql/ha_berkeley.cc:
        Use TABLE_SHARE
      sql/ha_heap.cc:
        Use TABLE_SHARE
      sql/ha_innodb.cc:
        Use TABLE_SHARE
      sql/ha_myisam.cc:
        Use TABLE_SHARE
      sql/ha_myisammrg.cc:
        Use TABLE_SHARE
        Change some pointer handling to use const char*
      sql/ha_ndbcluster.cc:
        Use TABLE_SHARE
      sql/handler.cc:
        Use TABLE_SHARE
      sql/item.cc:
        Use TABLE_SHARE
      sql/item_func.cc:
        Use TABLE_SHARE
      sql/item_subselect.cc:
        Use TABLE_SHARE
      sql/item_sum.cc:
        Use TABLE_SHARE
      sql/key.cc:
        Use TABLE_SHARE
      sql/lock.cc:
        Use TABLE_SHARE
      sql/log_event.cc:
        real_name -> table_name
      sql/mysql_priv.h:
        Use TABLE_SHARE
      sql/opt_range.cc:
        Use TABLE_SHARE
      sql/opt_sum.cc:
        Use TABLE_SHARE
      sql/records.cc:
        Use TABLE_SHARE
      sql/repl_failsafe.cc:
        real_name -> table_name
      sql/slave.cc:
        Use TABLE_SHARE
      sql/sp.cc:
        Use TABLE_SHARE
      sql/sp_head.cc:
        real_name -> table_name
      sql/sql_acl.cc:
        Use TABLE_SHARE
        removed unnecessary assert
        fixed indentation
        changed some char * -> const char*
      sql/sql_acl.h:
        changed some char* -> const char*
      sql/sql_base.cc:
        Use TABLE_SHARE
      sql/sql_cache.cc:
        Use TABLE_SHARE
      sql/sql_class.cc:
        Use TABLE_SHARE
      sql/sql_db.cc:
        real_name -> table_name
      sql/sql_delete.cc:
        Use TABLE_SHARE
      sql/sql_derived.cc:
        Use TABLE_SHARE
      sql/sql_handler.cc:
        Use TABLE_SHARE
      sql/sql_help.cc:
        Use TABLE_SHARE
      sql/sql_insert.cc:
        Use TABLE_SHARE
      sql/sql_load.cc:
        Use TABLE_SHARE
      sql/sql_parse.cc:
        Use TABLE_SHARE
      sql/sql_rename.cc:
        real_name -> table_name
      sql/sql_select.cc:
        Use TABLE_SHARE
        table->blob_fields now points to field offsets, not fields
        tmp_table->table_name now points to alias name
      sql/sql_show.cc:
        Use TABLE_SHARE
      sql/sql_table.cc:
        Use TABLE_SHARE
      sql/sql_test.cc:
        Use TABLE_SHARE
      sql/sql_trigger.cc:
        Use TABLE_SHARE
      sql/sql_udf.cc:
        Use TABLE_SHARE
      sql/sql_union.cc:
        real_name -> table_name
      sql/sql_update.cc:
        Use TABLE_SHARE
      sql/sql_view.cc:
        Use TABLE_SHARE
      sql/table.cc:
        Split TABLE to TABLE and TABLE_SHARE
        Changed blob_field to be field offsets instead of pointer to fields
        Only initialize table->s->default_values with default record (not all table->record[#])
        Some indentation changes
      sql/table.h:
        Split TABLE to TABLE and TABLE_SHARE
      sql/tztime.cc:
        real_name -> table_name
      sql/unireg.cc:
        Use TABLE_SHARE
      sql/unireg.h:
        Use TABLE_SHARE
      acf76e3b
  22. 05 Jan, 2005 1 commit
  23. 04 Jan, 2005 3 commits
    • unknown's avatar
      merge failure · b6e39434
      unknown authored
      b6e39434
    • unknown's avatar
      changed some NdbConnection to NdbTransaction · 46a847e7
      unknown authored
      46a847e7
    • unknown's avatar
      After merge fixes · bd365f76
      unknown authored
      Add support for warnings for prepare of prepared statements
      Fixed test to work with --ps-protocol
      Fixed some test results
      
      
      libmysql/libmysql.c:
        Add support for warnings for prepare of prepared statements
      mysql-test/r/func_concat.result:
        After merge fixes
      mysql-test/r/select.result:
        Delete conflicting tables form previous tests
      mysql-test/r/view.result:
        New code from 4.1 fixed old error
      mysql-test/t/create.test:
        Ensure that --ps-protocol return same results as normal test
      mysql-test/t/func_group.test:
        Remove not needed --disable_ps_protocol
      mysql-test/t/func_time.test:
        Ensure that --ps-protocol return same results as normal test
      mysql-test/t/having.test:
        Ensure that --ps-protocol return same results as normal test
      mysql-test/t/insert_select.test:
        Remove not needed --disable_ps_protocol
      mysql-test/t/select.test:
        Ensure that --ps-protocol return same results as normal test
      mysql-test/t/sp.test:
        Fixed comment
      mysql-test/t/system_mysql_db_fix.test:
        Fix that results is same as from system_mysql_db.test
      mysql-test/t/trigger.test:
        Added comment
      mysql-test/t/type_blob.test:
        Remove not needed --disable_ps_protocol
      mysql-test/t/union.test:
        Run most of the test with --ps-protocol
      mysql-test/t/user_limits.test:
        Ensure that --ps-protocol return same results as normal test
      mysql-test/t/view.test:
        Removed --error as bug is now fixed
      mysql-test/t/warnings.test:
        Ensure that --ps-protocol return same results as normal test
      ndb/include/Makefile.am:
        Don't automaticly use SCCS files
      sql/ha_ndbcluster.cc:
        Removed compiler warning
      sql/log_event.cc:
        After merge fix
      sql/sql_class.h:
        After merge fix
      sql/sql_insert.cc:
        After merge fix
      sql/sql_load.cc:
        After merge fix
      sql/sql_prepare.cc:
        Add support for warnings for prepare of prepared statements
      sql/sql_update.cc:
        After merge fixes
      bd365f76