bk commit into 5.0 tree (gkodinov:1.2529)

[kgeorge]

Below is the list of changes that have just been committed into a local
5.0 repository of kgeorge. When kgeorge 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-07-11 18:02:47+03:00, gkodinov@stripped +2 -0
  Addendum to bug 29325:
  test if TRUNCATE TABLE works with keep_files_on_create

  mysql-test/r/create.result@stripped, 2007-07-11 18:02:46+03:00, gkodinov@stripped +6 -1
    Addendum to bug 29325:
    test if TRUNCATE TABLE works with keep_files_on_create

  mysql-test/t/create.test@stripped, 2007-07-11 18:02:46+03:00, gkodinov@stripped +7 -1
    Addendum to bug 29325:
    test if TRUNCATE TABLE works with keep_files_on_create

diff -Nrup a/mysql-test/r/create.result b/mysql-test/r/create.result
--- a/mysql-test/r/create.result	2007-07-11 10:49:53 +03:00
+++ b/mysql-test/r/create.result	2007-07-11 18:02:46 +03:00
@@ -1515,8 +1515,13 @@ USE db1;
 SET SESSION keep_files_on_create = TRUE;
 CREATE TABLE t1 (a INT) ENGINE MYISAM;
 ERROR HY000: Can't create/write to file './db1/t1.MYD' (Errcode: 17)
+CREATE TABLE t3 (a INT) Engine=MyISAM;
+INSERT INTO t3 VALUES (1),(2),(3);
+TRUNCATE TABLE t3;
+SELECT * from t3;
+a
 SET SESSION keep_files_on_create = DEFAULT;
-DROP TABLE db2.t1;
+DROP TABLE db2.t1, db1.t3;
 DROP DATABASE db1;
 DROP DATABASE db2;
 USE test;
diff -Nrup a/mysql-test/t/create.test b/mysql-test/t/create.test
--- a/mysql-test/t/create.test	2007-07-11 10:49:53 +03:00
+++ b/mysql-test/t/create.test	2007-07-11 18:02:46 +03:00
@@ -1142,9 +1142,15 @@ SET SESSION keep_files_on_create = TRUE;
 --disable_abort_on_error
 CREATE TABLE t1 (a INT) ENGINE MYISAM;
 --enable_abort_on_error
+
+CREATE TABLE t3 (a INT) Engine=MyISAM;
+INSERT INTO t3 VALUES (1),(2),(3);
+TRUNCATE TABLE t3;
+SELECT * from t3;
+
 SET SESSION keep_files_on_create = DEFAULT;
 
-DROP TABLE db2.t1;
+DROP TABLE db2.t1, db1.t3;
 DROP DATABASE db1;
 DROP DATABASE db2;
 USE test;