From f4820ea62ef2635f2d79476deb001f3ae662470e Mon Sep 17 00:00:00 2001
From: Michael Widenius <monty@askmonty.org>
Date: Wed, 15 Sep 2010 15:48:15 +0300
Subject: mysqltest now gives error messages with error code for my_delete,
 my_rename, my_copy etc. Fixed crashing bug when doing ALTER TABLE RENAME with
 transactional tables.

client/mysqltest.cc:
  Added errno to error message for system calls (delete, rename etc)
  Write error message for failures of system calls
mysql-test/include/cleanup_fake_relay_log.inc:
  Disable warnings for remove_file
mysql-test/include/diff_tables.inc:
  Disable warnings for remove_file
mysql-test/include/maria_empty_logs.inc:
  Disable warnings for remove_file
mysql-test/include/maria_make_snapshot.inc:
  Disable warnings for remove_file
mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc:
  Disable warnings for remove_file
mysql-test/include/mysqlhotcopy.inc:
  Disable warnings for remove_file
mysql-test/include/ndb_backup.inc:
  Disable warnings for remove_file
mysql-test/include/ndb_backup_print.inc:
  Disable warnings for remove_file
mysql-test/r/alter_table_trans.result:
  Test of crashing ALTER TABLE RENAME bug
mysql-test/t/alter_table_trans.test:
  Test of crashing ALTER TABLE RENAME bug
mysql-test/t/mysqltest.test:
  Disable warnings for remove_file and move_file
mysys/my_copy.c:
  Fixed wrong error message
sql/sql_table.cc:
  Fixed crashing bug when doing ALTER TABLE RENAME with transactional tables.
---
 mysql-test/t/mysqltest.test | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'mysql-test/t/mysqltest.test')

diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test
index b103140190f..edc4da4e37f 100644
--- a/mysql-test/t/mysqltest.test
+++ b/mysql-test/t/mysqltest.test
@@ -106,7 +106,7 @@ select otto from (select 1 as otto) as t1;
 # expecting a SQL-state for a command that can't give one should fail
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 --error 1
---exec echo "error S00000; remove_file $MYSQLTEST_VARDIR/tmp/test_nonexistent.tmp;" | $MYSQL_TEST  2>&1
+--exec echo "disable_warnings ; error S00000;  remove_file $MYSQLTEST_VARDIR/tmp/test_nonexistent.tmp;" | $MYSQL_TEST  2>&1
 
 
 # ----------------------------------------------------------------------------
@@ -1551,12 +1551,14 @@ select "this will be executed";
 --exec $MYSQL_TEST -x $MYSQLTEST_VARDIR/tmp/query.sql -R $MYSQLTEST_VARDIR/tmp/zero_length_file.result  > /dev/null 2>&1
 
 remove_file $MYSQLTEST_VARDIR/tmp/zero_length_file.result;
+--disable_warnings
 --error 0,1
 remove_file $MYSQLTEST_VARDIR/tmp/zero_length_file.reject;
 --error 0,1
 remove_file $MYSQLTEST_VARDIR/tmp/zero_length_file.log;
 --error 0,1
 remove_file $MYSQL_TEST_DIR/r/zero_length_file.reject;
+--enable_warnings
 
 #
 # Test that a test file that does not generate any output fails.
@@ -1741,11 +1743,13 @@ drop table t1;
 # test for remove_file
 # ----------------------------------------------------------------------------
 
+--disable_warnings
 --error 1
 --exec echo "remove_file ;" | $MYSQL_TEST 2>&1
 
 --error 1
 remove_file non_existing_file;
+--enable_warnings
 
 # ----------------------------------------------------------------------------
 # test for remove_files_wildcard
@@ -1785,7 +1789,7 @@ Content for test_file1 contains EOF
 END_DELIMITER
 file_exists $MYSQLTEST_VARDIR/tmp/test_file1.tmp;
 
-# write to already exisiting file
+# write to already existing file
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 --error 1
 --exec echo "write_file $MYSQLTEST_VARDIR/tmp/test_file1.tmp;" | $MYSQL_TEST 2>&1
@@ -1901,8 +1905,10 @@ EOF
 --error 1
 --exec echo "file_exists ;" | $MYSQL_TEST 2>&1
 
+--disable_warnings
 --error 0,1
 remove_file $MYSQLTEST_VARDIR/tmp/test_file1.tmp;
+--enable_warnings
 --error 1
 file_exists $MYSQLTEST_VARDIR/tmp/test_file1.tmp;
 write_file $MYSQLTEST_VARDIR/tmp/test_file1.tmp;
@@ -1939,6 +1945,7 @@ remove_file $MYSQLTEST_VARDIR/tmp/file2.tmp;
 
 # - Check that if source file does not exist, nothing will be created.
 
+--disable_warnings
 --error 1
 file_exists $MYSQLTEST_VARDIR/tmp/file1.tmp;
 --error 1
@@ -1949,6 +1956,7 @@ move_file $MYSQLTEST_VARDIR/tmp/file1.tmp $MYSQLTEST_VARDIR/tmp/file2.tmp;
 file_exists $MYSQLTEST_VARDIR/tmp/file1.tmp;
 --error 1
 file_exists $MYSQLTEST_VARDIR/tmp/file2.tmp;
+--enable_warnings
 
 # - Check that if source file exists, everything works properly.
 
-- 
cgit v1.2.1