1. 26 Sep, 2006 1 commit
  2. 26 Aug, 2006 1 commit
    • unknown's avatar
      Merge dator5.(none):/home/pappa/clean-mysql-5.1 · b300d560
      unknown authored
      into  dator5.(none):/home/pappa/bug18198
      
      
      sql/item_func.h:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/sql_partition.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      b300d560
  3. 24 Aug, 2006 2 commits
  4. 23 Aug, 2006 4 commits
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 9a770f53
      unknown authored
      into  example.com:/work/mysql-5.1-runtime
      
      
      9a770f53
    • unknown's avatar
      Fix for bug #20665 All commands supported in Stored Procedures · 7a37eeae
      unknown authored
      should work in Prepared Statements. Post-review changeset.
      
      Problem: There are some commands which are avaiable to be executed in SP
               but cannot be prepared. This patch fixes this and makes it possible
               prepare these statements.
      
      Changes: The commands later are made available in PS. RESET has been forbidden
               in SF/Trigger.
      
      Solution: All current server commands where checked and those missing (see later)
                we added. Tests for all of the commands with repeated executions were
                added - testing with SP, SF and PS.
      
      SHOW BINLOG EVENTS
      SHOW (MASTER | SLAVE) STATUS
      SHOW (MASTER | BINARY) LOGS
      SHOW (PROCEDURE | FUNCTION) CODE (parsable only in debug builds)
      SHOW CREATE (PROCEDURE | FUNCTION | EVENT | TABLE | VIEW)
      SHOW (AUTHORS | CONTRIBUTORS | WARNINGS | ERRORS)
      CHANGE MASTER
      RESET (MASTER | SLAVE | QUERY CACHE)
      SLAVE (START | STOP)
      CHECKSUM (TABLE | TABLES)
      INSTALL PLUGIN
      UNINSTALL PLUGIN
      CACHE INDEX
      LOAD INDEX INTO CACHE
      GRANT
      REVOKE
      KILL
      (CREATE | RENAME | DROP) DATABASE
      (CREATE | RENAME | DROP) USER
      FLUSH (TABLE | TABLES | TABLES WITH READ LOCK | HOSTS | PRIVILEGES |
             LOGS | STATUS | MASTER | SLAVE | DES_KEY_FILE | USER_RESOURCES)
      
      
      mysql-test/r/ps.result:
        update result
      mysql-test/r/ps_1general.result:
        update result
      mysql-test/r/ps_grant.result:
        update result
      mysql-test/r/sp-dynamic.result:
        update result
      mysql-test/t/ps.test:
        Add more statements, probably all currently missing which are possible in
        a SP but not preparable.
        Every statement is tested in a SP, in a SF and attempted to prepare.
      mysql-test/t/ps_1general.test:
        - Enable some of the statements, which are already possible in SP.
        - 1295 -> ER_UNSUPPORTED_PS
      mysql-test/t/ps_grant.test:
        Enable statements already possible in SP.
      sql/sp_head.cc:
        - Reorder to keep some alphabet order.
        - Add missing SHOW_SCHEDULER_STATUS.
      sql/sql_prepare.cc:
        Add possibility to prepare statements, which are already allowed in SP.
      7a37eeae
    • unknown's avatar
      Merge mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin · d08dd523
      unknown authored
      into  mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
      
      
      storage/csv/ha_tina.cc:
        merge later
      mysql-test/r/csv.result:
        manual merge
      mysql-test/t/csv.test:
        manual merge
      d08dd523
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 118677a2
      unknown authored
      into  mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/table.h:
        Auto merged
      sql/handler.cc:
        manual merge
      118677a2
  5. 22 Aug, 2006 1 commit
  6. 21 Aug, 2006 10 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 1b6858ea
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
      
      
      1b6858ea
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · bfaef559
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
      
      
      bfaef559
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0 · 167aaaa5
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
      
      
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/r/grant.result:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      mysql-test/t/grant.test:
        Auto merged
      mysql-test/t/mysql.test:
        Auto merged
      mysql-test/t/mysql_client_test.test:
        Auto merged
      server-tools/instance-manager/listener.cc:
        Auto merged
      server-tools/instance-manager/portability.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      BitKeeper/deleted/.del-openssl.m4~41cebd0ba8281769:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      client/mysql.cc:
        Manual merge.
      mysql-test/mysql-test-run.pl:
        Manual merge.
      167aaaa5
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge · a6113078
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
      
      
      mysql-test/r/func_time.result:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      mysql-test/t/func_time.test:
        Manual merge.
      a6113078
    • unknown's avatar
      Fix for bug#19403/12212 "Crash that happens during removing of database name · 992aceaf
      unknown authored
      from cache" and #21216 "Simultaneous DROP TABLE and SHOW OPEN TABLES causes
      server to crash".
      
      Crash happened when one ran DROP DATABASE or SHOW OPEN TABLES statements
      while concurrently doing DROP TABLE (or RENAME TABLE, CREATE TABLE LIKE
      or any other command that takes name-lock) in other connection.
      
      This problem was caused by the fact that table placeholders which were
      added to table cache in order to obtain name-lock on table had
      TABLE_SHARE::db and table_name set to 0. Therefore they broke assumption
      that these members are non-0 for all tables in table cache on which some
      of our code relies.
      
      The fix sets these members for such placeholders to appropriate value making
      this assumption true again. As attempt to avoid such problems in future
      we introduce auxiliary TABLE_SHARE::set_table_cache_key() methods which
      should be used when one wants to set TABLE_SHARE::table_cache_key and which
      ensure that TABLE_SHARE::table_name/db are set properly.
      
      Test cases for these bugs were added to 5.0 test-suite (with 5.0-specific
      fix for bug #21216).
      
      
      sql/lock.cc:
        Our code assumes that TABLE_SHARE::table_name/db for objects in table cache
        is set properly (and is non-NULL). For example look in list_open_tables()
        and remove_db_from_cache(). This was not true for table placeholders that
        were added to table cache for name-locking. Changed lock_table_name() to
        preserve this assumption (now it uses TABLE_SHARE::set_table_cache_key()
        to set all three table_cache_key/db/table_name members at once).
        Also now we use my_multi_malloc() to allocate memory for TABLE and
        TABLE_SHARE objects instead of using my_malloc() + summing sizes as
        it automatically provides proper alignment for memory allocated.
      sql/sql_base.cc:
        Now we use TABLE_SHARE::set_table_cache_key() auxiliary methods to set
        TABLE_SHARE::table_cache_key/db/table_name members at once.
        We also use multi_alloc_root() instead of alloc_root() for allocating
        memory for several objects as it is less error prone.
        Finally, we also got rid of unused code in reopen_name_locked_table().
      sql/sql_select.cc:
        Got rid of redundant code. TABLE_SHARE::db/table_cache_key are both set to
        empty string by the call to init_tmp_table_share() routine.
      sql/table.cc:
        Now alloc_table_share() uses auxiliary TABLE_SHARE::set_table_cache_key()
        method to properly set TABLE_SHARE::table_cache_key/db/table_name members.
        Also now we use multi_alloc_root() instead of alloc_root() for allocating
        memory for several objects as it is more clear/less error-prone.
      sql/table.h:
        Added comment about importance of apropriate setting of
        TABLE_SHARE::table_name/db/table_cache_key for tables in table cache.
        Introduced two auxiliary TABLE_SHARE::set_table_cache_key() methods which
        allow to set these three members at once.
      992aceaf
    • unknown's avatar
      mysql-test/mysql-test-run.pl : Use fixed path names for all NDB binaries, · 524914b2
      unknown authored
      because searching for them makes the script abort with all non-NDB builds.
      
      
      mysql-test/mysql-test-run.pl:
        Checking with "mtr_exe_exists()" for the location of a binary will yield an error
        if the binary is found nowhere at all, and this happens with NDB binaries in all
        builds that do not contain NDB;  so the correct way is fixed path names only.
        Still part of the fix for the #21721 bug.
      524914b2
    • unknown's avatar
      Many files: · 2d766479
      unknown authored
        Deleted config/ac-macros/ha_berkeley.m4
        Removed more referenses to bdb
      
      
      BitKeeper/deleted/.del-ha_berkeley.m4:
        Delete: config/ac-macros/ha_berkeley.m4
      BUILD/FINISH.sh:
        Removed more referenses to bdb
      BUILD/compile-alpha-cxx:
        Removed more referenses to bdb
      BUILD/compile-alpha-debug:
        Removed more referenses to bdb
      BUILD/compile-dist:
        Removed more referenses to bdb
      BUILD/compile-ia64-debug-max:
        Removed more referenses to bdb
      CMakeLists.txt:
        Removed more referenses to bdb
      Makefile.am:
        Removed more referenses to bdb
      libmysqld/lib_sql.cc:
        Removed more referenses to bdb
      sql/mysql_priv.h:
        Removed more referenses to bdb
      storage/ndb/config/win-prg.am:
        Removed more referenses to bdb
      storage/ndb/test/run-test/ndb-autotest.sh:
        Removed more referenses to bdb
      support-files/my-huge.cnf.sh:
        Removed more referenses to bdb
      support-files/my-large.cnf.sh:
        Removed more referenses to bdb
      support-files/my-medium.cnf.sh:
        Removed more referenses to bdb
      2d766479
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · c75d6dbd
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
      
      
      c75d6dbd
    • unknown's avatar
      Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg21216-2 · cda7278d
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg19403-2
      
      
      mysql-test/r/drop.result:
        Auto merged
      sql/lock.cc:
        Use 5.1 version of code as bug#21216 will be fixed there in different way.
      cda7278d
    • unknown's avatar
      Fix for bug#21216 "Simultaneous DROP TABLE and SHOW OPEN TABLES causes · 8daf4e83
      unknown authored
      server to crash".
      
      Crash caused by assertion failure happened when one ran SHOW OPEN TABLES
      while concurrently doing DROP TABLE (or RENAME TABLE, CREATE TABLE LIKE
      or any other command that takes name-lock) in other connection.
      For non-debug version of server problem exposed itself as wrong output
      of SHOW OPEN TABLES statement (it was missing name-locked tables).
      Finally in 5.1 both debug and non-debug versions simply crashed in
      this situation due to NULL-pointer dereference.
      
      This problem was caused by the fact that table placeholders which were
      added to table cache in order to obtain name-lock had TABLE_SHARE::table_name
      set to 0. Therefore they broke assumption that this member is non-0 for
      all tables in table cache which was checked by assert in list_open_tables()
      (in 5.1 this function simply relies on it).
      The fix simply sets this member for such placeholders to appropriate value
      making this assumption true again.
      
      This patch also includes test for similar bug 12212 "Crash that happens
      during removing of database name from cache" reappeared in 5.1 as bug 19403.
      
      
      mysql-test/r/drop.result:
        Added test for bug#21216 "Simultaneous DROP TABLE and SHOW OPEN TABLES
        causes server to crash" and bug#12212/19403 "Crash that happens during
        removing of database name from cache".
      mysql-test/t/drop.test:
        Added test for bug#21216 "Simultaneous DROP TABLE and SHOW OPEN TABLES
        causes server to crash" and bug#12212/19403 "Crash that happens during
        removing of database name from cache".
      sql/lock.cc:
        lock_table_name():
          Our code assumes that TABLE_SHARE::table_name for objects in table cache
          is non-NULL (for example look at assertion in list_open_tables()). This
          was not true for table placeholders that were added to table cache for
          name-locking. So let us set this member for such placeholders.
      8daf4e83
  7. 20 Aug, 2006 1 commit
  8. 18 Aug, 2006 4 commits
  9. 17 Aug, 2006 14 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · eda1afe2
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
      
      
      mysql-test/r/type_newdecimal.result:
        Auto merged
      mysql-test/t/type_newdecimal.test:
        Auto merged
      eda1afe2
    • unknown's avatar
      A couple of adjustments to the merge to fix the broken build · 55fb3cae
      unknown authored
      instance.cc:
        Removed wrongly placed closing brace
      item_geofunc.cc:
        needed to pass in a TABLE_SHARE* instead of a TABLE*
      
      
      server-tools/instance-manager/instance.cc:
        Removed wrongly placed closing brace
      sql/item_geofunc.cc:
        needed to pass in a TABLE_SHARE* instead of a TABLE*
      55fb3cae
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 96aef62c
      unknown authored
      into  example.com:/work/mysql-5.1-runtime
      
      
      sql/item.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_partition.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_trigger.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      96aef62c
    • unknown's avatar
      rename to avoid case sensitive collision · 703717c7
      unknown authored
      
      BitKeeper/deleted/.del-readme-renamed:
        Rename: BitKeeper/deleted/.del-readme -> BitKeeper/deleted/.del-readme-renamed
      703717c7
    • unknown's avatar
      Cleanup patch. · 728a924c
      unknown authored
      There is an existing macros for initializing LEX_STRINGs
      with constant strings -> C_STRING_WITH_LEN. Change existing code to use it.
      (char *) STRING_WITH_LEN -> C_STRING_WITH_LEN
      
      
      sql/handler.cc:
        There is an existing macros for initializing LEX_STRINGs
        with constant strings -> C_STRING_WITH_LEN. Change existing code to use it.
        (char *) STRING_WITH_LEN -> C_STRING_WITH_LEN
      sql/item.cc:
        There is an existing macros for initializing LEX_STRINGs
        with constant strings -> C_STRING_WITH_LEN. Change existing code to use it.
        (char *) STRING_WITH_LEN -> C_STRING_WITH_LEN
      sql/mysql_priv.h:
        There is an existing macros for initializing LEX_STRINGs
        with constant strings -> C_STRING_WITH_LEN. Change existing code to use it.
        (char *) STRING_WITH_LEN -> C_STRING_WITH_LEN
      sql/sql_acl.cc:
        There is an existing macros for initializing LEX_STRINGs
        with constant strings -> C_STRING_WITH_LEN. Change existing code to use it.
        (char *) STRING_WITH_LEN -> C_STRING_WITH_LEN
      sql/sql_error.cc:
        There is an existing macros for initializing LEX_STRINGs
        with constant strings -> C_STRING_WITH_LEN. Change existing code to use it.
        (char *) STRING_WITH_LEN -> C_STRING_WITH_LEN
      sql/sql_error.h:
        There is an existing macros for initializing LEX_STRINGs
        with constant strings -> C_STRING_WITH_LEN. Change existing code to use it.
        (char *) STRING_WITH_LEN -> C_STRING_WITH_LEN
      sql/sql_lex.h:
        There is an existing macros for initializing LEX_STRINGs
        with constant strings -> C_STRING_WITH_LEN. Change existing code to use it.
        (char *) STRING_WITH_LEN -> C_STRING_WITH_LEN
      sql/sql_parse.cc:
        There is an existing macros for initializing LEX_STRINGs
        with constant strings -> C_STRING_WITH_LEN. Change existing code to use it.
        (char *) STRING_WITH_LEN -> C_STRING_WITH_LEN
      sql/sql_partition.cc:
        There is an existing macros for initializing LEX_STRINGs
        with constant strings -> C_STRING_WITH_LEN. Change existing code to use it.
        (char *) STRING_WITH_LEN -> C_STRING_WITH_LEN
      sql/sql_plugin.cc:
        There is an existing macros for initializing LEX_STRINGs
        with constant strings -> C_STRING_WITH_LEN. Change existing code to use it.
        (char *) STRING_WITH_LEN -> C_STRING_WITH_LEN
      sql/sql_show.cc:
        There is an existing macros for initializing LEX_STRINGs
        with constant strings -> C_STRING_WITH_LEN. Change existing code to use it.
        (char *) STRING_WITH_LEN -> C_STRING_WITH_LEN
      sql/sql_trigger.cc:
        There is an existing macros for initializing LEX_STRINGs
        with constant strings -> C_STRING_WITH_LEN. Change existing code to use it.
        (char *) STRING_WITH_LEN -> C_STRING_WITH_LEN
      sql/sql_view.cc:
        There is an existing macros for initializing LEX_STRINGs
        with constant strings -> C_STRING_WITH_LEN. Change existing code to use it.
        (char *) STRING_WITH_LEN -> C_STRING_WITH_LEN
      sql/tztime.cc:
        There is an existing macros for initializing LEX_STRINGs
        with constant strings -> C_STRING_WITH_LEN. Change existing code to use it.
        (char *) STRING_WITH_LEN -> C_STRING_WITH_LEN
      728a924c
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/tmp_reg · b32b2ce7
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1
      
      
      client/mysql.cc:
        Auto merged
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/r/gis.result:
        Auto merged
      mysql-test/r/grant.result:
        Auto merged
      mysql-test/r/im_life_cycle.result:
        Auto merged
      mysql-test/r/information_schema_db.result:
        Auto merged
      mysql-test/r/type_newdecimal.result:
        Auto merged
      mysql-test/r/type_ranges.result:
        Auto merged
      mysql-test/r/type_timestamp.result:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      mysql-test/t/gis.test:
        Auto merged
      mysql-test/t/im_life_cycle.imtest:
        Auto merged
      mysql-test/t/type_newdecimal.test:
        Auto merged
      mysql-test/t/type_timestamp.test:
        Auto merged
      server-tools/instance-manager/messages.cc:
        Auto merged
      sql/item_geofunc.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.h:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      b32b2ce7
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge · 5c8c2ab4
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
      
      
      BitKeeper/deleted/.del-mysql_client.result:
        Auto merged
      BitKeeper/deleted/.del-mysql_client.test:
        Auto merged
      client/mysql.cc:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/r/grant.result:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      mysql-test/t/grant.test:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      5c8c2ab4
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge · 860c3853
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
      
      
      client/mysql.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      860c3853
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge · 7faa9efe
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
      
      
      tests/mysql_client_test.c:
        Auto merged
      7faa9efe
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge · d82c1514
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
      
      
      mysql-test/r/grant.result:
        Auto merged
      mysql-test/t/grant.test:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      d82c1514
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge · d3efda57
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
      
      
      mysql-test/r/grant.result:
        Auto merged
      mysql-test/t/grant.test:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      d3efda57
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 62af392e
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
      
      
      mysql-test/r/view.result:
        Auto merged
      62af392e
    • unknown's avatar
      merge warning test results (!) · 0073d9be
      unknown authored
      0073d9be
    • unknown's avatar
      test result changes (non-functional) for 5.1-5.0 merge · 2eb9eb9f
      unknown authored
      
      mysql-test/r/federated_transactions.result:
        merge fixes to result file (case sensitivity)
      mysql-test/r/warnings.result:
        wrong warning message result
      2eb9eb9f
  10. 16 Aug, 2006 2 commits
    • unknown's avatar
      Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_20328 · b2cfa703
      unknown authored
      into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-merge
      
      
      sql/item_timefunc.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      mysql-test/r/func_time.result:
        manual merge
      mysql-test/r/mysql_client.result:
        manual merge
      mysql-test/t/func_time.test:
        manual merge
      mysql-test/t/mysql_client.test:
        manual merge
      sql/sql_acl.cc:
        manual merge
      b2cfa703
    • unknown's avatar
      manual merge · 1c28a068
      unknown authored
      1c28a068