1. 30 Jun, 2007 5 commits
    • unknown's avatar
      disabled test with bug number · 5c8f902d
      unknown authored
      5c8f902d
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · f9d1cc32
      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
      f9d1cc32
    • unknown's avatar
      0a2aa5ca
    • unknown's avatar
      [PATCH] Test for BUG#27404 util thd mysql_parse sig11 when default multibyte charset · 36d969ba
      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
      36d969ba
    • unknown's avatar
      [PATCH] BUG#27404 util thd mysql_parse sig11 when mysqld default multibyte charset · f0da211f
      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
      f0da211f
  2. 29 Jun, 2007 1 commit
  3. 28 Jun, 2007 2 commits
    • unknown's avatar
      Merge poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb · 7ff59029
      unknown authored
      into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-rpl
      
      
      mysql-test/r/rpl_ndb_stm_innodb.result:
        Auto merged
      mysql-test/t/rpl_ndb_stm_innodb.test:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      storage/ndb/test/run-test/daily-basic-tests.txt:
        Auto merged
      7ff59029
    • unknown's avatar
      check for blackhole · 1c2beafd
      unknown authored
      1c2beafd
  4. 27 Jun, 2007 8 commits
  5. 26 Jun, 2007 4 commits
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · 70ec4bc8
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/pgman.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/ERROR_codes.txt:
        merge
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        merge
      70ec4bc8
    • unknown's avatar
      BUG#28991 : rpl_events failure in pushbuild · d559d8dd
      unknown authored
      This patch contains enhancements to the rpl_events test to correct
      timing issues related to the firing of events and verification of the
      results of those events. 
      
      
      mysql-test/include/rpl_events.inc:
        BUG#28991 : rpl_events failure in pushbuild 
        
        This patch contains refinements to the rpl_events test to remove all
        timing issues related to sleep commands. It also refines the test to
        include additional documentation.
      mysql-test/r/rpl_events.result:
        BUG#28991 : rpl_events failure in pushbuild 
        
        This patch contains the result file for the refinements to the 
        rpl_events test.
      d559d8dd
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca · 5ebd65ea
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
      
      5ebd65ea
    • unknown's avatar
      ndb - bug#29331 (51) · 3a4078c6
      unknown authored
          Add better handling of GCP Stop
          Only kill "offending" node
      
      
      storage/ndb/src/kernel/blocks/ERROR_codes.txt:
        add new error codes
      storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
        add better GCP stop handling
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        add better GCP stop handling
      3a4078c6
  6. 25 Jun, 2007 6 commits
  7. 24 Jun, 2007 1 commit
  8. 22 Jun, 2007 7 commits
    • unknown's avatar
      updated for bug#28770 · 10bf8d12
      unknown authored
      10bf8d12
    • unknown's avatar
      After merge fix. · 78644117
      unknown authored
      78644117
    • unknown's avatar
      Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28925 · 43984603
      unknown authored
      into  mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl
      
      
      mysql-test/r/ctype_ucs.result:
        Auto merged
      mysql-test/r/ctype_ucs2_def.result:
        Auto merged
      mysql-test/t/ctype_ucs.test:
        Auto merged
      mysql-test/t/ctype_ucs2_def.test:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      43984603
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · ba12bf84
      unknown authored
      into  mysql.com:/home/bar/mysql-work/mysql-5.0.b28925
      
      
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/ctype_ucs2_def.result:
        After merge fix
      mysql-test/t/ctype_ucs2_def.test:
        After merge fix
      ba12bf84
    • unknown's avatar
      Bug#28925 GROUP_CONCAT inserts wrong separators for a ucs2 column · 486177cc
      unknown authored
      Problem: separator was not converted to the result character set,
      so the result was a mixture of two different character sets,
      which was especially bad for UCS2.
      Fix: convert separator to the result character set.
      
      
      mysql-test/r/ctype_ucs.result:
        Adding test case
      mysql-test/r/ctype_ucs2_def.result:
        Adding test case
      mysql-test/t/ctype_ucs.test:
        Adding test case
      mysql-test/t/ctype_ucs2_def.test:
        Adding test case
      sql/item_sum.cc:
        Adding conversion of separator to the result character set
      sql/sql_yacc.yy:
        Fixing GROUPC_CONCAT problems when "mysqld --default-character-set=ucs2".
      486177cc
    • unknown's avatar
      Fixes to replication team tree. · 7eee6b62
      unknown authored
      
      storage/innobase/handler/ha_innodb.cc:
        Using DBUG_RETURN() instead of normal return.
      7eee6b62
    • unknown's avatar
      BUG#23051 (READ COMMITTED breaks mixed and statement-based replication): · 5954d6ad
      unknown authored
      Removing dead code.
      
      
      storage/innobase/handler/ha_innodb.cc:
        Removing dead code.
      5954d6ad
  9. 21 Jun, 2007 6 commits
    • unknown's avatar
      Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl · 7935d736
      unknown authored
      into  kindahl-laptop.dnsalias.net:/home/bk/b28722-mysql-5.1-rpl
      
      7935d736
    • unknown's avatar
      Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl · c9ca9e3d
      unknown authored
      into  kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
      
      
      mysql-test/t/disabled.def:
        Auto merged
      c9ca9e3d
    • unknown's avatar
      BUG#28722 (Multi-engine statements on has_own_binlogging engine): · 87a51fac
      unknown authored
      Test fixes resulting from changed semantics.
      
      
      mysql-test/extra/rpl_tests/rpl_row_UUID.test:
        Using same engine throughout to prevent NDB tests from failing.
      mysql-test/r/binlog_multi_engine.result:
        Result change.
      mysql-test/r/ndb_read_multi_range.result:
        Result change.
      mysql-test/r/ndb_trigger.result:
        Result change.
      mysql-test/r/rpl_ndb_UUID.result:
        Result change.
      mysql-test/r/rpl_row_UUID.result:
        Result change.
      mysql-test/t/binlog_multi_engine.test:
        Removing garbage.
      mysql-test/t/ndb_read_multi_range.test:
        Using ndbcluster for table used inside trigger.
      mysql-test/t/ndb_trigger.test:
        Using ndbcluster for table used inside trigger.
      87a51fac
    • unknown's avatar
      BUG#23051 (READ COMMITTED breaks mixed and statement-based replication): · e6f23425
      unknown authored
      Minor fixes to get proper detection of transaction isolation level when
      inside external_lock().
      
      
      mysql-test/t/disabled.def:
        Enabling innodb.test again.
      mysql-test/t/innodb.test:
        Fixing some error codes. Test currently requires MIXED or ROW mode since
        READ-COMMITTED and READ-UNCOMMITTED are not safe for STATEMENT mode, i.e.,
        when the binary log is enabled.
      storage/innobase/handler/ha_innodb.cc:
        Using tx_isolation since trx->isolation_level is not defined when
        inside external_lock().
      e6f23425
    • unknown's avatar
      select_ndb_apply_status.inc: · cbd6cc7b
      unknown authored
        new support file that I missed during last check ing, sorry
      
      
      mysql-test/include/select_ndb_apply_status.inc:
        new support file that I missed during last check ing, sorry
      cbd6cc7b
    • unknown's avatar
      Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 074a25ac
      unknown authored
      into  mysql.com:/data2/mysql-5.1-new-ndb
      
      
      mysql-test/t/rpl_ndb_dd_advance.test:
        Auto merged
      mysql-test/t/rpl_ndb_stm_innodb.test:
        SCCS merged
      074a25ac