Commit e8fae25e authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools 

into  neptunus.(none):/home/msvensson/mysql/same_tools/my51-same_tools


BitKeeper/deleted/.del-mtr_stress.pl:
  Auto merged
BitKeeper/deleted/.del-ps_6bdb.result:
  Auto merged
BitKeeper/deleted/.del-rpl000018.result:
  Auto merged
BitKeeper/deleted/.del-rpl000018.test:
  Auto merged
BitKeeper/deleted/.del-rpl_chain_temp_table.result:
  Auto merged
BitKeeper/deleted/.del-rpl_chain_temp_table.test:
  Auto merged
BitKeeper/deleted/.del-rpl_failsafe.result:
  Auto merged
BitKeeper/deleted/.del-rpl_failsafe.test:
  Auto merged
BitKeeper/deleted/.del-rpl_heap.result:
  Auto merged
BitKeeper/deleted/.del-rpl_heap.test:
  Auto merged
mysql-test/include/have_ndb.inc:
  Auto merged
mysql-test/include/master-slave.inc:
  Auto merged
mysql-test/lib/mtr_misc.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/csv.result:
  Auto merged
mysql-test/r/drop.result:
  Auto merged
mysql-test/r/flush_block_commit.result:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/grant2.result:
  Auto merged
mysql-test/r/handler_myisam.result:
  Auto merged
mysql-test/r/multi_update.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
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/query_cache_notembedded.result:
  Auto merged
mysql-test/r/rpl_err_ignoredtable.result:
  Auto merged
mysql-test/r/rpl_master_pos_wait.result:
  Auto merged
mysql-test/r/rpl_stm_000001.result:
  Auto merged
mysql-test/r/sp-threads.result:
  Auto merged
mysql-test/r/sp_notembedded.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/synchronization.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/t/connect.test:
  Auto merged
mysql-test/t/csv.test:
  Auto merged
mysql-test/t/mysql_client_test.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
mysql-test/t/ps_grant.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/rpl_trunc_temp.test:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
mysql-test/t/sp_notembedded.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_flsh_tbls.test:
  SCCS merged
parents 8672a81b 5a39b93e

client/mysqltest.c

+2782 −2475

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/extra/rpl_tests/rpl_flsh_tbls.test

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 


-- source include/master-slave.inc



let $SERVER_VERSION=`select version()`;



create table t1 (a int);

insert into t1 values (10);

create table t2 (a int);

mysql-test/include/mysqltest_while.inc

deleted100644 → 0
+0 −137
Original line number Diff line number Diff line 
let $1 = 10;

while ($1)

{

while ($1)

{

while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

 while ($1)

{

  echo $1;

  dec $1;

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

}

mysql-test/include/sourced.inc

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
echo here is the sourced script;

mysql-test/include/sourced1.inc

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
--source include/sourced.inc