Commit fd40509c authored by unknown's avatar unknown
Browse files

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-new
parents 7dbb63fe ea67b28c

mysql-test/ndb/ndbcluster.sh

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ while test $# -gt 0; do 
    --small)

     ndb_no_ord=32

     ndb_con_op=5000

     ndb_dmem=10M

     ndb_dmem=20M

     ndb_imem=1M

     ndb_pbmem=4M

     ;;

mysql-test/r/ndb_config.result

+3 −3
Original line number Diff line number Diff line 
ndbd,1,localhost ndbd,2,localhost ndb_mgmd,3,localhost mysqld,4, mysqld,5, mysqld,6, mysqld,7, mysqld,8, mysqld,9, mysqld,10, mysqld,11,

1,localhost,10485760,1048576 2,localhost,10485760,1048576

1 localhost 10485760 1048576

2 localhost 10485760 1048576

1,localhost,20971520,1048576 2,localhost,20971520,1048576

1 localhost 20971520 1048576

2 localhost 20971520 1048576

1 2

ndbd,1,localhost ndbd,2,localhost ndb_mgmd,3,localhost mysqld,4, mysqld,5, mysqld,6, mysqld,7, mysqld,8, mysqld,9, mysqld,10, mysqld,11,

ndbd,1,localhost,52428800,26214400 ndbd,2,localhost,52428800,36700160 ndbd,3,localhost,52428800,52428800 ndbd,4,localhost,52428800,52428800 ndb_mgmd,5,localhost,, mysqld,6,localhost,,

mysql-test/r/ndb_restore.result

+9 −0
Original line number Diff line number Diff line 
use test;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

drop table if exists t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c;

id    type                 state    logging database     schema   name

2     UserTable            Online   Yes     cluster_replication def      apply_status

1     SystemTable          Online   Yes     sys          def      NDB$EVENTS_0

3     UserTable            Online   Yes     cluster_replication def      schema

0     SystemTable          Online   Yes     sys          def      SYSTAB_0



NDBT_ProgramExit: 0 - OK



CREATE TABLE `t1_c` (

`capgoaledatta` smallint(5) unsigned NOT NULL auto_increment,

`goaledatta` char(2) NOT NULL default '',
@@ -442,6 +450,7 @@ select * from t9_c) a; 
count(*)

3

drop table t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c;

Create table test/def/t2_c failed: Translate frm error

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

drop table if exists t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c;

520093696,2

mysql-test/t/disabled.def

+0 −1
Original line number Diff line number Diff line
@@ -26,6 +26,5 @@ rpl_ndb_basic : Bug#16228 
rpl_sp          : Bug #16456

ndb_autodiscover : Needs to be fixed w.r.t binlog

ndb_autodiscover2 : Needs to be fixed w.r.t binlog

ndb_restore     : Needs fixing

system_mysql_db : Needs fixing

system_mysql_db_fix : Needs fixing

mysql-test/t/ndb_restore.test

+4 −2
Original line number Diff line number Diff line
@@ -8,6 +8,9 @@ drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; 
drop table if exists t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c;

--enable_warnings



--exec $NDB_TOOLS_DIR/ndb_show_tables

--exec $NDB_MGM --no-defaults -e "all dump 1000" >> $NDB_TOOLS_OUTPUT



CREATE TABLE `t1_c` (

  `capgoaledatta` smallint(5) unsigned NOT NULL auto_increment,

  `goaledatta` char(2) NOT NULL default '',
@@ -348,8 +351,7 @@ select count(*) 
        select * from t9_c) a;



drop table t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c;

--error 134

--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b 2 -n 1 -m -r --ndb-nodegroup_map '(0,1)' --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-2 >> $NDB_TOOLS_OUTPUT

--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b 2 -n 1 -m -r --ndb-nodegroup_map '(0,1)' $NDB_BACKUP_DIR/BACKUP/BACKUP-2 2>&1 | grep Translate || true



#

# Cleanup