Merge five.local.lan:/work/merge/mysql-5.1-Bug

into  five.local.lan:/work/trees/mysql-5.1-build-src-clean

mysql-test/Makefile.am

@@ -46,6 +46,7 @@ dist-hook:
 		$(distdir)/std_data/ndb_backup51_data_le \
 		$(distdir)/std_data/parts \
 		$(distdir)/lib \
+                $(distdir)/funcs_1 \
 		$(distdir)/lib/My
 	-$(INSTALL_DATA) $(srcdir)/t/*.def $(distdir)/t
 	$(INSTALL_DATA) $(srcdir)/t/*.test $(distdir)/t
@@ -75,6 +76,7 @@ dist-hook:
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_be/BACKUP* $(distdir)/std_data/ndb_backup51_data_be
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_le/BACKUP* $(distdir)/std_data/ndb_backup51_data_le
 	$(INSTALL_DATA) $(srcdir)/std_data/parts/part_* $(distdir)/std_data/parts
+	$(INSTALL_DATA) $(srcdir)/std_data/funcs_1/* $(distdir)/std_data/funcs_1
 	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(distdir)/lib
 	$(INSTALL_DATA) $(srcdir)/lib/My/*.pm $(distdir)/lib/My
 	-rm -rf `find $(distdir)/suite -type d -name SCCS` $(distdir)/suite/row_lock
@@ -93,6 +95,7 @@ install-data-local:
 		$(DESTDIR)$(testdir)/std_data/ndb_backup51_data_le \
 		$(DESTDIR)$(testdir)/std_data/parts \
 		$(DESTDIR)$(testdir)/lib \
+		$(DESTDIR)$(testdir)/funcs_1 \
 		$(DESTDIR)$(testdir)/lib/My
 	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir)
 	-$(INSTALL_DATA) $(srcdir)/t/*.def $(DESTDIR)$(testdir)/t
@@ -127,6 +130,7 @@ install-data-local:
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_be/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup51_data_be
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_le/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup51_data_le
 	$(INSTALL_DATA) $(srcdir)/std_data/parts/part_* $(DESTDIR)$(testdir)/std_data/parts
+	$(INSTALL_DATA) $(srcdir)/std_data/funcs_1/* $(distdir)/std_data/funcs_1
 	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(DESTDIR)$(testdir)/lib
 	$(INSTALL_DATA) $(srcdir)/lib/My/*.pm $(DESTDIR)$(testdir)/lib/My
 	for f in `(cd $(srcdir); find suite -type f | egrep -v 'SCCS|row_lock')`; \

mysql-test/std_data/funcs_1/load_file.txt

@@ -0,0 +1 @@
+Here is content from load_file

mysql-test/suite/funcs_1/README.txt

@@ -25,7 +25,7 @@
    SESSION_STATUS
    SESSION_VARIABLES
 
-3. Some hints:
+3. Some hints for maintainers of this suite:
    - SHOW TABLES ... LIKE '<pattern>'
      does a case sensitive comparison between the tablename and
      the pattern.
@@ -43,4 +43,12 @@
      ERROR 42000: Access denied for user ... to database 'information_schema'
      DROP DATABASE INFORMATION_SCHEMA;
      ERROR 42000: Access denied for user ... to database 'INFORMATION_SCHEMA'
+   - Try to unify results by
+     --replace_result $engine_type <engine_to_be_tested>
+     if we could expect that the results for storage engine variants of a
+     test differ only in the engine names.
+     This makes future maintenance easier.
+   - Avoid the use of include/show_msg*.inc.
+     They produce "SQL" noise which annoys during server debugging and can be
+     easy replaced by "--echo ...".
 

mysql-test/suite/funcs_1/include/innodb_tb1.inc

@@ -64,6 +64,7 @@ f57 numeric (0) not null DEFAULT 99,
 f58 numeric (64) not null DEFAULT 99
 ) engine = innodb;
 
-
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+eval
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb1.txt' into table tb1 ;
+load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/innodb_tb1.txt'
+into table tb1;

mysql-test/suite/funcs_1/include/innodb_tb2.inc

@@ -57,5 +57,7 @@ f108 enum("1enum","2enum") not null default "1enum",
 f109 set("1set","2set") not null default "1set"
 ) engine = innodb;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb2.txt' into table tb2 ;
+eval
+load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/innodb_tb2.txt'
+into table tb2;

mysql-test/suite/funcs_1/include/innodb_tb3.inc

@@ -64,5 +64,7 @@ f174 numeric (0),
 f175 numeric (64)
 ) engine = innodb;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb3.txt' into table tb3 ;
+eval
+load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/innodb_tb3.txt'
+into table tb3;

mysql-test/suite/funcs_1/include/innodb_tb4.inc

@@ -64,5 +64,7 @@ f240 varchar(2000) unicode,
 f241 char(100) unicode
 ) engine = innodb;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb4.txt' into table tb4 ;
+eval
+load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/innodb_tb4.txt'
+into table tb4;

mysql-test/suite/funcs_1/include/memory_tb1.inc

@@ -56,5 +56,7 @@ f57 numeric (0) not null DEFAULT 99,
 f58 numeric (64) not null DEFAULT 99
 ) engine = memory;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb1.txt' into table tb1 ;
+eval
+load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/memory_tb1.txt'
+into table tb1;

mysql-test/suite/funcs_1/include/memory_tb2.inc

@@ -57,5 +57,7 @@ f108 enum("1enum","2enum") not null default "1enum",
 f109 set("1set","2set") not null default "1set"
 ) engine = memory;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb2.txt' into table tb2 ;
+eval
+load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/memory_tb2.txt'
+into table tb2 ;

mysql-test/suite/funcs_1/include/memory_tb3.inc

@@ -58,6 +58,7 @@ f174 numeric (0),
 f175 numeric (64)
 ) engine = memory;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb3.txt' into table tb3 ;
+eval
-
+load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/memory_tb3.txt'
+into table tb3;

mysql-test/suite/funcs_1/include/memory_tb4.inc

@@ -63,5 +63,7 @@ f239 varbinary(0),
 f240 varchar(1200) unicode
 ) engine = memory;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb4.txt' into table tb4 ;
+eval
+load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/memory_tb4.txt'
+into table tb4;

mysql-test/suite/funcs_1/include/myisam_tb1.inc

@@ -64,5 +64,7 @@ f57 numeric (0) not null DEFAULT 99,
 f58 numeric (64) not null DEFAULT 99
 ) engine = myisam;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb1.txt' into table tb1 ;
+eval
+load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/myisam_tb1.txt'
+into table tb1;

mysql-test/suite/funcs_1/include/myisam_tb2.inc

@@ -76,5 +76,7 @@ f117 VARBINARY(192) null
 # f116 multilinestring null,
 # f117 multipolygon null
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb2.txt' into table tb2 ;
+eval
+load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/myisam_tb2.txt'
+into table tb2;

mysql-test/suite/funcs_1/include/myisam_tb3.inc

@@ -64,5 +64,7 @@ f174 numeric (0),
 f175 numeric (64)
 ) Engine = myisam;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb3.txt' into table tb3 ;
+eval
+load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/myisam_tb3.txt'
+into table tb3;

mysql-test/suite/funcs_1/include/myisam_tb4.inc

@@ -84,5 +84,7 @@ f242 bit(30)
 # f233 multilinestring,
 # f234 multipolygon,
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb4.txt' into table tb4 ;
+eval
+load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/myisam_tb4.txt'
+into table tb4;

mysql-test/suite/funcs_1/include/ndb_tb1.inc

@@ -64,6 +64,7 @@ f57 numeric (0) not null DEFAULT 99,
 f58 numeric (64) not null DEFAULT 99
 ) engine = ndb;
 
-
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+eval
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb1.txt' into table tb1 ;
+load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/ndb_tb1.txt'
+into table tb1 ;

mysql-test/suite/funcs_1/include/ndb_tb2.inc

@@ -57,5 +57,7 @@ f108 enum("1enum","2enum") not null default "1enum",
 f109 set("1set","2set") not null default "1set"
 ) engine = ndb;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb2.txt' into table tb2 ;
+eval
+load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/ndb_tb2.txt'
+into table tb2 ;

mysql-test/suite/funcs_1/include/ndb_tb3.inc

@@ -64,5 +64,7 @@ f174 numeric (0),
 f175 numeric (64)
 ) engine = ndb;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb3.txt' into table tb3 ;
+eval
+load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/ndb_tb3.txt'
+into table tb3;

mysql-test/suite/funcs_1/include/ndb_tb4.inc

@@ -64,5 +64,7 @@ f240 varchar(2000) unicode,
 f241 char(100) unicode
 ) engine = ndb;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb4.txt' into table tb4 ;
+eval
+load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/ndb_tb4.txt'
+into table tb4 ;

mysql-test/suite/funcs_1/include/sp_tb.inc

@@ -5,29 +5,46 @@ USE test;
 --disable_warnings
 DROP TABLE IF EXISTS t1, t2, t4, t10, t11;
 --enable_warnings
-eval CREATE TABLE t1  (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = $engine_type;
+eval
-eval CREATE TABLE t2  (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = $engine_type;
+CREATE TABLE t1  (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-eval CREATE TABLE t4  (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = $engine_type;
+ENGINE = $engine_type;
-eval CREATE TABLE t10 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = $engine_type;
+eval
-eval CREATE TABLE t11 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = $engine_type;
+CREATE TABLE t2  (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+ENGINE = $engine_type;
-eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t1;
+eval
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+CREATE TABLE t4  (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t2;
+ENGINE = $engine_type;
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+eval
-eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t4;
+CREATE TABLE t10 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+ENGINE = $engine_type;
-eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t10;
+eval
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+CREATE TABLE t11 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t11;
+ENGINE = $engine_type;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/t4.txt' INTO TABLE t1;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/t4.txt' INTO TABLE t2;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/t4.txt' INTO TABLE t4;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/t4.txt' INTO TABLE t10;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/t4.txt' INTO TABLE t11;
 
 
 --disable_warnings
 drop TABLE if exists t3;
 --enable_warnings
-eval CREATE TABLE t3 (f1 char(20), f2 char(20), f3 integer) ENGINE = $engine_type;
+eval
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+CREATE TABLE t3 (f1 char(20), f2 char(20), f3 integer) ENGINE = $engine_type;
-eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' INTO TABLE t3;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/t3.txt' INTO TABLE t3;
 
 #---------------------------
 
@@ -37,9 +54,12 @@ drop database if exists test4;
 CREATE database test4;
 use test4;
 
-eval CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = $engine_type;
+eval
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int)
-eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t6;
+ENGINE = $engine_type;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/t4.txt' INTO TABLE t6;
 #---------------------------
 
 use test;
@@ -47,18 +67,23 @@ use test;
 --disable_warnings
 drop TABLE if exists t7, t8;
 --enable_warnings
-eval CREATE TABLE t7 (f1 char(20), f2 char(25), f3 date, f4 int) ENGINE = $engine_type;
+eval
-eval CREATE TABLE t8 (f1 char(20), f2 char(25), f3 date, f4 int) ENGINE = $engine_type;
+CREATE TABLE t7 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = $engine_type;
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+eval
-eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t7;
+CREATE TABLE t8 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = $engine_type;
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
-eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t8;
+eval
+LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/t7.txt' INTO TABLE t7;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/t7.txt' INTO TABLE t8;
 
 
 --disable_warnings
 drop TABLE if exists t9;
 --enable_warnings
 eval CREATE TABLE t9 (f1 int, f2 char(25), f3 int) ENGINE = $engine_type;
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
-eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' INTO TABLE t9;
+eval
+LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/t9.txt' INTO TABLE t9;
 

mysql-test/suite/funcs_1/r/innodb_func_view.result

@@ -202,9 +202,10 @@ SET @my_select = 'SELECT LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values';
 SET @my_select = 'SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values';
-SELECT 'äÄ@' INTO OUTFILE '../tmp/func_view.dat';
 SET @my_select =
-'SELECT LOAD_FILE(''../tmp/func_view.dat''), id FROM t1_values';
+'SELECT LOAD_FILE(''<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt'')
+           AS my_col,
+        id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_char_30),
 my_char_30, id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_varchar_1000),
@@ -810,36 +811,40 @@ WHERE select_id = 157 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values;
+CREATE VIEW v1 AS SELECT LOAD_FILE('<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt')
-SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values
+           AS my_col,
+        id FROM t1_values;
+SELECT LOAD_FILE('<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt')
+           AS my_col,
+        id FROM t1_values
 WHERE select_id = 156 OR select_id IS NULL order by id;
-LOAD_FILE('../tmp/func_view.dat')	id
+my_col	id
-äÄ@
+Here is content from load_file
 	1
-äÄ@
+Here is content from load_file
 	2
-äÄ@
+Here is content from load_file
 	3
-äÄ@
+Here is content from load_file
 	4
-äÄ@
+Here is content from load_file
 	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file('../tmp/func_view.dat') AS `LOAD_FILE('../tmp/func_view.dat')`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file('<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt') AS `my_col`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 156 OR select_id IS NULL) order by id;
-LOAD_FILE('../tmp/func_view.dat')	id
+my_col	id
-äÄ@
+Here is content from load_file
 	1
-äÄ@
+Here is content from load_file
 	2
-äÄ@
+Here is content from load_file
 	3
-äÄ@
+Here is content from load_file
 	4
-äÄ@
+Here is content from load_file
 	5
 DROP VIEW v1;
 
@@ -1013,10 +1018,10 @@ SELECT LEFT(my_binary_30, 2), my_binary_30, id FROM t1_values
 WHERE select_id = 147 OR select_id IS NULL order by id;
 LEFT(my_binary_30, 2)	my_binary_30	id
 NULL	NULL	1
-		2
+		2
 <-	<--------30 characters------->	3
- -	 ---äÖüß@µ*$-- 	4
+ -	 ---äÖüß@µ*$-- 	4
--1	-1	5
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_binary_30`,2) AS `LEFT(my_binary_30, 2)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -1141,10 +1146,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 141 OR select_id IS NULL order by id;
 BIT_LENGTH(my_binary_30)	my_binary_30	id
 NULL	NULL	1
-240		2
+240		2
 240	<--------30 characters------->	3
-240	 ---äÖüß@µ*$-- 	4
+240	 ---äÖüß@µ*$-- 	4
-240	-1	5
+240	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_binary_30`) AS `BIT_LENGTH(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -1453,10 +1458,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 129 OR select_id IS NULL order by id;
 IFNULL(my_binary_30,'IS_NULL')	my_binary_30	id
 IS_NULL	NULL	1
-		2
+		2
 <--------30 characters------->	<--------30 characters------->	3
- ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
+ ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
--1	-1	5
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_binary_30`,'IS_NULL') AS `IFNULL(my_binary_30,'IS_NULL')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -1793,10 +1798,10 @@ WHERE select_id = 117 OR select_id IS NULL order by id;
 IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_binary_30	id
 IS     NULL	NULL	1
-IS NOT NULL		2
+IS NOT NULL		2
 IS NOT NULL	<--------30 characters------->	3
-IS NOT NULL	 ---äÖüß@µ*$-- 	4
+IS NOT NULL	 ---äÖüß@µ*$-- 	4
-IS NOT NULL	-1	5
+IS NOT NULL	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(isnull(`t1_values`.`my_binary_30`),'IS     NULL','IS NOT NULL') AS `IF(my_binary_30 IS NULL, 'IS     NULL',
@@ -2113,10 +2118,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 105 OR select_id IS NULL order by id;
 IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')	my_binary_30	id
 IS NOT TRUE	NULL	1
-IS NOT TRUE		2
+IS NOT TRUE		2
 IS NOT TRUE	<--------30 characters------->	3
-IS NOT TRUE	 ---äÖüß@µ*$-- 	4
+IS NOT TRUE	 ---äÖüß@µ*$-- 	4
-IS     TRUE	-1	5
+IS     TRUE	-1	5
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: ''
 Warning	1292	Truncated incorrect DOUBLE value: '<--------30 characters------->'
@@ -2233,10 +2238,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 101 OR select_id IS NULL order by id;
 CONVERT(my_binary_30 USING koi8r)	my_binary_30	id
 NULL	NULL	1
-		2
+		2
 <--------30 characters------->	<--------30 characters------->	3
- ---???????<3F>@??*$-- 	 ---äÖüß@µ*$-- 	4
+ ---???????<3F>@??*$-- 	 ---äÖüß@µ*$-- 	4
--1	-1	5
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using koi8r) AS `CONVERT(my_binary_30 USING koi8r)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -2337,10 +2342,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 97 OR select_id IS NULL order by id;
 CONVERT(my_binary_30 USING utf8)	my_binary_30	id
 NULL	NULL	1
-		2
+		2
 <--------30 characters------->	<--------30 characters------->	3
- ---<2D><><EFBFBD><EFBFBD>@<40>*$-- 	 ---äÖüß@µ*$-- 	4
+ ---<2D><><EFBFBD><EFBFBD>@<40>*$-- 	 ---äÖüß@µ*$-- 	4
--1	-1	5
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using utf8) AS `CONVERT(my_binary_30 USING utf8)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -2673,10 +2678,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 85 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS UNSIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
-0		2
+0		2
 0	<--------30 characters------->	3
-0	 ---äÖüß@µ*$-- 	4
+0	 ---äÖüß@µ*$-- 	4
-18446744073709551615	-1	5
+18446744073709551615	-1	5
 Warnings:
 Warning	1292	Truncated incorrect INTEGER value: ''
 Warning	1292	Truncated incorrect INTEGER value: '<--------30 characters------->'
@@ -3037,10 +3042,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 73 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS SIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
-0		2
+0		2
 0	<--------30 characters------->	3
-0	 ---äÖüß@µ*$-- 	4
+0	 ---äÖüß@µ*$-- 	4
--1	-1	5
+-1	-1	5
 Warnings:
 Warning	1292	Truncated incorrect INTEGER value: ''
 Warning	1292	Truncated incorrect INTEGER value: '<--------30 characters------->'
@@ -3397,11 +3402,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 61 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DECIMAL(37,2))	my_binary_30	id
 NULL	NULL	1
-0.00		2
+0.00		2
 0.00	<--------30 characters------->	3
-0.00	 ---äÖüß@µ*$-- 	4
+0.00	 ---äÖüß@µ*$-- 	4
--1.00	-1	5
+-1.00	-1	5
--3333.33	-3333.3333	28
+-3333.33	-3333.3333	28
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: ''
@@ -3755,11 +3760,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 50 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS TIME)	my_binary_30	id
 NULL	NULL	1
-00:00:00		2
+00:00:00		2
 00:00:00	<--------30 characters------->	3
--00:00:00	 ---äÖüß@µ*$-- 	4
+-00:00:00	 ---äÖüß@µ*$-- 	4
-NULL	-1	5
+NULL	-1	5
-41:58:00	1 17:58	22
+41:58:00	1 17:58	22
 Warnings:
 Warning	1292	Truncated incorrect time value: ''
 Warning	1292	Truncated incorrect time value: '<--------30 characters------->'
@@ -4131,11 +4136,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 39 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DATETIME)	my_binary_30	id
 NULL	NULL	1
-NULL		2
+NULL		2
 NULL	<--------30 characters------->	3
-NULL	 ---äÖüß@µ*$-- 	4
+NULL	 ---äÖüß@µ*$-- 	4
-NULL	-1	5
+NULL	-1	5
-2005-06-27 17:58:00	2005-06-27 17:58	16
+2005-06-27 17:58:00	2005-06-27 17:58	16
 Warnings:
 Warning	1292	Incorrect datetime value: ''
 Warning	1292	Incorrect datetime value: '<--------30 characters------->'
@@ -4501,11 +4506,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 28 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DATE)	my_binary_30	id
 NULL	NULL	1
-NULL		2
+NULL		2
 NULL	<--------30 characters------->	3
-NULL	 ---äÖüß@µ*$-- 	4
+NULL	 ---äÖüß@µ*$-- 	4
-NULL	-1	5
+NULL	-1	5
-2005-06-27	2005-06-27	10
+2005-06-27	2005-06-27	10
 Warnings:
 Warning	1292	Incorrect datetime value: ''
 Warning	1292	Incorrect datetime value: '<--------30 characters------->'
@@ -4851,10 +4856,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 16 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS CHAR)	my_binary_30	id
 NULL	NULL	1
-		2
+		2
 <--------30 characters------->	<--------30 characters------->	3
- ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
+ ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
--1	-1	5
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset latin1) AS `CAST(my_binary_30 AS CHAR)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -5163,10 +5168,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 4 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS BINARY)	my_binary_30	id
 NULL	NULL	1
-		2
+		2
 <--------30 characters------->	<--------30 characters------->	3
- ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
+ ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
--1	-1	5
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset binary) AS `CAST(my_binary_30 AS BINARY)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci

mysql-test/suite/funcs_1/r/innodb_storedproc.result

@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
 CREATE DATABASE db_storedproc;
 CREATE DATABASE db_storedproc_1;
 USE db_storedproc;
-create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1;
+engine = <engine_to_be_tested>;
-create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2;
+create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-create table t3(f1 char(20),f2 char(20),f3 integer) engine = innodb;
+engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
-create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
+create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
 USE db_storedproc_1;
-create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
 USE db_storedproc;
-create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = innodb;
+create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -34,8 +39,9 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = innodb;
+create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -47,12 +53,14 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t9(f1 int, f2 char(25), f3 int) engine = innodb;
+create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
-create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10;
+engine = <engine_to_be_tested>;
-create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
+create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
 
 Section 3.1.1 - Syntax checks for the CREATE PROCEDURE, CREATE
 FUNCTION, ALTER PROCEDURE, ALTER FUNCTION, DROP PROCEDURE, DROP FUNCTION, SHOW
@@ -14949,46 +14957,47 @@ USE db_storedproc;
 Testcase 4.3.1:
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp1;
-drop table IF EXISTS res_t3_itisalongname_1381742_itsaverylongname_1381742;
+DROP TABLE IF EXISTS res_t3_itisalongname_1381742_itsaverylongname_1381742;
 CREATE TABLE res_t3_itisalongname_1381742_itsaverylongname_1381742(
-middleinitial CHAR,
+middleinitial CHAR, lastname VARCHAR(50),
-lastname VARCHAR(50),
+age_averylongfieldname_averylongname_1234569 INT, COMMENT VARCHAR(100))
-age_averylongfieldname_averylongname_1234569 int,
+ENGINE=<engine_to_be_tested>;
-COMMENT TEXT) ENGINE=innodb;
 INSERT INTO res_t3_itisalongname_1381742_itsaverylongname_1381742
 VALUES('a', 'aaaaaaaaaabbbbbbbbc', 0, 'default');
-CREATE PROCEDURE sp1(a int)
+CREATE PROCEDURE sp1(a INT)
 BEGIN
-declare itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx char;
+DECLARE itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx CHAR;
-declare itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx varchar(100);
+DECLARE itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx VARCHAR(100);
-declare itisjustamediumsizeintintegervariablename integer;
+DECLARE itisjustamediumsizeintintegervariablename INTEGER;
-set itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx = 'b';
+SET itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx = 'b';
-set itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx = 'oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%';
+SET itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx
-set itisjustamediumsizeintintegervariablename = 5;
+= 'oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%';
-set @comment='a';
+SET itisjustamediumsizeintintegervariablename = 5;
-label1: loop
+SET @comment='a';
-if a>100 then
+label1: LOOP
-set @comment='value of a is greater than 100';
+IF a > 100 THEN
-elseif a<100 then
+SET @comment = 'value of a is greater than 100';
-if a<50 then
+ELSEIF a < 100 THEN
-set @comment='value of a is less than 50';
+IF a < 50 THEN
-elseif a<25 then
+SET @comment = 'value of a is less than 50';
-set @comment='value of a is less than 25';
+ELSEIF a < 25 THEN
-else
+SET @comment = 'value of a is less than 25';
-set @comment='value of a is greater than 50 and less than 100';
+ELSE
-END if;
+SET @comment = 'value of a is greater than 50 and less than 100';
-else
+END IF;
-set @comment='value of a is 100';
+ELSE
-END if;
+SET @comment = 'value of a is 100';
-if itisjustamediumsizeintintegervariablename = 0 then leave label1;
+END IF;
-END if;
+IF itisjustamediumsizeintintegervariablename = 0 THEN LEAVE label1;
-insert into res_t3_itisalongname_1381742_itsaverylongname_1381742
+END IF;
-values( itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx,
+INSERT INTO res_t3_itisalongname_1381742_itsaverylongname_1381742
-concat(itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx, '  ', a),
+VALUES(itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx,
-a, @comment );
+CONCAT(itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx,
-set itisjustamediumsizeintintegervariablename = itisjustamediumsizeintintegervariablename - 1;
+'  ', a), a, @comment);
-iterate label1;
+SET itisjustamediumsizeintintegervariablename
-END loop label1;
+= itisjustamediumsizeintintegervariablename - 1;
+ITERATE label1;
+END LOOP label1;
 END//
 CALL sp1(101);
 CALL sp1(100);

mysql-test/suite/funcs_1/r/innodb_storedproc_02.result

@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
 CREATE DATABASE db_storedproc;
 CREATE DATABASE db_storedproc_1;
 USE db_storedproc;
-create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1;
+engine = <engine_to_be_tested>;
-create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2;
+create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-create table t3(f1 char(20),f2 char(20),f3 integer) engine = innodb;
+engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
-create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
+create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
 USE db_storedproc_1;
-create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
 USE db_storedproc;
-create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = innodb;
+create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -34,8 +39,9 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = innodb;
+create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -47,12 +53,14 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t9(f1 int, f2 char(25), f3 int) engine = innodb;
+create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
-create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10;
+engine = <engine_to_be_tested>;
-create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
+create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
 
 Section 3.1.2 - Syntax checks for the stored procedure-specific
 programming statements BEGIN/END, DECLARE, SET, SELECT/INTO, OPEN, FETCH, CLOSE:
@@ -698,7 +706,7 @@ Testcase 3.1.2.54:
 ------------------
 
 Ensure that a handler with a condition defined with an SQLSTATE that begins with
-<EFBFBD>01<EFBFBD> is always exactly equivalent in action to a handler with an SQLWARNING
+“01“ is always exactly equivalent in action to a handler with an SQLWARNING
 condition.
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp0;
@@ -797,7 +805,7 @@ Testcase 3.1.2.56:
 ------------------
 
 Ensure that a handler with a condition defined with an SQLSTATE that begins with
-<EFBFBD>02<EFBFBD> is always exactly equivalent in action to a handler with a NOT FOUND
+“02“ is always exactly equivalent in action to a handler with a NOT FOUND
 condition.
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp0;
@@ -905,7 +913,7 @@ Testcase 3.1.2.58:
 ------------------
 
 Ensure that a handler with a condition defined with an SQLSTATE that begins with
-anything other that <EFBFBD>01<EFBFBD> or <EFBFBD>02<EFBFBD> is always exactly equivalent in action to a
+anything other that “01“ or “02“ is always exactly equivalent in action to a
 handler with an SQLEXCEPTION condition.
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp0;

mysql-test/suite/funcs_1/r/innodb_storedproc_03.result

@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
 CREATE DATABASE db_storedproc;
 CREATE DATABASE db_storedproc_1;
 USE db_storedproc;
-create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1;
+engine = <engine_to_be_tested>;
-create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2;
+create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-create table t3(f1 char(20),f2 char(20),f3 integer) engine = innodb;
+engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
-create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
+create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
 USE db_storedproc_1;
-create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
 USE db_storedproc;
-create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = innodb;
+create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -34,8 +39,9 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = innodb;
+create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -47,12 +53,14 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t9(f1 int, f2 char(25), f3 int) engine = innodb;
+create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
-create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10;
+engine = <engine_to_be_tested>;
-create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
+create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
 
 Section 3.1.3 - Syntax checks for the stored procedure-specific flow
 control statements IF, CASE, LOOP, LEAVE, ITERATE, REPEAT, WHILE:

mysql-test/suite/funcs_1/r/innodb_storedproc_06.result

@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
 CREATE DATABASE db_storedproc;
 CREATE DATABASE db_storedproc_1;
 USE db_storedproc;
-create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1;
+engine = <engine_to_be_tested>;
-create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2;
+create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-create table t3(f1 char(20),f2 char(20),f3 integer) engine = innodb;
+engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
-create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
+create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
 USE db_storedproc_1;
-create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
 USE db_storedproc;
-create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = innodb;
+create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -34,8 +39,9 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = innodb;
+create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -47,12 +53,14 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t9(f1 int, f2 char(25), f3 int) engine = innodb;
+create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
-create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10;
+engine = <engine_to_be_tested>;
-create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
+create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
 
 Section 3.1.6 - Privilege Checks:
 --------------------------------------------------------------------------------

mysql-test/suite/funcs_1/r/innodb_storedproc_07.result

@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
 CREATE DATABASE db_storedproc;
 CREATE DATABASE db_storedproc_1;
 USE db_storedproc;
-create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1;
+engine = <engine_to_be_tested>;
-create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2;
+create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-create table t3(f1 char(20),f2 char(20),f3 integer) engine = innodb;
+engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
-create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
+create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
 USE db_storedproc_1;
-create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
 USE db_storedproc;
-create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = innodb;
+create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -34,8 +39,9 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = innodb;
+create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -47,12 +53,14 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t9(f1 int, f2 char(25), f3 int) engine = innodb;
+create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
-create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10;
+engine = <engine_to_be_tested>;
-create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
+create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
 
 Section 3.1.7 - SQL mode checks:
 --------------------------------------------------------------------------------

mysql-test/suite/funcs_1/r/innodb_storedproc_08.result

@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
 CREATE DATABASE db_storedproc;
 CREATE DATABASE db_storedproc_1;
 USE db_storedproc;
-create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1;
+engine = <engine_to_be_tested>;
-create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2;
+create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-create table t3(f1 char(20),f2 char(20),f3 integer) engine = innodb;
+engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
-create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
+create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
 USE db_storedproc_1;
-create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
 USE db_storedproc;
-create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = innodb;
+create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -34,8 +39,9 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = innodb;
+create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -47,12 +53,14 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t9(f1 int, f2 char(25), f3 int) engine = innodb;
+create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
-create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10;
+engine = <engine_to_be_tested>;
-create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
+create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
 
 Section 3.1.8 - SHOW statement checks:
 --------------------------------------------------------------------------------

mysql-test/suite/funcs_1/r/innodb_storedproc_10.result

@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
 CREATE DATABASE db_storedproc;
 CREATE DATABASE db_storedproc_1;
 USE db_storedproc;
-create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1;
+engine = <engine_to_be_tested>;
-create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2;
+create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-create table t3(f1 char(20),f2 char(20),f3 integer) engine = innodb;
+engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
-create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
+create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
 USE db_storedproc_1;
-create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
 USE db_storedproc;
-create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = innodb;
+create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -34,8 +39,9 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = innodb;
+create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -47,12 +53,14 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t9(f1 int, f2 char(25), f3 int) engine = innodb;
+create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
-create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10;
+engine = <engine_to_be_tested>;
-create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
+create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
 
 Section 3.1.10 - CALL checks:
 --------------------------------------------------------------------------------

mysql-test/suite/funcs_1/r/innodb_trig_0102.result

@@ -64,7 +64,8 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb3.txt' into table tb3 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb3.txt'
+into table tb3;
 
 Testcase: 3.5.1.1:
 ------------------

mysql-test/suite/funcs_1/r/innodb_trig_03.result

@@ -64,7 +64,8 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb3.txt' into table tb3 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb3.txt'
+into table tb3;
 
 Testcase 3.5.3:
 ---------------
@@ -103,7 +104,7 @@ test_noprivs@localhost
 use priv_db;
 create trigger trg1_1 before INSERT on t1 for each row
 set new.f1 = 'trig 3.5.3.2_1-no';
-Got one of the listed errors
+ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1'
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.2-no');
 select f1 from t1 order by f1;
@@ -135,7 +136,7 @@ Testcase 3.5.3.6:
 -----------------
 use priv_db;
 drop trigger trg1_2;
-Got one of the listed errors
+ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1'
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.6-yes');
 select f1 from t1 order by f1;

mysql-test/suite/funcs_1/r/innodb_trig_03e.result

@@ -1214,7 +1214,7 @@ create definer=not_ex_user@localhost trigger trg1_0
 before INSERT on t1 for each row
 set new.f1 = 'trig 1_0-yes';
 Warnings:
-Note	1449	There is no 'not_ex_user'@'localhost' registered
+Note	1449	The user specified as a definer ('not_ex_user'@'localhost') does not exist
 drop trigger trg1_0;
 create definer=test_yesprivs@localhost trigger trg1_0
 before INSERT on t1 for each row

mysql-test/suite/funcs_1/r/innodb_trig_0407.result

@@ -64,7 +64,8 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb3.txt' into table tb3 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb3.txt'
+into table tb3;
 
 Testcase: 3.5:
 --------------

mysql-test/suite/funcs_1/r/innodb_trig_08.result

@@ -64,7 +64,8 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb3.txt' into table tb3 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb3.txt'
+into table tb3;
 
 Testcase: 3.5:
 --------------

mysql-test/suite/funcs_1/r/innodb_trig_09.result

@@ -64,7 +64,8 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb3.txt' into table tb3 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb3.txt'
+into table tb3;
 
 Testcase 3.5.9.1/2:
 -------------------
@@ -241,6 +242,7 @@ ERROR HY000: There is no NEW row in on DELETE trigger
 create trigger trg5b after DELETE on tb3 for each row
 set new.f122='test';
 ERROR HY000: There is no NEW row in on DELETE trigger
+drop trigger trg5a;
 drop trigger trg5b;
 
 Testcase 3.5.9.10: (implied in previous tests)

mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result

@@ -64,7 +64,8 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb3.txt' into table tb3 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb3.txt'
+into table tb3;
 
 Testcase 3.5.10.1/2/3:
 ----------------------
@@ -141,7 +142,7 @@ set @counter= 0;
 select @counter as 'Rows Loaded Before';
 Rows Loaded Before
 0
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table tb_load;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table tb_load;
 select @counter as 'Rows Loaded After';
 Rows Loaded After
 10

mysql-test/suite/funcs_1/r/innodb_trig_frkey.result

@@ -64,7 +64,8 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb3.txt' into table tb3 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb3.txt'
+into table tb3;
 
 Testcase x.x.x.1:
 -----------------

mysql-test/suite/funcs_1/r/innodb_views.result

@@ -53,7 +53,8 @@ f107 year(4) not null default 2000,
 f108 enum("1enum","2enum") not null default "1enum",
 f109 set("1set","2set") not null default "1set"
 ) engine = innodb;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb2.txt' into table tb2 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb2.txt'
+into table tb2;
 DROP DATABASE IF EXISTS test1;
 CREATE DATABASE test1;
 USE test1;
@@ -111,7 +112,8 @@ f107 year(4) not null default 2000,
 f108 enum("1enum","2enum") not null default "1enum",
 f109 set("1set","2set") not null default "1set"
 ) engine = innodb;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb2.txt' into table tb2 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb2.txt'
+into table tb2;
 USE test;
 
 ! Attention: The file with the expected results is not

mysql-test/suite/funcs_1/r/is_columns_innodb.result

@@ -76,7 +76,8 @@ Note	1265	Data truncated for column 'f45' at row 1
 Note	1265	Data truncated for column 'f47' at row 1
 Note	1265	Data truncated for column 'f49' at row 1
 Note	1265	Data truncated for column 'f51' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb1.txt' into table tb1 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb1.txt'
+into table tb1;
 drop table if exists tb2 ;
 create table tb2 (
 f59 numeric (0) unsigned,
@@ -131,7 +132,8 @@ f107 year(4) not null default 2000,
 f108 enum("1enum","2enum") not null default "1enum",
 f109 set("1set","2set") not null default "1set"
 ) engine = innodb;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb2.txt' into table tb2 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb2.txt'
+into table tb2;
 drop table if exists tb3 ;
 create table tb3 (
 f118 char not null DEFAULT 'a',
@@ -197,7 +199,8 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb3.txt' into table tb3 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb3.txt'
+into table tb3;
 drop table if exists tb4;
 create table tb4 (
 f176 numeric (0) unsigned not null DEFAULT 9,
@@ -259,7 +262,8 @@ f239 varchar(20000) binary,
 f240 varchar(2000) unicode,
 f241 char(100) unicode
 ) engine = innodb;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb4.txt' into table tb4 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb4.txt'
+into table tb4;
 USE test1;
 drop table if exists tb2 ;
 create table tb2 (
@@ -315,33 +319,40 @@ f107 year(4) not null default 2000,
 f108 enum("1enum","2enum") not null default "1enum",
 f109 set("1set","2set") not null default "1set"
 ) engine = innodb;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb2.txt' into table tb2 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb2.txt'
+into table tb2;
 USE test;
 USE test;
 DROP TABLE IF EXISTS t1, t2, t4, t10, t11;
-CREATE TABLE t1  (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = InnoDB;
+CREATE TABLE t1  (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-CREATE TABLE t2  (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = InnoDB;
+ENGINE = InnoDB;
-CREATE TABLE t4  (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = InnoDB;
+CREATE TABLE t2  (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-CREATE TABLE t10 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = InnoDB;
+ENGINE = InnoDB;
-CREATE TABLE t11 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = InnoDB;
+CREATE TABLE t4  (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t1;
+ENGINE = InnoDB;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t2;
+CREATE TABLE t10 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t4;
+ENGINE = InnoDB;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t10;
+CREATE TABLE t11 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t11;
+ENGINE = InnoDB;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t1;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t2;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t4;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t10;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t11;
 drop TABLE if exists t3;
 CREATE TABLE t3 (f1 char(20), f2 char(20), f3 integer) ENGINE = InnoDB;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' INTO TABLE t3;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' INTO TABLE t3;
 drop database if exists test4;
 CREATE database test4;
 use test4;
-CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = InnoDB;
+CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int)
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t6;
+ENGINE = InnoDB;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t6;
 use test;
 drop TABLE if exists t7, t8;
 CREATE TABLE t7 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = InnoDB;
 CREATE TABLE t8 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = InnoDB;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t7;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' INTO TABLE t7;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -353,7 +364,7 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t8;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' INTO TABLE t8;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -367,7 +378,7 @@ Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
 drop TABLE if exists t9;
 CREATE TABLE t9 (f1 int, f2 char(25), f3 int) ENGINE = InnoDB;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' INTO TABLE t9;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' INTO TABLE t9;
 SELECT * FROM information_schema.columns
 WHERE table_schema LIKE 'test%'
 ORDER BY table_schema, table_name, column_name;

mysql-test/suite/funcs_1/r/is_columns_memory.result

@@ -72,7 +72,8 @@ Note	1265	Data truncated for column 'f45' at row 1
 Note	1265	Data truncated for column 'f47' at row 1
 Note	1265	Data truncated for column 'f49' at row 1
 Note	1265	Data truncated for column 'f51' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb1.txt' into table tb1 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb1.txt'
+into table tb1;
 drop table if exists tb2 ;
 create table tb2 (
 f59 numeric (0) unsigned,
@@ -127,7 +128,8 @@ f107 year(4) not null default 2000,
 f108 enum("1enum","2enum") not null default "1enum",
 f109 set("1set","2set") not null default "1set"
 ) engine = memory;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb2.txt' into table tb2 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb2.txt'
+into table tb2 ;
 drop table if exists tb3;
 create table tb3 (
 f118 char not null DEFAULT 'a',
@@ -187,7 +189,8 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb3.txt' into table tb3 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb3.txt'
+into table tb3;
 drop table if exists tb4 ;
 create table tb4 (
 f176 numeric (0) unsigned not null DEFAULT 9,
@@ -248,7 +251,8 @@ f238 varchar(25000) binary,
 f239 varbinary(0),
 f240 varchar(1200) unicode
 ) engine = memory;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb4.txt' into table tb4 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb4.txt'
+into table tb4;
 USE test1;
 drop table if exists tb2 ;
 create table tb2 (
@@ -304,33 +308,40 @@ f107 year(4) not null default 2000,
 f108 enum("1enum","2enum") not null default "1enum",
 f109 set("1set","2set") not null default "1set"
 ) engine = memory;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb2.txt' into table tb2 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb2.txt'
+into table tb2 ;
 USE test;
 USE test;
 DROP TABLE IF EXISTS t1, t2, t4, t10, t11;
-CREATE TABLE t1  (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MEMORY;
+CREATE TABLE t1  (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-CREATE TABLE t2  (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MEMORY;
+ENGINE = MEMORY;
-CREATE TABLE t4  (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MEMORY;
+CREATE TABLE t2  (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-CREATE TABLE t10 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MEMORY;
+ENGINE = MEMORY;
-CREATE TABLE t11 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MEMORY;
+CREATE TABLE t4  (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t1;
+ENGINE = MEMORY;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t2;
+CREATE TABLE t10 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t4;
+ENGINE = MEMORY;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t10;
+CREATE TABLE t11 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t11;
+ENGINE = MEMORY;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t1;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t2;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t4;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t10;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t11;
 drop TABLE if exists t3;
 CREATE TABLE t3 (f1 char(20), f2 char(20), f3 integer) ENGINE = MEMORY;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' INTO TABLE t3;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' INTO TABLE t3;
 drop database if exists test4;
 CREATE database test4;
 use test4;
-CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MEMORY;
+CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int)
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t6;
+ENGINE = MEMORY;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t6;
 use test;
 drop TABLE if exists t7, t8;
 CREATE TABLE t7 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = MEMORY;
 CREATE TABLE t8 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = MEMORY;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t7;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' INTO TABLE t7;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -342,7 +353,7 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t8;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' INTO TABLE t8;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -356,7 +367,7 @@ Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
 drop TABLE if exists t9;
 CREATE TABLE t9 (f1 int, f2 char(25), f3 int) ENGINE = MEMORY;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' INTO TABLE t9;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' INTO TABLE t9;
 SELECT * FROM information_schema.columns
 WHERE table_schema LIKE 'test%'
 ORDER BY table_schema, table_name, column_name;

mysql-test/suite/funcs_1/r/is_columns_myisam.result

@@ -80,7 +80,8 @@ Note	1265	Data truncated for column 'f45' at row 1
 Note	1265	Data truncated for column 'f47' at row 1
 Note	1265	Data truncated for column 'f49' at row 1
 Note	1265	Data truncated for column 'f51' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb1.txt' into table tb1 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb1.txt'
+into table tb1;
 drop table if exists tb2 ;
 create table tb2 (
 f59 numeric (0) unsigned,
@@ -143,7 +144,8 @@ f115 VARBINARY(27) null ,
 f116 VARBINARY(64) null,
 f117 VARBINARY(192) null
 ) engine = myisam;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb2.txt' into table tb2 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb2.txt'
+into table tb2;
 drop table if exists tb3 ;
 create table tb3 (
 f118 char not null DEFAULT 'a',
@@ -209,7 +211,8 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb3.txt' into table tb3 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb3.txt'
+into table tb3;
 drop table if exists tb4 ;
 create table tb4 (
 f176 numeric (0) unsigned not null DEFAULT 9,
@@ -280,7 +283,8 @@ f240 varchar(120) unicode,
 f241 char(100) unicode,
 f242 bit(30)
 ) engine = myisam;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb4.txt' into table tb4 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb4.txt'
+into table tb4;
 USE test1;
 drop table if exists tb2 ;
 create table tb2 (
@@ -344,33 +348,40 @@ f115 VARBINARY(27) null ,
 f116 VARBINARY(64) null,
 f117 VARBINARY(192) null
 ) engine = myisam;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb2.txt' into table tb2 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb2.txt'
+into table tb2;
 USE test;
 USE test;
 DROP TABLE IF EXISTS t1, t2, t4, t10, t11;
-CREATE TABLE t1  (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MyISAM;
+CREATE TABLE t1  (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-CREATE TABLE t2  (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MyISAM;
+ENGINE = MyISAM;
-CREATE TABLE t4  (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MyISAM;
+CREATE TABLE t2  (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-CREATE TABLE t10 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MyISAM;
+ENGINE = MyISAM;
-CREATE TABLE t11 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MyISAM;
+CREATE TABLE t4  (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t1;
+ENGINE = MyISAM;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t2;
+CREATE TABLE t10 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t4;
+ENGINE = MyISAM;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t10;
+CREATE TABLE t11 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t11;
+ENGINE = MyISAM;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t1;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t2;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t4;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t10;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t11;
 drop TABLE if exists t3;
 CREATE TABLE t3 (f1 char(20), f2 char(20), f3 integer) ENGINE = MyISAM;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' INTO TABLE t3;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' INTO TABLE t3;
 drop database if exists test4;
 CREATE database test4;
 use test4;
-CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MyISAM;
+CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int)
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t6;
+ENGINE = MyISAM;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t6;
 use test;
 drop TABLE if exists t7, t8;
 CREATE TABLE t7 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = MyISAM;
 CREATE TABLE t8 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = MyISAM;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t7;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' INTO TABLE t7;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -382,7 +393,7 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t8;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' INTO TABLE t8;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -396,7 +407,7 @@ Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
 drop TABLE if exists t9;
 CREATE TABLE t9 (f1 int, f2 char(25), f3 int) ENGINE = MyISAM;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' INTO TABLE t9;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' INTO TABLE t9;
 SELECT * FROM information_schema.columns
 WHERE table_schema LIKE 'test%'
 ORDER BY table_schema, table_name, column_name;

mysql-test/suite/funcs_1/r/is_columns_ndb.result

@@ -4,29 +4,35 @@ USE test;
 USE test;
 USE test;
 DROP TABLE IF EXISTS t1, t2, t4, t10, t11;
-CREATE TABLE t1  (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = ndb;
+CREATE TABLE t1  (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-CREATE TABLE t2  (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = ndb;
+ENGINE = ndb;
-CREATE TABLE t4  (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = ndb;
+CREATE TABLE t2  (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-CREATE TABLE t10 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = ndb;
+ENGINE = ndb;
-CREATE TABLE t11 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = ndb;
+CREATE TABLE t4  (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t1;
+ENGINE = ndb;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t2;
+CREATE TABLE t10 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t4;
+ENGINE = ndb;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t10;
+CREATE TABLE t11 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t11;
+ENGINE = ndb;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t1;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t2;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t4;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t10;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t11;
 drop TABLE if exists t3;
 CREATE TABLE t3 (f1 char(20), f2 char(20), f3 integer) ENGINE = ndb;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' INTO TABLE t3;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' INTO TABLE t3;
 drop database if exists test4;
 CREATE database test4;
 use test4;
-CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = ndb;
+CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int)
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t6;
+ENGINE = ndb;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t6;
 use test;
 drop TABLE if exists t7, t8;
 CREATE TABLE t7 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = ndb;
 CREATE TABLE t8 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = ndb;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t7;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' INTO TABLE t7;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -38,7 +44,7 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t8;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' INTO TABLE t8;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -52,7 +58,7 @@ Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
 drop TABLE if exists t9;
 CREATE TABLE t9 (f1 int, f2 char(25), f3 int) ENGINE = ndb;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' INTO TABLE t9;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' INTO TABLE t9;
 SELECT * FROM information_schema.columns
 WHERE table_schema LIKE 'test%'
 ORDER BY table_schema, table_name, column_name;

mysql-test/suite/funcs_1/r/is_tables_innodb.result

@@ -76,7 +76,8 @@ Note	1265	Data truncated for column 'f45' at row 1
 Note	1265	Data truncated for column 'f47' at row 1
 Note	1265	Data truncated for column 'f49' at row 1
 Note	1265	Data truncated for column 'f51' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb1.txt' into table tb1 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb1.txt'
+into table tb1;
 drop table if exists tb2 ;
 create table tb2 (
 f59 numeric (0) unsigned,
@@ -131,7 +132,8 @@ f107 year(4) not null default 2000,
 f108 enum("1enum","2enum") not null default "1enum",
 f109 set("1set","2set") not null default "1set"
 ) engine = innodb;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb2.txt' into table tb2 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb2.txt'
+into table tb2;
 drop table if exists tb3 ;
 create table tb3 (
 f118 char not null DEFAULT 'a',
@@ -197,7 +199,8 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb3.txt' into table tb3 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb3.txt'
+into table tb3;
 drop table if exists tb4;
 create table tb4 (
 f176 numeric (0) unsigned not null DEFAULT 9,
@@ -259,7 +262,8 @@ f239 varchar(20000) binary,
 f240 varchar(2000) unicode,
 f241 char(100) unicode
 ) engine = innodb;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb4.txt' into table tb4 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb4.txt'
+into table tb4;
 USE test1;
 drop table if exists tb2 ;
 create table tb2 (
@@ -315,33 +319,40 @@ f107 year(4) not null default 2000,
 f108 enum("1enum","2enum") not null default "1enum",
 f109 set("1set","2set") not null default "1set"
 ) engine = innodb;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb2.txt' into table tb2 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb2.txt'
+into table tb2;
 USE test;
 USE test;
 DROP TABLE IF EXISTS t1, t2, t4, t10, t11;
-CREATE TABLE t1  (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = InnoDB;
+CREATE TABLE t1  (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-CREATE TABLE t2  (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = InnoDB;
+ENGINE = InnoDB;
-CREATE TABLE t4  (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = InnoDB;
+CREATE TABLE t2  (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-CREATE TABLE t10 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = InnoDB;
+ENGINE = InnoDB;
-CREATE TABLE t11 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = InnoDB;
+CREATE TABLE t4  (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t1;
+ENGINE = InnoDB;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t2;
+CREATE TABLE t10 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t4;
+ENGINE = InnoDB;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t10;
+CREATE TABLE t11 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t11;
+ENGINE = InnoDB;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t1;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t2;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t4;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t10;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t11;
 drop TABLE if exists t3;
 CREATE TABLE t3 (f1 char(20), f2 char(20), f3 integer) ENGINE = InnoDB;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' INTO TABLE t3;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' INTO TABLE t3;
 drop database if exists test4;
 CREATE database test4;
 use test4;
-CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = InnoDB;
+CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int)
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t6;
+ENGINE = InnoDB;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t6;
 use test;
 drop TABLE if exists t7, t8;
 CREATE TABLE t7 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = InnoDB;
 CREATE TABLE t8 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = InnoDB;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t7;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' INTO TABLE t7;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -353,7 +364,7 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t8;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' INTO TABLE t8;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -367,7 +378,7 @@ Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
 drop TABLE if exists t9;
 CREATE TABLE t9 (f1 int, f2 char(25), f3 int) ENGINE = InnoDB;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' INTO TABLE t9;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' INTO TABLE t9;
 DROP DATABASE IF EXISTS db_datadict;
 CREATE DATABASE db_datadict;
 SELECT *,

mysql-test/suite/funcs_1/r/is_tables_memory.result

@@ -72,7 +72,8 @@ Note	1265	Data truncated for column 'f45' at row 1
 Note	1265	Data truncated for column 'f47' at row 1
 Note	1265	Data truncated for column 'f49' at row 1
 Note	1265	Data truncated for column 'f51' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb1.txt' into table tb1 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb1.txt'
+into table tb1;
 drop table if exists tb2 ;
 create table tb2 (
 f59 numeric (0) unsigned,
@@ -127,7 +128,8 @@ f107 year(4) not null default 2000,
 f108 enum("1enum","2enum") not null default "1enum",
 f109 set("1set","2set") not null default "1set"
 ) engine = memory;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb2.txt' into table tb2 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb2.txt'
+into table tb2 ;
 drop table if exists tb3;
 create table tb3 (
 f118 char not null DEFAULT 'a',
@@ -187,7 +189,8 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb3.txt' into table tb3 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb3.txt'
+into table tb3;
 drop table if exists tb4 ;
 create table tb4 (
 f176 numeric (0) unsigned not null DEFAULT 9,
@@ -248,7 +251,8 @@ f238 varchar(25000) binary,
 f239 varbinary(0),
 f240 varchar(1200) unicode
 ) engine = memory;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb4.txt' into table tb4 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb4.txt'
+into table tb4;
 USE test1;
 drop table if exists tb2 ;
 create table tb2 (
@@ -304,33 +308,40 @@ f107 year(4) not null default 2000,
 f108 enum("1enum","2enum") not null default "1enum",
 f109 set("1set","2set") not null default "1set"
 ) engine = memory;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb2.txt' into table tb2 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb2.txt'
+into table tb2 ;
 USE test;
 USE test;
 DROP TABLE IF EXISTS t1, t2, t4, t10, t11;
-CREATE TABLE t1  (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MEMORY;
+CREATE TABLE t1  (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-CREATE TABLE t2  (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MEMORY;
+ENGINE = MEMORY;
-CREATE TABLE t4  (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MEMORY;
+CREATE TABLE t2  (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-CREATE TABLE t10 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MEMORY;
+ENGINE = MEMORY;
-CREATE TABLE t11 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MEMORY;
+CREATE TABLE t4  (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t1;
+ENGINE = MEMORY;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t2;
+CREATE TABLE t10 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t4;
+ENGINE = MEMORY;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t10;
+CREATE TABLE t11 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t11;
+ENGINE = MEMORY;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t1;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t2;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t4;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t10;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t11;
 drop TABLE if exists t3;
 CREATE TABLE t3 (f1 char(20), f2 char(20), f3 integer) ENGINE = MEMORY;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' INTO TABLE t3;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' INTO TABLE t3;
 drop database if exists test4;
 CREATE database test4;
 use test4;
-CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MEMORY;
+CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int)
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t6;
+ENGINE = MEMORY;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t6;
 use test;
 drop TABLE if exists t7, t8;
 CREATE TABLE t7 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = MEMORY;
 CREATE TABLE t8 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = MEMORY;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t7;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' INTO TABLE t7;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -342,7 +353,7 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t8;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' INTO TABLE t8;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -356,7 +367,7 @@ Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
 drop TABLE if exists t9;
 CREATE TABLE t9 (f1 int, f2 char(25), f3 int) ENGINE = MEMORY;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' INTO TABLE t9;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' INTO TABLE t9;
 DROP DATABASE IF EXISTS db_datadict;
 CREATE DATABASE db_datadict;
 SELECT *,

mysql-test/suite/funcs_1/r/is_tables_myisam.result

@@ -80,7 +80,8 @@ Note	1265	Data truncated for column 'f45' at row 1
 Note	1265	Data truncated for column 'f47' at row 1
 Note	1265	Data truncated for column 'f49' at row 1
 Note	1265	Data truncated for column 'f51' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb1.txt' into table tb1 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb1.txt'
+into table tb1;
 drop table if exists tb2 ;
 create table tb2 (
 f59 numeric (0) unsigned,
@@ -143,7 +144,8 @@ f115 VARBINARY(27) null ,
 f116 VARBINARY(64) null,
 f117 VARBINARY(192) null
 ) engine = myisam;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb2.txt' into table tb2 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb2.txt'
+into table tb2;
 drop table if exists tb3 ;
 create table tb3 (
 f118 char not null DEFAULT 'a',
@@ -209,7 +211,8 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb3.txt' into table tb3 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb3.txt'
+into table tb3;
 drop table if exists tb4 ;
 create table tb4 (
 f176 numeric (0) unsigned not null DEFAULT 9,
@@ -280,7 +283,8 @@ f240 varchar(120) unicode,
 f241 char(100) unicode,
 f242 bit(30)
 ) engine = myisam;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb4.txt' into table tb4 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb4.txt'
+into table tb4;
 USE test1;
 drop table if exists tb2 ;
 create table tb2 (
@@ -344,33 +348,40 @@ f115 VARBINARY(27) null ,
 f116 VARBINARY(64) null,
 f117 VARBINARY(192) null
 ) engine = myisam;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb2.txt' into table tb2 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb2.txt'
+into table tb2;
 USE test;
 USE test;
 DROP TABLE IF EXISTS t1, t2, t4, t10, t11;
-CREATE TABLE t1  (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MyISAM;
+CREATE TABLE t1  (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-CREATE TABLE t2  (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MyISAM;
+ENGINE = MyISAM;
-CREATE TABLE t4  (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MyISAM;
+CREATE TABLE t2  (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-CREATE TABLE t10 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MyISAM;
+ENGINE = MyISAM;
-CREATE TABLE t11 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MyISAM;
+CREATE TABLE t4  (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t1;
+ENGINE = MyISAM;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t2;
+CREATE TABLE t10 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t4;
+ENGINE = MyISAM;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t10;
+CREATE TABLE t11 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t11;
+ENGINE = MyISAM;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t1;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t2;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t4;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t10;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t11;
 drop TABLE if exists t3;
 CREATE TABLE t3 (f1 char(20), f2 char(20), f3 integer) ENGINE = MyISAM;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' INTO TABLE t3;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' INTO TABLE t3;
 drop database if exists test4;
 CREATE database test4;
 use test4;
-CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = MyISAM;
+CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int)
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t6;
+ENGINE = MyISAM;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t6;
 use test;
 drop TABLE if exists t7, t8;
 CREATE TABLE t7 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = MyISAM;
 CREATE TABLE t8 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = MyISAM;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t7;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' INTO TABLE t7;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -382,7 +393,7 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t8;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' INTO TABLE t8;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -396,7 +407,7 @@ Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
 drop TABLE if exists t9;
 CREATE TABLE t9 (f1 int, f2 char(25), f3 int) ENGINE = MyISAM;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' INTO TABLE t9;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' INTO TABLE t9;
 DROP DATABASE IF EXISTS db_datadict;
 CREATE DATABASE db_datadict;
 SELECT *,

mysql-test/suite/funcs_1/r/is_tables_ndb.result

@@ -4,29 +4,35 @@ USE test;
 USE test;
 USE test;
 DROP TABLE IF EXISTS t1, t2, t4, t10, t11;
-CREATE TABLE t1  (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = NDB;
+CREATE TABLE t1  (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-CREATE TABLE t2  (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = NDB;
+ENGINE = NDB;
-CREATE TABLE t4  (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = NDB;
+CREATE TABLE t2  (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-CREATE TABLE t10 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = NDB;
+ENGINE = NDB;
-CREATE TABLE t11 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = NDB;
+CREATE TABLE t4  (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t1;
+ENGINE = NDB;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t2;
+CREATE TABLE t10 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t4;
+ENGINE = NDB;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t10;
+CREATE TABLE t11 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t11;
+ENGINE = NDB;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t1;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t2;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t4;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t10;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t11;
 drop TABLE if exists t3;
 CREATE TABLE t3 (f1 char(20), f2 char(20), f3 integer) ENGINE = NDB;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' INTO TABLE t3;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' INTO TABLE t3;
 drop database if exists test4;
 CREATE database test4;
 use test4;
-CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = NDB;
+CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int)
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t6;
+ENGINE = NDB;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' INTO TABLE t6;
 use test;
 drop TABLE if exists t7, t8;
 CREATE TABLE t7 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = NDB;
 CREATE TABLE t8 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = NDB;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t7;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' INTO TABLE t7;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -38,7 +44,7 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t8;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' INTO TABLE t8;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -52,7 +58,7 @@ Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
 drop TABLE if exists t9;
 CREATE TABLE t9 (f1 int, f2 char(25), f3 int) ENGINE = NDB;
-LOAD DATA INFILE 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' INTO TABLE t9;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' INTO TABLE t9;
 DROP DATABASE IF EXISTS db_datadict;
 CREATE DATABASE db_datadict;
 SELECT *,

mysql-test/suite/funcs_1/r/memory_func_view.result

@@ -202,9 +202,10 @@ SET @my_select = 'SELECT LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values';
 SET @my_select = 'SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values';
-SELECT 'äÄ@' INTO OUTFILE '../tmp/func_view.dat';
 SET @my_select =
-'SELECT LOAD_FILE(''../tmp/func_view.dat''), id FROM t1_values';
+'SELECT LOAD_FILE(''<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt'')
+           AS my_col,
+        id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_char_30),
 my_char_30, id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_varchar_1000),
@@ -810,36 +811,40 @@ WHERE select_id = 157 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values;
+CREATE VIEW v1 AS SELECT LOAD_FILE('<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt')
-SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values
+           AS my_col,
+        id FROM t1_values;
+SELECT LOAD_FILE('<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt')
+           AS my_col,
+        id FROM t1_values
 WHERE select_id = 156 OR select_id IS NULL order by id;
-LOAD_FILE('../tmp/func_view.dat')	id
+my_col	id
-äÄ@
+Here is content from load_file
 	1
-äÄ@
+Here is content from load_file
 	2
-äÄ@
+Here is content from load_file
 	3
-äÄ@
+Here is content from load_file
 	4
-äÄ@
+Here is content from load_file
 	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file('../tmp/func_view.dat') AS `LOAD_FILE('../tmp/func_view.dat')`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file('<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt') AS `my_col`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 156 OR select_id IS NULL) order by id;
-LOAD_FILE('../tmp/func_view.dat')	id
+my_col	id
-äÄ@
+Here is content from load_file
 	1
-äÄ@
+Here is content from load_file
 	2
-äÄ@
+Here is content from load_file
 	3
-äÄ@
+Here is content from load_file
 	4
-äÄ@
+Here is content from load_file
 	5
 DROP VIEW v1;
 
@@ -1013,10 +1018,10 @@ SELECT LEFT(my_binary_30, 2), my_binary_30, id FROM t1_values
 WHERE select_id = 147 OR select_id IS NULL order by id;
 LEFT(my_binary_30, 2)	my_binary_30	id
 NULL	NULL	1
-		2
+		2
 <-	<--------30 characters------->	3
- -	 ---äÖüß@µ*$-- 	4
+ -	 ---äÖüß@µ*$-- 	4
--1	-1	5
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_binary_30`,2) AS `LEFT(my_binary_30, 2)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -1141,10 +1146,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 141 OR select_id IS NULL order by id;
 BIT_LENGTH(my_binary_30)	my_binary_30	id
 NULL	NULL	1
-240		2
+240		2
 240	<--------30 characters------->	3
-240	 ---äÖüß@µ*$-- 	4
+240	 ---äÖüß@µ*$-- 	4
-240	-1	5
+240	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_binary_30`) AS `BIT_LENGTH(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -1453,10 +1458,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 129 OR select_id IS NULL order by id;
 IFNULL(my_binary_30,'IS_NULL')	my_binary_30	id
 IS_NULL	NULL	1
-		2
+		2
 <--------30 characters------->	<--------30 characters------->	3
- ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
+ ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
--1	-1	5
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_binary_30`,'IS_NULL') AS `IFNULL(my_binary_30,'IS_NULL')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -1793,10 +1798,10 @@ WHERE select_id = 117 OR select_id IS NULL order by id;
 IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_binary_30	id
 IS     NULL	NULL	1
-IS NOT NULL		2
+IS NOT NULL		2
 IS NOT NULL	<--------30 characters------->	3
-IS NOT NULL	 ---äÖüß@µ*$-- 	4
+IS NOT NULL	 ---äÖüß@µ*$-- 	4
-IS NOT NULL	-1	5
+IS NOT NULL	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(isnull(`t1_values`.`my_binary_30`),'IS     NULL','IS NOT NULL') AS `IF(my_binary_30 IS NULL, 'IS     NULL',
@@ -2113,10 +2118,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 105 OR select_id IS NULL order by id;
 IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')	my_binary_30	id
 IS NOT TRUE	NULL	1
-IS NOT TRUE		2
+IS NOT TRUE		2
 IS NOT TRUE	<--------30 characters------->	3
-IS NOT TRUE	 ---äÖüß@µ*$-- 	4
+IS NOT TRUE	 ---äÖüß@µ*$-- 	4
-IS     TRUE	-1	5
+IS     TRUE	-1	5
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: ''
 Warning	1292	Truncated incorrect DOUBLE value: '<--------30 characters------->'
@@ -2233,10 +2238,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 101 OR select_id IS NULL order by id;
 CONVERT(my_binary_30 USING koi8r)	my_binary_30	id
 NULL	NULL	1
-		2
+		2
 <--------30 characters------->	<--------30 characters------->	3
- ---???????<3F>@??*$-- 	 ---äÖüß@µ*$-- 	4
+ ---???????<3F>@??*$-- 	 ---äÖüß@µ*$-- 	4
--1	-1	5
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using koi8r) AS `CONVERT(my_binary_30 USING koi8r)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -2337,10 +2342,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 97 OR select_id IS NULL order by id;
 CONVERT(my_binary_30 USING utf8)	my_binary_30	id
 NULL	NULL	1
-		2
+		2
 <--------30 characters------->	<--------30 characters------->	3
- ---<2D><><EFBFBD><EFBFBD>@<40>*$-- 	 ---äÖüß@µ*$-- 	4
+ ---<2D><><EFBFBD><EFBFBD>@<40>*$-- 	 ---äÖüß@µ*$-- 	4
--1	-1	5
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using utf8) AS `CONVERT(my_binary_30 USING utf8)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -2673,10 +2678,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 85 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS UNSIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
-0		2
+0		2
 0	<--------30 characters------->	3
-0	 ---äÖüß@µ*$-- 	4
+0	 ---äÖüß@µ*$-- 	4
-18446744073709551615	-1	5
+18446744073709551615	-1	5
 Warnings:
 Warning	1292	Truncated incorrect INTEGER value: ''
 Warning	1292	Truncated incorrect INTEGER value: '<--------30 characters------->'
@@ -3037,10 +3042,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 73 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS SIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
-0		2
+0		2
 0	<--------30 characters------->	3
-0	 ---äÖüß@µ*$-- 	4
+0	 ---äÖüß@µ*$-- 	4
--1	-1	5
+-1	-1	5
 Warnings:
 Warning	1292	Truncated incorrect INTEGER value: ''
 Warning	1292	Truncated incorrect INTEGER value: '<--------30 characters------->'
@@ -3397,11 +3402,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 61 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DECIMAL(37,2))	my_binary_30	id
 NULL	NULL	1
-0.00		2
+0.00		2
 0.00	<--------30 characters------->	3
-0.00	 ---äÖüß@µ*$-- 	4
+0.00	 ---äÖüß@µ*$-- 	4
--1.00	-1	5
+-1.00	-1	5
--3333.33	-3333.3333	28
+-3333.33	-3333.3333	28
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: ''
@@ -3755,11 +3760,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 50 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS TIME)	my_binary_30	id
 NULL	NULL	1
-00:00:00		2
+00:00:00		2
 00:00:00	<--------30 characters------->	3
--00:00:00	 ---äÖüß@µ*$-- 	4
+-00:00:00	 ---äÖüß@µ*$-- 	4
-NULL	-1	5
+NULL	-1	5
-41:58:00	1 17:58	22
+41:58:00	1 17:58	22
 Warnings:
 Warning	1292	Truncated incorrect time value: ''
 Warning	1292	Truncated incorrect time value: '<--------30 characters------->'
@@ -4131,11 +4136,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 39 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DATETIME)	my_binary_30	id
 NULL	NULL	1
-NULL		2
+NULL		2
 NULL	<--------30 characters------->	3
-NULL	 ---äÖüß@µ*$-- 	4
+NULL	 ---äÖüß@µ*$-- 	4
-NULL	-1	5
+NULL	-1	5
-2005-06-27 17:58:00	2005-06-27 17:58	16
+2005-06-27 17:58:00	2005-06-27 17:58	16
 Warnings:
 Warning	1292	Incorrect datetime value: ''
 Warning	1292	Incorrect datetime value: '<--------30 characters------->'
@@ -4501,11 +4506,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 28 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DATE)	my_binary_30	id
 NULL	NULL	1
-NULL		2
+NULL		2
 NULL	<--------30 characters------->	3
-NULL	 ---äÖüß@µ*$-- 	4
+NULL	 ---äÖüß@µ*$-- 	4
-NULL	-1	5
+NULL	-1	5
-2005-06-27	2005-06-27	10
+2005-06-27	2005-06-27	10
 Warnings:
 Warning	1292	Incorrect datetime value: ''
 Warning	1292	Incorrect datetime value: '<--------30 characters------->'
@@ -4851,10 +4856,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 16 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS CHAR)	my_binary_30	id
 NULL	NULL	1
-		2
+		2
 <--------30 characters------->	<--------30 characters------->	3
- ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
+ ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
--1	-1	5
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset latin1) AS `CAST(my_binary_30 AS CHAR)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -5163,10 +5168,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 4 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS BINARY)	my_binary_30	id
 NULL	NULL	1
-		2
+		2
 <--------30 characters------->	<--------30 characters------->	3
- ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
+ ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
--1	-1	5
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset binary) AS `CAST(my_binary_30 AS BINARY)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci

mysql-test/suite/funcs_1/r/memory_storedproc.result

@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
 CREATE DATABASE db_storedproc;
 CREATE DATABASE db_storedproc_1;
 USE db_storedproc;
-create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1;
+engine = <engine_to_be_tested>;
-create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2;
+create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-create table t3(f1 char(20),f2 char(20),f3 integer) engine = memory;
+engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
-create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
+create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
 USE db_storedproc_1;
-create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
 USE db_storedproc;
-create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = memory;
+create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -34,8 +39,9 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = memory;
+create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -47,12 +53,14 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t9(f1 int, f2 char(25), f3 int) engine = memory;
+create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
-create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10;
+engine = <engine_to_be_tested>;
-create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
+create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
 
 Section 3.1.1 - Syntax checks for the CREATE PROCEDURE, CREATE
 FUNCTION, ALTER PROCEDURE, ALTER FUNCTION, DROP PROCEDURE, DROP FUNCTION, SHOW
@@ -14949,66 +14957,89 @@ USE db_storedproc;
 Testcase 4.3.1:
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp1;
-drop table IF EXISTS res_t3_itisalongname_1381742_itsaverylongname_1381742;
+DROP TABLE IF EXISTS res_t3_itisalongname_1381742_itsaverylongname_1381742;
 CREATE TABLE res_t3_itisalongname_1381742_itsaverylongname_1381742(
-middleinitial CHAR,
+middleinitial CHAR, lastname VARCHAR(50),
-lastname VARCHAR(50),
+age_averylongfieldname_averylongname_1234569 INT, COMMENT VARCHAR(100))
-age_averylongfieldname_averylongname_1234569 int,
+ENGINE=<engine_to_be_tested>;
-COMMENT TEXT) ENGINE=memory;
-ERROR 42000: The used table type doesn't support BLOB/TEXT columns
 INSERT INTO res_t3_itisalongname_1381742_itsaverylongname_1381742
 VALUES('a', 'aaaaaaaaaabbbbbbbbc', 0, 'default');
-ERROR 42S02: Table 'db_storedproc.res_t3_itisalongname_1381742_itsaverylongname_1381742' doesn't exist
+CREATE PROCEDURE sp1(a INT)
-CREATE PROCEDURE sp1(a int)
 BEGIN
-declare itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx char;
+DECLARE itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx CHAR;
-declare itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx varchar(100);
+DECLARE itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx VARCHAR(100);
-declare itisjustamediumsizeintintegervariablename integer;
+DECLARE itisjustamediumsizeintintegervariablename INTEGER;
-set itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx = 'b';
+SET itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx = 'b';
-set itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx = 'oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%';
+SET itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx
-set itisjustamediumsizeintintegervariablename = 5;
+= 'oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%';
-set @comment='a';
+SET itisjustamediumsizeintintegervariablename = 5;
-label1: loop
+SET @comment='a';
-if a>100 then
+label1: LOOP
-set @comment='value of a is greater than 100';
+IF a > 100 THEN
-elseif a<100 then
+SET @comment = 'value of a is greater than 100';
-if a<50 then
+ELSEIF a < 100 THEN
-set @comment='value of a is less than 50';
+IF a < 50 THEN
-elseif a<25 then
+SET @comment = 'value of a is less than 50';
-set @comment='value of a is less than 25';
+ELSEIF a < 25 THEN
-else
+SET @comment = 'value of a is less than 25';
-set @comment='value of a is greater than 50 and less than 100';
+ELSE
-END if;
+SET @comment = 'value of a is greater than 50 and less than 100';
-else
+END IF;
-set @comment='value of a is 100';
+ELSE
-END if;
+SET @comment = 'value of a is 100';
-if itisjustamediumsizeintintegervariablename = 0 then leave label1;
+END IF;
-END if;
+IF itisjustamediumsizeintintegervariablename = 0 THEN LEAVE label1;
-insert into res_t3_itisalongname_1381742_itsaverylongname_1381742
+END IF;
-values( itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx,
+INSERT INTO res_t3_itisalongname_1381742_itsaverylongname_1381742
-concat(itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx, '  ', a),
+VALUES(itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx,
-a, @comment );
+CONCAT(itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx,
-set itisjustamediumsizeintintegervariablename = itisjustamediumsizeintintegervariablename - 1;
+'  ', a), a, @comment);
-iterate label1;
+SET itisjustamediumsizeintintegervariablename
-END loop label1;
+= itisjustamediumsizeintintegervariablename - 1;
+ITERATE label1;
+END LOOP label1;
 END//
 CALL sp1(101);
-ERROR 42S02: Table 'db_storedproc.res_t3_itisalongname_1381742_itsaverylongname_1381742' doesn't exist
 CALL sp1(100);
-ERROR 42S02: Table 'db_storedproc.res_t3_itisalongname_1381742_itsaverylongname_1381742' doesn't exist
 CALL sp1(75);
-ERROR 42S02: Table 'db_storedproc.res_t3_itisalongname_1381742_itsaverylongname_1381742' doesn't exist
 CALL sp1(40);
-ERROR 42S02: Table 'db_storedproc.res_t3_itisalongname_1381742_itsaverylongname_1381742' doesn't exist
 CALL sp1(20);
-ERROR 42S02: Table 'db_storedproc.res_t3_itisalongname_1381742_itsaverylongname_1381742' doesn't exist
 CALL sp1(-1);
-ERROR 42S02: Table 'db_storedproc.res_t3_itisalongname_1381742_itsaverylongname_1381742' doesn't exist
 SELECT * from res_t3_itisalongname_1381742_itsaverylongname_1381742
 ORDER BY middleinitial, lastname, age_averylongfieldname_averylongname_1234569;
-ERROR 42S02: Table 'db_storedproc.res_t3_itisalongname_1381742_itsaverylongname_1381742' doesn't exist
+middleinitial	lastname	age_averylongfieldname_averylongname_1234569	COMMENT
+a	aaaaaaaaaabbbbbbbbc	0	default
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  -1	-1	value of a is less than 50
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  -1	-1	value of a is less than 50
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  -1	-1	value of a is less than 50
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  -1	-1	value of a is less than 50
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  -1	-1	value of a is less than 50
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  100	100	value of a is 100
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  100	100	value of a is 100
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  100	100	value of a is 100
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  100	100	value of a is 100
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  100	100	value of a is 100
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  101	101	value of a is greater than 100
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  101	101	value of a is greater than 100
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  101	101	value of a is greater than 100
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  101	101	value of a is greater than 100
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  101	101	value of a is greater than 100
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  20	20	value of a is less than 50
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  20	20	value of a is less than 50
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  20	20	value of a is less than 50
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  20	20	value of a is less than 50
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  20	20	value of a is less than 50
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  40	40	value of a is less than 50
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  40	40	value of a is less than 50
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  40	40	value of a is less than 50
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  40	40	value of a is less than 50
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  40	40	value of a is less than 50
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  75	75	value of a is greater than 50 and less than 100
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  75	75	value of a is greater than 50 and less than 100
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  75	75	value of a is greater than 50 and less than 100
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  75	75	value of a is greater than 50 and less than 100
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  75	75	value of a is greater than 50 and less than 100
 drop table res_t3_itisalongname_1381742_itsaverylongname_1381742;
-ERROR 42S02: Unknown table 'res_t3_itisalongname_1381742_itsaverylongname_1381742'
 DROP PROCEDURE sp1;
 
 Testcase 4.3.2:

mysql-test/suite/funcs_1/r/memory_storedproc_02.result

@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
 CREATE DATABASE db_storedproc;
 CREATE DATABASE db_storedproc_1;
 USE db_storedproc;
-create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1;
+engine = <engine_to_be_tested>;
-create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2;
+create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-create table t3(f1 char(20),f2 char(20),f3 integer) engine = memory;
+engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
-create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
+create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
 USE db_storedproc_1;
-create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
 USE db_storedproc;
-create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = memory;
+create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -34,8 +39,9 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = memory;
+create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -47,12 +53,14 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t9(f1 int, f2 char(25), f3 int) engine = memory;
+create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
-create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10;
+engine = <engine_to_be_tested>;
-create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
+create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
 
 Section 3.1.2 - Syntax checks for the stored procedure-specific
 programming statements BEGIN/END, DECLARE, SET, SELECT/INTO, OPEN, FETCH, CLOSE:
@@ -698,7 +706,7 @@ Testcase 3.1.2.54:
 ------------------
 
 Ensure that a handler with a condition defined with an SQLSTATE that begins with
-<EFBFBD>01<EFBFBD> is always exactly equivalent in action to a handler with an SQLWARNING
+“01“ is always exactly equivalent in action to a handler with an SQLWARNING
 condition.
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp0;
@@ -797,7 +805,7 @@ Testcase 3.1.2.56:
 ------------------
 
 Ensure that a handler with a condition defined with an SQLSTATE that begins with
-<EFBFBD>02<EFBFBD> is always exactly equivalent in action to a handler with a NOT FOUND
+“02“ is always exactly equivalent in action to a handler with a NOT FOUND
 condition.
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp0;
@@ -905,7 +913,7 @@ Testcase 3.1.2.58:
 ------------------
 
 Ensure that a handler with a condition defined with an SQLSTATE that begins with
-anything other that <EFBFBD>01<EFBFBD> or <EFBFBD>02<EFBFBD> is always exactly equivalent in action to a
+anything other that “01“ or “02“ is always exactly equivalent in action to a
 handler with an SQLEXCEPTION condition.
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp0;

mysql-test/suite/funcs_1/r/memory_storedproc_03.result

@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
 CREATE DATABASE db_storedproc;
 CREATE DATABASE db_storedproc_1;
 USE db_storedproc;
-create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1;
+engine = <engine_to_be_tested>;
-create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2;
+create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-create table t3(f1 char(20),f2 char(20),f3 integer) engine = memory;
+engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
-create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
+create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
 USE db_storedproc_1;
-create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
 USE db_storedproc;
-create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = memory;
+create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -34,8 +39,9 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = memory;
+create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -47,12 +53,14 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t9(f1 int, f2 char(25), f3 int) engine = memory;
+create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
-create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10;
+engine = <engine_to_be_tested>;
-create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
+create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
 
 Section 3.1.3 - Syntax checks for the stored procedure-specific flow
 control statements IF, CASE, LOOP, LEAVE, ITERATE, REPEAT, WHILE:

mysql-test/suite/funcs_1/r/memory_storedproc_06.result

@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
 CREATE DATABASE db_storedproc;
 CREATE DATABASE db_storedproc_1;
 USE db_storedproc;
-create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1;
+engine = <engine_to_be_tested>;
-create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2;
+create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-create table t3(f1 char(20),f2 char(20),f3 integer) engine = memory;
+engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
-create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
+create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
 USE db_storedproc_1;
-create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
 USE db_storedproc;
-create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = memory;
+create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -34,8 +39,9 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = memory;
+create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -47,12 +53,14 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t9(f1 int, f2 char(25), f3 int) engine = memory;
+create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
-create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10;
+engine = <engine_to_be_tested>;
-create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
+create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
 
 Section 3.1.6 - Privilege Checks:
 --------------------------------------------------------------------------------

mysql-test/suite/funcs_1/r/memory_storedproc_07.result

@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
 CREATE DATABASE db_storedproc;
 CREATE DATABASE db_storedproc_1;
 USE db_storedproc;
-create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1;
+engine = <engine_to_be_tested>;
-create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2;
+create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-create table t3(f1 char(20),f2 char(20),f3 integer) engine = memory;
+engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
-create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
+create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
 USE db_storedproc_1;
-create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
 USE db_storedproc;
-create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = memory;
+create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -34,8 +39,9 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = memory;
+create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -47,12 +53,14 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t9(f1 int, f2 char(25), f3 int) engine = memory;
+create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
-create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10;
+engine = <engine_to_be_tested>;
-create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
+create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
 
 Section 3.1.7 - SQL mode checks:
 --------------------------------------------------------------------------------

mysql-test/suite/funcs_1/r/memory_storedproc_08.result

@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
 CREATE DATABASE db_storedproc;
 CREATE DATABASE db_storedproc_1;
 USE db_storedproc;
-create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1;
+engine = <engine_to_be_tested>;
-create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2;
+create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-create table t3(f1 char(20),f2 char(20),f3 integer) engine = memory;
+engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
-create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
+create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
 USE db_storedproc_1;
-create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
 USE db_storedproc;
-create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = memory;
+create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -34,8 +39,9 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = memory;
+create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -47,12 +53,14 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t9(f1 int, f2 char(25), f3 int) engine = memory;
+create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
-create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10;
+engine = <engine_to_be_tested>;
-create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
+create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
 
 Section 3.1.8 - SHOW statement checks:
 --------------------------------------------------------------------------------

mysql-test/suite/funcs_1/r/memory_storedproc_10.result

@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
 CREATE DATABASE db_storedproc;
 CREATE DATABASE db_storedproc_1;
 USE db_storedproc;
-create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1;
+engine = <engine_to_be_tested>;
-create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2;
+create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-create table t3(f1 char(20),f2 char(20),f3 integer) engine = memory;
+engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
-create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
+create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
 USE db_storedproc_1;
-create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
 USE db_storedproc;
-create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = memory;
+create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -34,8 +39,9 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = memory;
+create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -47,12 +53,14 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t9(f1 int, f2 char(25), f3 int) engine = memory;
+create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
-create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10;
+engine = <engine_to_be_tested>;
-create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
+create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
 
 Section 3.1.10 - CALL checks:
 --------------------------------------------------------------------------------

mysql-test/suite/funcs_1/r/memory_trig_0102.result

@@ -58,7 +58,8 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb3.txt' into table tb3 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb3.txt'
+into table tb3;
 
 Testcase: 3.5.1.1:
 ------------------

mysql-test/suite/funcs_1/r/memory_trig_03.result

@@ -58,7 +58,8 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb3.txt' into table tb3 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb3.txt'
+into table tb3;
 
 Testcase 3.5.3:
 ---------------
@@ -97,7 +98,7 @@ test_noprivs@localhost
 use priv_db;
 create trigger trg1_1 before INSERT on t1 for each row
 set new.f1 = 'trig 3.5.3.2_1-no';
-Got one of the listed errors
+ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1'
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.2-no');
 select f1 from t1 order by f1;
@@ -129,7 +130,7 @@ Testcase 3.5.3.6:
 -----------------
 use priv_db;
 drop trigger trg1_2;
-Got one of the listed errors
+ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1'
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.6-yes');
 select f1 from t1 order by f1;

mysql-test/suite/funcs_1/r/memory_trig_03e.result

@@ -1214,7 +1214,7 @@ create definer=not_ex_user@localhost trigger trg1_0
 before INSERT on t1 for each row
 set new.f1 = 'trig 1_0-yes';
 Warnings:
-Note	1449	There is no 'not_ex_user'@'localhost' registered
+Note	1449	The user specified as a definer ('not_ex_user'@'localhost') does not exist
 drop trigger trg1_0;
 create definer=test_yesprivs@localhost trigger trg1_0
 before INSERT on t1 for each row

mysql-test/suite/funcs_1/r/memory_trig_0407.result

@@ -58,7 +58,8 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb3.txt' into table tb3 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb3.txt'
+into table tb3;
 
 Testcase: 3.5:
 --------------

mysql-test/suite/funcs_1/r/memory_trig_08.result

@@ -58,7 +58,8 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb3.txt' into table tb3 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb3.txt'
+into table tb3;
 
 Testcase: 3.5:
 --------------

mysql-test/suite/funcs_1/r/memory_trig_09.result

@@ -58,7 +58,8 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb3.txt' into table tb3 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb3.txt'
+into table tb3;
 
 Testcase 3.5.9.1/2:
 -------------------
@@ -235,6 +236,7 @@ ERROR HY000: There is no NEW row in on DELETE trigger
 create trigger trg5b after DELETE on tb3 for each row
 set new.f122='test';
 ERROR HY000: There is no NEW row in on DELETE trigger
+drop trigger trg5a;
 drop trigger trg5b;
 
 Testcase 3.5.9.10: (implied in previous tests)

mysql-test/suite/funcs_1/r/memory_trig_1011ext.result

@@ -58,7 +58,8 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb3.txt' into table tb3 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb3.txt'
+into table tb3;
 
 Testcase 3.5.10.1/2/3:
 ----------------------
@@ -135,7 +136,7 @@ set @counter= 0;
 select @counter as 'Rows Loaded Before';
 Rows Loaded Before
 0
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table tb_load;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table tb_load;
 select @counter as 'Rows Loaded After';
 Rows Loaded After
 10

mysql-test/suite/funcs_1/r/memory_views.result

@@ -53,7 +53,8 @@ f107 year(4) not null default 2000,
 f108 enum("1enum","2enum") not null default "1enum",
 f109 set("1set","2set") not null default "1set"
 ) engine = memory;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb2.txt' into table tb2 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb2.txt'
+into table tb2 ;
 DROP DATABASE IF EXISTS test1;
 CREATE DATABASE test1;
 USE test1;
@@ -111,7 +112,8 @@ f107 year(4) not null default 2000,
 f108 enum("1enum","2enum") not null default "1enum",
 f109 set("1set","2set") not null default "1set"
 ) engine = memory;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb2.txt' into table tb2 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb2.txt'
+into table tb2 ;
 USE test;
 
 ! Attention: The file with the expected results is not

mysql-test/suite/funcs_1/r/myisam_func_view.result

@@ -202,9 +202,10 @@ SET @my_select = 'SELECT LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values';
 SET @my_select = 'SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values';
-SELECT 'äÄ@' INTO OUTFILE '../tmp/func_view.dat';
 SET @my_select =
-'SELECT LOAD_FILE(''../tmp/func_view.dat''), id FROM t1_values';
+'SELECT LOAD_FILE(''<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt'')
+           AS my_col,
+        id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_char_30),
 my_char_30, id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_varchar_1000),
@@ -810,36 +811,40 @@ WHERE select_id = 157 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values;
+CREATE VIEW v1 AS SELECT LOAD_FILE('<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt')
-SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values
+           AS my_col,
+        id FROM t1_values;
+SELECT LOAD_FILE('<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt')
+           AS my_col,
+        id FROM t1_values
 WHERE select_id = 156 OR select_id IS NULL order by id;
-LOAD_FILE('../tmp/func_view.dat')	id
+my_col	id
-äÄ@
+Here is content from load_file
 	1
-äÄ@
+Here is content from load_file
 	2
-äÄ@
+Here is content from load_file
 	3
-äÄ@
+Here is content from load_file
 	4
-äÄ@
+Here is content from load_file
 	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file('../tmp/func_view.dat') AS `LOAD_FILE('../tmp/func_view.dat')`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file('<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt') AS `my_col`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 156 OR select_id IS NULL) order by id;
-LOAD_FILE('../tmp/func_view.dat')	id
+my_col	id
-äÄ@
+Here is content from load_file
 	1
-äÄ@
+Here is content from load_file
 	2
-äÄ@
+Here is content from load_file
 	3
-äÄ@
+Here is content from load_file
 	4
-äÄ@
+Here is content from load_file
 	5
 DROP VIEW v1;
 
@@ -1013,10 +1018,10 @@ SELECT LEFT(my_binary_30, 2), my_binary_30, id FROM t1_values
 WHERE select_id = 147 OR select_id IS NULL order by id;
 LEFT(my_binary_30, 2)	my_binary_30	id
 NULL	NULL	1
-		2
+		2
 <-	<--------30 characters------->	3
- -	 ---äÖüß@µ*$-- 	4
+ -	 ---äÖüß@µ*$-- 	4
--1	-1	5
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_binary_30`,2) AS `LEFT(my_binary_30, 2)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -1141,10 +1146,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 141 OR select_id IS NULL order by id;
 BIT_LENGTH(my_binary_30)	my_binary_30	id
 NULL	NULL	1
-240		2
+240		2
 240	<--------30 characters------->	3
-240	 ---äÖüß@µ*$-- 	4
+240	 ---äÖüß@µ*$-- 	4
-240	-1	5
+240	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_binary_30`) AS `BIT_LENGTH(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -1453,10 +1458,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 129 OR select_id IS NULL order by id;
 IFNULL(my_binary_30,'IS_NULL')	my_binary_30	id
 IS_NULL	NULL	1
-		2
+		2
 <--------30 characters------->	<--------30 characters------->	3
- ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
+ ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
--1	-1	5
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_binary_30`,'IS_NULL') AS `IFNULL(my_binary_30,'IS_NULL')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -1793,10 +1798,10 @@ WHERE select_id = 117 OR select_id IS NULL order by id;
 IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_binary_30	id
 IS     NULL	NULL	1
-IS NOT NULL		2
+IS NOT NULL		2
 IS NOT NULL	<--------30 characters------->	3
-IS NOT NULL	 ---äÖüß@µ*$-- 	4
+IS NOT NULL	 ---äÖüß@µ*$-- 	4
-IS NOT NULL	-1	5
+IS NOT NULL	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(isnull(`t1_values`.`my_binary_30`),'IS     NULL','IS NOT NULL') AS `IF(my_binary_30 IS NULL, 'IS     NULL',
@@ -2113,10 +2118,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 105 OR select_id IS NULL order by id;
 IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')	my_binary_30	id
 IS NOT TRUE	NULL	1
-IS NOT TRUE		2
+IS NOT TRUE		2
 IS NOT TRUE	<--------30 characters------->	3
-IS NOT TRUE	 ---äÖüß@µ*$-- 	4
+IS NOT TRUE	 ---äÖüß@µ*$-- 	4
-IS     TRUE	-1	5
+IS     TRUE	-1	5
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: ''
 Warning	1292	Truncated incorrect DOUBLE value: '<--------30 characters------->'
@@ -2233,10 +2238,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 101 OR select_id IS NULL order by id;
 CONVERT(my_binary_30 USING koi8r)	my_binary_30	id
 NULL	NULL	1
-		2
+		2
 <--------30 characters------->	<--------30 characters------->	3
- ---???????<3F>@??*$-- 	 ---äÖüß@µ*$-- 	4
+ ---???????<3F>@??*$-- 	 ---äÖüß@µ*$-- 	4
--1	-1	5
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using koi8r) AS `CONVERT(my_binary_30 USING koi8r)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -2337,10 +2342,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 97 OR select_id IS NULL order by id;
 CONVERT(my_binary_30 USING utf8)	my_binary_30	id
 NULL	NULL	1
-		2
+		2
 <--------30 characters------->	<--------30 characters------->	3
- ---<2D><><EFBFBD><EFBFBD>@<40>*$-- 	 ---äÖüß@µ*$-- 	4
+ ---<2D><><EFBFBD><EFBFBD>@<40>*$-- 	 ---äÖüß@µ*$-- 	4
--1	-1	5
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using utf8) AS `CONVERT(my_binary_30 USING utf8)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -2673,10 +2678,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 85 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS UNSIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
-0		2
+0		2
 0	<--------30 characters------->	3
-0	 ---äÖüß@µ*$-- 	4
+0	 ---äÖüß@µ*$-- 	4
-18446744073709551615	-1	5
+18446744073709551615	-1	5
 Warnings:
 Warning	1292	Truncated incorrect INTEGER value: ''
 Warning	1292	Truncated incorrect INTEGER value: '<--------30 characters------->'
@@ -3037,10 +3042,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 73 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS SIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
-0		2
+0		2
 0	<--------30 characters------->	3
-0	 ---äÖüß@µ*$-- 	4
+0	 ---äÖüß@µ*$-- 	4
--1	-1	5
+-1	-1	5
 Warnings:
 Warning	1292	Truncated incorrect INTEGER value: ''
 Warning	1292	Truncated incorrect INTEGER value: '<--------30 characters------->'
@@ -3397,11 +3402,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 61 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DECIMAL(37,2))	my_binary_30	id
 NULL	NULL	1
-0.00		2
+0.00		2
 0.00	<--------30 characters------->	3
-0.00	 ---äÖüß@µ*$-- 	4
+0.00	 ---äÖüß@µ*$-- 	4
--1.00	-1	5
+-1.00	-1	5
--3333.33	-3333.3333	28
+-3333.33	-3333.3333	28
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: ''
@@ -3755,11 +3760,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 50 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS TIME)	my_binary_30	id
 NULL	NULL	1
-00:00:00		2
+00:00:00		2
 00:00:00	<--------30 characters------->	3
--00:00:00	 ---äÖüß@µ*$-- 	4
+-00:00:00	 ---äÖüß@µ*$-- 	4
-NULL	-1	5
+NULL	-1	5
-41:58:00	1 17:58	22
+41:58:00	1 17:58	22
 Warnings:
 Warning	1292	Truncated incorrect time value: ''
 Warning	1292	Truncated incorrect time value: '<--------30 characters------->'
@@ -4131,11 +4136,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 39 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DATETIME)	my_binary_30	id
 NULL	NULL	1
-NULL		2
+NULL		2
 NULL	<--------30 characters------->	3
-NULL	 ---äÖüß@µ*$-- 	4
+NULL	 ---äÖüß@µ*$-- 	4
-NULL	-1	5
+NULL	-1	5
-2005-06-27 17:58:00	2005-06-27 17:58	16
+2005-06-27 17:58:00	2005-06-27 17:58	16
 Warnings:
 Warning	1292	Incorrect datetime value: ''
 Warning	1292	Incorrect datetime value: '<--------30 characters------->'
@@ -4501,11 +4506,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 28 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DATE)	my_binary_30	id
 NULL	NULL	1
-NULL		2
+NULL		2
 NULL	<--------30 characters------->	3
-NULL	 ---äÖüß@µ*$-- 	4
+NULL	 ---äÖüß@µ*$-- 	4
-NULL	-1	5
+NULL	-1	5
-2005-06-27	2005-06-27	10
+2005-06-27	2005-06-27	10
 Warnings:
 Warning	1292	Incorrect datetime value: ''
 Warning	1292	Incorrect datetime value: '<--------30 characters------->'
@@ -4851,10 +4856,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 16 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS CHAR)	my_binary_30	id
 NULL	NULL	1
-		2
+		2
 <--------30 characters------->	<--------30 characters------->	3
- ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
+ ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
--1	-1	5
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset latin1) AS `CAST(my_binary_30 AS CHAR)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -5163,10 +5168,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 4 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS BINARY)	my_binary_30	id
 NULL	NULL	1
-		2
+		2
 <--------30 characters------->	<--------30 characters------->	3
- ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
+ ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
--1	-1	5
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset binary) AS `CAST(my_binary_30 AS BINARY)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci

mysql-test/suite/funcs_1/r/myisam_storedproc.result

@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
 CREATE DATABASE db_storedproc;
 CREATE DATABASE db_storedproc_1;
 USE db_storedproc;
-create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1;
+engine = <engine_to_be_tested>;
-create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2;
+create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-create table t3(f1 char(20),f2 char(20),f3 integer) engine = myisam;
+engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
-create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
+create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
 USE db_storedproc_1;
-create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
 USE db_storedproc;
-create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = myisam;
+create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -34,8 +39,9 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = myisam;
+create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -47,12 +53,14 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t9(f1 int, f2 char(25), f3 int) engine = myisam;
+create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
-create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10;
+engine = <engine_to_be_tested>;
-create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
+create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
 
 Section 3.1.1 - Syntax checks for the CREATE PROCEDURE, CREATE
 FUNCTION, ALTER PROCEDURE, ALTER FUNCTION, DROP PROCEDURE, DROP FUNCTION, SHOW
@@ -14949,46 +14957,47 @@ USE db_storedproc;
 Testcase 4.3.1:
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp1;
-drop table IF EXISTS res_t3_itisalongname_1381742_itsaverylongname_1381742;
+DROP TABLE IF EXISTS res_t3_itisalongname_1381742_itsaverylongname_1381742;
 CREATE TABLE res_t3_itisalongname_1381742_itsaverylongname_1381742(
-middleinitial CHAR,
+middleinitial CHAR, lastname VARCHAR(50),
-lastname VARCHAR(50),
+age_averylongfieldname_averylongname_1234569 INT, COMMENT VARCHAR(100))
-age_averylongfieldname_averylongname_1234569 int,
+ENGINE=<engine_to_be_tested>;
-COMMENT TEXT) ENGINE=myisam;
 INSERT INTO res_t3_itisalongname_1381742_itsaverylongname_1381742
 VALUES('a', 'aaaaaaaaaabbbbbbbbc', 0, 'default');
-CREATE PROCEDURE sp1(a int)
+CREATE PROCEDURE sp1(a INT)
 BEGIN
-declare itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx char;
+DECLARE itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx CHAR;
-declare itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx varchar(100);
+DECLARE itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx VARCHAR(100);
-declare itisjustamediumsizeintintegervariablename integer;
+DECLARE itisjustamediumsizeintintegervariablename INTEGER;
-set itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx = 'b';
+SET itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx = 'b';
-set itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx = 'oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%';
+SET itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx
-set itisjustamediumsizeintintegervariablename = 5;
+= 'oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%';
-set @comment='a';
+SET itisjustamediumsizeintintegervariablename = 5;
-label1: loop
+SET @comment='a';
-if a>100 then
+label1: LOOP
-set @comment='value of a is greater than 100';
+IF a > 100 THEN
-elseif a<100 then
+SET @comment = 'value of a is greater than 100';
-if a<50 then
+ELSEIF a < 100 THEN
-set @comment='value of a is less than 50';
+IF a < 50 THEN
-elseif a<25 then
+SET @comment = 'value of a is less than 50';
-set @comment='value of a is less than 25';
+ELSEIF a < 25 THEN
-else
+SET @comment = 'value of a is less than 25';
-set @comment='value of a is greater than 50 and less than 100';
+ELSE
-END if;
+SET @comment = 'value of a is greater than 50 and less than 100';
-else
+END IF;
-set @comment='value of a is 100';
+ELSE
-END if;
+SET @comment = 'value of a is 100';
-if itisjustamediumsizeintintegervariablename = 0 then leave label1;
+END IF;
-END if;
+IF itisjustamediumsizeintintegervariablename = 0 THEN LEAVE label1;
-insert into res_t3_itisalongname_1381742_itsaverylongname_1381742
+END IF;
-values( itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx,
+INSERT INTO res_t3_itisalongname_1381742_itsaverylongname_1381742
-concat(itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx, '  ', a),
+VALUES(itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx,
-a, @comment );
+CONCAT(itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx,
-set itisjustamediumsizeintintegervariablename = itisjustamediumsizeintintegervariablename - 1;
+'  ', a), a, @comment);
-iterate label1;
+SET itisjustamediumsizeintintegervariablename
-END loop label1;
+= itisjustamediumsizeintintegervariablename - 1;
+ITERATE label1;
+END LOOP label1;
 END//
 CALL sp1(101);
 CALL sp1(100);

mysql-test/suite/funcs_1/r/myisam_storedproc_02.result

@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
 CREATE DATABASE db_storedproc;
 CREATE DATABASE db_storedproc_1;
 USE db_storedproc;
-create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1;
+engine = <engine_to_be_tested>;
-create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2;
+create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-create table t3(f1 char(20),f2 char(20),f3 integer) engine = myisam;
+engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
-create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
+create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
 USE db_storedproc_1;
-create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
 USE db_storedproc;
-create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = myisam;
+create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -34,8 +39,9 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = myisam;
+create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -47,12 +53,14 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t9(f1 int, f2 char(25), f3 int) engine = myisam;
+create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
-create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10;
+engine = <engine_to_be_tested>;
-create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
+create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
 
 Section 3.1.2 - Syntax checks for the stored procedure-specific
 programming statements BEGIN/END, DECLARE, SET, SELECT/INTO, OPEN, FETCH, CLOSE:
@@ -698,7 +706,7 @@ Testcase 3.1.2.54:
 ------------------
 
 Ensure that a handler with a condition defined with an SQLSTATE that begins with
-<EFBFBD>01<EFBFBD> is always exactly equivalent in action to a handler with an SQLWARNING
+“01“ is always exactly equivalent in action to a handler with an SQLWARNING
 condition.
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp0;
@@ -797,7 +805,7 @@ Testcase 3.1.2.56:
 ------------------
 
 Ensure that a handler with a condition defined with an SQLSTATE that begins with
-<EFBFBD>02<EFBFBD> is always exactly equivalent in action to a handler with a NOT FOUND
+“02“ is always exactly equivalent in action to a handler with a NOT FOUND
 condition.
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp0;
@@ -905,7 +913,7 @@ Testcase 3.1.2.58:
 ------------------
 
 Ensure that a handler with a condition defined with an SQLSTATE that begins with
-anything other that <EFBFBD>01<EFBFBD> or <EFBFBD>02<EFBFBD> is always exactly equivalent in action to a
+anything other that “01“ or “02“ is always exactly equivalent in action to a
 handler with an SQLEXCEPTION condition.
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp0;

mysql-test/suite/funcs_1/r/myisam_storedproc_03.result

@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
 CREATE DATABASE db_storedproc;
 CREATE DATABASE db_storedproc_1;
 USE db_storedproc;
-create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1;
+engine = <engine_to_be_tested>;
-create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2;
+create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-create table t3(f1 char(20),f2 char(20),f3 integer) engine = myisam;
+engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
-create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
+create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
 USE db_storedproc_1;
-create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
 USE db_storedproc;
-create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = myisam;
+create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -34,8 +39,9 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = myisam;
+create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -47,12 +53,14 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t9(f1 int, f2 char(25), f3 int) engine = myisam;
+create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
-create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10;
+engine = <engine_to_be_tested>;
-create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
+create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
 
 Section 3.1.3 - Syntax checks for the stored procedure-specific flow
 control statements IF, CASE, LOOP, LEAVE, ITERATE, REPEAT, WHILE:

mysql-test/suite/funcs_1/r/myisam_storedproc_06.result

@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
 CREATE DATABASE db_storedproc;
 CREATE DATABASE db_storedproc_1;
 USE db_storedproc;
-create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1;
+engine = <engine_to_be_tested>;
-create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2;
+create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-create table t3(f1 char(20),f2 char(20),f3 integer) engine = myisam;
+engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
-create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
+create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
 USE db_storedproc_1;
-create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
 USE db_storedproc;
-create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = myisam;
+create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -34,8 +39,9 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = myisam;
+create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -47,12 +53,14 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t9(f1 int, f2 char(25), f3 int) engine = myisam;
+create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
-create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10;
+engine = <engine_to_be_tested>;
-create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
+create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
 
 Section 3.1.6 - Privilege Checks:
 --------------------------------------------------------------------------------

mysql-test/suite/funcs_1/r/myisam_storedproc_07.result

@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
 CREATE DATABASE db_storedproc;
 CREATE DATABASE db_storedproc_1;
 USE db_storedproc;
-create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1;
+engine = <engine_to_be_tested>;
-create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2;
+create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-create table t3(f1 char(20),f2 char(20),f3 integer) engine = myisam;
+engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
-create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
+create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
 USE db_storedproc_1;
-create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
 USE db_storedproc;
-create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = myisam;
+create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -34,8 +39,9 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = myisam;
+create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -47,12 +53,14 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t9(f1 int, f2 char(25), f3 int) engine = myisam;
+create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
-create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10;
+engine = <engine_to_be_tested>;
-create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
+create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
 
 Section 3.1.7 - SQL mode checks:
 --------------------------------------------------------------------------------

mysql-test/suite/funcs_1/r/myisam_storedproc_08.result

@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
 CREATE DATABASE db_storedproc;
 CREATE DATABASE db_storedproc_1;
 USE db_storedproc;
-create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1;
+engine = <engine_to_be_tested>;
-create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2;
+create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-create table t3(f1 char(20),f2 char(20),f3 integer) engine = myisam;
+engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
-create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
+create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
 USE db_storedproc_1;
-create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
 USE db_storedproc;
-create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = myisam;
+create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -34,8 +39,9 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = myisam;
+create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -47,12 +53,14 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t9(f1 int, f2 char(25), f3 int) engine = myisam;
+create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
-create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10;
+engine = <engine_to_be_tested>;
-create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
+create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
 
 Section 3.1.8 - SHOW statement checks:
 --------------------------------------------------------------------------------

mysql-test/suite/funcs_1/r/myisam_storedproc_10.result

@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
 CREATE DATABASE db_storedproc;
 CREATE DATABASE db_storedproc_1;
 USE db_storedproc;
-create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1;
+engine = <engine_to_be_tested>;
-create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2;
+create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-create table t3(f1 char(20),f2 char(20),f3 integer) engine = myisam;
+engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
-create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
+create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
 USE db_storedproc_1;
-create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
 USE db_storedproc;
-create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = myisam;
+create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -34,8 +39,9 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = myisam;
+create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -47,12 +53,14 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t9(f1 int, f2 char(25), f3 int) engine = myisam;
+create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
-create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10;
+engine = <engine_to_be_tested>;
-create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
+create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
 
 Section 3.1.10 - CALL checks:
 --------------------------------------------------------------------------------

mysql-test/suite/funcs_1/r/myisam_trig_0102.result

@@ -64,7 +64,8 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb3.txt' into table tb3 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb3.txt'
+into table tb3;
 
 Testcase: 3.5.1.1:
 ------------------

mysql-test/suite/funcs_1/r/myisam_trig_03.result

@@ -64,7 +64,8 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb3.txt' into table tb3 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb3.txt'
+into table tb3;
 
 Testcase 3.5.3:
 ---------------
@@ -103,7 +104,7 @@ test_noprivs@localhost
 use priv_db;
 create trigger trg1_1 before INSERT on t1 for each row
 set new.f1 = 'trig 3.5.3.2_1-no';
-Got one of the listed errors
+ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1'
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.2-no');
 select f1 from t1 order by f1;
@@ -135,7 +136,7 @@ Testcase 3.5.3.6:
 -----------------
 use priv_db;
 drop trigger trg1_2;
-Got one of the listed errors
+ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1'
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.6-yes');
 select f1 from t1 order by f1;

mysql-test/suite/funcs_1/r/myisam_trig_03e.result

@@ -1214,7 +1214,7 @@ create definer=not_ex_user@localhost trigger trg1_0
 before INSERT on t1 for each row
 set new.f1 = 'trig 1_0-yes';
 Warnings:
-Note	1449	There is no 'not_ex_user'@'localhost' registered
+Note	1449	The user specified as a definer ('not_ex_user'@'localhost') does not exist
 drop trigger trg1_0;
 create definer=test_yesprivs@localhost trigger trg1_0
 before INSERT on t1 for each row

mysql-test/suite/funcs_1/r/myisam_trig_0407.result

@@ -64,7 +64,8 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb3.txt' into table tb3 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb3.txt'
+into table tb3;
 
 Testcase: 3.5:
 --------------

mysql-test/suite/funcs_1/r/myisam_trig_08.result

@@ -64,7 +64,8 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb3.txt' into table tb3 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb3.txt'
+into table tb3;
 
 Testcase: 3.5:
 --------------

mysql-test/suite/funcs_1/r/myisam_trig_09.result

@@ -64,7 +64,8 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb3.txt' into table tb3 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb3.txt'
+into table tb3;
 
 Testcase 3.5.9.1/2:
 -------------------
@@ -241,6 +242,7 @@ ERROR HY000: There is no NEW row in on DELETE trigger
 create trigger trg5b after DELETE on tb3 for each row
 set new.f122='test';
 ERROR HY000: There is no NEW row in on DELETE trigger
+drop trigger trg5a;
 drop trigger trg5b;
 
 Testcase 3.5.9.10: (implied in previous tests)

mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result

@@ -64,7 +64,8 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb3.txt' into table tb3 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb3.txt'
+into table tb3;
 
 Testcase 3.5.10.1/2/3:
 ----------------------
@@ -141,7 +142,7 @@ set @counter= 0;
 select @counter as 'Rows Loaded Before';
 Rows Loaded Before
 0
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table tb_load;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table tb_load;
 select @counter as 'Rows Loaded After';
 Rows Loaded After
 10

mysql-test/suite/funcs_1/r/myisam_views.result

@@ -61,7 +61,8 @@ f115 VARBINARY(27) null ,
 f116 VARBINARY(64) null,
 f117 VARBINARY(192) null
 ) engine = myisam;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb2.txt' into table tb2 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb2.txt'
+into table tb2;
 DROP DATABASE IF EXISTS test1;
 CREATE DATABASE test1;
 USE test1;
@@ -127,7 +128,8 @@ f115 VARBINARY(27) null ,
 f116 VARBINARY(64) null,
 f117 VARBINARY(192) null
 ) engine = myisam;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb2.txt' into table tb2 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb2.txt'
+into table tb2;
 USE test;
 
 Attention: The nesting level @max_level in Testcase 3.3.1.A6

mysql-test/suite/funcs_1/r/ndb_func_view.result

@@ -202,9 +202,10 @@ SET @my_select = 'SELECT LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values';
 SET @my_select = 'SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values';
-SELECT 'äÄ@' INTO OUTFILE '../tmp/func_view.dat';
 SET @my_select =
-'SELECT LOAD_FILE(''../tmp/func_view.dat''), id FROM t1_values';
+'SELECT LOAD_FILE(''<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt'')
+           AS my_col,
+        id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_char_30),
 my_char_30, id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_varchar_1000),
@@ -810,36 +811,40 @@ WHERE select_id = 157 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values;
+CREATE VIEW v1 AS SELECT LOAD_FILE('<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt')
-SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values
+           AS my_col,
+        id FROM t1_values;
+SELECT LOAD_FILE('<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt')
+           AS my_col,
+        id FROM t1_values
 WHERE select_id = 156 OR select_id IS NULL order by id;
-LOAD_FILE('../tmp/func_view.dat')	id
+my_col	id
-äÄ@
+Here is content from load_file
 	1
-äÄ@
+Here is content from load_file
 	2
-äÄ@
+Here is content from load_file
 	3
-äÄ@
+Here is content from load_file
 	4
-äÄ@
+Here is content from load_file
 	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file('../tmp/func_view.dat') AS `LOAD_FILE('../tmp/func_view.dat')`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file('<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt') AS `my_col`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 156 OR select_id IS NULL) order by id;
-LOAD_FILE('../tmp/func_view.dat')	id
+my_col	id
-äÄ@
+Here is content from load_file
 	1
-äÄ@
+Here is content from load_file
 	2
-äÄ@
+Here is content from load_file
 	3
-äÄ@
+Here is content from load_file
 	4
-äÄ@
+Here is content from load_file
 	5
 DROP VIEW v1;
 
@@ -1013,10 +1018,10 @@ SELECT LEFT(my_binary_30, 2), my_binary_30, id FROM t1_values
 WHERE select_id = 147 OR select_id IS NULL order by id;
 LEFT(my_binary_30, 2)	my_binary_30	id
 NULL	NULL	1
-		2
+		2
 <-	<--------30 characters------->	3
- -	 ---äÖüß@µ*$-- 	4
+ -	 ---äÖüß@µ*$-- 	4
--1	-1	5
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_binary_30`,2) AS `LEFT(my_binary_30, 2)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -1141,10 +1146,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 141 OR select_id IS NULL order by id;
 BIT_LENGTH(my_binary_30)	my_binary_30	id
 NULL	NULL	1
-240		2
+240		2
 240	<--------30 characters------->	3
-240	 ---äÖüß@µ*$-- 	4
+240	 ---äÖüß@µ*$-- 	4
-240	-1	5
+240	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_binary_30`) AS `BIT_LENGTH(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -1453,10 +1458,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 129 OR select_id IS NULL order by id;
 IFNULL(my_binary_30,'IS_NULL')	my_binary_30	id
 IS_NULL	NULL	1
-		2
+		2
 <--------30 characters------->	<--------30 characters------->	3
- ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
+ ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
--1	-1	5
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_binary_30`,'IS_NULL') AS `IFNULL(my_binary_30,'IS_NULL')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -1793,10 +1798,10 @@ WHERE select_id = 117 OR select_id IS NULL order by id;
 IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_binary_30	id
 IS     NULL	NULL	1
-IS NOT NULL		2
+IS NOT NULL		2
 IS NOT NULL	<--------30 characters------->	3
-IS NOT NULL	 ---äÖüß@µ*$-- 	4
+IS NOT NULL	 ---äÖüß@µ*$-- 	4
-IS NOT NULL	-1	5
+IS NOT NULL	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(isnull(`t1_values`.`my_binary_30`),'IS     NULL','IS NOT NULL') AS `IF(my_binary_30 IS NULL, 'IS     NULL',
@@ -2113,10 +2118,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 105 OR select_id IS NULL order by id;
 IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')	my_binary_30	id
 IS NOT TRUE	NULL	1
-IS NOT TRUE		2
+IS NOT TRUE		2
 IS NOT TRUE	<--------30 characters------->	3
-IS NOT TRUE	 ---äÖüß@µ*$-- 	4
+IS NOT TRUE	 ---äÖüß@µ*$-- 	4
-IS     TRUE	-1	5
+IS     TRUE	-1	5
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: ''
 Warning	1292	Truncated incorrect DOUBLE value: '<--------30 characters------->'
@@ -2233,10 +2238,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 101 OR select_id IS NULL order by id;
 CONVERT(my_binary_30 USING koi8r)	my_binary_30	id
 NULL	NULL	1
-		2
+		2
 <--------30 characters------->	<--------30 characters------->	3
- ---???????<3F>@??*$-- 	 ---äÖüß@µ*$-- 	4
+ ---???????<3F>@??*$-- 	 ---äÖüß@µ*$-- 	4
--1	-1	5
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using koi8r) AS `CONVERT(my_binary_30 USING koi8r)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -2337,10 +2342,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 97 OR select_id IS NULL order by id;
 CONVERT(my_binary_30 USING utf8)	my_binary_30	id
 NULL	NULL	1
-		2
+		2
 <--------30 characters------->	<--------30 characters------->	3
- ---<2D><><EFBFBD><EFBFBD>@<40>*$-- 	 ---äÖüß@µ*$-- 	4
+ ---<2D><><EFBFBD><EFBFBD>@<40>*$-- 	 ---äÖüß@µ*$-- 	4
--1	-1	5
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using utf8) AS `CONVERT(my_binary_30 USING utf8)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -2673,10 +2678,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 85 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS UNSIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
-0		2
+0		2
 0	<--------30 characters------->	3
-0	 ---äÖüß@µ*$-- 	4
+0	 ---äÖüß@µ*$-- 	4
-18446744073709551615	-1	5
+18446744073709551615	-1	5
 Warnings:
 Warning	1292	Truncated incorrect INTEGER value: ''
 Warning	1292	Truncated incorrect INTEGER value: '<--------30 characters------->'
@@ -3037,10 +3042,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 73 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS SIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
-0		2
+0		2
 0	<--------30 characters------->	3
-0	 ---äÖüß@µ*$-- 	4
+0	 ---äÖüß@µ*$-- 	4
--1	-1	5
+-1	-1	5
 Warnings:
 Warning	1292	Truncated incorrect INTEGER value: ''
 Warning	1292	Truncated incorrect INTEGER value: '<--------30 characters------->'
@@ -3397,11 +3402,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 61 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DECIMAL(37,2))	my_binary_30	id
 NULL	NULL	1
-0.00		2
+0.00		2
 0.00	<--------30 characters------->	3
-0.00	 ---äÖüß@µ*$-- 	4
+0.00	 ---äÖüß@µ*$-- 	4
--1.00	-1	5
+-1.00	-1	5
--3333.33	-3333.3333	28
+-3333.33	-3333.3333	28
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: ''
@@ -3755,11 +3760,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 50 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS TIME)	my_binary_30	id
 NULL	NULL	1
-00:00:00		2
+00:00:00		2
 00:00:00	<--------30 characters------->	3
--00:00:00	 ---äÖüß@µ*$-- 	4
+-00:00:00	 ---äÖüß@µ*$-- 	4
-NULL	-1	5
+NULL	-1	5
-41:58:00	1 17:58	22
+41:58:00	1 17:58	22
 Warnings:
 Warning	1292	Truncated incorrect time value: ''
 Warning	1292	Truncated incorrect time value: '<--------30 characters------->'
@@ -4131,11 +4136,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 39 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DATETIME)	my_binary_30	id
 NULL	NULL	1
-NULL		2
+NULL		2
 NULL	<--------30 characters------->	3
-NULL	 ---äÖüß@µ*$-- 	4
+NULL	 ---äÖüß@µ*$-- 	4
-NULL	-1	5
+NULL	-1	5
-2005-06-27 17:58:00	2005-06-27 17:58	16
+2005-06-27 17:58:00	2005-06-27 17:58	16
 Warnings:
 Warning	1292	Incorrect datetime value: ''
 Warning	1292	Incorrect datetime value: '<--------30 characters------->'
@@ -4501,11 +4506,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 28 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DATE)	my_binary_30	id
 NULL	NULL	1
-NULL		2
+NULL		2
 NULL	<--------30 characters------->	3
-NULL	 ---äÖüß@µ*$-- 	4
+NULL	 ---äÖüß@µ*$-- 	4
-NULL	-1	5
+NULL	-1	5
-2005-06-27	2005-06-27	10
+2005-06-27	2005-06-27	10
 Warnings:
 Warning	1292	Incorrect datetime value: ''
 Warning	1292	Incorrect datetime value: '<--------30 characters------->'
@@ -4851,10 +4856,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 16 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS CHAR)	my_binary_30	id
 NULL	NULL	1
-		2
+		2
 <--------30 characters------->	<--------30 characters------->	3
- ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
+ ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
--1	-1	5
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset latin1) AS `CAST(my_binary_30 AS CHAR)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -5163,10 +5168,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 4 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS BINARY)	my_binary_30	id
 NULL	NULL	1
-		2
+		2
 <--------30 characters------->	<--------30 characters------->	3
- ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
+ ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
--1	-1	5
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset binary) AS `CAST(my_binary_30 AS BINARY)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci

mysql-test/suite/funcs_1/r/ndb_storedproc.result

@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
 CREATE DATABASE db_storedproc;
 CREATE DATABASE db_storedproc_1;
 USE db_storedproc;
-create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = ndb;
+create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1;
+engine = <engine_to_be_tested>;
-create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = ndb;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2;
+create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-create table t3(f1 char(20),f2 char(20),f3 integer) engine = ndb;
+engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
-create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = ndb;
+create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
+create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
 USE db_storedproc_1;
-create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = ndb;
+create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
 USE db_storedproc;
-create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = ndb;
+create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -34,8 +39,9 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = ndb;
+create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -47,12 +53,14 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t9(f1 int, f2 char(25), f3 int) engine = ndb;
+create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
-create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = ndb;
+create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10;
+engine = <engine_to_be_tested>;
-create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = ndb;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
+create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
 
 Section 3.1.1 - Syntax checks for the CREATE PROCEDURE, CREATE
 FUNCTION, ALTER PROCEDURE, ALTER FUNCTION, DROP PROCEDURE, DROP FUNCTION, SHOW
@@ -14949,48 +14957,47 @@ USE db_storedproc;
 Testcase 4.3.1:
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp1;
-drop table IF EXISTS res_t3_itisalongname_1381742_itsaverylongname_1381742;
+DROP TABLE IF EXISTS res_t3_itisalongname_1381742_itsaverylongname_1381742;
 CREATE TABLE res_t3_itisalongname_1381742_itsaverylongname_1381742(
-middleinitial CHAR,
+middleinitial CHAR, lastname VARCHAR(50),
-lastname VARCHAR(50),
+age_averylongfieldname_averylongname_1234569 INT, COMMENT VARCHAR(100))
-age_averylongfieldname_averylongname_1234569 int,
+ENGINE=<engine_to_be_tested>;
-COMMENT TEXT) ENGINE=ndb;
-Warnings:
-Error	1478	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
 INSERT INTO res_t3_itisalongname_1381742_itsaverylongname_1381742
 VALUES('a', 'aaaaaaaaaabbbbbbbbc', 0, 'default');
-CREATE PROCEDURE sp1(a int)
+CREATE PROCEDURE sp1(a INT)
 BEGIN
-declare itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx char;
+DECLARE itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx CHAR;
-declare itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx varchar(100);
+DECLARE itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx VARCHAR(100);
-declare itisjustamediumsizeintintegervariablename integer;
+DECLARE itisjustamediumsizeintintegervariablename INTEGER;
-set itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx = 'b';
+SET itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx = 'b';
-set itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx = 'oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%';
+SET itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx
-set itisjustamediumsizeintintegervariablename = 5;
+= 'oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%';
-set @comment='a';
+SET itisjustamediumsizeintintegervariablename = 5;
-label1: loop
+SET @comment='a';
-if a>100 then
+label1: LOOP
-set @comment='value of a is greater than 100';
+IF a > 100 THEN
-elseif a<100 then
+SET @comment = 'value of a is greater than 100';
-if a<50 then
+ELSEIF a < 100 THEN
-set @comment='value of a is less than 50';
+IF a < 50 THEN
-elseif a<25 then
+SET @comment = 'value of a is less than 50';
-set @comment='value of a is less than 25';
+ELSEIF a < 25 THEN
-else
+SET @comment = 'value of a is less than 25';
-set @comment='value of a is greater than 50 and less than 100';
+ELSE
-END if;
+SET @comment = 'value of a is greater than 50 and less than 100';
-else
+END IF;
-set @comment='value of a is 100';
+ELSE
-END if;
+SET @comment = 'value of a is 100';
-if itisjustamediumsizeintintegervariablename = 0 then leave label1;
+END IF;
-END if;
+IF itisjustamediumsizeintintegervariablename = 0 THEN LEAVE label1;
-insert into res_t3_itisalongname_1381742_itsaverylongname_1381742
+END IF;
-values( itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx,
+INSERT INTO res_t3_itisalongname_1381742_itsaverylongname_1381742
-concat(itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx, '  ', a),
+VALUES(itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx,
-a, @comment );
+CONCAT(itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx,
-set itisjustamediumsizeintintegervariablename = itisjustamediumsizeintintegervariablename - 1;
+'  ', a), a, @comment);
-iterate label1;
+SET itisjustamediumsizeintintegervariablename
-END loop label1;
+= itisjustamediumsizeintintegervariablename - 1;
+ITERATE label1;
+END LOOP label1;
 END//
 CALL sp1(101);
 CALL sp1(100);

mysql-test/suite/funcs_1/r/ndb_storedproc_02.result

@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
 CREATE DATABASE db_storedproc;
 CREATE DATABASE db_storedproc_1;
 USE db_storedproc;
-create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = ndb;
+create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1;
+engine = <engine_to_be_tested>;
-create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = ndb;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t1;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2;
+create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-create table t3(f1 char(20),f2 char(20),f3 integer) engine = ndb;
+engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' into table t3;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t2;
-create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = ndb;
+create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t3.txt' into table t3;
+create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t4;
 USE db_storedproc_1;
-create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = ndb;
+create table t6(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t6;
 USE db_storedproc;
-create table t7 (f1 char(20), f2 char(25), f3 date, f4 int) engine = ndb;
+create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t7;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t7;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -34,8 +39,9 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = ndb;
+create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8;
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t7.txt' into table t8;
 Warnings:
 Warning	1265	Data truncated for column 'f3' at row 1
 Warning	1265	Data truncated for column 'f3' at row 2
@@ -47,12 +53,14 @@ Warning	1265	Data truncated for column 'f3' at row 7
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t9(f1 int, f2 char(25), f3 int) engine = ndb;
+create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table t9;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table t9;
-create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = ndb;
+create table t10(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10;
+engine = <engine_to_be_tested>;
-create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = ndb;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
+create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+engine = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t11;
 
 Section 3.1.2 - Syntax checks for the stored procedure-specific
 programming statements BEGIN/END, DECLARE, SET, SELECT/INTO, OPEN, FETCH, CLOSE:
@@ -698,7 +706,7 @@ Testcase 3.1.2.54:
 ------------------
 
 Ensure that a handler with a condition defined with an SQLSTATE that begins with
-<EFBFBD>01<EFBFBD> is always exactly equivalent in action to a handler with an SQLWARNING
+“01“ is always exactly equivalent in action to a handler with an SQLWARNING
 condition.
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp0;
@@ -797,7 +805,7 @@ Testcase 3.1.2.56:
 ------------------
 
 Ensure that a handler with a condition defined with an SQLSTATE that begins with
-<EFBFBD>02<EFBFBD> is always exactly equivalent in action to a handler with a NOT FOUND
+“02“ is always exactly equivalent in action to a handler with a NOT FOUND
 condition.
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp0;
@@ -905,7 +913,7 @@ Testcase 3.1.2.58:
 ------------------
 
 Ensure that a handler with a condition defined with an SQLSTATE that begins with
-anything other that <EFBFBD>01<EFBFBD> or <EFBFBD>02<EFBFBD> is always exactly equivalent in action to a
+anything other that “01“ or “02“ is always exactly equivalent in action to a
 handler with an SQLEXCEPTION condition.
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp0;