bk commit into 5.0 tree (gkodinov:1.2536)

[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-13 13:56:22+03:00, gkodinov@stripped +4 -0
  Bug 29325: moved the test from create_not_windows to symlink.

  mysql-test/r/create_not_windows.result@stripped, 2007-07-13 13:56:20+03:00, gkodinov@stripped +0 -22
    Bug 29325: moved the test from create_not_windows to symlink.

  mysql-test/r/symlink.result@stripped, 2007-07-13 13:56:21+03:00, gkodinov@stripped +24 -0
    Bug 29325: moved the test from create_not_windows to symlink.

  mysql-test/t/create_not_windows.test@stripped, 2007-07-13 13:56:21+03:00, gkodinov@stripped +0 -38
    Bug 29325: moved the test from create_not_windows to symlink.

  mysql-test/t/symlink.test@stripped, 2007-07-13 13:56:21+03:00, gkodinov@stripped +36 -0
    Bug 29325: moved the test from create_not_windows to symlink.

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-12 15:12:55 +03:00
+++ b/mysql-test/r/create_not_windows.result	2007-07-13 13:56:20 +03:00
@@ -12,25 +12,3 @@ about:text	CREATE TABLE `about:text` (
   PRIMARY KEY  (`_id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table `about:text`;
-CREATE DATABASE db1;
-CREATE DATABASE db2;
-USE db2;
-INSERT INTO db2.t1 VALUES (1);
-SELECT * FROM db2.t1;
-b
-1
-RESET QUERY CACHE;
-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, db1.t3;
-DROP DATABASE db1;
-DROP DATABASE db2;
-USE test;
diff -Nrup a/mysql-test/r/symlink.result b/mysql-test/r/symlink.result
--- a/mysql-test/r/symlink.result	2007-02-01 18:32:03 +02:00
+++ b/mysql-test/r/symlink.result	2007-07-13 13:56:21 +03:00
@@ -133,4 +133,28 @@ a
 42
 drop table t1;
 End of 4.1 tests
+CREATE DATABASE db1;
+CREATE DATABASE db2;
+USE db2;
+CREATE TABLE t1 (b INT) ENGINE MYISAM
+DATA DIRECTORY = '/home/kgeorge/mysql/work/B29325-winfix-5.0-opt/mysql-test/var/master-data/db1/';
+INSERT INTO db2.t1 VALUES (1);
+SELECT * FROM db2.t1;
+b
+1
+RESET QUERY CACHE;
+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, db1.t3;
+DROP DATABASE db1;
+DROP DATABASE db2;
+USE test;
 End of 5.0 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-12 15:12:55 +03:00
+++ b/mysql-test/t/create_not_windows.test	2007-07-13 13:56:21 +03:00
@@ -18,42 +18,4 @@ show create table `about:text`; 
 drop table `about:text`;
 
 
-#
-# Bug #29325: create table overwrites .MYD file of other table (datadir)
-#
-
-CREATE DATABASE db1; 
-CREATE DATABASE db2;
-
-USE db2;
---disable_query_log
-eval CREATE TABLE t1 (b INT) ENGINE MYISAM
-DATA DIRECTORY = '$MYSQLTEST_VARDIR/master-data/db1/';
---enable_query_log
-
-INSERT INTO db2.t1 VALUES (1);
-SELECT * FROM db2.t1;
-RESET QUERY CACHE;
-
-USE db1;
-
-#no warning from create table
-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, db1.t3;
-DROP DATABASE db1;
-DROP DATABASE db2;
-USE test;
-
-
 # End of 5.0 tests
diff -Nrup a/mysql-test/t/symlink.test b/mysql-test/t/symlink.test
--- a/mysql-test/t/symlink.test	2007-02-01 18:32:40 +02:00
+++ b/mysql-test/t/symlink.test	2007-07-13 13:56:21 +03:00
@@ -178,4 +178,40 @@ drop table t1;
 
 --echo End of 4.1 tests
 
+#
+# Bug #29325: create table overwrites .MYD file of other table (datadir)
+#
+
+CREATE DATABASE db1; 
+CREATE DATABASE db2;
+
+USE db2;
+eval CREATE TABLE t1 (b INT) ENGINE MYISAM
+DATA DIRECTORY = '$MYSQLTEST_VARDIR/master-data/db1/';
+
+INSERT INTO db2.t1 VALUES (1);
+SELECT * FROM db2.t1;
+RESET QUERY CACHE;
+
+USE db1;
+
+#no warning from create table
+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, db1.t3;
+DROP DATABASE db1;
+DROP DATABASE db2;
+USE test;
+
+
 --echo End of 5.0 tests