An error occurred fetching the project authors.
  1. 05 Jul, 2007 1 commit
    • unknown's avatar
      Fix for bug #29411: deleting from a csv table leads to the table corruption · 558aeb0f
      unknown authored
      Problem: we don't adjust share->rows_recorded and local_saved_data_file_length
      deleting rows from a CSV table, so following table check may fail.
      
      Fix: properly adjust those values.
      
      
      mysql-test/r/csv.result:
        Fix for bug #29411: deleting from a csv table leads to the table corruption
          - test result.
      mysql-test/t/csv.test:
        Fix for bug #29411: deleting from a csv table leads to the table corruption
          - test case.
      storage/csv/ha_tina.cc:
        Fix for bug #29411: deleting from a csv table leads to the table corruption
          - decrement share->rows_recorded in the ha_tina::delete_row().
          - set share->rows_recorded and local_saved_data_file_length to 0 in the 
            ha_tina::delete_all_rows().
          - adjust local_saved_data_file_length after cleaning up in the 
            ha_tina::rnd_end().
      558aeb0f
  2. 04 Jul, 2007 11 commits
    • unknown's avatar
      WL#3914: Additonal accessors required to compile InnoDB as a plugin storage engine · bd8b9746
      unknown authored
      Add more accessors to MySQL internals in mysql/plugin.h, for storage
      engine plugins.
      
      Add some accessors specific to the InnoDB storage engine, to allow
      InnoDB to be compiled as a plugin (without MYSQL_SERVER).  InnoDB
      has additional requirements, due to its foreign key support, etc.
      
      
      include/m_string.h:
        Add structure tag to LEX_STRING definition, so that it can be referred
        to by forward declarations.  Allow struct st_mysql_lex_string to be
        defined here, or in mysql/plugin.h.
      include/my_global.h:
        Define INNODB_COMPATIBILITY_HOOKS unconditionally; it brackets
        some definitions needed for the InnoDB storage engine plugin
        which do not belong in our general plugin interface.
      include/mysql/plugin.h:
        Additional accessors for MySQL internals:
         
        - Full definition of MYSQL_LEX_STRING (identical to LEX_STRING from
          m_string.h)
        - Full definition of MYSQL_XID (binary compatible with XID from
          handler.h)
        - mysql_tmpfile(), creates a temporary file in mysqld's tmpdir
        - thd_killed(), to check killed state of connection
        - thd_alloc() and similar allocation functions
        - thd_get_xid(), to get XID of connection's transaction
        - mysql_query_cache_invalidate4, to invalidate a table's query cache entries
      sql/handler.h:
        Use MYSQL_XIDDATASIZE definition from mysql/plugin.h, to avoid redundant
        definitions
      sql/log.cc:
        Add definitions for two InnoDB compatibility hooks:
        - mysql_bin_log_file(), to get log filename
        - mysql_bin_log_file_pos, to get position in file
          
        These are defined only if INNODB_COMPATIBILITY_HOOKS is defined;
        they are needed by the InnoDB plugin, but aren't part of the general
        plugin interface.  They are declared in ha_innodb.h for InnoDB's
        use.
      sql/mysql_priv.h:
        Expose some server internals when INNODB_COMPATIBILITY_HOOKS is
        defined, so that InnoDB can be built as a plugin when MYSQL_SERVER
        is not defined.
          
        Move make_lex_string inside THD class.
      sql/sql_cache.cc:
        Add definiton of mysql_query_cache_invalidate4(), a part of the
        plugin API (mysql/plugin.h).
      sql/sql_class.cc:
        Add definitions for several accessor functions which form part
        of the plugin API (mysql/plugin.h):
        - mysql_tmpfile()
        - thd_alloc() and friends
        - thd_make_lex_string()
        - thd_get_xid()
         
        Add definitons for accessor functions which InnoDB requires,
        but which are not part of the plugin interface:
        - thd_charset()
        - thd_query()
        - thd_slave_thread()
        - thd_non_transactional_update()
        - thd_binlog_format()
         
        Move definition of make_lex_string() from sql_show.cc into THD class
      sql/sql_class.h:
        Remove LEX_STRING_make(), and move make_lex_string() from sql_show.cc inside THD
        class.
      sql/sql_parse.cc:
        Use thd->make_lex_string() instead of thd->LEX_STRING_make()
      sql/sql_show.cc:
        Move make_lex_string() inside THD class
      storage/innobase/handler/ha_innodb.cc:
        Call thd_make_lex_string() instead of make_lex_string().
      bd8b9746
    • unknown's avatar
      Merge maint1.mysql.com:/data/localhome/tsmith/bk/maint/50 · aa6565ce
      unknown authored
      into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
      
      
      aa6565ce
    • unknown's avatar
      Merge maint1.mysql.com:/data/localhome/tsmith/bk/maint/41 · 0b5daef9
      unknown authored
      into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
      
      
      0b5daef9
    • unknown's avatar
      Many tests have been moved to suite/*. Some tests have been removed. · a7489ed1
      unknown authored
      Update the disabled.def files to reflect actual contents of the t/* directories.
      
      Also, move a few more tests into suite/*.
      
      
      mysql-test/suite/parts/t/rpl_partition.test:
        Rename: mysql-test/t/rpl_partition.test -> mysql-test/suite/parts/t/rpl_partition.test
      mysql-test/suite/parts/r/rpl_partition.result:
        Rename: mysql-test/r/rpl_partition.result -> mysql-test/suite/parts/r/rpl_partition.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def-master.opt:
        Rename: mysql-test/t/rpl_ndb_ctype_ucs2_def-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def-master.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def.test:
        Rename: mysql-test/t/rpl_ndb_ctype_ucs2_def.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb-master.opt:
        Rename: mysql-test/t/rpl_ndb_mix_innodb-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb-master.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb.test:
        Rename: mysql-test/t/rpl_ndb_mix_innodb.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb.test
      mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result:
        Rename: mysql-test/r/rpl_ndb_ctype_ucs2_def.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_mix_innodb.result:
        Rename: mysql-test/r/rpl_ndb_mix_innodb.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_mix_innodb.result
      mysql-test/suite/ndb/t/disabled.def:
        Some tests have moved to suite/*, and some have been removed. Update disabled.def files to be consistent with actual t/* contents.
      mysql-test/suite/parts/t/disabled.def:
        Some tests have moved to suite/*, and some have been removed. Update disabled.def files to be consistent with actual t/* contents.
      mysql-test/suite/rpl/t/disabled.def:
        Some tests have moved to suite/*, and some have been removed. Update disabled.def files to be consistent with actual t/* contents.
      mysql-test/suite/rpl_ndb/t/disabled.def:
        Some tests have moved to suite/*, and some have been removed. Update disabled.def files to be consistent with actual t/* contents.
      mysql-test/t/disabled.def:
        Some tests have moved to suite/*, and some have been removed. Update disabled.def files to be consistent with actual t/* contents.
      a7489ed1
    • unknown's avatar
      Merge maint1.mysql.com:/data/localhome/tsmith/bk/51 · 9e14ae94
      unknown authored
      into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
      
      
      client/mysqldump.c:
        Auto merged
      mysql-test/lib/mtr_cases.pl:
        Auto merged
      mysql-test/lib/mtr_report.pl:
        Auto merged
      mysql-test/r/mysqldump.result:
        Auto merged
      mysql-test/suite/binlog/r/binlog_multi_engine.result:
        Auto merged
      mysql-test/suite/binlog/t/binlog_multi_engine.test:
        Auto merged
      mysql-test/suite/ndb/r/ndb_read_multi_range.result:
        Auto merged
      mysql-test/suite/ndb/r/ndb_sp.result:
        Auto merged
      mysql-test/suite/ndb/r/ndb_trigger.result:
        Auto merged
      mysql-test/suite/ndb/r/ps_7ndb.result:
        Auto merged
      mysql-test/suite/ndb/t/loaddata_autocom_ndb.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_alter_table.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_alter_table2.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_alter_table3.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_autodiscover.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_autodiscover2.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_autodiscover3.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_basic.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_binlog_ddl_multi.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_binlog_log_bin.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_binlog_multi.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_bitfield.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_blob.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_blob_partition.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_cache.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_cache2.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_cache_multi.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_cache_multi2.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_charset.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_condition_pushdown.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_config.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_config2.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_cursor.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_database.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_dd_alter.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_dd_backuprestore.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_dd_basic.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_dd_ddl.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_dd_disk2memory.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_dd_dump.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_dd_sql_features.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_gis.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_index.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_index_ordered.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_index_unique.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_insert.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_limit.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_loaddatalocal.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_lock.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_minmax.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_multi.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_partition_error.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_partition_key.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_partition_list.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_partition_range.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_read_multi_range.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_rename.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_replace.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_restore.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_restore_partition.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_restore_print.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_row_format.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_single_user.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_sp.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_subquery.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_temporary.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_transaction.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_trigger.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_truncate.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_types.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_update.test:
        Auto merged
      mysql-test/suite/ndb/t/ndb_view.test:
        Auto merged
      mysql-test/suite/ndb/t/ndbapi.test:
        Auto merged
      mysql-test/suite/ndb/t/ps_7ndb.test:
        Auto merged
      mysql-test/suite/ndb/t/strict_autoinc_5ndb.test:
        Auto merged
      mysql-test/suite/rpl/r/rpl_events.result:
        Auto merged
      mysql-test/suite/rpl/r/rpl_replicate_do.result:
        Auto merged
      mysql-test/suite/rpl/r/rpl_row_UUID.result:
        Auto merged
      mysql-test/suite/rpl/r/rpl_sp.result:
        Auto merged
      mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result:
        Auto merged
      mysql-test/suite/rpl/r/rpl_trigger.result:
        Auto merged
      mysql-test/suite/rpl/r/rpl_view.result:
        Auto merged
      mysql-test/suite/rpl_ndb/r/rpl_ndb_UUID.result:
        Auto merged
      mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result:
        Auto merged
      mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result:
        Auto merged
      mysql-test/suite/rpl_ndb/t/rpl_ndb_commit_afterflush.test:
        Auto merged
      mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_advance.test:
        Auto merged
      mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test:
        Auto merged
      mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-master.opt:
        Auto merged
      mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      sql/Makefile.am:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_class.h:
        Auto merged
      mysql-test/t/disabled.def:
        manual merge
        (Will need to follow up with moving a few test cases around post-merge)
      9e14ae94
    • unknown's avatar
      Merge maint1.mysql.com:/data/localhome/tsmith/bk/50 · 8d2d1520
      unknown authored
      into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
      
      
      8d2d1520
    • unknown's avatar
      Merge maint1.mysql.com:/data/localhome/tsmith/bk/41 · 1b827e03
      unknown authored
      into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/41
      
      
      1b827e03
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 9838a1a9
      unknown authored
      into  sita.local:/Users/tsmith/m/bk/maint/51
      
      
      9838a1a9
    • unknown's avatar
      rpl_misc_functions.result, rpl_misc_functions.test: · 793c1896
      unknown authored
        Remove indeterministic behavior from a test
      
      
      mysql-test/suite/rpl/r/rpl_misc_functions.result:
        Remove indeterministic behavior from a test
      mysql-test/suite/rpl/t/rpl_misc_functions.test:
        Remove indeterministic behavior from a test
      793c1896
    • unknown's avatar
      Merge mysql.com:/home/ram/work/mysql-5.1-maint · 5b5ef176
      unknown authored
      into  mysql.com:/home/ram/work/b19328/b19328.5.1
      
      
      5b5ef176
    • unknown's avatar
      rpl_misc_functions.result, rpl_misc_functions.test: · d7282f13
      unknown authored
        work around bug 29537, which was revealed by patch for bug 28356: move DROP TABLE before DROP PROCEDURE in cleanup
      
      
      mysql-test/suite/rpl/r/rpl_misc_functions.result:
        work around bug 29537, which was revealed by patch for bug 28356: move DROP TABLE before DROP PROCEDURE in cleanup
      mysql-test/suite/rpl/t/rpl_misc_functions.test:
        work around bug 29537, which was revealed by patch for bug 28356: move DROP TABLE before DROP PROCEDURE in cleanup
      d7282f13
  3. 03 Jul, 2007 7 commits
    • unknown's avatar
      Complementary fix for bug #29353: inserting a negative value to a csv table · b16b2683
      unknown authored
      leads to the table corruption
      
      New Field::store() method implemented to explicitly set thd->count_cuted_fields
      before value storing, instead of (incorrectly) setting it in the CSV storage engine.
      Thread row counter now properly incremented during check and repair in the CSV engine.
      
      
      include/mysql/plugin.h:
        Complementary fix for bug #29353: inserting a negative value to a csv table 
        leads to the table corruption
          - thd_inc_row_count() function prototype added, which allows a storage 
            engine to increment thread row counter.
      mysql-test/r/csv.result:
        Complementary fix for bug #29353: inserting a negative value to a csv table 
        leads to the table corruption
          - result adjusted.
      sql/field.cc:
        Complementary fix for bug #29353: inserting a negative value to a csv table 
        leads to the table corruption
          - Field::store(const char *to, uint length, CHARSET_INFO *cs,
                         enum_check_fields check_level)
            method introduced in order to explicitly set count_cuted_fields before 
            a ::store call, then reset it back after.
      sql/field.h:
        Complementary fix for bug #29353: inserting a negative value to a csv table 
        leads to the table corruption
          - Field::store(const char *to, uint length, CHARSET_INFO *cs,
                         enum_check_fields check_level)
            method introduced in order to explicitly set count_cuted_fields before 
            a ::store call, then reset it back after.
      sql/mysql_priv.h:
        Complementary fix for bug #29353: inserting a negative value to a csv table 
        leads to the table corruption
          - enum enum_check_fields moved from sql/sql_class.h to sql/mysql_priv.h
            as it's used now in the field.h
      sql/sql_class.cc:
        Complementary fix for bug #29353: inserting a negative value to a csv table 
        leads to the table corruption
          - implementation of the new thd_inc_row_count() function which increments
            thread row counter.
      sql/sql_class.h:
        Complementary fix for bug #29353: inserting a negative value to a csv table 
        leads to the table corruption
          - enum enum_check_fields moved from sql/sql_class.h to sql/mysql_priv.h
            as it's used now in the field.h
      storage/csv/ha_tina.cc:
        Complementary fix for bug #29353: inserting a negative value to a csv table 
        leads to the table corruption
          - removed #define MYSQL_SERVER 1 - "a storage engine should not need 
            internals of the server"
          - removed thd->count_cuted_fields= CHECK_FIELD_WARN as we are not allowed to 
            access internals of THD.
          - used new Field::store() method to explicitly set thd->count_cuted_fields to
            CHECK_FIELD_WARN
          - thd_inc_row_count() calls added to ha_tina::repair() and ha_tina::check()
            to get proper row count values.
      b16b2683
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 48782e34
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
      
      
      storage/ndb/test/run-test/daily-basic-tests.txt:
        Auto merged
      48782e34
    • unknown's avatar
      Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b27345 · c45f8f94
      unknown authored
      into  mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl
      
      
      strings/ctype-uca.c:
        Auto merged
      strings/ctype-mb.c:
        After merge fix.
      strings/ctype-ucs2.c:
        After merge fix.
      c45f8f94
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · 7edcebc9
      unknown authored
      into  mysql.com:/home/bar/mysql-work/mysql-5.0.b27345
      
      
      7edcebc9
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · b5a61001
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      b5a61001
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · fb349433
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
      
      
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      fb349433
    • unknown's avatar
      ndb - bug#29354 - Incorrect handling of replica REDO during SR (5.0) · d55ca617
      unknown authored
        Not very clever fix for DIH incorrect REDO handling
        - Dont report GCP_SAVE_CONF until first LCP has been complete during NR
      
      
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Not very clever fix for DIH incorrect REDO handling
          - Dont report GCP_SAVE_CONF until first LCP has been complete during NR
      d55ca617
  4. 02 Jul, 2007 18 commits
  5. 01 Jul, 2007 3 commits
    • unknown's avatar
      Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime · 418996f3
      unknown authored
      into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
      
      
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      418996f3
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · c182dfa2
      unknown authored
      into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
      
      
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      c182dfa2
    • unknown's avatar
      Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime · 58935a31
      unknown authored
      into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
      
      
      mysql-test/r/ps_1general.result:
        Auto merged
      mysql-test/r/ps_2myisam.result:
        Auto merged
      mysql-test/r/ps_3innodb.result:
        Auto merged
      mysql-test/r/ps_4heap.result:
        Auto merged
      mysql-test/r/ps_5merge.result:
        Auto merged
      BitKeeper/deleted/.del-ps_6bdb.result:
        Auto merged
      mysql-test/r/ps_7ndb.result:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_error.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/show_check.result:
        Manual merge.
      mysql-test/t/show_check.test:
        Manual merge.
      sql/item.h:
        Manual merge.
      sql/sp.cc:
        Manual merge.
      sql/sql_trigger.cc:
        Manual merge.
      tests/mysql_client_test.c:
        Manual merge.
      58935a31