An error occurred fetching the project authors.
  1. 06 Aug, 2005 1 commit
    • unknown's avatar
      log_event.h: · c2108b08
      unknown authored
        extra safety for OPTIONS_WRITTEN_TO_BIN_LOG
      
      
      sql/log_event.h:
        extra safety for OPTIONS_WRITTEN_TO_BIN_LOG
      c2108b08
  2. 31 Jul, 2005 7 commits
  3. 30 Jul, 2005 2 commits
  4. 29 Jul, 2005 19 commits
    • unknown's avatar
      Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8867beec
      unknown authored
      into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
      
      
      8867beec
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 7dafc733
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-trigger-5.0
      
      
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/t/mysqldump.test:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      mysql-test/r/mysqldump.result:
        merge
      sql/sql_trigger.cc:
        merge
      7dafc733
    • unknown's avatar
      Added sql_mode saving to mysql_dump (BUG#5891, part 2) · 675c4bb4
      unknown authored
      client/client_priv.h:
        add OPT_ for --trigger parameter
      client/mysqldump.c:
        fixed short simbol for trigger
        fixed lines break for more compiler compatibility
        added sql_mode output
        added comments
        made protection of trigger and view restoring commands from execution by old versions of mysql
      mysql-test/r/mysqldump.result:
        changed test, to test sql_mode
      mysql-test/r/sp.result:
        now sql_mode preserved in SP
      mysql-test/t/mysqldump.test:
        changed test, to test sql_mode
      mysql-test/t/sp.test:
        now sql_mode preserved in SP
      sql/set_var.cc:
        fixed comment
      675c4bb4
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-10351 · c7908e78
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      mysql-test/t/select_safe.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      c7908e78
    • unknown's avatar
      Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 · 243e9f32
      unknown authored
      into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
      
      
      sql/sql_prepare.cc:
        Auto merged
      243e9f32
    • unknown's avatar
      fix for bug#12665 · 52dfa3b8
      unknown authored
      macro floatget was missing in config-win.h
      
      
      52dfa3b8
    • unknown's avatar
      - fixed a typo in C++Files/client/mysqlclient_ia64.dsp: ctype-cp963.c -> ctype-cp932.c · 8cec8458
      unknown authored
        (thanks to JoergB for spotting it)
      
      
      VC++Files/client/mysqlclient_ia64.dsp:
        - fixed a typo: ctype-cp963.c -> ctype-cp932.c (thanks to JoergB for spotting it)
      8cec8458
    • unknown's avatar
      Fix for bug #12173 (show create table crash) · 68cd99bd
      unknown authored
      mysql-test/r/type_newdecimal.result:
        test result fixed
      mysql-test/t/type_newdecimal.test:
        testcase
      strings/decimal.c:
        we always add one int-part digit even if decimal(10,10) (no int part declared)
      68cd99bd
    • unknown's avatar
      Manual merge · df7e030b
      unknown authored
      df7e030b
    • unknown's avatar
      Manual merge · 48abe1d6
      unknown authored
      configure.in:
        Auto merged
      mysql-test/r/null_key.result:
        Auto merged
      mysql-test/t/null_key.test:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      48abe1d6
    • unknown's avatar
      func_gconcat.result, func_gconcat.test: · 21d2fb62
      unknown authored
        Added a test case for bug #12095.
      sql_class.h:
        Fixed bug #12095: a join query with GROUP_CONCAT over a single row table.
        Added a flag to the TMP_TABLE_PARAM class forcing to put constant
        items generated after elimination of a single row table into temp table
        in some cases (e.g. when GROUP_CONCAT is calculated over a single row
        table).
        bk ci sql/item_sum.cc
        Fixed bug #12095: a join query with GROUP_CONCAT over a single row table.
        If GROUP_CONCAT is calculated we always put its argument into a temp
        table, even when the argument is a constant item.
      sql_select.cc:
        Fixed bug #12095: a join query with GROUP_CONCAT over one row table.
        If temp table is used to calculate GROUP_CONCAT the argument should
        be always put into this table, even when it is a constant item.
      
      
      sql/sql_select.cc:
        Fixed bug #12095: a join query with GROUP_CONCAT over one row table.
        If temp table is used to calculate GROUP_CONCAT the argument should
        be always put into this table, even when it is a constant item.
      sql/sql_class.h:
        Fixed bug #12095: a join query with GROUP_CONCAT over a single row table.
        Added a flag to the TMP_TABLE_PARAM class forcing to put constant
        items generated after elimination of a single row table into temp table
        in some cases (e.g. when GROUP_CONCAT is calculated over a single row
        table).
        bk ci sql/item_sum.cc
        Fixed bug #12095: a join query with GROUP_CONCAT over a single row table.
        If GROUP_CONCAT is calculated we always put its argument into a temp
        table, even when the argument is a constant item.
      mysql-test/t/func_gconcat.test:
        Added a test case for bug #12095.
      mysql-test/r/func_gconcat.result:
        Added a test case for bug #12095.
      21d2fb62
    • unknown's avatar
      Ensure we free all items for prepared statements · 90b2daa7
      unknown authored
      Before the fix in ~Prepared_statments we got a memory leak when executing mysql_client_test.test
      Note that test 'variables.test' fails.
      This will be fixed when Jimw pushes the fix for Bug 10351
      
      
      mysys/default.c:
        Fixed typo
      sql/item.cc:
        More debugging information
      sql/sql_prepare.cc:
        More debugging information
        Ensure we free all items for prepared statements
        Before the fix in ~Prepared_statments we got a memory leak when executing mysql_client_test.test
      90b2daa7
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 833a5ce0
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      833a5ce0
    • unknown's avatar
    • unknown's avatar
      Fix for handling of unsigned long options on 32-bit platforms that · 120e80f1
      unknown authored
      allowed unintended overflows. (Bug #10351)
      
      
      mysql-test/r/select_safe.result:
        Update results
      mysql-test/r/variables.result:
        Update results
      mysql-test/t/select_safe.test:
        Remove "SELECT @@MAX_SEEKS_FOR_KEY;" because it depends on
        size of unsigned long of the system.
      mysql-test/t/variables.test:
        Fix test for #10351 to test the actual problem
      sql/mysqld.cc:
        Undo unnecessary change to default and max of max_seeks_for_key
      sql/set_var.cc:
        On platforms where SIZEOF_LONG != SIZEOF_LONGLONG, make sure to handle
        max values for ulong-sized options correctly.
      120e80f1
    • unknown's avatar
      null_key.test, null_key.result: · 0ad1836d
      unknown authored
        Made the test case for bug #12144 independent on other tests.
      
      
      mysql-test/r/null_key.result:
        Made the test case for bug #12144 independent on other tests.
      mysql-test/t/null_key.test:
        Made the test case for bug #12144 independent on other tests.
      0ad1836d
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · ab5023d8
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      mysql-test/t/variables.test:
        Auto merged
      sql/sql_trigger.cc:
        Auto merged
      ab5023d8
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8db171df
      unknown authored
      into mysql.com:/home/psergey/mysql-5.0-28jul-look
      
      
      8db171df
    • unknown's avatar
  5. 28 Jul, 2005 11 commits
    • unknown's avatar
      null_key.test, null_key.result: · a54ddda4
      unknown authored
        Modified the test case for patch of the bug #12144
        to display status of Handler_read_next before and
        after the tested query.
      
      
      mysql-test/r/null_key.result:
        Modified the test case for patch of the bug #12144
        to display status of Handler_read_next before and
        after the tested query.
      mysql-test/t/null_key.test:
        Modified the test case for patch of the bug #12144
        to display status of Handler_read_next before and
        after the tested query.
      a54ddda4
    • unknown's avatar
      Manual merge · 0cd0a463
      unknown authored
      sql/sql_select.cc:
        Auto merged
      0cd0a463
    • unknown's avatar
      sql_select.cc: · 74e523d2
      unknown authored
        Fixed bug #12144.
        Added an optimization that avoids key access with null keys for the 'ref'
        method when used in outer joins. The regilar optimization with adding
        IS NOT NULL expressions is not applied for outer join on expressions as
        the predicates of these expressions are not pushed down in 4.1.
      null_key.result, null_key.test:
        Added a test case for bug #12144.
      
      
      mysql-test/t/null_key.test:
        Added a test case for bug #12144.
      mysql-test/r/null_key.result:
        Added a test case for bug #12144.
      sql/sql_select.cc:
        Fixed bug #12144.
        Added an optimization that avoids key access with null keys for the 'ref'
        method when used in outer joins. The regilar optimization with adding
        IS NOT NULL expressions is not applied for outer join on expressions as
        the predicates of these expressions are not pushed down in 4.1.
      74e523d2
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 21189de3
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-trigger-5.0
      
      
      21189de3
    • unknown's avatar
      store/restore sql_mode which was in force during ctrigger creation (BUG#5891) · a66928bb
      unknown authored
      other sql_mode fixes
      
      
      mysql-test/r/information_schema.result:
        changes in information schema
      mysql-test/r/trigger.result:
        storing and restoring sql modes for triggers
      mysql-test/t/trigger.test:
        storing and restoring parsing modes for triggers
      sql/mysqld.cc:
        add length of mode names
      sql/parse_file.cc:
        new type of list (ulonglong)
      sql/parse_file.h:
        new type of list (ulonglong)
      sql/set_var.cc:
        mode output made as static method
      sql/set_var.h:
        mode output made as static method
      sql/sp_head.cc:
        added sql_mode storing/restoring during SP execution
        optimised sql_mode printing
      sql/sp_head.h:
        comment fixed according this changes
      sql/sql_show.cc:
        added sql_mode field
      sql/sql_trigger.cc:
        store/restore sql_mode which was in force during ctrigger creation
      sql/sql_trigger.h:
        store/restore sql_mode which was in force during ctrigger creation
      sql/sql_view.cc:
        fixed sql_mode
      a66928bb
    • unknown's avatar
      After merge fixes · f11418f7
      unknown authored
      mysql-test/r/func_group.result:
        Update results after merge (things moved around when aligning 4.1 and 5.0 tests)
      mysql-test/r/mysqldump.result:
        Update results after merge (things moved around when aligning 4.1 and 5.0 tests)
      mysql-test/r/ps_grant.result:
        Update results after merge (test moved to another file)
      mysql-test/t/mysqldump.test:
        Align with other lines
      sql/lock.cc:
        Removed compiler warning
        Fixed typo during merge
      f11418f7
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-10351 · 98c57c1a
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      sql/item.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      98c57c1a
    • unknown's avatar
      Manually merging 4.1.13a into general 4.1 · 4456ae32
      unknown authored
      support-files/mysql.spec.sh:
        Auto merged
      zlib/inftrees.h:
        Auto merged
      configure.in:
        Manually merging 4.1.13a into general 4.1 - version remains at 4.1.14
      4456ae32
    • unknown's avatar
      Manual merge of 5.0.10a back to the general tree. · a487f2f0
      unknown authored
      configure.in:
        Manual merge of 5.0.10a back to the general tree, general version remains 5.0.11.
      a487f2f0
    • unknown's avatar
      Combining zlib security fixes for version 4.1.13a: · 000f2403
      unknown authored
      Fix for CAN-2005-1849 from zlib-1.2.3
         (originally:  2005/07/27 14:55:08+02:00 lenz@mysql.com )
      Ensure static linking takes the bundled libraries
         (originally:  2005/07/27 16:42:13+02:00 lenz@mysql.com )
      Version number change.
      
      
      configure.in:
        Update the version number.
      support-files/mysql.spec.sh:
        - build against the bundled zlib, when linking statically
        (originally:  2005/07/27 16:42:08+02:00 lenz@mysql.com +1 -0 )
      zlib/inftrees.h:
        - applied another security fix to resolve CAN-2005-1849, taken from the 1.2.3 zlib sources
        (CAN-2005-1849)
        (originally:  2005/07/27 14:54:58+02:00 lenz@mysql.com +5 -5 )
      000f2403
    • unknown's avatar
      Merge mysql.com:/home/my/mysql-4.1 · 36b6bf2e
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/deleted/.del-ctype_cp932.test:
        Auto merged
      BitKeeper/deleted/.del-isam.test~834fb0ee8196c445:
        Auto merged
      include/thr_lock.h:
        Auto merged
      mysql-test/t/alias.test:
        Auto merged
      mysql-test/t/alter_table.test:
        Auto merged
      mysql-test/t/archive.test:
        Auto merged
      mysql-test/t/backup.test:
        Auto merged
      mysql-test/t/bool.test:
        Auto merged
      mysql-test/t/connect.test:
        Auto merged
      mysql-test/t/count_distinct2.test:
        Auto merged
      mysql-test/t/create.test:
        Auto merged
      mysql-test/t/ctype_many.test:
        Auto merged
      mysql-test/t/ctype_ucs_binlog.test:
        Auto merged
      mysql-test/t/date_formats.test:
        Auto merged
      mysql-test/t/delayed.test:
        Auto merged
      mysql-test/t/derived.test:
        Auto merged
      mysql-test/t/distinct.test:
        Auto merged
      mysql-test/t/drop.test:
        Auto merged
      mysql-test/t/endspace.test:
        Auto merged
      mysql-test/t/flush.test:
        Auto merged
      mysql-test/t/fulltext.test:
        Auto merged
      mysql-test/t/fulltext_order_by.test:
        Auto merged
      mysql-test/t/func_compress.test:
        Auto merged
      mysql-test/t/func_concat.test:
        Auto merged
      mysql-test/t/func_date_add.test:
        Auto merged
      mysql-test/t/func_equal.test:
        Auto merged
      mysql-test/t/func_if.test:
        Auto merged
      mysql-test/t/func_sapdb.test:
        Auto merged
      mysql-test/t/func_set.test:
        Auto merged
      mysql-test/t/func_str.test:
        Auto merged
      mysql-test/t/gis-rtree.test:
        Auto merged
      mysql-test/t/gis.test:
        Auto merged
      mysql-test/t/grant.test:
        Auto merged
      mysql-test/t/grant2.test:
        Auto merged
      mysql-test/t/grant_cache.test:
        Auto merged
      mysql-test/t/heap.test:
        Auto merged
      mysql-test/t/heap_btree.test:
        Auto merged
      mysql-test/t/heap_hash.test:
        Auto merged
      mysql-test/t/init_connect.test:
        Auto merged
      mysql-test/t/insert_select.test:
        Auto merged
      mysql-test/t/insert_update.test:
        Auto merged
      mysql-test/t/key.test:
        Auto merged
      mysql-test/t/keywords.test:
        Auto merged
      mysql-test/t/limit.test:
        Auto merged
      mysql-test/t/lock.test:
        Auto merged
      mysql-test/t/lowercase_table.test:
        Auto merged
      mysql-test/t/lowercase_table3.test:
        Auto merged
      mysql-test/t/merge.test:
        Auto merged
      mysql-test/t/mix_innodb_myisam_binlog.test:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      mysql-test/t/mysqlbinlog2.test:
        Auto merged
      mysql-test/t/ndb_alter_table.test:
        Auto merged
      mysql-test/t/ndb_autodiscover.test:
        Auto merged
      mysql-test/t/ndb_charset.test:
        Auto merged
      mysql-test/t/ndb_grant.later:
        Auto merged
      mysql-test/t/ndb_index_ordered.test:
        Auto merged
      mysql-test/t/ndb_index_unique.test:
        Auto merged
      mysql-test/t/ndb_restore.test:
        Auto merged
      mysql-test/t/ndb_types.test:
        Auto merged
      mysql-test/t/ndb_update.test:
        Auto merged
      mysql-test/t/null.test:
        Auto merged
      mysql-test/t/null_key.test:
        Auto merged
      mysql-test/t/olap.test:
        Auto merged
      mysql-test/t/openssl_1.test:
        Auto merged
      mysql-test/t/order_by.test:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      mysql-test/t/ps_1general.test:
        Auto merged
      mysql-test/t/ps_4heap.test:
        Auto merged
      mysql-test/t/ps_5merge.test:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      mysql-test/t/replace.test:
        Auto merged
      mysql-test/t/row.test:
        Auto merged
      mysql-test/t/rpl000001.test:
        Auto merged
      mysql-test/t/rpl000015.test:
        Auto merged
      mysql-test/t/rpl000017.test:
        Auto merged
      mysql-test/t/rpl000018.test:
        Auto merged
      mysql-test/t/rpl_EE_error.test:
        Auto merged
      mysql-test/t/rpl_change_master.test:
        Auto merged
      mysql-test/t/rpl_charset.test:
        Auto merged
      mysql-test/t/rpl_create_database.test:
        Auto merged
      mysql-test/t/rpl_ddl.test:
        Auto merged
      mysql-test/t/rpl_deadlock.test:
        Auto merged
      mysql-test/t/rpl_empty_master_crash.test:
        Auto merged
      mysql-test/t/rpl_error_ignored_table.test:
        Auto merged
      mysql-test/t/rpl_flush_log_loop.test:
        Auto merged
      mysql-test/t/rpl_flush_tables.test:
        Auto merged
      mysql-test/t/rpl_get_lock.test:
        Auto merged
      mysql-test/t/rpl_heap.test:
        Auto merged
      mysql-test/t/rpl_loaddata.test:
        Auto merged
      mysql-test/t/rpl_loaddata_rule_m.test:
        Auto merged
      mysql-test/t/rpl_log.test:
        Auto merged
      mysql-test/t/rpl_log_pos.test:
        Auto merged
      mysql-test/t/rpl_max_relay_size.test:
        Auto merged
      mysql-test/t/rpl_multi_query.test:
        Auto merged
      mysql-test/t/rpl_openssl.test:
        Auto merged
      mysql-test/t/rpl_redirect.test:
        Auto merged
      mysql-test/t/rpl_relayrotate.test:
        Auto merged
      mysql-test/t/rpl_replicate_do.test:
        Auto merged
      mysql-test/t/rpl_reset_slave.test:
        Auto merged
      mysql-test/t/rpl_server_id2.test:
        Auto merged
      mysql-test/t/rpl_temporary.test:
        Auto merged
      mysql-test/t/rpl_timezone.test:
        Auto merged
      mysql-test/t/rpl_user_variables.test:
        Auto merged
      mysql-test/t/show_check.test:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      mysql-test/t/symlink.test:
        Auto merged
      mysql-test/t/synchronization.test:
        Auto merged
      mysql-test/t/system_mysql_db.test:
        Auto merged
      mysql-test/t/system_mysql_db_fix.test:
        Auto merged
      mysql-test/t/temp_table.test:
        Auto merged
      mysql-test/t/timezone2.test:
        Auto merged
      mysql-test/t/timezone_grant.test:
        Auto merged
      mysql-test/t/type_float.test:
        Auto merged
      mysql-test/t/type_ranges.test:
        Auto merged
      mysql-test/t/type_timestamp.test:
        Auto merged
      mysql-test/t/union.test:
        Auto merged
      mysql-test/t/update.test:
        Auto merged
      mysql-test/t/user_var-binlog.test:
        Auto merged
      mysql-test/t/warnings.test:
        Auto merged
      mysys/thr_lock.c:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      BitKeeper/deleted/.del-rpl_trunc_binlog.test~961b1f6ac73d37c8:
        Simple merge
      mysql-test/r/ps_grant.result:
        Simple merge
      mysql-test/t/analyse.test:
        Simple merge
      mysql-test/t/auto_increment.test:
        Simple merge
      mysql-test/t/bdb.test:
        Simple merge
      mysql-test/t/bigint.test:
        Simple merge
      mysql-test/t/case.test:
        Simple merge
      mysql-test/t/cast.test:
        Simple merge
      mysql-test/t/check.test:
        Simple merge
      mysql-test/t/count_distinct.test:
        Simple merge
      mysql-test/t/ctype_latin1_de.test:
        Simple merge
      mysql-test/t/ctype_uca.test:
        Simple merge
      mysql-test/t/ctype_ucs.test:
        Simple merge
      mysql-test/t/ctype_utf8.test:
        Simple merge
      mysql-test/t/delete.test:
        Simple merge
      mysql-test/t/flush_block_commit.test:
        Simple merge
      mysql-test/t/func_default.test:
        Simple merge
      mysql-test/t/func_gconcat.test:
        Simple merge
      mysql-test/t/func_group.test:
        Aligned code with 4.1
      mysql-test/t/func_in.test:
        Simple merge
      mysql-test/t/func_math.test:
        Simple merge
      mysql-test/t/func_misc.test:
        Simple merge
      mysql-test/t/func_test.test:
        Simple merge
      mysql-test/t/func_time.test:
        Simple merge
      mysql-test/t/group_by.test:
        Simple merge
      mysql-test/t/having.test:
        Simple merge
      mysql-test/t/innodb.test:
        Simple merge
      mysql-test/t/insert.test:
        Simple merge
      mysql-test/t/join_outer.test:
        Simple merge
      mysql-test/t/kill.test:
        Simple merge
      mysql-test/t/loaddata.test:
        Simple merge
      mysql-test/t/lock_multi.test:
        Simple merge
      mysql-test/t/multi_update.test:
        Simple merge
      mysql-test/t/mysqlbinlog.test:
        Simple merge
      mysql-test/t/mysqldump.test:
        Aligned code with 4.1
      mysql-test/t/mysqltest.test:
        Simple merge
      mysql-test/t/ndb_basic.test:
        Simple merge
      mysql-test/t/ndb_cache.test:
        Simple merge
      mysql-test/t/ndb_subquery.test:
        Simple merge
      mysql-test/t/ps_grant.test:
        Simple merge
      mysql-test/t/range.test:
        Simple merge
      mysql-test/t/rpl_drop_temp.test:
        Simple merge
      mysql-test/t/rpl_loaddata_rule_s.test:
        Simple merge
      mysql-test/t/rpl_loaddatalocal.test:
        Simple merge
      mysql-test/t/rpl_rotate_logs.test:
        Simple merge
      mysql-test/t/rpl_until.test:
        Simple merge
      mysql-test/t/rpl_variables.test:
        Simple merge
      mysql-test/t/select.test:
        Simple merge
      mysql-test/t/sql_mode.test:
        Simple merge
      mysql-test/t/type_blob.test:
        Simple merge
      mysql-test/t/type_decimal.test:
        Simple merge
      mysql-test/t/user_var.test:
        Simple merge
      mysql-test/t/variables.test:
        Simple merge
      sql/lock.cc:
        Simple optimization
      sql/mysql_priv.h:
        Simple merge
      sql/sql_table.cc:
        Simple merge
      sql/table.cc:
        Simple merge
      sql/unireg.cc:
        Simple merge
      36b6bf2e