1. 31 Oct, 2007 3 commits
    • unknown's avatar
      Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl · 5371e4ab
      unknown authored
      into  kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
      
      
      5371e4ab
    • unknown's avatar
      bug#27571 merging. Fixing offsets and moving tests to the corrent · ffdf36f2
      unknown authored
      destination. Removing wrong (local temp) tests.
      
      
      mysql-test/suite/binlog/t/binlog_killed_simulate-master.opt:
        Rename: mysql-test/t/binlog_killed_simulate-master.opt -> mysql-test/suite/binlog/t/binlog_killed_simulate-master.opt
      BitKeeper/deleted/.del-binlog_killed_bug27571.test:
        Delete: mysql-test/t/binlog_killed_bug27571.test
      BitKeeper/deleted/.del-binlog_killed_bug27571-master.opt:
        Delete: mysql-test/t/binlog_killed_bug27571-master.opt
      mysql-test/suite/binlog/r/binlog_killed.result:
        results changed
      mysql-test/suite/binlog/t/binlog_killed.test:
        binlog offset made 5.1 specific
      mysql-test/suite/binlog/t/binlog_killed_simulate.test:
        binlog offset + guard to run the test with stmt/mixed format
      mysql-test/suite/binlog/r/binlog_killed_simulate.result:
        new results file
      ffdf36f2
    • unknown's avatar
      Post-merge fixes to handle some test failures. · d2048efb
      unknown authored
      
      mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
        Result file change.
      mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
        Include file show_slave_status.inc should be used for portable SHOW SLAVE STATUS.
      d2048efb
  2. 30 Oct, 2007 7 commits
    • unknown's avatar
      Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl · 44dc5049
      unknown authored
      into  kindahl-laptop.dnsalias.net:/home/bk/b19958-mysql-5.1-rpl
      
      
      sql/log_event.cc:
        Auto merged
      44dc5049
    • unknown's avatar
      BUG#19958 (RBR idempotency issue for UPDATE and DELETE): · eb191861
      unknown authored
      The rpl_trigger test case indicated a problem with idempotency support when run
      under row-based replication, which this patch fixes.
      
      However, despite this, the test is not designed for execution under row-based
      replication and hence rpl_trigger.test is not executed under row-based
      replication.
      
      The problem is that the test expects triggers to be executed when the slave
      updates rows on the slave, and this is (deliberately) not done with row-based
      replication.
      
      
      sql/log_event.cc:
        Adding function to print symbolic name of handler errors for debug purposes.
        Ignoring some more error messages to provide full idempotency support for
        update and delete operations.
      mysql-test/suite/rpl/r/rpl_idempotency.result:
        New BitKeeper file ``mysql-test/suite/rpl/r/rpl_idempotency.result''
      mysql-test/suite/rpl/t/rpl_idempotency.test:
        New BitKeeper file ``mysql-test/suite/rpl/t/rpl_idempotency.test''
      eb191861
    • unknown's avatar
      manual merge · fcff3b5a
      unknown authored
      
      BitKeeper/deleted/.del-rpl_slave_skip-slave.opt:
        Delete: mysql-test/t/rpl_slave_skip-slave.opt
      BitKeeper/deleted/.del-rpl_slave_skip.test:
        Delete: mysql-test/t/rpl_slave_skip.test
      BitKeeper/deleted/.del-rpl_slave_skip.result:
        Delete: mysql-test/r/rpl_slave_skip.result
      fcff3b5a
    • unknown's avatar
      Manual merge 5.0-rpl -> 5.1-rpl. · 356bdcb7
      unknown authored
      involved bug#12691, bug#27571
      
      
      mysql-test/suite/rpl/r/rpl_sp_effects.result:
        results changed
      sql/slave.cc:
        pended manual merge done (mats)
      sql/sql_delete.cc:
        manual merge
      sql/sql_insert.cc:
        manual merge
      sql/sql_load.cc:
        manual merge
      sql/sql_update.cc:
        manual merge.
      356bdcb7
    • unknown's avatar
      Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug27571_asyn_killed_flags · 200f0531
      unknown authored
      into  koti.dsl.inet.fi:/home/elkin/MySQL/5.1-merge-bug27571
      
      
      client/mysql.cc:
        Auto merged
      mysql-test/r/ctype_euckr.result:
        Auto merged
      mysql-test/r/ctype_uca.result:
        Auto merged
      mysql-test/suite/binlog/r/binlog_killed.result:
        Auto merged
      mysql-test/suite/binlog/t/binlog_killed.test:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/log_event.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      strings/ctype-euc_kr.c:
        Auto merged
      mysql-test/suite/rpl/r/rpl_sp_effects.result:
        manual merge ul
      mysql-test/suite/rpl/t/rpl_sp_effects.test:
        manual merge
      sql/slave.cc:
        leaving for manual merge
      sql/sql_delete.cc:
        leaving for manual merge
      sql/sql_insert.cc:
        leaving for manual merge
      sql/sql_load.cc:
        leaving for manual merge
      sql/sql_update.cc:
        leaving for manual merge
      200f0531
    • unknown's avatar
      Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · 5e314d06
      unknown authored
      into  koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug27571_asyn_killed_flags
      
      
      5e314d06
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1 · a3b60d2d
      unknown authored
      into  mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl-merge
      
      
      client/mysql.cc:
        Auto merged
      mysql-test/r/ctype_euckr.result:
        Auto merged
      mysql-test/r/ctype_uca.result:
        Auto merged
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/r/func_regexp.result:
        Auto merged
      mysql-test/suite/rpl/r/rpl_bug31076.result:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      mysql-test/t/func_regexp.test:
        Auto merged
      mysql-test/t/partition.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_xmlfunc.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log.h:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      strings/ctype-euc_kr.c:
        Auto merged
      sql/sql_yacc.yy:
        Reverting Rafal's changes: TRANSACTIONAL_SYM was removed in a mistake.
      mysql-test/r/ctype_ucs.result:
        After merge fix
      mysql-test/suite/rpl/t/rpl_bug31076.test:
        After merge fix.
      mysql-test/t/ctype_ucs.test:
        After megre fix
      a3b60d2d
  3. 29 Oct, 2007 2 commits
    • unknown's avatar
      Bug #27571 asynchronousity in setting mysql_`query`::error and · 95f3db7b
      unknown authored
                 Query_log_event::error_code
      
      A query can perform completely having the local var error of mysql_$query
      zero, where $query in insert, update, delete, load,
      and be  binlogged with error_code e.g KILLED_QUERY while there is no
      reason do to so.
      That can happen because Query_log_event consults thd->killed flag to
      evaluate error_code.
      
      Fixed with implementing a scheme suggested and partly implemented at
      time of bug@22725 work-on. error_status is cached immediatly after the
      control leaves the main rows-loop and that instance always corresponds
      to `error' the local of mysql_$query functions. The cached value
      is passed to Query_log_event constructor, not the default thd->killed
      which can be changed in between of the caching and the constructing.
      
      
      mysql-test/r/binlog_killed.result:
        results changed
      mysql-test/t/binlog_killed.test:
        Demonstrating that effective killing during rows-loop execution leads to the speficied actions:
        binlogging with the error for a query modified a not-transactional table or
        rolling back effects for transactional table;
        
        fixing possible non-determinism with ID when query_log_enabled;
        
        leave commented out tests for multi-update,delete due to another bug;
        
        removing an obsolete tests template;
        
        changing system rm to --remove_file.
      sql/log_event.cc:
        adding killed status arg
      sql/log_event.h:
        added killed status arg
      sql/sql_delete.cc:
        deploying the update part patch for delete, multi-delete
      sql/sql_insert.cc:
        deploying the update-part patch for insert..select
      sql/sql_load.cc:
        deploying the update-part patch for load data.
        simulation added.
      sql/sql_update.cc:
        Impementing the fix as described in the comments left by bug@22725.
        Also simulation of killing after the loop that would affect binlogging in the old code.
      mysql-test/t/binlog_killed_bug27571-master.opt:
        post rows-loop killing simulation's options
      mysql-test/t/binlog_killed_bug27571.test:
        Checking that if killing happens inbetween of the end of rows loop and
        recording into binlog that will not lead to recording any error incl
        the killed error.
      mysql-test/t/binlog_killed_simulate-master.opt:
        simulation options
      mysql-test/t/binlog_killed_simulate.test:
        tests for 
        a query (update is choosen) being killed after the row-loop;
        load data killed within the loop - effective killed error in the event is gained.
      95f3db7b
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1 · 7d9c59b7
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      7d9c59b7
  4. 26 Oct, 2007 2 commits
    • unknown's avatar
      Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.0-rpl · 2d380a83
      unknown authored
      into  kindahl-laptop.dnsalias.net:/home/bk/b12691-mysql-5.0-rpl
      
      
      sql/slave.cc:
        Auto merged
      2d380a83
    • unknown's avatar
      BUG#12691 (Exec_master_log_pos corrupted with SQL_SLAVE_SKIP_COUNTER): · f01321fd
      unknown authored
        
      Adding code to keep skipping events while inside a transaction. Execution
      will start just after the transaction has been skipped.
      
      
      sql/slave.cc:
        Adding code to set the thd->options flag for the slave SQL thread
        even when BEGIN, ROLLBACK, COMMIT, and XID events are being skipped.
            
        Adding code to not decrease the slave skip counter from 1 to 0 if we
        are inside a transaction. This will keep the counter at 1, and keep
        skipping events, until a transaction terminator is read. At that point,
        the slave skip counter will be decreased to 0, and events will be read
        and executed instead of read and skipped.
      mysql-test/r/rpl_slave_skip.result:
        New BitKeeper file ``mysql-test/r/rpl_slave_skip.result''
      mysql-test/t/rpl_slave_skip-slave.opt:
        New BitKeeper file ``mysql-test/t/rpl_slave_skip-slave.opt''
      mysql-test/t/rpl_slave_skip.test:
        New BitKeeper file ``mysql-test/t/rpl_slave_skip.test''
      f01321fd
  5. 25 Oct, 2007 3 commits
    • unknown's avatar
      Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl · e70e5326
      unknown authored
      into  koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug30594-rpl.rpl_skip_error_is_nondeterministic
      
      
      e70e5326
    • unknown's avatar
      Mimic a rename which Daniel already did in 6.0, · a71a829a
      unknown authored
      to get rid of a name clash among *deleted* files on case-insignificant file systems.
      
      
      BitKeeper/deleted/.del-changelog-bleh:
        Rename: BitKeeper/deleted/.del-changelog -> BitKeeper/deleted/.del-changelog-bleh
      a71a829a
    • unknown's avatar
      WL#4078: Document binary format of binlog entries · f8f8c028
      unknown authored
      Documented some binlog events using doxygen. More will be done later.
      Also fixed typos in other comments and added remarks about dubious code.
      Only comments are affected, there is no change to the actual code.
      
      
      sql/log_event.cc:
        Fixed typos in some comments.
        Added remarks (as comments) about questionable code.
      sql/log_event.h:
        Documented the binary format of following binlog events:
        Log_event
        Query_log_event
        Muted_query_log_event
        Slave_log_event (partial)
        Load_log_event
        Intvar_log_event
        Rand_log_event
        Rotate_log_event (partial)
      sql/sql_class.h:
        Fixed typo in comment.
      f8f8c028
  6. 24 Oct, 2007 6 commits
    • unknown's avatar
      Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl · 06e82cb8
      unknown authored
      into  kindahl-laptop.dnsalias.net:/home/bk/b24860-mysql-5.1-rpl
      
      
      sql/log_event.cc:
        Auto merged
      sql/log_event.h:
        Auto merged
      sql/slave.cc:
        Auto merged
      06e82cb8
    • unknown's avatar
      BUG#31702 (Missing row on slave causes assertion failure under row-based · 4a08f392
      unknown authored
      replication):
      
      Incremental patch to enable idempotency support for update events again.
      The final handling of errors will be done in BUG#31609, and until then
      the handling of errors should be consistent between the different types
      of changes.
      
      
      mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result:
        Result change.
      mysql-test/suite/rpl/r/rpl_temporary_errors.result:
        Result change.
      mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test:
        Changing test to assume idempotency handling of update event.
      mysql-test/suite/rpl/t/rpl_temporary_errors.test:
        Changing test to assume idempotency handling of update event.
      sql/log_event.cc:
        Incremental patch to enable idempotency support for the update events again.
        The real error handling will be implemented in BUG#31609.
      4a08f392
    • unknown's avatar
      result fix · f78be6c8
      unknown authored
      f78be6c8
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · 18436d48
      unknown authored
      into  mysql.com:/home/bar/mysql-work/mysql-5.0.b31081
      
      
      18436d48
    • unknown's avatar
      Bug#31081 server crash in regexp function · 47bed4d4
      unknown authored
      Additional fix for valgrind warning
      
      
      47bed4d4
    • unknown's avatar
      Merge mysql.com:/home/bar/mysql-work/mysql-5.0 · 9be2220b
      unknown authored
      into  mysql.com:/home/bar/mysql-work/mysql-5.0-rpl-mr
      
      
      client/mysql.cc:
        Auto merged
      mysql-test/r/ctype_euckr.result:
        Auto merged
      mysql-test/r/ctype_uca.result:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      strings/ctype-euc_kr.c:
        Auto merged
      9be2220b
  7. 23 Oct, 2007 17 commits
    • unknown's avatar
      result fix · b987945d
      unknown authored
      b987945d
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · e085211d
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      client/mysqldump.c:
        Auto merged
      include/config-win.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysql-test/r/func_sapdb.result:
        Auto merged
      mysql-test/r/type_decimal.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/type_datetime.test:
        Auto merged
      mysql-test/t/type_decimal.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      storage/innobase/handler/ha_innodb.cc:
        Auto merged
      storage/myisam/sort.c:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/r/type_datetime.result:
        after merge fix
      e085211d
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt · fa0e1d6b
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
      
      
      fa0e1d6b
    • unknown's avatar
      after merge fix · 985e4a64
      unknown authored
      985e4a64
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.1 · 95a8bb20
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      client/client_priv.h:
        Auto merged
      client/mysqldump.c:
        Auto merged
      include/config-win.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/create.result:
        Auto merged
      mysql-test/r/func_sapdb.result:
        Auto merged
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/information_schema.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/ha_partition.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/protocol.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      storage/innobase/handler/ha_innodb.cc:
        Auto merged
      storage/myisam/sort.c:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/r/query_cache.result:
        manual merge
      mysql-test/include/mix1.inc:
        manual merge
      mysql-test/r/innodb_mysql.result:
        manual merge
      mysql-test/r/type_datetime.result:
        manual merge
      mysql-test/r/type_decimal.result:
        manual merge
      mysql-test/t/query_cache.test:
        manual merge
      mysql-test/t/type_datetime.test:
        manual merge
      mysql-test/t/type_decimal.test:
        manual merge
      sql/item.cc:
        manual merge
      95a8bb20
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 8479eb1d
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
      
      
      client/mysqldump.c:
        Auto merged
      include/config-win.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      myisam/sort.c:
        Auto merged
      mysql-test/r/func_sapdb.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/r/type_datetime.result:
        manual merge
      mysql-test/r/type_decimal.result:
        manual merge
      mysql-test/t/type_datetime.test:
        manual merge
      mysql-test/t/type_decimal.test:
        manual merge
      sql/item.cc:
        manual merge
      8479eb1d
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 6e8919b0
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      6e8919b0
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · c448d2ed
      unknown authored
      into  mysql.com:/home/hf/work/30638/my50-30638
      
      
      c448d2ed
    • unknown's avatar
      Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-opt · 72bd96ae
      unknown authored
      into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
      
      
      72bd96ae
    • unknown's avatar
      Merge mysql.com:/home/hf/work/30638/my50-30638 · f102f668
      unknown authored
      into  mysql.com:/home/hf/work/30638/my51-30638
      
      
      sql/opt_range.cc:
        Auto merged
      storage/heap/ha_heap.cc:
        Auto merged
      f102f668
    • unknown's avatar
      Merge polly.(none):/home/kaa/src/opt/mysql-5.0-opt · 21469c40
      unknown authored
      into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
      
      
      21469c40
    • unknown's avatar
      Merge polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550 · de3eb8fb
      unknown authored
      into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
      
      
      de3eb8fb
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · f7f8ca8b
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
      
      
      f7f8ca8b
    • unknown's avatar
      Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550 · 2d4639c4
      unknown authored
      into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
      
      
      2d4639c4
    • unknown's avatar
      Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550 · 619bb76b
      unknown authored
      into  polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550
      
      
      sql/filesort.cc:
        SCCS merged
      619bb76b
    • unknown's avatar
      type conversions fixed to get rid of warnings · 4e5c8bc7
      unknown authored
      
      sql/ha_heap.cc:
        type conversion fix
      sql/opt_range.cc:
        type conversion fix
      4e5c8bc7
    • unknown's avatar
      Merge mysql.com:/home/hf/work/30638/my50-30638 · 0fb0e7ac
      unknown authored
      into  mysql.com:/home/hf/work/30638/my51-30638
      
      
      0fb0e7ac