bk commit into 5.1 tree (msvensson:1.2601) BUG#31741

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-01 17:14:15+01:00, msvensson@stripped +8 -0
  Bug#31741 mysqltest - deprecate "system" command
   - Additional changes for 5.1

  mysql-test/r/create.result@stripped, 2007-11-01 17:14:09+01:00, msvensson@stripped
+17 -0
    Move result from create_not_windows.test

  mysql-test/r/create_not_windows.result@stripped, 2007-11-01 17:14:09+01:00,
msvensson@stripped +0 -17
    Move result to create.test

  mysql-test/suite/binlog/t/binlog_killed.test@stripped, 2007-11-01 17:14:09+01:00,
msvensson@stripped +1 -1
    system rm -> remove_file

  mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test@stripped, 2007-11-01 17:14:09+01:00,
msvensson@stripped +0 -2
    Remove use of killall

  mysql-test/t/create.test@stripped, 2007-11-01 17:14:09+01:00, msvensson@stripped +21
-0
    Move test from create_not_windows.test

  mysql-test/t/create_not_windows.test@stripped, 2007-11-01 17:14:09+01:00,
msvensson@stripped +0 -20
    Move test to create.test

  mysql-test/t/partition_mgm_err2.test@stripped, 2007-11-01 17:14:09+01:00,
msvensson@stripped +7 -6
    remove non portable constructs

  mysql-test/t/upgrade.test@stripped, 2007-11-01 17:14:09+01:00, msvensson@stripped +1
-1
    system cp -> copy_file

diff -Nrup a/mysql-test/r/create.result b/mysql-test/r/create.result
--- a/mysql-test/r/create.result	2007-10-23 08:54:13 +02:00
+++ b/mysql-test/r/create.result	2007-11-01 17:14:09 +01:00
@@ -1743,4 +1743,21 @@ create table t1 as select 1;
 create table t2 as select f1() from t1;
 drop table t1,t2;
 drop function f1;
+use test;
+drop table if exists t1;
+create table t1(a int) engine=myisam;
+insert into t1 values(1);
+"We get an error because the table is in the definition cache"
+create table t1(a int, b int);
+ERROR 42S01: Table 't1' already exists
+"Flush the cache and recreate the table anew to be able to drop it"
+flush tables;
+show open tables like "t%";
+Database	Table	In_use	Name_locked
+create table t1(a int, b int, c int);
+"Try to select from the table. This should not crash the server"
+select count(a) from t1;
+count(a)
+0
+drop table t1;
 End of 5.1 tests
diff -Nrup a/mysql-test/r/create_not_windows.result
b/mysql-test/r/create_not_windows.result
--- a/mysql-test/r/create_not_windows.result	2007-07-13 16:08:05 +02:00
+++ b/mysql-test/r/create_not_windows.result	2007-11-01 17:14:09 +01:00
@@ -12,20 +12,3 @@ about:text	CREATE TABLE `about:text` (
   PRIMARY KEY (`_id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table `about:text`;
-use test;
-drop table if exists t1;
-create table t1(a int) engine=myisam;
-insert into t1 values(1);
-"We get an error because the table is in the definition cache"
-create table t1(a int, b int);
-ERROR 42S01: Table 't1' already exists
-"Flush the cache and recreate the table anew to be able to drop it"
-flush tables;
-show open tables like "t%";
-Database	Table	In_use	Name_locked
-create table t1(a int, b int, c int);
-"Try to select from the table. This should not crash the server"
-select count(a) from t1;
-count(a)
-0
-drop table t1;
diff -Nrup a/mysql-test/suite/binlog/t/binlog_killed.test
b/mysql-test/suite/binlog/t/binlog_killed.test
--- a/mysql-test/suite/binlog/t/binlog_killed.test	2007-06-27 14:27:32 +02:00
+++ b/mysql-test/suite/binlog/t/binlog_killed.test	2007-11-01 17:14:09 +01:00
@@ -242,7 +242,7 @@ drop function bug27563;
 drop function bug27565;
 }
 
-system rm $MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog ;
+remove_file $MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog;
 
 drop table t1,t2,t3;
 
diff -Nrup a/mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test
b/mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test	2007-07-25 15:29:29 +02:00
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test	2007-11-01 17:14:09 +01:00
@@ -15,8 +15,6 @@
 --source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc
 
-# kill any trailing processes
---system killall lt-bankTransactionMaker lt-bankTimer lt-bankMakeGL || true
 
 --disable_warnings
 # initialize master
diff -Nrup a/mysql-test/t/create.test b/mysql-test/t/create.test
--- a/mysql-test/t/create.test	2007-10-23 08:54:13 +02:00
+++ b/mysql-test/t/create.test	2007-11-01 17:14:09 +01:00
@@ -1404,4 +1404,25 @@ create table t2 as select f1() from t1;
 drop table t1,t2;
 drop function f1;
 
+#
+# Bug#16532:mysql server assert in debug if table det is removed
+#
+use test;
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+create table t1(a int) engine=myisam;
+insert into t1 values(1);
+remove_file $MYSQLTEST_VARDIR/master-data/test/t1.frm;
+--echo "We get an error because the table is in the definition cache"
+--error ER_TABLE_EXISTS_ERROR
+create table t1(a int, b int);
+--echo "Flush the cache and recreate the table anew to be able to drop it"
+flush tables;
+show open tables like "t%";
+create table t1(a int, b int, c int);
+--echo "Try to select from the table. This should not crash the server"
+select count(a) from t1;
+drop table t1;
+
 --echo End of 5.1 tests
diff -Nrup a/mysql-test/t/create_not_windows.test b/mysql-test/t/create_not_windows.test
--- a/mysql-test/t/create_not_windows.test	2007-07-13 16:08:05 +02:00
+++ b/mysql-test/t/create_not_windows.test	2007-11-01 17:14:09 +01:00
@@ -20,23 +20,3 @@ drop table `about:text`;
 
 # End of 5.0 tests
 
-#
-# Bug#16532:mysql server assert in debug if table det is removed
-#
-use test;
---disable_warnings
-drop table if exists t1;
---enable_warnings
-create table t1(a int) engine=myisam;
-insert into t1 values(1);
---system rm -f $MYSQLTEST_VARDIR/master-data/test/t1.frm
---echo "We get an error because the table is in the definition cache"
---error ER_TABLE_EXISTS_ERROR
-create table t1(a int, b int);
---echo "Flush the cache and recreate the table anew to be able to drop it"
-flush tables;
-show open tables like "t%";
-create table t1(a int, b int, c int);
---echo "Try to select from the table. This should not crash the server"
-select count(a) from t1;
-drop table t1;
diff -Nrup a/mysql-test/t/partition_mgm_err2.test b/mysql-test/t/partition_mgm_err2.test
--- a/mysql-test/t/partition_mgm_err2.test	2007-04-25 20:21:22 +02:00
+++ b/mysql-test/t/partition_mgm_err2.test	2007-11-01 17:14:09 +01:00
@@ -6,13 +6,14 @@
 
 #
 # This test is disabled on windows due to BUG#19107
-#
+#  - it requires symlinked files
 --source include/not_windows.inc
+
 #
 # BUG: 14354 Partitions: data directory clause fails
 #
---system rm -rf $MYSQLTEST_VARDIR/tmp/bug14354
---system mkdir $MYSQLTEST_VARDIR/tmp/bug14354
+
+mkdir $MYSQLTEST_VARDIR/tmp/bug14354;
 disable_query_log;
 eval CREATE TABLE t1 (id int) PARTITION BY RANGE(id) (
 PARTITION p1 VALUES LESS THAN (20) ENGINE=myisam
@@ -20,7 +21,7 @@ DATA DIRECTORY="$MYSQLTEST_VARDIR/tmp/bu
 INDEX DIRECTORY="$MYSQLTEST_VARDIR/tmp/bug14354");
 enable_query_log;
 INSERT INTO t1 VALUES (15);
---system test -f $MYSQLTEST_VARDIR/tmp/bug14354/t1#P#p1.MYD
---system test -f $MYSQLTEST_VARDIR/tmp/bug14354/t1#P#p1.MYI
+file_exist $MYSQLTEST_VARDIR/tmp/bug14354/t1#P#p1.MYD;
+file_exist $MYSQLTEST_VARDIR/tmp/bug14354/t1#P#p1.MYI;
 DROP TABLE t1;
---system rm -rf $MYSQLTEST_VARDIR/tmp/bug14354
+rmdir $MYSQLTEST_VARDIR/tmp/bug14354;
diff -Nrup a/mysql-test/t/upgrade.test b/mysql-test/t/upgrade.test
--- a/mysql-test/t/upgrade.test	2007-10-08 20:37:55 +02:00
+++ b/mysql-test/t/upgrade.test	2007-11-01 17:14:09 +01:00
@@ -57,7 +57,7 @@ drop table `txu#p#p1`;
 # Check if old tables work
 #
 
-system cp $MYSQL_TEST_DIR/std_data/old_table-323.frm
$MYSQLTEST_VARDIR/master-data/test/t1.frm;
+copy_file $MYSQL_TEST_DIR/std_data/old_table-323.frm
$MYSQLTEST_VARDIR/master-data/test/t1.frm;
 truncate t1;
 drop table t1;