MySQL Lists: commits: bk commit into 5.1 tree (msvensson:1.2553)

List:	Commits	« Previous Message Next Message »
From:	msvensson	Date:	April 3 2008 9:40pm
Subject:	bk commit into 5.1 tree (msvensson:1.2553)
View as plain text
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, 2008-04-03 21:40:10+02:00, msvensson@stripped +13 -0
  Fix paths in test and result files

  mysql-test/r/loaddata.result@stripped, 2008-04-03 21:39:56+02:00, msvensson@stripped
+4 -4
    Update paths in result

  mysql-test/r/myisam.result@stripped, 2008-04-03 21:39:56+02:00, msvensson@stripped
+1 -1
    Update paths in result

  mysql-test/r/partition_not_windows.result@stripped, 2008-04-03 21:39:56+02:00,
msvensson@stripped +6 -6
    Update paths in result

  mysql-test/r/symlink.result@stripped, 2008-04-03 21:39:56+02:00, msvensson@stripped
+4 -4
    Update paths in result

  mysql-test/suite/binlog/r/binlog_index.result@stripped, 2008-04-03 21:39:56+02:00,
msvensson@stripped +3 -3
    Update paths in result

  mysql-test/suite/binlog/r/binlog_index.result@stripped, 2008-04-03 15:52:29+02:00,
msvensson@stripped +0 -0
    Rename: mysql-test/r/binlog_index.result ->
mysql-test/suite/binlog/r/binlog_index.result

  mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test@stripped, 2008-04-03
21:39:56+02:00, msvensson@stripped +6 -4
    Update paths

  mysql-test/suite/binlog/t/binlog_index.test@stripped, 2008-04-03 21:39:57+02:00,
msvensson@stripped +6 -8
    Update paths

  mysql-test/suite/binlog/t/binlog_index.test@stripped, 2008-04-03 15:52:21+02:00,
msvensson@stripped +0 -0
    Rename: mysql-test/t/binlog_index.test ->
mysql-test/suite/binlog/t/binlog_index.test

  mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test@stripped, 2008-04-03 21:39:57+02:00,
msvensson@stripped +1 -1
    Fix merge error s/start-position/stop-position/

  mysql-test/t/drop.test@stripped, 2008-04-03 21:39:57+02:00, msvensson@stripped +7 -6
    Update paths

  mysql-test/t/loaddata.test@stripped, 2008-04-03 21:39:57+02:00, msvensson@stripped +4
-4
    Update paths

  mysql-test/t/myisam.test@stripped, 2008-04-03 21:40:02+02:00, msvensson@stripped +3
-2
    Update paths

  mysql-test/t/partition_not_windows.test@stripped, 2008-04-03 21:40:02+02:00,
msvensson@stripped +42 -35
    Update paths

  mysql-test/t/symlink.test@stripped, 2008-04-03 21:40:02+02:00, msvensson@stripped +17
-10
    Update paths

diff -Nrup a/mysql-test/r/binlog_index.result b/mysql-test/r/binlog_index.result
--- a/mysql-test/r/binlog_index.result	2008-04-01 12:36:14 +02:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1,39 +0,0 @@
-flush logs;
-flush logs;
-flush logs;
-show binary logs;
-Log_name	File_size
-master-bin.000001	#
-master-bin.000002	#
-master-bin.000003	#
-master-bin.000004	#
-purge binary logs TO 'master-bin.000004';
-Warnings:
-Warning	1612	Being purged log MYSQLTEST_VARDIR/log/master-bin.000001 was not found
-*** must show a list starting from the 'TO' argument of PURGE ***
-show binary logs;
-Log_name	File_size
-master-bin.000004	#
-reset master;
-flush logs;
-flush logs;
-flush logs;
-*** must be a warning master-bin.000001 was not found ***
-Warnings:
-Warning	1612	Being purged log MYSQLTEST_VARDIR/log/master-bin.000001 was not found
-*** must show one record, of the active binlog, left in the index file after PURGE ***
-show binary logs;
-Log_name	File_size
-master-bin.000004	#
-reset master;
-flush logs;
-flush logs;
-flush logs;
-purge binary logs TO 'master-bin.000002';
-ERROR HY000: Fatal error during log purge
-show warnings;
-Level	Code	Message
-Error	1377	a problem with deleting MYSQLTEST_VARDIR/log/master-bin.000001; consider
examining correspondence of your binlog index file to the actual binlog files
-Error	1377	Fatal error during log purge
-reset master;
-End of tests
diff -Nrup a/mysql-test/r/loaddata.result b/mysql-test/r/loaddata.result
--- a/mysql-test/r/loaddata.result	2008-04-03 11:43:18 +02:00
+++ b/mysql-test/r/loaddata.result	2008-04-03 21:39:56 +02:00
@@ -277,7 +277,7 @@ CREATE VIEW v1 AS SELECT * FROM t1;
 CREATE VIEW v2 AS SELECT 1 + 2 AS c0, c1, c2 FROM t1;
 CREATE VIEW v3 AS SELECT 1 AS d1, 2 AS d2;
 
-LOAD DATA INFILE '../std_data_ln/bug35469.dat' INTO TABLE v1
+LOAD DATA INFILE '../../std_data/bug35469.dat' INTO TABLE v1
 FIELDS ESCAPED BY '\\'
   TERMINATED BY ','
   ENCLOSED BY '"'
@@ -297,7 +297,7 @@ c1	c2
 
 DELETE FROM t1;
 
-LOAD DATA INFILE '../std_data_ln/bug35469.dat' INTO TABLE v2
+LOAD DATA INFILE '../../std_data/bug35469.dat' INTO TABLE v2
 FIELDS ESCAPED BY '\\'
   TERMINATED BY ','
   ENCLOSED BY '"'
@@ -317,14 +317,14 @@ c0	c1	c2
 
 DELETE FROM t1;
 
-LOAD DATA INFILE '../std_data_ln/bug35469.dat' INTO TABLE v2
+LOAD DATA INFILE '../../std_data/bug35469.dat' INTO TABLE v2
 FIELDS ESCAPED BY '\\'
   TERMINATED BY ','
   ENCLOSED BY '"'
   LINES TERMINATED BY '\n' (c0, c2);
 ERROR HY000: Invalid column reference (v2.c0) in LOAD DATA
 
-LOAD DATA INFILE '../std_data_ln/bug35469.dat' INTO TABLE v3
+LOAD DATA INFILE '../../std_data/bug35469.dat' INTO TABLE v3
 FIELDS ESCAPED BY '\\'
   TERMINATED BY ','
   ENCLOSED BY '"'
diff -Nrup a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result
--- a/mysql-test/r/myisam.result	2008-03-15 19:28:17 +01:00
+++ b/mysql-test/r/myisam.result	2008-04-03 21:39:56 +02:00
@@ -2194,7 +2194,7 @@ KEY (c1),
 KEY (c2)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 PACK_KEYS=0;
 
-MyISAM file:         MYSQLTEST_VARDIR/master-data/test/t1
+MyISAM file:         MYSQLD_DATADIR/test/t1
 Record format:       Packed
 Character set:       utf8_general_ci (33)
 Data records:                    0  Deleted blocks:                 0
diff -Nrup a/mysql-test/r/partition_not_windows.result
b/mysql-test/r/partition_not_windows.result
--- a/mysql-test/r/partition_not_windows.result	2008-04-03 11:43:55 +02:00
+++ b/mysql-test/r/partition_not_windows.result	2008-04-03 21:39:56 +02:00
@@ -35,20 +35,20 @@ DROP TABLE t1, t2;
 set @@sql_mode=@org_mode;
 CREATE TABLE t1(a INT)
 PARTITION BY KEY (a)
-(PARTITION p0 DATA DIRECTORY 'TEST_DIR/master-data/test');
+(PARTITION p0 DATA DIRECTORY 'MYSQLD_DATADIR/test');
 ERROR HY000: Incorrect arguments to DATA DIRECTORY
 CREATE TABLE t1(a INT)
 PARTITION BY KEY (a)
-(PARTITION p0 INDEX DIRECTORY 'TEST_DIR/master-data/test');
+(PARTITION p0 INDEX DIRECTORY 'MYSQLD_DATADIR/test');
 ERROR HY000: Incorrect arguments to INDEX DIRECTORY
 CREATE TABLE ts (id INT, purchased DATE)
 PARTITION BY RANGE(YEAR(purchased))
 SUBPARTITION BY HASH(TO_DAYS(purchased)) (
 PARTITION p0 VALUES LESS THAN (1990) (
 SUBPARTITION s0a
-DATA DIRECTORY = 'TEST_DIR/master-data/test',
+DATA DIRECTORY = 'MYSQLD_DATADIR/test',
 SUBPARTITION s0b
-DATA DIRECTORY = 'TEST_DIR/master-data/test'
+DATA DIRECTORY = 'MYSQLD_DATADIR/test'
 ));
 ERROR HY000: Incorrect arguments to DATA DIRECTORY
 CREATE TABLE ts (id INT, purchased DATE)
@@ -56,9 +56,9 @@ PARTITION BY RANGE(YEAR(purchased))
 SUBPARTITION BY HASH(TO_DAYS(purchased)) (
 PARTITION p0 VALUES LESS THAN (1990) (
 SUBPARTITION s0a
-INDEX DIRECTORY = 'TEST_DIR/master-data/test',
+INDEX DIRECTORY = 'MYSQLD_DATADIR/test',
 SUBPARTITION s0b
-INDEX DIRECTORY = 'TEST_DIR/master-data/test'
+INDEX DIRECTORY = 'MYSQLD_DATADIR/test'
 ));
 ERROR HY000: Incorrect arguments to INDEX DIRECTORY
 DROP TABLE IF EXISTS `example`;
diff -Nrup a/mysql-test/r/symlink.result b/mysql-test/r/symlink.result
--- a/mysql-test/r/symlink.result	2008-04-03 11:44:12 +02:00
+++ b/mysql-test/r/symlink.result	2008-04-03 21:39:56 +02:00
@@ -151,16 +151,16 @@ CREATE TABLE t1 (a INT) ENGINE MYISAM;
 DROP TABLE t1;
 End of 5.0 tests
 CREATE TABLE t1(a INT)
-INDEX DIRECTORY='TEST_DIR/master-data/mysql';
+INDEX DIRECTORY='MYSQLD_DATADIR/mysql';
 ERROR HY000: Incorrect arguments to INDEX DIRECTORY
 CREATE TABLE t1(a INT)
-DATA DIRECTORY='TEST_DIR/master-data/test';
+DATA DIRECTORY='MYSQLD_DATADIR/test';
 ERROR HY000: Incorrect arguments to DATA DIRECTORY
 CREATE TABLE t1(a INT)
-DATA DIRECTORY='TEST_DIR/master-data/';
+DATA DIRECTORY='MYSQLD_DATADIR/';
 ERROR HY000: Incorrect arguments to DATA DIRECTORY
 CREATE TABLE t1(a INT)
-INDEX DIRECTORY='TEST_DIR/master-data';
+INDEX DIRECTORY='MYSQLD_DATADIR';
 ERROR HY000: Incorrect arguments to INDEX DIRECTORY
 CREATE TABLE t1(a INT)
 INDEX DIRECTORY='TEST_DIR/master-data_var';
diff -Nrup a/mysql-test/suite/binlog/r/binlog_index.result
b/mysql-test/suite/binlog/r/binlog_index.result
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/binlog/r/binlog_index.result	2008-04-03 21:39:56 +02:00
@@ -0,0 +1,39 @@
+flush logs;
+flush logs;
+flush logs;
+show binary logs;
+Log_name	File_size
+master-bin.000001	#
+master-bin.000002	#
+master-bin.000003	#
+master-bin.000004	#
+purge binary logs TO 'master-bin.000004';
+Warnings:
+Warning	1612	Being purged log ./master-bin.000001 was not found
+*** must show a list starting from the 'TO' argument of PURGE ***
+show binary logs;
+Log_name	File_size
+master-bin.000004	#
+reset master;
+flush logs;
+flush logs;
+flush logs;
+*** must be a warning master-bin.000001 was not found ***
+Warnings:
+Warning	1612	Being purged log ./master-bin.000001 was not found
+*** must show one record, of the active binlog, left in the index file after PURGE ***
+show binary logs;
+Log_name	File_size
+master-bin.000004	#
+reset master;
+flush logs;
+flush logs;
+flush logs;
+purge binary logs TO 'master-bin.000002';
+ERROR HY000: Fatal error during log purge
+show warnings;
+Level	Code	Message
+Error	1377	a problem with deleting ./master-bin.000001; consider examining correspondence
of your binlog index file to the actual binlog files
+Error	1377	Fatal error during log purge
+reset master;
+End of tests
diff -Nrup a/mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test
b/mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test
--- a/mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test	2008-03-29 23:54:06
+01:00
+++ b/mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test	2008-04-03 21:39:56
+02:00
@@ -17,9 +17,11 @@
 
 source include/have_log_bin.inc;
 
-copy_file $MYSQL_TEST_DIR/std_data/bug33029-slave-relay-bin.000001
$MYSQLTEST_VARDIR/master-data/slave-relay-bin.000001;
+let $MYSQLD_DATADIR= `select @@datadir`;
 
-write_file $MYSQLTEST_VARDIR/master-data/slave-relay-bin.index;
+copy_file $MYSQL_TEST_DIR/std_data/bug33029-slave-relay-bin.000001
$MYSQLD_DATADIR/slave-relay-bin.000001;
+
+write_file $MYSQLD_DATADIR/slave-relay-bin.index;
 slave-relay-bin.000001
 EOF
 
@@ -46,8 +48,8 @@ DROP FUNCTION IF EXISTS f1;
 DROP TRIGGER IF EXISTS tr1;
 enable_warnings;
 
-remove_file $MYSQLTEST_VARDIR/master-data/slave-relay-bin.000001;
-remove_file $MYSQLTEST_VARDIR/master-data/slave-relay-bin.index;
+remove_file $MYSQLD_DATADIR/slave-relay-bin.000001;
+remove_file $MYSQLD_DATADIR/slave-relay-bin.index;
 stop slave sql_thread;
 let $keep_connection=1;
 source include/wait_for_slave_sql_to_stop.inc;
diff -Nrup a/mysql-test/suite/binlog/t/binlog_index.test
b/mysql-test/suite/binlog/t/binlog_index.test
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/binlog/t/binlog_index.test	2008-04-03 21:39:57 +02:00
@@ -0,0 +1,67 @@
+#
+# testing of purging of binary log files bug#18199/Bug#18453
+#
+source include/have_log_bin.inc;
+source include/not_embedded.inc;
+
+#
+# testing purge binary logs TO
+#
+
+flush logs;
+flush logs;
+flush logs;
+
+source include/show_binary_logs.inc;
+
+let $MYSQLD_DATADIR= `select @@datadir`;
+remove_file $MYSQLD_DATADIR/master-bin.000001;
+
+# there must be a warning with file names
+purge binary logs TO 'master-bin.000004';
+
+--echo *** must show a list starting from the 'TO' argument of PURGE ***
+source include/show_binary_logs.inc;
+
+#
+# testing purge binary logs BEFORE
+#
+
+reset master;
+
+flush logs;
+flush logs;
+flush logs;
+remove_file $MYSQLD_DATADIR/master-bin.000001;
+
+--echo *** must be a warning master-bin.000001 was not found ***
+let $date=`select NOW()  +  INTERVAL 1 MINUTE`;
+--disable_query_log
+eval purge binary logs BEFORE '$date';
+--enable_query_log
+
+--echo *** must show one record, of the active binlog, left in the index file after PURGE
***
+source include/show_binary_logs.inc;
+
+#
+# testing a fatal error
+# Turning a binlog file into a directory must be a portable setup
+# 
+
+reset master;
+
+flush logs;
+flush logs;
+flush logs;
+
+remove_file $MYSQLD_DATADIR/master-bin.000001;
+mkdir $MYSQLD_DATADIR/master-bin.000001;
+
+--error ER_BINLOG_PURGE_FATAL_ERR
+purge binary logs TO 'master-bin.000002';
+show warnings;
+rmdir $MYSQLD_DATADIR/master-bin.000001;
+--disable_warnings
+reset master;
+--enable_warnings
+--echo End of tests
diff -Nrup a/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test
b/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test
--- a/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test	2008-04-03 11:50:39 +02:00
+++ b/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test	2008-04-03 21:39:57 +02:00
@@ -170,7 +170,7 @@ select "--- Test 2 position test --" as 
 --enable_query_log
 let $MYSQLD_DATADIR= `select @@datadir;`;
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
---exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --position=416
--start-position=569 $MYSQLD_DATADIR/master-bin.000001
+--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --position=416
--stop-position=569 $MYSQLD_DATADIR/master-bin.000001
 
 # These are tests for remote binlog.
 # They should return the same as previous test.
diff -Nrup a/mysql-test/t/binlog_index.test b/mysql-test/t/binlog_index.test
--- a/mysql-test/t/binlog_index.test	2008-03-17 19:19:03 +01:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1,69 +0,0 @@
-#
-# testing of purging of binary log files bug#18199/Bug#18453
-#
-source include/have_log_bin.inc;
-source include/not_embedded.inc;
-
-#
-# testing purge binary logs TO
-#
-
-flush logs;
-flush logs;
-flush logs;
-
-source include/show_binary_logs.inc;
-
-remove_file $MYSQLTEST_VARDIR/log/master-bin.000001;
-
-# there must be a warning with file names
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
-purge binary logs TO 'master-bin.000004';
-
---echo *** must show a list starting from the 'TO' argument of PURGE ***
-source include/show_binary_logs.inc;
-
-#
-# testing purge binary logs BEFORE
-#
-
-reset master;
-
-flush logs;
-flush logs;
-flush logs;
-remove_file $MYSQLTEST_VARDIR/log/master-bin.000001;
-
---echo *** must be a warning master-bin.000001 was not found ***
-let $date=`select NOW()  +  INTERVAL 1 MINUTE`;
---disable_query_log
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
-eval purge binary logs BEFORE '$date';
---enable_query_log
-
---echo *** must show one record, of the active binlog, left in the index file after PURGE
***
-source include/show_binary_logs.inc;
-
-#
-# testing a fatal error
-# Turning a binlog file into a directory must be a portable setup
-# 
-
-reset master;
-
-flush logs;
-flush logs;
-flush logs;
-
-remove_file $MYSQLTEST_VARDIR/log/master-bin.000001;
-mkdir $MYSQLTEST_VARDIR/log/master-bin.000001;
-
---error ER_BINLOG_PURGE_FATAL_ERR
-purge binary logs TO 'master-bin.000002';
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
-show warnings;
-rmdir $MYSQLTEST_VARDIR/log/master-bin.000001;
---disable_warnings
-reset master;
---enable_warnings
---echo End of tests
diff -Nrup a/mysql-test/t/drop.test b/mysql-test/t/drop.test
--- a/mysql-test/t/drop.test	2008-04-03 11:43:25 +02:00
+++ b/mysql-test/t/drop.test	2008-04-03 21:39:57 +02:00
@@ -149,17 +149,18 @@ DROP DATABASE IF EXISTS mysql_test;
 
 CREATE DATABASE mysql_test;
 
---copy_file $MYSQLTEST_VARDIR/master-data/mysql/proc.frm
$MYSQLTEST_VARDIR/tmp/bug29958.proc.frm
---copy_file $MYSQLTEST_VARDIR/master-data/mysql/proc.MYD
$MYSQLTEST_VARDIR/tmp/bug29958.proc.MYD
---copy_file $MYSQLTEST_VARDIR/master-data/mysql/proc.MYI
$MYSQLTEST_VARDIR/tmp/bug29958.proc.MYI
+let $MYSQLD_DATADIR= `select @@datadir`;
+--copy_file $MYSQLD_DATADIR/mysql/proc.frm $MYSQLTEST_VARDIR/tmp/bug29958.proc.frm
+--copy_file $MYSQLD_DATADIR/mysql/proc.MYD $MYSQLTEST_VARDIR/tmp/bug29958.proc.MYD
+--copy_file $MYSQLD_DATADIR/mysql/proc.MYI $MYSQLTEST_VARDIR/tmp/bug29958.proc.MYI
 
 DROP TABLE mysql.proc;
 
 DROP DATABASE mysql_test;
 
---copy_file $MYSQLTEST_VARDIR/tmp/bug29958.proc.frm
$MYSQLTEST_VARDIR/master-data/mysql/proc.frm
---copy_file $MYSQLTEST_VARDIR/tmp/bug29958.proc.MYD
$MYSQLTEST_VARDIR/master-data/mysql/proc.MYD
---copy_file $MYSQLTEST_VARDIR/tmp/bug29958.proc.MYI
$MYSQLTEST_VARDIR/master-data/mysql/proc.MYI
+--copy_file $MYSQLTEST_VARDIR/tmp/bug29958.proc.frm $MYSQLD_DATADIR/mysql/proc.frm
+--copy_file $MYSQLTEST_VARDIR/tmp/bug29958.proc.MYD $MYSQLD_DATADIR/mysql/proc.MYD
+--copy_file $MYSQLTEST_VARDIR/tmp/bug29958.proc.MYI $MYSQLD_DATADIR/mysql/proc.MYI
 
 --echo
 --echo # --
diff -Nrup a/mysql-test/t/loaddata.test b/mysql-test/t/loaddata.test
--- a/mysql-test/t/loaddata.test	2008-04-03 11:43:25 +02:00
+++ b/mysql-test/t/loaddata.test	2008-04-03 21:39:57 +02:00
@@ -264,7 +264,7 @@ CREATE VIEW v2 AS SELECT 1 + 2 AS c0, c1
 CREATE VIEW v3 AS SELECT 1 AS d1, 2 AS d2;
 
 --echo
-LOAD DATA INFILE '../std_data_ln/bug35469.dat' INTO TABLE v1
+LOAD DATA INFILE '../../std_data/bug35469.dat' INTO TABLE v1
   FIELDS ESCAPED BY '\\'
   TERMINATED BY ','
   ENCLOSED BY '"'
@@ -280,7 +280,7 @@ SELECT * FROM v1;
 DELETE FROM t1;
 
 --echo
-LOAD DATA INFILE '../std_data_ln/bug35469.dat' INTO TABLE v2
+LOAD DATA INFILE '../../std_data/bug35469.dat' INTO TABLE v2
   FIELDS ESCAPED BY '\\'
   TERMINATED BY ','
   ENCLOSED BY '"'
@@ -297,7 +297,7 @@ DELETE FROM t1;
 
 --echo
 --error ER_LOAD_DATA_INVALID_COLUMN
-LOAD DATA INFILE '../std_data_ln/bug35469.dat' INTO TABLE v2
+LOAD DATA INFILE '../../std_data/bug35469.dat' INTO TABLE v2
   FIELDS ESCAPED BY '\\'
   TERMINATED BY ','
   ENCLOSED BY '"'
@@ -305,7 +305,7 @@ LOAD DATA INFILE '../std_data_ln/bug3546
 
 --echo
 --error ER_NON_UPDATABLE_TABLE
-LOAD DATA INFILE '../std_data_ln/bug35469.dat' INTO TABLE v3
+LOAD DATA INFILE '../../std_data/bug35469.dat' INTO TABLE v3
   FIELDS ESCAPED BY '\\'
   TERMINATED BY ','
   ENCLOSED BY '"'
diff -Nrup a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test
--- a/mysql-test/t/myisam.test	2008-01-24 18:56:41 +01:00
+++ b/mysql-test/t/myisam.test	2008-04-03 21:40:02 +02:00
@@ -1458,8 +1458,9 @@ CREATE TABLE t1 (
   KEY (c1),
   KEY (c2)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 PACK_KEYS=0;
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
---exec $MYISAMCHK -d $MYSQLTEST_VARDIR/master-data/test/t1
+let $MYSQLD_DATADIR= `select @@datadir`;
+--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR
+--exec $MYISAMCHK -d $MYSQLD_DATADIR/test/t1
 DROP TABLE t1;
 
 --echo End of 5.1 tests
diff -Nrup a/mysql-test/t/partition_not_windows.test
b/mysql-test/t/partition_not_windows.test
--- a/mysql-test/t/partition_not_windows.test	2008-04-03 11:47:32 +02:00
+++ b/mysql-test/t/partition_not_windows.test	2008-04-03 21:40:02 +02:00
@@ -11,8 +11,8 @@
 # Bug 20770 Partitions: DATA DIRECTORY clause change in reorganize
 #                       doesn't remove old directory
 
+let $MYSQLD_DATADIR= `select @@datadir`;
 let $data_directory = DATA DIRECTORY = '$MYSQLTEST_VARDIR/tmp';
-
 let $inx_directory = INDEX DIRECTORY = '$MYSQLTEST_VARDIR/tmp';
 
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
@@ -23,12 +23,12 @@ subpartition by hash (a)
  (SUBPARTITION subpart00, SUBPARTITION subpart01));
 
 --echo # Checking if file exists before alter
---file_exists $MYSQLTEST_VARDIR/master-data/test/t1.frm
---file_exists $MYSQLTEST_VARDIR/master-data/test/t1.par
---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p0#SP#subpart00.MYD
---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p0#SP#subpart00.MYI
---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p0#SP#subpart01.MYD
---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p0#SP#subpart01.MYI
+--file_exists $MYSQLD_DATADIR/test/t1.frm
+--file_exists $MYSQLD_DATADIR/test/t1.par
+--file_exists $MYSQLD_DATADIR/test/t1#P#p0#SP#subpart00.MYD
+--file_exists $MYSQLD_DATADIR/test/t1#P#p0#SP#subpart00.MYI
+--file_exists $MYSQLD_DATADIR/test/t1#P#p0#SP#subpart01.MYD
+--file_exists $MYSQLD_DATADIR/test/t1#P#p0#SP#subpart01.MYI
 --file_exists $MYSQLTEST_VARDIR/tmp/t1#P#p0#SP#subpart00.MYD
 --file_exists $MYSQLTEST_VARDIR/tmp/t1#P#p0#SP#subpart01.MYD
 --file_exists $MYSQLTEST_VARDIR/tmp/t1#P#p0#SP#subpart00.MYI
@@ -42,16 +42,16 @@ eval ALTER TABLE t1 REORGANIZE PARTITION
  (SUBPARTITION subpart20, SUBPARTITION subpart21));
 
 --echo # Checking if file exists after alter
---file_exists $MYSQLTEST_VARDIR/master-data/test/t1.frm
---file_exists $MYSQLTEST_VARDIR/master-data/test/t1.par
---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p1#SP#subpart10.MYD
---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p1#SP#subpart10.MYI
---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p1#SP#subpart11.MYD
---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p1#SP#subpart11.MYI
---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p2#SP#subpart20.MYD
---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p2#SP#subpart20.MYI
---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p2#SP#subpart21.MYD
---file_exists $MYSQLTEST_VARDIR/master-data/test/t1#P#p2#SP#subpart21.MYI
+--file_exists $MYSQLD_DATADIR/test/t1.frm
+--file_exists $MYSQLD_DATADIR/test/t1.par
+--file_exists $MYSQLD_DATADIR/test/t1#P#p1#SP#subpart10.MYD
+--file_exists $MYSQLD_DATADIR/test/t1#P#p1#SP#subpart10.MYI
+--file_exists $MYSQLD_DATADIR/test/t1#P#p1#SP#subpart11.MYD
+--file_exists $MYSQLD_DATADIR/test/t1#P#p1#SP#subpart11.MYI
+--file_exists $MYSQLD_DATADIR/test/t1#P#p2#SP#subpart20.MYD
+--file_exists $MYSQLD_DATADIR/test/t1#P#p2#SP#subpart20.MYI
+--file_exists $MYSQLD_DATADIR/test/t1#P#p2#SP#subpart21.MYD
+--file_exists $MYSQLD_DATADIR/test/t1#P#p2#SP#subpart21.MYI
 --file_exists $MYSQLTEST_VARDIR/tmp/t1#P#p1#SP#subpart10.MYD
 --file_exists $MYSQLTEST_VARDIR/tmp/t1#P#p1#SP#subpart11.MYD
 --file_exists $MYSQLTEST_VARDIR/tmp/t1#P#p2#SP#subpart20.MYD
@@ -93,39 +93,43 @@ set @@sql_mode=@org_mode;
 #
 # Bug#32167: another privilege bypass with DATA/INDEX DIRECTORY
 #
---replace_result $MYSQLTEST_VARDIR TEST_DIR
+
+let $MYSQLD_DATADIR= `select @@datadir`;
+
+--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR
 --error ER_WRONG_ARGUMENTS
 eval CREATE TABLE t1(a INT)
 PARTITION BY KEY (a)
-(PARTITION p0 DATA DIRECTORY '$MYSQLTEST_VARDIR/master-data/test');
---replace_result $MYSQLTEST_VARDIR TEST_DIR
+(PARTITION p0 DATA DIRECTORY '$MYSQLD_DATADIR/test');
+
+--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR
 --error ER_WRONG_ARGUMENTS
 eval CREATE TABLE t1(a INT)
 PARTITION BY KEY (a)
-(PARTITION p0 INDEX DIRECTORY '$MYSQLTEST_VARDIR/master-data/test');
+(PARTITION p0 INDEX DIRECTORY '$MYSQLD_DATADIR/test');
 
---replace_result $MYSQLTEST_VARDIR TEST_DIR
+--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR
 --error ER_WRONG_ARGUMENTS
 eval CREATE TABLE ts (id INT, purchased DATE)
 PARTITION BY RANGE(YEAR(purchased))
 SUBPARTITION BY HASH(TO_DAYS(purchased)) (
 PARTITION p0 VALUES LESS THAN (1990) (
 SUBPARTITION s0a
-  DATA DIRECTORY = '$MYSQLTEST_VARDIR/master-data/test',
+  DATA DIRECTORY = '$MYSQLD_DATADIR/test',
 SUBPARTITION s0b
-  DATA DIRECTORY = '$MYSQLTEST_VARDIR/master-data/test'
+  DATA DIRECTORY = '$MYSQLD_DATADIR/test'
 ));
 
---replace_result $MYSQLTEST_VARDIR TEST_DIR
+--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR
 --error ER_WRONG_ARGUMENTS
 eval CREATE TABLE ts (id INT, purchased DATE)
 PARTITION BY RANGE(YEAR(purchased))
 SUBPARTITION BY HASH(TO_DAYS(purchased)) (
 PARTITION p0 VALUES LESS THAN (1990) (
 SUBPARTITION s0a
-  INDEX DIRECTORY = '$MYSQLTEST_VARDIR/master-data/test',
+  INDEX DIRECTORY = '$MYSQLD_DATADIR/test',
 SUBPARTITION s0b
-  INDEX DIRECTORY = '$MYSQLTEST_VARDIR/master-data/test'
+  INDEX DIRECTORY = '$MYSQLD_DATADIR/test'
 ));
 
 # End Windows specific test failures.
@@ -165,21 +169,24 @@ INDEX DIRECTORY = '$MYSQLTEST_VARDIR/p2I
 PARTITION p3 DATA DIRECTORY = '$MYSQLTEST_VARDIR/p3Data'
 INDEX DIRECTORY = '$MYSQLTEST_VARDIR/p3Index'
 );
+
+let $MYSQLD_DATADIR= `select @@datadir`;
+
 --echo # Checking that MyISAM .MYD and .MYI are in test db and data/idx dir
---file_exists $MYSQLTEST_VARDIR/master-data/test/example#P#p0.MYI
---file_exists $MYSQLTEST_VARDIR/master-data/test/example#P#p0.MYD
+--file_exists $MYSQLD_DATADIR/test/example#P#p0.MYI
+--file_exists $MYSQLD_DATADIR/test/example#P#p0.MYD
 --file_exists $MYSQLTEST_VARDIR/p0Data/example#P#p0.MYD
 --file_exists $MYSQLTEST_VARDIR/p0Index/example#P#p0.MYI
---file_exists $MYSQLTEST_VARDIR/master-data/test/example#P#p1.MYI
---file_exists $MYSQLTEST_VARDIR/master-data/test/example#P#p1.MYD
+--file_exists $MYSQLD_DATADIR/test/example#P#p1.MYI
+--file_exists $MYSQLD_DATADIR/test/example#P#p1.MYD
 --file_exists $MYSQLTEST_VARDIR/p1Data/example#P#p1.MYD
 --file_exists $MYSQLTEST_VARDIR/p1Index/example#P#p1.MYI
---file_exists $MYSQLTEST_VARDIR/master-data/test/example#P#p2.MYI
---file_exists $MYSQLTEST_VARDIR/master-data/test/example#P#p2.MYD
+--file_exists $MYSQLD_DATADIR/test/example#P#p2.MYI
+--file_exists $MYSQLD_DATADIR/test/example#P#p2.MYD
 --file_exists $MYSQLTEST_VARDIR/p2Data/example#P#p2.MYD
 --file_exists $MYSQLTEST_VARDIR/p2Index/example#P#p2.MYI
---file_exists $MYSQLTEST_VARDIR/master-data/test/example#P#p3.MYI
---file_exists $MYSQLTEST_VARDIR/master-data/test/example#P#p3.MYD
+--file_exists $MYSQLD_DATADIR/test/example#P#p3.MYI
+--file_exists $MYSQLD_DATADIR/test/example#P#p3.MYD
 --file_exists $MYSQLTEST_VARDIR/p3Data/example#P#p3.MYD
 --file_exists $MYSQLTEST_VARDIR/p3Index/example#P#p3.MYI
 DROP TABLE example;
diff -Nrup a/mysql-test/t/symlink.test b/mysql-test/t/symlink.test
--- a/mysql-test/t/symlink.test	2008-04-03 11:47:43 +02:00
+++ b/mysql-test/t/symlink.test	2008-04-03 21:40:02 +02:00
@@ -177,14 +177,15 @@ drop table t1;
 #
 # Bug #29325: create table overwrites .MYD file of other table (datadir)
 #
+let $MYSQLD_DATADIR= `select @@datadir`;
 SET SESSION keep_files_on_create = TRUE;
---write_file $MYSQLTEST_VARDIR/master-data/test/t1.MYD
+--write_file $MYSQLD_DATADIR/test/t1.MYD
 EOF
 --disable_abort_on_error
 --error 1,1,ER_TABLE_EXISTS_ERROR
 CREATE TABLE t1 (a INT) ENGINE MYISAM;
 --error 0,1
---remove_file $MYSQLTEST_VARDIR/master-data/test/t1.MYD;
+--remove_file $MYSQLD_DATADIR/test/t1.MYD;
 --enable_abort_on_error
 SET SESSION keep_files_on_create = FALSE;
 CREATE TABLE t1 (a INT) ENGINE MYISAM;
@@ -195,22 +196,27 @@ DROP TABLE t1;
 #
 # Bug#32167: another privilege bypass with DATA/INDEX DIRECTORY
 #
---replace_result $MYSQLTEST_VARDIR TEST_DIR
+let $MYSQLD_DATADIR= `select @@datadir`;
+--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR
 --error 1210
 eval CREATE TABLE t1(a INT)
-INDEX DIRECTORY='$MYSQLTEST_VARDIR/master-data/mysql';
---replace_result $MYSQLTEST_VARDIR TEST_DIR
+INDEX DIRECTORY='$MYSQLD_DATADIR/mysql';
+
+--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR
 --error 1210
 eval CREATE TABLE t1(a INT)
-DATA DIRECTORY='$MYSQLTEST_VARDIR/master-data/test';
---replace_result $MYSQLTEST_VARDIR TEST_DIR
+DATA DIRECTORY='$MYSQLD_DATADIR/test';
+
+--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR
 --error 1210
 eval CREATE TABLE t1(a INT)
-DATA DIRECTORY='$MYSQLTEST_VARDIR/master-data/';
---replace_result $MYSQLTEST_VARDIR TEST_DIR
+DATA DIRECTORY='$MYSQLD_DATADIR/';
+
+--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR
 --error 1210
 eval CREATE TABLE t1(a INT)
-INDEX DIRECTORY='$MYSQLTEST_VARDIR/master-data';
+INDEX DIRECTORY='$MYSQLD_DATADIR';
+
 --replace_result $MYSQLTEST_VARDIR TEST_DIR
 --error 1
 eval CREATE TABLE t1(a INT)
@@ -218,6 +224,7 @@ INDEX DIRECTORY='$MYSQLTEST_VARDIR/maste
 # BUG#25677 - With --skip-symbolic-links option on, DATA DIRECTORY clause is
 #             silently ignored
 #
+
 SET @OLD_SQL_MODE=@@SQL_MODE, @@SQL_MODE='NO_DIR_IN_CREATE';
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 eval CREATE TABLE t1(a INT) DATA DIRECTORY='$MYSQLTEST_VARDIR/tmp' INDEX
DIRECTORY='$MYSQLTEST_VARDIR/tmp';
Thread
• bk commit into 5.1 tree (msvensson:1.2553)	msvensson	3 Apr