1. 03 Oct, 2006 17 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1 · c8b64ea1
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
      
      
      sql/item_func.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      c8b64ea1
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new-rpl · c9970c5b
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
      
      
      client/mysql.cc:
        Auto merged
      include/m_ctype.h:
        Auto merged
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/r/strict.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/r/warnings.result:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      c9970c5b
    • unknown's avatar
    • unknown's avatar
      After merge fix. · 0416b69d
      unknown authored
      
      mysql-test/extra/rpl_tests/rpl_insert_id.test:
        Enhance test for bug#21726 to cover statement-based replication of
        function calls.
      sql/sql_class.cc:
        Fix typo and whitespace.
      0416b69d
    • unknown's avatar
      Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real-bug21726-fix · af9e2eb1
      unknown authored
      into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-real-bug21726
      
      
      sql/item_func.cc:
        Use local.
      sql/log.cc:
        Use local.
      sql/set_var.cc:
        Use local.
      sql/sql_class.cc:
        Use local.
      sql/sql_class.h:
        Use local.
      sql/sql_parse.cc:
        Use local.
      sql/sql_select.cc:
        Use local.
      mysql-test/r/rpl_insert_id.result:
        Use local.
      mysql-test/t/rpl_insert_id.test:
        Add result for updated test.
      af9e2eb1
    • unknown's avatar
      sql_yacc.yy: · fd5ea175
      unknown authored
        After merge fix.
      field.cc:
        After merge fix
      
      
      sql/field.cc:
        After merge fix
      sql/sql_yacc.yy:
        After merge fix.
      fd5ea175
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 · e6340946
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
      
      
      BitKeeper/etc/collapsed:
        auto-union
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/lib/mtr_process.pl:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      e6340946
    • unknown's avatar
      After merge fix · 7dad8e69
      unknown authored
      
      BitKeeper/deleted/.del-ps_6bdb.result:
        Auto merged
      client/mysql.cc:
        Auto merged
      include/m_ctype.h:
        Auto merged
      mysql-test/r/cast.result:
        Auto merged
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/r/ps.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
      mysql-test/r/ps_7ndb.result:
        Auto merged
      mysql-test/t/cast.test:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      mysql-test/t/strict.test:
        Auto merged
      sql/field_conv.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      strings/ctype-big5.c:
        Auto merged
      strings/ctype-bin.c:
        Auto merged
      strings/ctype-cp932.c:
        Auto merged
      strings/ctype-euc_kr.c:
        Auto merged
      strings/ctype-eucjpms.c:
        Auto merged
      strings/ctype-gb2312.c:
        Auto merged
      strings/ctype-gbk.c:
        Auto merged
      strings/ctype-latin1.c:
        Auto merged
      strings/ctype-sjis.c:
        Auto merged
      strings/ctype-tis620.c:
        Auto merged
      strings/ctype-ucs2.c:
        Auto merged
      strings/ctype-ujis.c:
        Auto merged
      strings/ctype-utf8.c:
        Auto merged
      7dad8e69
    • unknown's avatar
      Fix for the patch for bug#21726: Incorrect result with multiple · 37b5cbdc
      unknown authored
      invocations of LAST_INSERT_ID.
      
      Reding of LAST_INSERT_ID inside stored function wasn't noted by caller,
      and no LAST_INSERT_ID_EVENT was issued for binary log.
      
      The solution is to add THD::last_insert_id_used_bin_log, which is much
      like THD::last_insert_id_used, but is reset only for upper-level
      statements.  This new variable is used to issue LAST_INSERT_ID_EVENT.
      
      
      mysql-test/r/rpl_insert_id.result:
        For bug#21726, add result for statement-based replication of function
        calls.
      mysql-test/t/rpl_insert_id.test:
        For bug#21726, add test case for statement-based replication of function
        calls.
      sql/item_func.cc:
        Set THD::last_insert_id_used_bin_log for issuing of LAST_INSERT_ID_EVENT.
      sql/log.cc:
        Issue LAST_INSERT_ID_EVENT if THD::last_insert_id_used_bin_log is set.
      sql/set_var.cc:
        Set THD::last_insert_id_used_bin_log for issuing of LAST_INSERT_ID_EVENT.
      sql/sql_class.cc:
        Initialize THD::last_insert_id_used_bin_log.
        Fix typo, add whitespace.
      sql/sql_class.h:
        Add THD::last_insert_id_used_bin_log.
      sql/sql_parse.cc:
        Reset THD::last_insert_id_used_bin_log for upper-level statements.
      sql/sql_select.cc:
        Set THD::last_insert_id_used_bin_log for issuing of LAST_INSERT_ID_EVENT.
      37b5cbdc
    • unknown's avatar
      Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-real · 16336789
      unknown authored
      into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-real-bug21726
      
      
      sql/sql_select.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      16336789
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 · 4506b26d
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
      
      
      BitKeeper/etc/ignore:
        auto-union
      mysql-test/r/ctype_ucs.result:
        Auto merged
      mysql-test/r/func_gconcat.result:
        Auto merged
      mysql-test/r/func_group.result:
        Auto merged
      mysql-test/r/group_by.result:
        Auto merged
      mysql-test/r/partition.result:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/ctype_ucs.test:
        Auto merged
      mysql-test/t/func_gconcat.test:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/field.h:
        Auto merged
      sql/filesort.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      storage/innobase/handler/ha_innodb.cc:
        Auto merged
      storage/innobase/handler/ha_innodb.h:
        Auto merged
      storage/myisam/mi_check.c:
        Auto merged
      sql/share/errmsg.txt:
        Manul merge(conflict with new german text)
      sql/unireg.cc:
        Manual merge(as it is in 5.1)
      4506b26d
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-maint · 5d6d3f40
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
      
      
      5d6d3f40
    • unknown's avatar
      Merge mysql.com:/usr/home/bar/mysql-4.1-rpl.b8663 · c317c2d2
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0-rpl
      
      
      mysql-test/r/cast.result:
        null merge for bug#8663
        It will beed another fix for 5.0
        - changes in new DECIMAL instead of FLOAT
      mysql-test/r/ps.result:
        null merge
      mysql-test/t/cast.test:
        null merge
      mysql-test/t/count_distinct3.test:
        null merge
      sql/item_func.cc:
        null merge
      c317c2d2
    • unknown's avatar
      Merge mysql.com:/usr/home/bar/mysql-4.1.b8663 · dc62ff55
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-4.1-rpl
      
      
      mysql-test/r/cast.result:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      sql/item_func.cc:
        Auto merged
      dc62ff55
    • unknown's avatar
      after-merge fix: warning adjusted. · 59301c14
      unknown authored
      59301c14
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 68fa1c27
      unknown authored
      into  mysql.com:/usr/home/ram/work/bug22271/my51-bug22271
      
      
      sql/field.cc:
        Auto merged
      68fa1c27
    • unknown's avatar
      Merge mysql.com:/usr/home/ram/work/bug22271/my50-bug22271 · 4a09aeb3
      unknown authored
      into  mysql.com:/usr/home/ram/work/bug22271/my51-bug22271
      
      
      mysql-test/r/type_bit.result:
        Auto merged
      sql/field.cc:
        Auto merged
      4a09aeb3
  2. 02 Oct, 2006 23 commits
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · ca3d54e1
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
      
      
      include/my_global.h:
        Auto merged
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      ca3d54e1
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · d026ddba
      unknown authored
      into  siva.hindu.god:/usr/home/tim/m/bk/wl3516/51
      
      
      sql/log.cc:
        Auto merged
      d026ddba
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · b92388a2
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
      
      
      sql/opt_range.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      b92388a2
    • unknown's avatar
      Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-real · 2ac39ce6
      unknown authored
      into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-real-bug21726
      
      
      sql/sql_insert.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      2ac39ce6
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 21070e43
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
      
      
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      21070e43
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · 60dc71eb
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      include/my_global.h:
        Auto merged
      mysql-test/r/ctype_utf8.result:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Manual merge
      sql/mysqld.cc:
        Manual merge
      60dc71eb
    • unknown's avatar
      Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1 · 57eef6e4
      unknown authored
      into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21081
      
      
      57eef6e4
    • unknown's avatar
      Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl · 338d024d
      unknown authored
      into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
      
      
      338d024d
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl · 8079917f
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
      
      
      8079917f
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl · 0ca2e21b
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
      
      
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      0ca2e21b
    • unknown's avatar
      Remove faulty merge · c71ecd92
      unknown authored
      c71ecd92
    • unknown's avatar
      Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl · 8aa26289
      unknown authored
      into  romeo.(none):/home/bk/fix-mysql-5.1-new-rpl
      
      
      8aa26289
    • unknown's avatar
      When compiling with qcc on QNC the define __GNUC__will be set although it... · 5bd5f55e
      unknown authored
      When compiling with qcc on QNC the define __GNUC__will be set although it doesn't support full GNU syntax
       - disable __attribute__ when using qcc
      
      
      include/my_global.h:
        Disable __attribute__ when compiling with qcc
      5bd5f55e
    • unknown's avatar
      Remove faulty merge causing ctype_utf8 failure · 4c59fcea
      unknown authored
      4c59fcea
    • unknown's avatar
    • unknown's avatar
      BUG#22550 (Replication of BIT column failing): · a613b341
      unknown authored
      Adding test case.
      
      
      mysql-test/extra/rpl_tests/rpl_row_basic.test:
        Rename: mysql-test/include/rpl_row_basic.inc -> mysql-test/extra/rpl_tests/rpl_row_basic.test
      mysql-test/r/rpl_row_basic_11bugs.result:
        Result change
      mysql-test/t/rpl_row_basic_11bugs.test:
        Adding test case for bug.
      mysql-test/t/rpl_row_basic_2myisam.test:
        Moving test include file to extra/rpl_tests
      mysql-test/t/rpl_row_basic_3innodb.test:
        Moving test include file to extra/rpl_tests
      mysql-test/t/rpl_row_basic_7ndb.test:
        Moving test include file to extra/rpl_tests
      a613b341
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1-maint · b85d8034
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
      
      
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      b85d8034
    • unknown's avatar
      Fix after manual merge: add tests from 5.0. · d224f221
      unknown authored
      
      mysql-test/extra/rpl_tests/rpl_insert_id.test:
        Add test case for bug#21726: Incorrect result with multiple invocations
        of LAST_INSERT_ID, and 5.0 version of test case for bug#20339: stored
        procedure using LAST_INSERT_ID() does not replicate statement-based.
      mysql-test/r/rpl_insert_id.result:
        Update result.
      d224f221
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 · 1672af1f
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
      
      
      mysql-test/r/ctype_utf8.result:
        Manual merge
      mysql-test/t/ctype_utf8.test:
        Manual merge
      1672af1f
    • unknown's avatar
      Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real-bug21726 · 43ed7433
      unknown authored
      into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-real-bug21726
      
      
      mysql-test/t/rpl_insert_id.test:
        Use local.
      sql/item_func.cc:
        Use local.
      sql/item_func.h:
        Use local.
      sql/log_event.cc:
        SCCS merged
      sql/set_var.cc:
        Use local.
      sql/sql_class.h:
        Use local.
      sql/sql_insert.cc:
        Use local.
      sql/sql_load.cc:
        Use local.
      sql/sql_parse.cc:
        Use local.
      sql/sql_select.cc:
        Use local.
      sql/sql_update.cc:
        Use local.
      mysql-test/r/rpl_insert_id.result:
        Use local.
      sql/sql_class.cc:
        Manual merge.  Add comment for THD::cleanup_after_query().
      tests/mysql_client_test.c:
        Manual merge.  Add test case for bug#21726: Incorrect result with
        multiple invocations of LAST_INSERT_ID.
      43ed7433
    • unknown's avatar
      BUG#21726: Incorrect result with multiple invocations of LAST_INSERT_ID · be929087
      unknown authored
      Non-upper-level INSERTs (the ones in the body of stored procedure,
      stored function, or trigger) into a table that have AUTO_INCREMENT
      column didn't affected the result of LAST_INSERT_ID() on this level.
      
      The problem was introduced with the fix of bug 6880, which in turn was
      introduced with the fix of bug 3117, where current insert_id value was
      remembered on the first call to LAST_INSERT_ID() (bug 3117) and was
      returned from that function until it was reset before the next
      _upper-level_ statement (bug 6880).
      
      The fix for bug#21726 brings back the behaviour of version 4.0, and
      implements the following: remember insert_id value at the beginning
      of the statement or expression (which at that point equals to
      the first insert_id value generated by the previous statement), and
      return that remembered value from LAST_INSERT_ID() or @@LAST_INSERT_ID.
      
      Thus, the value returned by LAST_INSERT_ID() is not affected by values
      generated by current statement, nor by LAST_INSERT_ID(expr) calls in
      this statement.
      
      Version 5.1 does not have this bug (it was fixed by WL 3146).
      
      
      mysql-test/r/rpl_insert_id.result:
        Add results for bug#21726: Incorrect result with multiple invocations
        of LAST_INSERT_ID, and bug#20339: stored procedure using LAST_INSERT_ID()
        does not replicate statement-based.
      mysql-test/t/rpl_insert_id.test:
        Add test cases for bug#21726: Incorrect result with multiple invocations
        of LAST_INSERT_ID, and bug#20339: stored procedure using LAST_INSERT_ID()
        does not replicate statement-based.
      sql/item_func.cc:
        Add implementation of Item_func_last_insert_id::fix_fields(), where we
        remember in THD::current_insert_id the first value generated during
        execution of the previous statement, which is returned then from
        Item_func_last_insert_id::val_int().
      sql/item_func.h:
        Add declaration of Item_func_last_insert_id::fix_fields().
      sql/log_event.cc:
        Do not set THD::last_insert_id_used on LAST_INSERT_ID_EVENT.  Though we
        know the statement will call LAST_INSERT_ID(), it wasn't called yet.
      sql/set_var.cc:
        In sys_var_last_insert_id::value_ptr() remember in
        THD::current_insert_id the first value generated during execution of the
        previous statement, and return this value for @@LAST_INSERT_ID.
      sql/sql_class.cc:
        Reset THD::last_insert_id_used after each statement execution.
      sql/sql_class.h:
        Rather then remember current insert_id value on first invocation of
        THD::insert_id(), remember it in Item_func_last_insert_id::fix_fields(),
        sys_var_last_insert_id::value_ptr(), or mysql_execute_command().
        Remove THD::insert_id(), as it lost its value now.
      sql/sql_insert.cc:
        THD::insert_id() is removed, use THD::last_insert_id directly.
      sql/sql_load.cc:
        THD::insert_id() is removed, using THD::last_insert_id directly is OK.
      sql/sql_parse.cc:
        Remember in THD::current_insert_id first generated insert id value of
        the previous statement in mysql_execute_command().
        No need to reset THD::last_insert_id_used in
        mysql_reset_thd_for_next_command(), it will be reset after each
        statement.
      sql/sql_select.cc:
        If "IS NULL" is replaced with "= <LAST_INSERT_ID>", use right value,
        which is THD::current_insert_id, and also set THD::last_insert_id_used
        to issue binary log LAST_INSERT_ID_EVENT.
      sql/sql_update.cc:
        THD::insert_id() is removed, use THD::last_insert_id directly.
      tests/mysql_client_test.c:
        Add test case for bug#21726: Incorrect result with multiple invocations
        of LAST_INSERT_ID.
      be929087
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines · d5d02ca9
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
      
      
      BitKeeper/etc/ignore:
        auto-union
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      d5d02ca9
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 · a9f677dc
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
      
      
      BitKeeper/etc/ignore:
        auto-union
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      storage/archive/ha_archive.cc:
        Auto merged
      storage/archive/ha_archive.h:
        Auto merged
      sql/sql_insert.cc:
        Manual merge.
      a9f677dc