1. 05 Jul, 2007 1 commit
  2. 03 Jul, 2007 6 commits
  3. 02 Jul, 2007 13 commits
  4. 01 Jul, 2007 9 commits
    • unknown's avatar
      Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime · 418996f3
      unknown authored
      into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
      
      
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      418996f3
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · c182dfa2
      unknown authored
      into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
      
      
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      c182dfa2
    • unknown's avatar
      Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime · 58935a31
      unknown authored
      into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
      
      
      mysql-test/r/ps_1general.result:
        Auto merged
      mysql-test/r/ps_2myisam.result:
        Auto merged
      mysql-test/r/ps_3innodb.result:
        Auto merged
      mysql-test/r/ps_4heap.result:
        Auto merged
      mysql-test/r/ps_5merge.result:
        Auto merged
      BitKeeper/deleted/.del-ps_6bdb.result:
        Auto merged
      mysql-test/r/ps_7ndb.result:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_error.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/show_check.result:
        Manual merge.
      mysql-test/t/show_check.test:
        Manual merge.
      sql/item.h:
        Manual merge.
      sql/sp.cc:
        Manual merge.
      sql/sql_trigger.cc:
        Manual merge.
      tests/mysql_client_test.c:
        Manual merge.
      58935a31
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 0852b369
      unknown authored
      into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
      
      
      mysql-test/r/create.result:
        Auto merged
      mysql-test/r/events_bugs.result:
        Auto merged
      sql/event_data_objects.cc:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      0852b369
    • unknown's avatar
      Update a missed test result. · 2e81ee13
      unknown authored
      
      mysql-test/r/ps_6bdb.result:
        Update test results (character sets patch).
      2e81ee13
    • unknown's avatar
      Corrected a test case. · de0ba5c8
      unknown authored
      de0ba5c8
    • unknown's avatar
      Made test case platform independent. · e63f6f32
      unknown authored
      e63f6f32
    • unknown's avatar
      Post-merge fix. · f9d36194
      unknown authored
      f9d36194
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 26a2b004
      unknown authored
      into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt
      
      
      mysql-test/r/binary.result:
        Auto merged
      mysql-test/r/ctype_collate.result:
        Auto merged
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/t/binary.test:
        Auto merged
      mysql-test/t/create.test:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      sql/field_conv.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_sum.h:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql/sql_select.h:
        Auto merged
      sql/table.cc:
        Auto merged
      storage/myisam/mi_open.c:
        Auto merged
      strings/ctype-simple.c:
        Auto merged
      mysql-test/r/create.result:
        Manual merge.
      mysql-test/r/subselect.result:
        Manual merge.
      mysql-test/r/type_enum.result:
        Manual merge.
      mysql-test/t/type_enum.test:
        Manual merge.
      mysql-test/include/mix1.inc:
        Manual merge.
      mysql-test/r/innodb_mysql.result:
        Manual merge.
      mysql-test/t/subselect.test:
        Manual merge.
      sql/sql_parse.cc:
        Manual merge.
      storage/myisam/mi_key.c:
        Manual merge.
      26a2b004
  5. 30 Jun, 2007 9 commits
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-4.1-opt · 8dcd5fca
      unknown authored
      into  olga.mysql.com:/home/igor/mysql-5.0-opt
      
      
      mysql-test/r/type_enum.result:
        Auto merged
      mysql-test/t/type_enum.test:
        Auto merged
      sql/field_conv.cc:
        SCCS merged
      8dcd5fca
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 2ca2b232
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B29157-5.1-opt
      
      
      2ca2b232
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · e3a6b29b
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
      
      
      mysql-test/t/disabled.def:
        SCCS merged
      e3a6b29b
    • unknown's avatar
      disable with bug no · 0b079d97
      unknown authored
      0b079d97
    • unknown's avatar
      disabled test with bug number · 39cc5ca2
      unknown authored
      39cc5ca2
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 21b6a3bc
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
      
      
      mysql-test/lib/mtr_cases.pl:
        Auto merged
      mysql-test/t/ndb_alter_table.test:
        Auto merged
      mysql-test/t/ndb_alter_table2.test:
        Auto merged
      mysql-test/t/ndb_alter_table3.test:
        Auto merged
      mysql-test/t/ndb_autodiscover3.test:
        Auto merged
      mysql-test/t/ndb_binlog_log_bin.test:
        Auto merged
      mysql-test/t/ndb_binlog_multi.test:
        Auto merged
      mysql-test/t/ndb_cache_multi.test:
        Auto merged
      mysql-test/t/ndb_cache_multi2.test:
        Auto merged
      mysql-test/t/ndb_single_user.test:
        Auto merged
      sql/ha_ndbcluster.cc:
        SCCS merged
      21b6a3bc
    • unknown's avatar
      3f59098a
    • unknown's avatar
      [PATCH] Test for BUG#27404 util thd mysql_parse sig11 when default multibyte charset · 5629c496
      unknown authored
      Test that we can start a MySQL Server with a default multibyte charset with
      NDB running. Test *really* basic functionality too.
      
      Index: ndb-work/mysql-test/r/rpl_ndb_ctype_ucs2_def.result
      ===================================================================
      
      
      mysql-test/r/rpl_ndb_ctype_ucs2_def.result:
        Test for BUG#27404 util thd mysql_parse sig11 when default multibyte charset
      mysql-test/t/rpl_ndb_ctype_ucs2_def-master.opt:
        Test for BUG#27404 util thd mysql_parse sig11 when default multibyte charset
      mysql-test/t/rpl_ndb_ctype_ucs2_def.test:
        Test for BUG#27404 util thd mysql_parse sig11 when default multibyte charset
      5629c496
    • unknown's avatar
      [PATCH] BUG#27404 util thd mysql_parse sig11 when mysqld default multibyte charset · 60f3384c
      unknown authored
      NDB util thread calls mysql_parse internally with plain old c strings (7bit ascii) to create tables (e.g. mysql.ndb_schema). With mysqld default charset set to a multibyte one (e.g. ucs2) mysql_parse would try to interpret the 7bit string as UCS2 and promptly explode in a heap.
      
      Solution is to set the util thread to be using utf8 charset.
      
      Index: ndb-work/sql/ha_ndbcluster.cc
      ===================================================================
      
      
      sql/ha_ndbcluster.cc:
        BUG#27404 util thd mysql_parse sig11 when mysqld default multibyte charset
      60f3384c
  6. 29 Jun, 2007 2 commits