Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0-build

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

mysql-test/Makefile.am

@@ -45,7 +45,8 @@ dist-hook:
 	mkdir -p $(distdir)/t $(distdir)/r $(distdir)/include \
 		$(distdir)/std_data \
 		$(distdir)/std_data/ndb_backup50_data_be $(distdir)/std_data/ndb_backup50_data_le \
-		$(distdir)/lib
+		$(distdir)/lib \
+		$(distdir)/funcs_1
 	-$(INSTALL_DATA) $(srcdir)/t/*.def $(distdir)/t
 	$(INSTALL_DATA) $(srcdir)/t/*.test $(distdir)/t
 	-$(INSTALL_DATA) $(srcdir)/t/*.imtest $(distdir)/t
@@ -66,6 +67,7 @@ dist-hook:
 	$(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(distdir)/std_data
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup50_data_be/BACKUP* $(distdir)/std_data/ndb_backup50_data_be
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup50_data_le/BACKUP* $(distdir)/std_data/ndb_backup50_data_le
+	$(INSTALL_DATA) $(srcdir)/std_data/funcs_1/* $(distdir)/std_data/funcs_1
 	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(distdir)/lib
 	-rm -rf `find $(distdir)/suite -type d -name SCCS`
 
@@ -77,7 +79,8 @@ install-data-local:
 		$(DESTDIR)$(testdir)/std_data \
 		$(DESTDIR)$(testdir)/std_data/ndb_backup50_data_be \
 		$(DESTDIR)$(testdir)/std_data/ndb_backup50_data_le \
-		$(DESTDIR)$(testdir)/lib
+		$(DESTDIR)$(testdir)/lib \
+		$(DESTDIR)$(testdir)/funcs_1
 	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir)
 	-$(INSTALL_DATA) $(srcdir)/t/*.def $(DESTDIR)$(testdir)/t
 	$(INSTALL_DATA) $(srcdir)/t/*.test $(DESTDIR)$(testdir)/t
@@ -103,6 +106,7 @@ install-data-local:
 	$(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(DESTDIR)$(testdir)/std_data
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup50_data_be/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup50_data_be
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup50_data_le/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup50_data_le
+	$(INSTALL_DATA) $(srcdir)/std_data/funcs_1/* $(distdir)/std_data/funcs_1
 	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(DESTDIR)$(testdir)/lib
 	for f in `(cd $(srcdir); find suite -type f | grep -v SCCS)`; \
 	do \

mysql-test/mysql-test-run.pl

@@ -3739,9 +3739,9 @@ sub mysqld_arguments ($$$$) {
   {
     # By default, prevent the started mysqld to access files outside of vardir
     my $secure_file_dir= $opt_vardir;
-    if ( $opt_suite ne "main" )
+    if ( $opt_suite ne "main" and $opt_suite ne "funcs_1" )
     {
-      # When running a suite other than default allow the mysqld
+      # When running a suite other than default or funcs_1 allow the mysqld
       # access to subdirs of mysql-test/ in order to make it possible
       # to "load data" from the suites data/ directory.
       $secure_file_dir= $glob_mysql_test_dir;

mysql-test/std_data/funcs_1/load_file.txt

+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/datadict/datadict_bug_12777.inc

@@ -2,7 +2,7 @@
 #
 
 # columns in INFORMATION_SCHEMA with VARCHAR(4096) on Linux and Intel or AMD
-# processor are shown as VARCHAR(512) on Windows, VARCHAR(1023) on AIX and HPUX, 
+# processor are shown as VARCHAR(512) on Windows, VARCHAR(1023) on AIX and HPUX,
 # VARCHAR(1024) on Solaris10, ... see below and in bug #12777 for details.
 # So we need to replace the output for these systems. There may be other still
 # not tested / detected systems.
@@ -10,10 +10,10 @@
 # Setting the variables used below has been moved to the beginning of the datadict
 # tests to "suite/funcs_1/datadict/datadict_load.inc".
 #
-# SELECT character_maximum_length INTO @CML 
-#   FROM information_schema.columns 
-#  WHERE table_schema = 'information_schema' 
-#    AND table_name   = 'columns' 
+# SELECT character_maximum_length INTO @CML
+#   FROM information_schema.columns
+#  WHERE table_schema = 'information_schema'
+#    AND table_name   = 'columns'
 #    AND column_name  = 'table_catalog';
 
 # this enables the --replace_result only if needed, using this we never replace
@@ -31,7 +31,7 @@ if ($bug_12777_0512)
    --replace_result 512 4096  1536 12288
 }
 
-# aix52, aix52-64bit, hp3750, hp3750-64bit, hpux11, hpux11-64bit, 
+# aix52, aix52-64bit, hp3750, hp3750-64bit, hpux11, hpux11-64bit,
 if ($bug_12777_1023)
 {
    #                nnnn       3*n

mysql-test/suite/funcs_1/datadict/datadict_load.inc

@@ -12,14 +12,14 @@
 --disable_query_log
 
 # ------------------------------------------------------------------------------
-# Get the size of ONE known colum and check the size against some values to 
-# be able to use the correct --replace_result statement. Using this only the 
-# one pair of 'wrong' values is replaced and not all occurrencies of all 
+# Get the size of ONE known colum and check the size against some values to
+# be able to use the correct --replace_result statement. Using this only the
+# one pair of 'wrong' values is replaced and not all occurrencies of all
 # possible pairs of values. See bug #12777 for details.
-SELECT character_maximum_length INTO @CML 
-  FROM information_schema.columns 
- WHERE table_schema = 'information_schema' 
-   AND table_name   = 'columns' 
+SELECT character_maximum_length INTO @CML
+  FROM information_schema.columns
+ WHERE table_schema = 'information_schema'
+   AND table_name   = 'columns'
    AND column_name  = 'table_catalog';
 
 let $bug_12777_0512= `SELECT @CML =  512`;
@@ -53,7 +53,7 @@ let $SERVER_NAME= `SELECT DISTINCT host FROM mysql.user WHERE host NOT In ("loca
 #  load tables
 #  -----------
 #
-#  this was part of the 3 files $<engine>_datadict.test, but it has been moved 
+#  this was part of the 3 files $<engine>_datadict.test, but it has been moved
 #  here to have only one place where all preparation for the test is done.
 #
 ################################################################################

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

@@ -4,66 +4,67 @@
 drop table if exists tb1 ;
 --enable_warnings
 create table tb1 (
-f1 char(0), 
-f2 char(0) binary, 
-f3 char(0) ascii, 
-f4 tinytext unicode, 
-f5 text, 
-f6 mediumtext, 
-f7 longtext, 
-f8 tinyblob, 
+f1 char(0),
+f2 char(0) binary,
+f3 char(0) ascii,
+f4 tinytext unicode,
+f5 text,
+f6 mediumtext,
+f7 longtext,
+f8 tinyblob,
 f9 blob,
-f10 mediumblob, 
-f11 longblob, 
-f12 binary, 
-f13 tinyint, 
-f14 tinyint unsigned, 
-f15 tinyint zerofill, 
-f16 tinyint unsigned zerofill, 
-f17 smallint, 
-f18 smallint unsigned,  
-f19 smallint zerofill, 
-f20 smallint unsigned zerofill, 
-f21 mediumint, 
-f22 mediumint unsigned, 
-f23 mediumint zerofill, 
-f24 mediumint unsigned zerofill, 
-f25 int, 
-f26 int unsigned, 
-f27 int zerofill, 
-f28 int unsigned zerofill, 
-f29 bigint, 
-f30 bigint unsigned, 
-f31 bigint zerofill, 
-f32 bigint unsigned zerofill, 
-f33 decimal, 
-f34 decimal unsigned, 
-f35 decimal zerofill, 
-f36 decimal unsigned zerofill not null DEFAULT 9.9, 
-f37 decimal (0) not null DEFAULT 9.9, 
-f38 decimal (64) not null DEFAULT 9.9, 
-f39 decimal (0) unsigned not null DEFAULT 9.9, 
-f40 decimal (64) unsigned not null DEFAULT 9.9, 
-f41 decimal (0) zerofill not null DEFAULT 9.9, 
-f42 decimal (64) zerofill not null DEFAULT 9.9, 
-f43 decimal (0) unsigned zerofill not null DEFAULT 9.9, 
-f44 decimal (64) unsigned zerofill not null DEFAULT 9.9, 
-f45 decimal (0,0) not null DEFAULT 9.9, 
-f46 decimal (63,30) not null DEFAULT 9.9, 
-f47 decimal (0,0) unsigned not null DEFAULT 9.9, 
-f48 decimal (63,30) unsigned not null DEFAULT 9.9, 
-f49 decimal (0,0) zerofill not null DEFAULT 9.9, 
-f50 decimal (63,30) zerofill not null DEFAULT 9.9, 
-f51 decimal (0,0) unsigned zerofill not null DEFAULT 9.9, 
-f52 decimal (63,30) unsigned zerofill not null DEFAULT 9.9, 
-f53 numeric not null DEFAULT 99, 
-f54 numeric unsigned not null DEFAULT 99, 
-f55 numeric zerofill not null DEFAULT 99, 
-f56 numeric unsigned zerofill not null DEFAULT 99, 
-f57 numeric (0) not null DEFAULT 99, 
+f10 mediumblob,
+f11 longblob,
+f12 binary,
+f13 tinyint,
+f14 tinyint unsigned,
+f15 tinyint zerofill,
+f16 tinyint unsigned zerofill,
+f17 smallint,
+f18 smallint unsigned,
+f19 smallint zerofill,
+f20 smallint unsigned zerofill,
+f21 mediumint,
+f22 mediumint unsigned,
+f23 mediumint zerofill,
+f24 mediumint unsigned zerofill,
+f25 int,
+f26 int unsigned,
+f27 int zerofill,
+f28 int unsigned zerofill,
+f29 bigint,
+f30 bigint unsigned,
+f31 bigint zerofill,
+f32 bigint unsigned zerofill,
+f33 decimal,
+f34 decimal unsigned,
+f35 decimal zerofill,
+f36 decimal unsigned zerofill not null DEFAULT 9.9,
+f37 decimal (0) not null DEFAULT 9.9,
+f38 decimal (64) not null DEFAULT 9.9,
+f39 decimal (0) unsigned not null DEFAULT 9.9,
+f40 decimal (64) unsigned not null DEFAULT 9.9,
+f41 decimal (0) zerofill not null DEFAULT 9.9,
+f42 decimal (64) zerofill not null DEFAULT 9.9,
+f43 decimal (0) unsigned zerofill not null DEFAULT 9.9,
+f44 decimal (64) unsigned zerofill not null DEFAULT 9.9,
+f45 decimal (0,0) not null DEFAULT 9.9,
+f46 decimal (63,30) not null DEFAULT 9.9,
+f47 decimal (0,0) unsigned not null DEFAULT 9.9,
+f48 decimal (63,30) unsigned not null DEFAULT 9.9,
+f49 decimal (0,0) zerofill not null DEFAULT 9.9,
+f50 decimal (63,30) zerofill not null DEFAULT 9.9,
+f51 decimal (0,0) unsigned zerofill not null DEFAULT 9.9,
+f52 decimal (63,30) unsigned zerofill not null DEFAULT 9.9,
+f53 numeric not null DEFAULT 99,
+f54 numeric unsigned not null DEFAULT 99,
+f55 numeric zerofill not null DEFAULT 99,
+f56 numeric unsigned zerofill not null DEFAULT 99,
+f57 numeric (0) not null DEFAULT 99,
 f58 numeric (64) not null DEFAULT 99
 ) engine = innodb;
 
-
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb1.txt' into table tb1 ;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+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

@@ -4,58 +4,60 @@
 drop table if exists tb2 ;
 --enable_warnings
 create table tb2 (
-f59 numeric (0) unsigned, 
-f60 numeric (64) unsigned, 
-f61 numeric (0) zerofill, 
-f62 numeric (64) zerofill, 
-f63 numeric (0) unsigned zerofill, 
-f64 numeric (64) unsigned zerofill, 
-f65 numeric (0,0), 
-f66 numeric (63,30), 
-f67 numeric (0,0) unsigned, 
-f68 numeric (63,30) unsigned, 
-f69 numeric (0,0) zerofill, 
-f70 numeric (63,30) zerofill, 
-f71 numeric (0,0) unsigned zerofill, 
-f72 numeric (63,30) unsigned zerofill, 
-f73 real, 
-f74 real unsigned, 
-f75 real zerofill, 
-f76 real unsigned zerofill, 
-f77 double default 7.7, 
-f78 double unsigned default 7.7, 
-f79 double zerofill default 7.7, 
-f80 double unsigned zerofill default 8.8, 
-f81 float not null default 8.8, 
-f82 float unsigned not null default 8.8, 
-f83 float zerofill not null default 8.8, 
-f84 float unsigned zerofill not null default 8.8, 
-f85 float(0) not null default 8.8, 
-f86 float(23) not null default 8.8, 
-f87 float(0) unsigned not null default 8.8, 
-f88 float(23) unsigned not null default 8.8, 
-f89 float(0) zerofill not null default 8.8, 
-f90 float(23) zerofill not null default 8.8, 
-f91 float(0) unsigned zerofill not null default 8.8, 
-f92 float(23) unsigned zerofill not null default 8.8, 
-f93 float(24) not null default 8.8, 
-f94 float(53) not null default 8.8, 
-f95 float(24) unsigned not null default 8.8, 
-f96 float(53) unsigned not null default 8.8, 
-f97 float(24) zerofill not null default 8.8, 
-f98 float(53) zerofill not null default 8.8, 
-f99 float(24) unsigned zerofill not null default 8.8, 
-f100 float(53) unsigned zerofill not null default 8.8, 
-f101 date not null default '2000-01-01', 
-f102 time not null default 20, 
-f103 datetime not null default '2/2/2', 
-f104 timestamp not null default 20001231235959, 
-f105 year not null default 2000, 
-f106 year(3) not null default 2000, 
-f107 year(4) not null default 2000, 
-f108 enum("1enum","2enum") not null default "1enum", 
+f59 numeric (0) unsigned,
+f60 numeric (64) unsigned,
+f61 numeric (0) zerofill,
+f62 numeric (64) zerofill,
+f63 numeric (0) unsigned zerofill,
+f64 numeric (64) unsigned zerofill,
+f65 numeric (0,0),
+f66 numeric (63,30),
+f67 numeric (0,0) unsigned,
+f68 numeric (63,30) unsigned,
+f69 numeric (0,0) zerofill,
+f70 numeric (63,30) zerofill,
+f71 numeric (0,0) unsigned zerofill,
+f72 numeric (63,30) unsigned zerofill,
+f73 real,
+f74 real unsigned,
+f75 real zerofill,
+f76 real unsigned zerofill,
+f77 double default 7.7,
+f78 double unsigned default 7.7,
+f79 double zerofill default 7.7,
+f80 double unsigned zerofill default 8.8,
+f81 float not null default 8.8,
+f82 float unsigned not null default 8.8,
+f83 float zerofill not null default 8.8,
+f84 float unsigned zerofill not null default 8.8,
+f85 float(0) not null default 8.8,
+f86 float(23) not null default 8.8,
+f87 float(0) unsigned not null default 8.8,
+f88 float(23) unsigned not null default 8.8,
+f89 float(0) zerofill not null default 8.8,
+f90 float(23) zerofill not null default 8.8,
+f91 float(0) unsigned zerofill not null default 8.8,
+f92 float(23) unsigned zerofill not null default 8.8,
+f93 float(24) not null default 8.8,
+f94 float(53) not null default 8.8,
+f95 float(24) unsigned not null default 8.8,
+f96 float(53) unsigned not null default 8.8,
+f97 float(24) zerofill not null default 8.8,
+f98 float(53) zerofill not null default 8.8,
+f99 float(24) unsigned zerofill not null default 8.8,
+f100 float(53) unsigned zerofill not null default 8.8,
+f101 date not null default '2000-01-01',
+f102 time not null default 20,
+f103 datetime not null default '2/2/2',
+f104 timestamp not null default 20001231235959,
+f105 year not null default 2000,
+f106 year(3) not null default 2000,
+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;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb2.txt' into table tb2 ;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+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

@@ -4,65 +4,67 @@
 drop table if exists tb3 ;
 --enable_warnings
 create table tb3 (
-f118 char not null DEFAULT 'a', 
-f119 char binary not null DEFAULT b'101', 
-f120 char ascii not null DEFAULT b'101', 
-f121 tinytext, 
-f122 text, 
-f123 mediumtext, 
-f124 longtext unicode, 
-f125 tinyblob, 
-f126 blob, 
-f127 mediumblob, 
-f128 longblob, 
-f129 binary not null DEFAULT b'101', 
-f130 tinyint not null DEFAULT 99, 
-f131 tinyint unsigned not null DEFAULT 99, 
-f132 tinyint zerofill not null DEFAULT 99, 
-f133 tinyint unsigned zerofill not null DEFAULT 99, 
-f134 smallint not null DEFAULT 999, 
-f135 smallint unsigned not null DEFAULT 999, 
-f136 smallint zerofill not null DEFAULT 999,  
-f137 smallint unsigned zerofill not null DEFAULT 999, 
-f138 mediumint not null DEFAULT 9999, 
-f139 mediumint unsigned not null DEFAULT 9999, 
-f140 mediumint zerofill not null DEFAULT 9999, 
-f141 mediumint unsigned zerofill not null DEFAULT 9999, 
-f142 int not null DEFAULT 99999, 
-f143 int unsigned not null DEFAULT 99999, 
-f144 int zerofill not null DEFAULT 99999, 
-f145 int unsigned zerofill not null DEFAULT 99999, 
-f146 bigint not null DEFAULT 999999, 
-f147 bigint unsigned not null DEFAULT 999999, 
-f148 bigint zerofill not null DEFAULT 999999, 
-f149 bigint unsigned zerofill not null DEFAULT 999999, 
-f150 decimal not null DEFAULT 999.999, 
-f151 decimal unsigned not null DEFAULT 999.17, 
-f152 decimal zerofill not null DEFAULT 999.999, 
-f153 decimal unsigned zerofill, 
-f154 decimal (0), 
-f155 decimal (64), 
-f156 decimal (0) unsigned, 
-f157 decimal (64) unsigned, 
-f158 decimal (0) zerofill, 
-f159 decimal (64) zerofill, 
-f160 decimal (0) unsigned zerofill, 
-f161 decimal (64) unsigned zerofill, 
-f162 decimal (0,0), 
-f163 decimal (63,30), 
-f164 decimal (0,0) unsigned, 
-f165 decimal (63,30) unsigned, 
-f166 decimal (0,0) zerofill, 
-f167 decimal (63,30) zerofill, 
-f168 decimal (0,0) unsigned zerofill, 
-f169 decimal (63,30) unsigned zerofill, 
-f170 numeric, 
-f171 numeric unsigned, 
-f172 numeric zerofill, 
-f173 numeric unsigned zerofill, 
-f174 numeric (0), 
-f175 numeric (64) 
+f118 char not null DEFAULT 'a',
+f119 char binary not null DEFAULT b'101',
+f120 char ascii not null DEFAULT b'101',
+f121 tinytext,
+f122 text,
+f123 mediumtext,
+f124 longtext unicode,
+f125 tinyblob,
+f126 blob,
+f127 mediumblob,
+f128 longblob,
+f129 binary not null DEFAULT b'101',
+f130 tinyint not null DEFAULT 99,
+f131 tinyint unsigned not null DEFAULT 99,
+f132 tinyint zerofill not null DEFAULT 99,
+f133 tinyint unsigned zerofill not null DEFAULT 99,
+f134 smallint not null DEFAULT 999,
+f135 smallint unsigned not null DEFAULT 999,
+f136 smallint zerofill not null DEFAULT 999,
+f137 smallint unsigned zerofill not null DEFAULT 999,
+f138 mediumint not null DEFAULT 9999,
+f139 mediumint unsigned not null DEFAULT 9999,
+f140 mediumint zerofill not null DEFAULT 9999,
+f141 mediumint unsigned zerofill not null DEFAULT 9999,
+f142 int not null DEFAULT 99999,
+f143 int unsigned not null DEFAULT 99999,
+f144 int zerofill not null DEFAULT 99999,
+f145 int unsigned zerofill not null DEFAULT 99999,
+f146 bigint not null DEFAULT 999999,
+f147 bigint unsigned not null DEFAULT 999999,
+f148 bigint zerofill not null DEFAULT 999999,
+f149 bigint unsigned zerofill not null DEFAULT 999999,
+f150 decimal not null DEFAULT 999.999,
+f151 decimal unsigned not null DEFAULT 999.17,
+f152 decimal zerofill not null DEFAULT 999.999,
+f153 decimal unsigned zerofill,
+f154 decimal (0),
+f155 decimal (64),
+f156 decimal (0) unsigned,
+f157 decimal (64) unsigned,
+f158 decimal (0) zerofill,
+f159 decimal (64) zerofill,
+f160 decimal (0) unsigned zerofill,
+f161 decimal (64) unsigned zerofill,
+f162 decimal (0,0),
+f163 decimal (63,30),
+f164 decimal (0,0) unsigned,
+f165 decimal (63,30) unsigned,
+f166 decimal (0,0) zerofill,
+f167 decimal (63,30) zerofill,
+f168 decimal (0,0) unsigned zerofill,
+f169 decimal (63,30) unsigned zerofill,
+f170 numeric,
+f171 numeric unsigned,
+f172 numeric zerofill,
+f173 numeric unsigned zerofill,
+f174 numeric (0),
+f175 numeric (64)
 ) engine = innodb;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb3.txt' into table tb3 ;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+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

@@ -4,56 +4,56 @@
 drop table if exists tb4;
 --enable_warnings
 create table tb4 (
-f176 numeric (0) unsigned not null DEFAULT 9, 
-f177 numeric (64) unsigned not null DEFAULT 9, 
-f178 numeric (0) zerofill not null DEFAULT 9, 
-f179 numeric (64) zerofill not null DEFAULT 9, 
-f180 numeric (0) unsigned zerofill not null DEFAULT 9, 
-f181 numeric (64) unsigned zerofill not null DEFAULT 9, 
-f182 numeric (0,0) not null DEFAULT 9, 
-f183 numeric (63,30) not null DEFAULT 9, 
-f184 numeric (0,0) unsigned not null DEFAULT 9, 
-f185 numeric (63,30) unsigned not null DEFAULT 9, 
-f186 numeric (0,0) zerofill not null DEFAULT 9, 
-f187 numeric (63,30) zerofill not null DEFAULT 9, 
-f188 numeric (0,0) unsigned zerofill not null DEFAULT 9, 
-f189 numeric (63,30) unsigned zerofill not null DEFAULT 9, 
-f190 real not null DEFAULT 88.8, 
-f191 real unsigned not null DEFAULT 88.8, 
-f192 real zerofill not null DEFAULT 88.8, 
-f193 real unsigned zerofill not null DEFAULT 88.8, 
-f194 double not null DEFAULT 55.5, 
-f195 double unsigned not null DEFAULT 55.5, 
-f196 double zerofill not null DEFAULT 55.5, 
-f197 double unsigned zerofill not null DEFAULT 55.5, 
-f198 float, 
-f199 float unsigned, 
-f200 float zerofill, 
-f201 float unsigned zerofill, 
-f202 float(0), 
-f203 float(23), 
-f204 float(0) unsigned, 
-f205 float(23) unsigned, 
-f206 float(0) zerofill, 
-f207 float(23) zerofill, 
-f208 float(0) unsigned zerofill, 
-f209 float(23) unsigned zerofill, 
-f210 float(24), 
-f211 float(53), 
-f212 float(24) unsigned, 
-f213 float(53) unsigned, 
-f214 float(24) zerofill, 
-f215 float(53) zerofill, 
-f216 float(24) unsigned zerofill, 
-f217 float(53) unsigned zerofill, 
-f218 date, 
-f219 time, 
-f220 datetime, 
-f221 timestamp, 
-f222 year, 
-f223 year(3), 
-f224 year(4), 
-f225 enum("1enum","2enum"), 
+f176 numeric (0) unsigned not null DEFAULT 9,
+f177 numeric (64) unsigned not null DEFAULT 9,
+f178 numeric (0) zerofill not null DEFAULT 9,
+f179 numeric (64) zerofill not null DEFAULT 9,
+f180 numeric (0) unsigned zerofill not null DEFAULT 9,
+f181 numeric (64) unsigned zerofill not null DEFAULT 9,
+f182 numeric (0,0) not null DEFAULT 9,
+f183 numeric (63,30) not null DEFAULT 9,
+f184 numeric (0,0) unsigned not null DEFAULT 9,
+f185 numeric (63,30) unsigned not null DEFAULT 9,
+f186 numeric (0,0) zerofill not null DEFAULT 9,
+f187 numeric (63,30) zerofill not null DEFAULT 9,
+f188 numeric (0,0) unsigned zerofill not null DEFAULT 9,
+f189 numeric (63,30) unsigned zerofill not null DEFAULT 9,
+f190 real not null DEFAULT 88.8,
+f191 real unsigned not null DEFAULT 88.8,
+f192 real zerofill not null DEFAULT 88.8,
+f193 real unsigned zerofill not null DEFAULT 88.8,
+f194 double not null DEFAULT 55.5,
+f195 double unsigned not null DEFAULT 55.5,
+f196 double zerofill not null DEFAULT 55.5,
+f197 double unsigned zerofill not null DEFAULT 55.5,
+f198 float,
+f199 float unsigned,
+f200 float zerofill,
+f201 float unsigned zerofill,
+f202 float(0),
+f203 float(23),
+f204 float(0) unsigned,
+f205 float(23) unsigned,
+f206 float(0) zerofill,
+f207 float(23) zerofill,
+f208 float(0) unsigned zerofill,
+f209 float(23) unsigned zerofill,
+f210 float(24),
+f211 float(53),
+f212 float(24) unsigned,
+f213 float(53) unsigned,
+f214 float(24) zerofill,
+f215 float(53) zerofill,
+f216 float(24) unsigned zerofill,
+f217 float(53) unsigned zerofill,
+f218 date,
+f219 time,
+f220 datetime,
+f221 timestamp,
+f222 year,
+f223 year(3),
+f224 year(4),
+f225 enum("1enum","2enum"),
 f226 set("1set","2set"),
 f235 char(0) unicode,
 f236 char(90),
@@ -64,5 +64,7 @@ f240 varchar(2000) unicode,
 f241 char(100) unicode
 ) engine = innodb;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb4.txt' into table tb4 ;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+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

@@ -4,57 +4,59 @@
 drop table if exists tb1 ;
 --enable_warnings
 create table tb1 (
-f1 char, 
-f2 char binary, 
-f3 char ascii, 
-f12 binary, 
-f13 tinyint, 
-f14 tinyint unsigned, 
-f15 tinyint zerofill, 
-f16 tinyint unsigned zerofill, 
-f17 smallint, 
-f18 smallint unsigned,  
-f19 smallint zerofill, 
-f20 smallint unsigned zerofill, 
-f21 mediumint, 
-f22 mediumint unsigned, 
-f23 mediumint zerofill, 
-f24 mediumint unsigned zerofill, 
-f25 int, 
-f26 int unsigned, 
-f27 int zerofill, 
-f28 int unsigned zerofill, 
-f29 bigint, 
-f30 bigint unsigned, 
-f31 bigint zerofill, 
-f32 bigint unsigned zerofill, 
-f33 decimal not null DEFAULT 9.9, 
-f34 decimal unsigned not null DEFAULT 9.9, 
-f35 decimal zerofill not null DEFAULT 9.9, 
-f36 decimal unsigned zerofill not null DEFAULT 9.9, 
-f37 decimal (0) not null DEFAULT 9.9, 
-f38 decimal (64) not null DEFAULT 9.9, 
-f39 decimal (0) unsigned not null DEFAULT 9.9, 
-f40 decimal (64) unsigned not null DEFAULT 9.9, 
-f41 decimal (0) zerofill not null DEFAULT 9.9, 
-f42 decimal (64) zerofill not null DEFAULT 9.9, 
-f43 decimal (0) unsigned zerofill not null DEFAULT 9.9, 
-f44 decimal (64) unsigned zerofill not null DEFAULT 9.9, 
-f45 decimal (0,0) not null DEFAULT 9.9, 
-f46 decimal (63,30) not null DEFAULT 9.9, 
-f47 decimal (0,0) unsigned not null DEFAULT 9.9, 
-f48 decimal (63,30) unsigned not null DEFAULT 9.9, 
-f49 decimal (0,0) zerofill not null DEFAULT 9.9, 
-f50 decimal (63,30) zerofill not null DEFAULT 9.9, 
-f51 decimal (0,0) unsigned zerofill not null DEFAULT 9.9, 
-f52 decimal (63,30) unsigned zerofill not null DEFAULT 9.9, 
-f53 numeric not null DEFAULT 99, 
-f54 numeric unsigned not null DEFAULT 99, 
-f55 numeric zerofill not null DEFAULT 99, 
-f56 numeric unsigned zerofill not null DEFAULT 99, 
-f57 numeric (0) not null DEFAULT 99, 
+f1 char,
+f2 char binary,
+f3 char ascii,
+f12 binary,
+f13 tinyint,
+f14 tinyint unsigned,
+f15 tinyint zerofill,
+f16 tinyint unsigned zerofill,
+f17 smallint,
+f18 smallint unsigned,
+f19 smallint zerofill,
+f20 smallint unsigned zerofill,
+f21 mediumint,
+f22 mediumint unsigned,
+f23 mediumint zerofill,
+f24 mediumint unsigned zerofill,
+f25 int,
+f26 int unsigned,
+f27 int zerofill,
+f28 int unsigned zerofill,
+f29 bigint,
+f30 bigint unsigned,
+f31 bigint zerofill,
+f32 bigint unsigned zerofill,
+f33 decimal not null DEFAULT 9.9,
+f34 decimal unsigned not null DEFAULT 9.9,
+f35 decimal zerofill not null DEFAULT 9.9,
+f36 decimal unsigned zerofill not null DEFAULT 9.9,
+f37 decimal (0) not null DEFAULT 9.9,
+f38 decimal (64) not null DEFAULT 9.9,
+f39 decimal (0) unsigned not null DEFAULT 9.9,
+f40 decimal (64) unsigned not null DEFAULT 9.9,
+f41 decimal (0) zerofill not null DEFAULT 9.9,
+f42 decimal (64) zerofill not null DEFAULT 9.9,
+f43 decimal (0) unsigned zerofill not null DEFAULT 9.9,
+f44 decimal (64) unsigned zerofill not null DEFAULT 9.9,
+f45 decimal (0,0) not null DEFAULT 9.9,
+f46 decimal (63,30) not null DEFAULT 9.9,
+f47 decimal (0,0) unsigned not null DEFAULT 9.9,
+f48 decimal (63,30) unsigned not null DEFAULT 9.9,
+f49 decimal (0,0) zerofill not null DEFAULT 9.9,
+f50 decimal (63,30) zerofill not null DEFAULT 9.9,
+f51 decimal (0,0) unsigned zerofill not null DEFAULT 9.9,
+f52 decimal (63,30) unsigned zerofill not null DEFAULT 9.9,
+f53 numeric not null DEFAULT 99,
+f54 numeric unsigned not null DEFAULT 99,
+f55 numeric zerofill not null DEFAULT 99,
+f56 numeric unsigned zerofill not null DEFAULT 99,
+f57 numeric (0) not null DEFAULT 99,
 f58 numeric (64) not null DEFAULT 99
 ) engine = memory;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb1.txt' into table tb1 ;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+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

@@ -4,58 +4,60 @@
 drop table if exists tb2 ;
 --enable_warnings
 create table tb2 (
-f59 numeric (0) unsigned, 
-f60 numeric (64) unsigned, 
-f61 numeric (0) zerofill, 
-f62 numeric (64) zerofill, 
-f63 numeric (0) unsigned zerofill, 
-f64 numeric (64) unsigned zerofill, 
-f65 numeric (0,0), 
-f66 numeric (63,30), 
-f67 numeric (0,0) unsigned, 
-f68 numeric (63,30) unsigned, 
-f69 numeric (0,0) zerofill, 
-f70 numeric (63,30) zerofill, 
-f71 numeric (0,0) unsigned zerofill, 
-f72 numeric (63,30) unsigned zerofill, 
-f73 real, 
-f74 real unsigned, 
-f75 real zerofill, 
-f76 real unsigned zerofill, 
-f77 double default 7.7, 
-f78 double unsigned default 7.7, 
-f79 double zerofill default 7.7, 
-f80 double unsigned zerofill default 8.8, 
-f81 float not null default 8.8, 
-f82 float unsigned not null default 8.8, 
-f83 float zerofill not null default 8.8, 
-f84 float unsigned zerofill not null default 8.8, 
-f85 float(0) not null default 8.8, 
-f86 float(23) not null default 8.8, 
-f87 float(0) unsigned not null default 8.8, 
-f88 float(23) unsigned not null default 8.8, 
-f89 float(0) zerofill not null default 8.8, 
-f90 float(23) zerofill not null default 8.8, 
-f91 float(0) unsigned zerofill not null default 8.8, 
-f92 float(23) unsigned zerofill not null default 8.8, 
-f93 float(24) not null default 8.8, 
-f94 float(53) not null default 8.8, 
-f95 float(24) unsigned not null default 8.8, 
-f96 float(53) unsigned not null default 8.8, 
-f97 float(24) zerofill not null default 8.8, 
-f98 float(53) zerofill not null default 8.8, 
-f99 float(24) unsigned zerofill not null default 8.8, 
-f100 float(53) unsigned zerofill not null default 8.8, 
-f101 date not null default '2000-01-01', 
-f102 time not null default 20, 
-f103 datetime not null default '2/2/2', 
-f104 timestamp not null default 20001231235959, 
-f105 year not null default 2000, 
-f106 year(3) not null default 2000, 
-f107 year(4) not null default 2000, 
-f108 enum("1enum","2enum") not null default "1enum", 
+f59 numeric (0) unsigned,
+f60 numeric (64) unsigned,
+f61 numeric (0) zerofill,
+f62 numeric (64) zerofill,
+f63 numeric (0) unsigned zerofill,
+f64 numeric (64) unsigned zerofill,
+f65 numeric (0,0),
+f66 numeric (63,30),
+f67 numeric (0,0) unsigned,
+f68 numeric (63,30) unsigned,
+f69 numeric (0,0) zerofill,
+f70 numeric (63,30) zerofill,
+f71 numeric (0,0) unsigned zerofill,
+f72 numeric (63,30) unsigned zerofill,
+f73 real,
+f74 real unsigned,
+f75 real zerofill,
+f76 real unsigned zerofill,
+f77 double default 7.7,
+f78 double unsigned default 7.7,
+f79 double zerofill default 7.7,
+f80 double unsigned zerofill default 8.8,
+f81 float not null default 8.8,
+f82 float unsigned not null default 8.8,
+f83 float zerofill not null default 8.8,
+f84 float unsigned zerofill not null default 8.8,
+f85 float(0) not null default 8.8,
+f86 float(23) not null default 8.8,
+f87 float(0) unsigned not null default 8.8,
+f88 float(23) unsigned not null default 8.8,
+f89 float(0) zerofill not null default 8.8,
+f90 float(23) zerofill not null default 8.8,
+f91 float(0) unsigned zerofill not null default 8.8,
+f92 float(23) unsigned zerofill not null default 8.8,
+f93 float(24) not null default 8.8,
+f94 float(53) not null default 8.8,
+f95 float(24) unsigned not null default 8.8,
+f96 float(53) unsigned not null default 8.8,
+f97 float(24) zerofill not null default 8.8,
+f98 float(53) zerofill not null default 8.8,
+f99 float(24) unsigned zerofill not null default 8.8,
+f100 float(53) unsigned zerofill not null default 8.8,
+f101 date not null default '2000-01-01',
+f102 time not null default 20,
+f103 datetime not null default '2/2/2',
+f104 timestamp not null default 20001231235959,
+f105 year not null default 2000,
+f106 year(3) not null default 2000,
+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;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb2.txt' into table tb2 ;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+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

@@ -4,60 +4,61 @@
 drop table if exists tb3;
 --enable_warnings
 create table tb3 (
-f118 char not null DEFAULT 'a', 
-f119 char binary not null DEFAULT b'101', 
-f120 char ascii not null DEFAULT b'101', 
-f121 char(50), 
-f122 char(50), 
-f129 binary not null DEFAULT b'101', 
-f130 tinyint not null DEFAULT 99, 
-f131 tinyint unsigned not null DEFAULT 99, 
-f132 tinyint zerofill not null DEFAULT 99, 
-f133 tinyint unsigned zerofill not null DEFAULT 99, 
-f134 smallint not null DEFAULT 999, 
-f135 smallint unsigned not null DEFAULT 999, 
-f136 smallint zerofill not null DEFAULT 999,  
-f137 smallint unsigned zerofill not null DEFAULT 999, 
-f138 mediumint not null DEFAULT 9999, 
-f139 mediumint unsigned not null DEFAULT 9999, 
-f140 mediumint zerofill not null DEFAULT 9999, 
-f141 mediumint unsigned zerofill not null DEFAULT 9999, 
-f142 int not null DEFAULT 99999, 
-f143 int unsigned not null DEFAULT 99999, 
-f144 int zerofill not null DEFAULT 99999, 
-f145 int unsigned zerofill not null DEFAULT 99999, 
-f146 bigint not null DEFAULT 999999, 
-f147 bigint unsigned not null DEFAULT 999999, 
-f148 bigint zerofill not null DEFAULT 999999, 
-f149 bigint unsigned zerofill not null DEFAULT 999999, 
-f150 decimal not null DEFAULT 999.999, 
-f151 decimal unsigned not null DEFAULT 999.17, 
-f152 decimal zerofill not null DEFAULT 999.999, 
-f153 decimal unsigned zerofill, 
-f154 decimal (0), 
-f155 decimal (64), 
-f156 decimal (0) unsigned, 
-f157 decimal (64) unsigned, 
-f158 decimal (0) zerofill, 
-f159 decimal (64) zerofill, 
-f160 decimal (0) unsigned zerofill, 
-f161 decimal (64) unsigned zerofill, 
-f162 decimal (0,0), 
-f163 decimal (63,30), 
-f164 decimal (0,0) unsigned, 
-f165 decimal (63,30) unsigned, 
-f166 decimal (0,0) zerofill, 
-f167 decimal (63,30) zerofill, 
-f168 decimal (0,0) unsigned zerofill, 
-f169 decimal (63,30) unsigned zerofill, 
-f170 numeric, 
-f171 numeric unsigned, 
-f172 numeric zerofill, 
-f173 numeric unsigned zerofill, 
-f174 numeric (0), 
-f175 numeric (64) 
+f118 char not null DEFAULT 'a',
+f119 char binary not null DEFAULT b'101',
+f120 char ascii not null DEFAULT b'101',
+f121 char(50),
+f122 char(50),
+f129 binary not null DEFAULT b'101',
+f130 tinyint not null DEFAULT 99,
+f131 tinyint unsigned not null DEFAULT 99,
+f132 tinyint zerofill not null DEFAULT 99,
+f133 tinyint unsigned zerofill not null DEFAULT 99,
+f134 smallint not null DEFAULT 999,
+f135 smallint unsigned not null DEFAULT 999,
+f136 smallint zerofill not null DEFAULT 999,
+f137 smallint unsigned zerofill not null DEFAULT 999,
+f138 mediumint not null DEFAULT 9999,
+f139 mediumint unsigned not null DEFAULT 9999,
+f140 mediumint zerofill not null DEFAULT 9999,
+f141 mediumint unsigned zerofill not null DEFAULT 9999,
+f142 int not null DEFAULT 99999,
+f143 int unsigned not null DEFAULT 99999,
+f144 int zerofill not null DEFAULT 99999,
+f145 int unsigned zerofill not null DEFAULT 99999,
+f146 bigint not null DEFAULT 999999,
+f147 bigint unsigned not null DEFAULT 999999,
+f148 bigint zerofill not null DEFAULT 999999,
+f149 bigint unsigned zerofill not null DEFAULT 999999,
+f150 decimal not null DEFAULT 999.999,
+f151 decimal unsigned not null DEFAULT 999.17,
+f152 decimal zerofill not null DEFAULT 999.999,
+f153 decimal unsigned zerofill,
+f154 decimal (0),
+f155 decimal (64),
+f156 decimal (0) unsigned,
+f157 decimal (64) unsigned,
+f158 decimal (0) zerofill,
+f159 decimal (64) zerofill,
+f160 decimal (0) unsigned zerofill,
+f161 decimal (64) unsigned zerofill,
+f162 decimal (0,0),
+f163 decimal (63,30),
+f164 decimal (0,0) unsigned,
+f165 decimal (63,30) unsigned,
+f166 decimal (0,0) zerofill,
+f167 decimal (63,30) zerofill,
+f168 decimal (0,0) unsigned zerofill,
+f169 decimal (63,30) unsigned zerofill,
+f170 numeric,
+f171 numeric unsigned,
+f172 numeric zerofill,
+f173 numeric unsigned zerofill,
+f174 numeric (0),
+f175 numeric (64)
 ) engine = memory;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb3.txt' into table tb3 ;
-
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+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

@@ -4,56 +4,56 @@
 drop table if exists tb4 ;
 --enable_warnings
 create table tb4 (
-f176 numeric (0) unsigned not null DEFAULT 9, 
-f177 numeric (64) unsigned not null DEFAULT 9, 
-f178 numeric (0) zerofill not null DEFAULT 9, 
-f179 numeric (64) zerofill not null DEFAULT 9, 
-f180 numeric (0) unsigned zerofill not null DEFAULT 9, 
-f181 numeric (64) unsigned zerofill not null DEFAULT 9, 
-f182 numeric (0,0) not null DEFAULT 9, 
-f183 numeric (63,30) not null DEFAULT 9, 
-f184 numeric (0,0) unsigned not null DEFAULT 9, 
-f185 numeric (63,30) unsigned not null DEFAULT 9, 
-f186 numeric (0,0) zerofill not null DEFAULT 9, 
-f187 numeric (63,30) zerofill not null DEFAULT 9, 
-f188 numeric (0,0) unsigned zerofill not null DEFAULT 9, 
-f189 numeric (63,30) unsigned zerofill not null DEFAULT 9, 
-f190 real not null DEFAULT 88.8, 
-f191 real unsigned not null DEFAULT 88.8, 
-f192 real zerofill not null DEFAULT 88.8, 
-f193 real unsigned zerofill not null DEFAULT 88.8, 
-f194 double not null DEFAULT 55.5, 
-f195 double unsigned not null DEFAULT 55.5, 
-f196 double zerofill not null DEFAULT 55.5, 
-f197 double unsigned zerofill not null DEFAULT 55.5, 
-f198 float, 
-f199 float unsigned, 
-f200 float zerofill, 
-f201 float unsigned zerofill, 
-f202 float(0), 
-f203 float(23), 
-f204 float(0) unsigned, 
-f205 float(23) unsigned, 
-f206 float(0) zerofill, 
-f207 float(23) zerofill, 
-f208 float(0) unsigned zerofill, 
-f209 float(23) unsigned zerofill, 
-f210 float(24), 
-f211 float(53), 
-f212 float(24) unsigned, 
-f213 float(53) unsigned, 
-f214 float(24) zerofill, 
-f215 float(53) zerofill, 
-f216 float(24) unsigned zerofill, 
-f217 float(53) unsigned zerofill, 
-f218 date, 
-f219 time, 
-f220 datetime, 
-f221 timestamp, 
-f222 year, 
-f223 year(3), 
-f224 year(4), 
-f225 enum("1enum","2enum"), 
+f176 numeric (0) unsigned not null DEFAULT 9,
+f177 numeric (64) unsigned not null DEFAULT 9,
+f178 numeric (0) zerofill not null DEFAULT 9,
+f179 numeric (64) zerofill not null DEFAULT 9,
+f180 numeric (0) unsigned zerofill not null DEFAULT 9,
+f181 numeric (64) unsigned zerofill not null DEFAULT 9,
+f182 numeric (0,0) not null DEFAULT 9,
+f183 numeric (63,30) not null DEFAULT 9,
+f184 numeric (0,0) unsigned not null DEFAULT 9,
+f185 numeric (63,30) unsigned not null DEFAULT 9,
+f186 numeric (0,0) zerofill not null DEFAULT 9,
+f187 numeric (63,30) zerofill not null DEFAULT 9,
+f188 numeric (0,0) unsigned zerofill not null DEFAULT 9,
+f189 numeric (63,30) unsigned zerofill not null DEFAULT 9,
+f190 real not null DEFAULT 88.8,
+f191 real unsigned not null DEFAULT 88.8,
+f192 real zerofill not null DEFAULT 88.8,
+f193 real unsigned zerofill not null DEFAULT 88.8,
+f194 double not null DEFAULT 55.5,
+f195 double unsigned not null DEFAULT 55.5,
+f196 double zerofill not null DEFAULT 55.5,
+f197 double unsigned zerofill not null DEFAULT 55.5,
+f198 float,
+f199 float unsigned,
+f200 float zerofill,
+f201 float unsigned zerofill,
+f202 float(0),
+f203 float(23),
+f204 float(0) unsigned,
+f205 float(23) unsigned,
+f206 float(0) zerofill,
+f207 float(23) zerofill,
+f208 float(0) unsigned zerofill,
+f209 float(23) unsigned zerofill,
+f210 float(24),
+f211 float(53),
+f212 float(24) unsigned,
+f213 float(53) unsigned,
+f214 float(24) zerofill,
+f215 float(53) zerofill,
+f216 float(24) unsigned zerofill,
+f217 float(53) unsigned zerofill,
+f218 date,
+f219 time,
+f220 datetime,
+f221 timestamp,
+f222 year,
+f223 year(3),
+f224 year(4),
+f225 enum("1enum","2enum"),
 f226 set("1set","2set"),
 f236 char(95) unicode,
 f241 char(255) unicode,
@@ -63,5 +63,7 @@ f239 varbinary(0),
 f240 varchar(1200) unicode
 ) engine = memory;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb4.txt' into table tb4 ;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+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

@@ -4,65 +4,67 @@
 drop table if exists tb1 ;
 --enable_warnings
 create table tb1 (
-f1 char, 
-f2 char binary, 
-f3 char ascii, 
-f4 tinytext unicode, 
-f5 text, 
-f6 mediumtext, 
-f7 longtext, 
-f8 tinyblob, 
+f1 char,
+f2 char binary,
+f3 char ascii,
+f4 tinytext unicode,
+f5 text,
+f6 mediumtext,
+f7 longtext,
+f8 tinyblob,
 f9 blob,
-f10 mediumblob, 
-f11 longblob, 
-f12 binary, 
-f13 tinyint, 
-f14 tinyint unsigned, 
-f15 tinyint zerofill, 
-f16 tinyint unsigned zerofill, 
-f17 smallint, 
-f18 smallint unsigned,  
-f19 smallint zerofill, 
-f20 smallint unsigned zerofill, 
-f21 mediumint, 
-f22 mediumint unsigned, 
-f23 mediumint zerofill, 
-f24 mediumint unsigned zerofill, 
-f25 int, 
-f26 int unsigned, 
-f27 int zerofill, 
-f28 int unsigned zerofill, 
-f29 bigint, 
-f30 bigint unsigned, 
-f31 bigint zerofill, 
-f32 bigint unsigned zerofill, 
-f33 decimal not null DEFAULT 9.9, 
-f34 decimal unsigned not null DEFAULT 9.9, 
-f35 decimal zerofill not null DEFAULT 9.9, 
-f36 decimal unsigned zerofill not null DEFAULT 9.9, 
-f37 decimal (0) not null DEFAULT 9.9, 
-f38 decimal (64) not null DEFAULT 9.9, 
-f39 decimal (0) unsigned not null DEFAULT 9.9, 
-f40 decimal (64) unsigned not null DEFAULT 9.9, 
-f41 decimal (0) zerofill not null DEFAULT 9.9, 
-f42 decimal (64) zerofill not null DEFAULT 9.9, 
-f43 decimal (0) unsigned zerofill not null DEFAULT 9.9, 
-f44 decimal (64) unsigned zerofill not null DEFAULT 9.9, 
-f45 decimal (0,0) not null DEFAULT 9.9, 
-f46 decimal (63,30) not null DEFAULT 9.9, 
-f47 decimal (0,0) unsigned not null DEFAULT 9.9, 
-f48 decimal (63,30) unsigned not null DEFAULT 9.9, 
-f49 decimal (0,0) zerofill not null DEFAULT 9.9, 
-f50 decimal (63,30) zerofill not null DEFAULT 9.9, 
-f51 decimal (0,0) unsigned zerofill not null DEFAULT 9.9, 
-f52 decimal (63,30) unsigned zerofill not null DEFAULT 9.9, 
-f53 numeric not null DEFAULT 99, 
-f54 numeric unsigned not null DEFAULT 99, 
-f55 numeric zerofill not null DEFAULT 99, 
-f56 numeric unsigned zerofill not null DEFAULT 99, 
-f57 numeric (0) not null DEFAULT 99, 
+f10 mediumblob,
+f11 longblob,
+f12 binary,
+f13 tinyint,
+f14 tinyint unsigned,
+f15 tinyint zerofill,
+f16 tinyint unsigned zerofill,
+f17 smallint,
+f18 smallint unsigned,
+f19 smallint zerofill,
+f20 smallint unsigned zerofill,
+f21 mediumint,
+f22 mediumint unsigned,
+f23 mediumint zerofill,
+f24 mediumint unsigned zerofill,
+f25 int,
+f26 int unsigned,
+f27 int zerofill,
+f28 int unsigned zerofill,
+f29 bigint,
+f30 bigint unsigned,
+f31 bigint zerofill,
+f32 bigint unsigned zerofill,
+f33 decimal not null DEFAULT 9.9,
+f34 decimal unsigned not null DEFAULT 9.9,
+f35 decimal zerofill not null DEFAULT 9.9,
+f36 decimal unsigned zerofill not null DEFAULT 9.9,
+f37 decimal (0) not null DEFAULT 9.9,
+f38 decimal (64) not null DEFAULT 9.9,
+f39 decimal (0) unsigned not null DEFAULT 9.9,
+f40 decimal (64) unsigned not null DEFAULT 9.9,
+f41 decimal (0) zerofill not null DEFAULT 9.9,
+f42 decimal (64) zerofill not null DEFAULT 9.9,
+f43 decimal (0) unsigned zerofill not null DEFAULT 9.9,
+f44 decimal (64) unsigned zerofill not null DEFAULT 9.9,
+f45 decimal (0,0) not null DEFAULT 9.9,
+f46 decimal (63,30) not null DEFAULT 9.9,
+f47 decimal (0,0) unsigned not null DEFAULT 9.9,
+f48 decimal (63,30) unsigned not null DEFAULT 9.9,
+f49 decimal (0,0) zerofill not null DEFAULT 9.9,
+f50 decimal (63,30) zerofill not null DEFAULT 9.9,
+f51 decimal (0,0) unsigned zerofill not null DEFAULT 9.9,
+f52 decimal (63,30) unsigned zerofill not null DEFAULT 9.9,
+f53 numeric not null DEFAULT 99,
+f54 numeric unsigned not null DEFAULT 99,
+f55 numeric zerofill not null DEFAULT 99,
+f56 numeric unsigned zerofill not null DEFAULT 99,
+f57 numeric (0) not null DEFAULT 99,
 f58 numeric (64) not null DEFAULT 99
 ) engine = myisam;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb1.txt' into table tb1 ;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+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

@@ -4,77 +4,79 @@
 drop table if exists tb2 ;
 --enable_warnings
 create table tb2 (
-f59 numeric (0) unsigned, 
-f60 numeric (64) unsigned, 
-f61 numeric (0) zerofill, 
-f62 numeric (64) zerofill, 
-f63 numeric (0) unsigned zerofill, 
-f64 numeric (64) unsigned zerofill, 
-f65 numeric (0,0), 
-f66 numeric (63,30), 
-f67 numeric (0,0) unsigned, 
-f68 numeric (63,30) unsigned, 
-f69 numeric (0,0) zerofill, 
-f70 numeric (63,30) zerofill, 
-f71 numeric (0,0) unsigned zerofill, 
-f72 numeric (63,30) unsigned zerofill, 
-f73 real, 
-f74 real unsigned, 
-f75 real zerofill, 
-f76 real unsigned zerofill, 
-f77 double default 7.7, 
-f78 double unsigned default 7.7, 
-f79 double zerofill default 7.7, 
-f80 double unsigned zerofill default 8.8, 
-f81 float not null default 8.8, 
-f82 float unsigned not null default 8.8, 
-f83 float zerofill not null default 8.8, 
-f84 float unsigned zerofill not null default 8.8, 
-f85 float(0) not null default 8.8, 
-f86 float(23) not null default 8.8, 
-f87 float(0) unsigned not null default 8.8, 
-f88 float(23) unsigned not null default 8.8, 
-f89 float(0) zerofill not null default 8.8, 
-f90 float(23) zerofill not null default 8.8, 
-f91 float(0) unsigned zerofill not null default 8.8, 
-f92 float(23) unsigned zerofill not null default 8.8, 
-f93 float(24) not null default 8.8, 
-f94 float(53) not null default 8.8, 
-f95 float(24) unsigned not null default 8.8, 
-f96 float(53) unsigned not null default 8.8, 
-f97 float(24) zerofill not null default 8.8, 
-f98 float(53) zerofill not null default 8.8, 
-f99 float(24) unsigned zerofill not null default 8.8, 
-f100 float(53) unsigned zerofill not null default 8.8, 
-f101 date not null default '2000-01-01', 
-f102 time not null default 20, 
-f103 datetime not null default '2/2/2', 
-f104 timestamp not null default 20001231235959, 
-f105 year not null default 2000, 
-f106 year(3) not null default 2000, 
-f107 year(4) not null default 2000, 
-f108 enum("1enum","2enum") not null default "1enum", 
+f59 numeric (0) unsigned,
+f60 numeric (64) unsigned,
+f61 numeric (0) zerofill,
+f62 numeric (64) zerofill,
+f63 numeric (0) unsigned zerofill,
+f64 numeric (64) unsigned zerofill,
+f65 numeric (0,0),
+f66 numeric (63,30),
+f67 numeric (0,0) unsigned,
+f68 numeric (63,30) unsigned,
+f69 numeric (0,0) zerofill,
+f70 numeric (63,30) zerofill,
+f71 numeric (0,0) unsigned zerofill,
+f72 numeric (63,30) unsigned zerofill,
+f73 real,
+f74 real unsigned,
+f75 real zerofill,
+f76 real unsigned zerofill,
+f77 double default 7.7,
+f78 double unsigned default 7.7,
+f79 double zerofill default 7.7,
+f80 double unsigned zerofill default 8.8,
+f81 float not null default 8.8,
+f82 float unsigned not null default 8.8,
+f83 float zerofill not null default 8.8,
+f84 float unsigned zerofill not null default 8.8,
+f85 float(0) not null default 8.8,
+f86 float(23) not null default 8.8,
+f87 float(0) unsigned not null default 8.8,
+f88 float(23) unsigned not null default 8.8,
+f89 float(0) zerofill not null default 8.8,
+f90 float(23) zerofill not null default 8.8,
+f91 float(0) unsigned zerofill not null default 8.8,
+f92 float(23) unsigned zerofill not null default 8.8,
+f93 float(24) not null default 8.8,
+f94 float(53) not null default 8.8,
+f95 float(24) unsigned not null default 8.8,
+f96 float(53) unsigned not null default 8.8,
+f97 float(24) zerofill not null default 8.8,
+f98 float(53) zerofill not null default 8.8,
+f99 float(24) unsigned zerofill not null default 8.8,
+f100 float(53) unsigned zerofill not null default 8.8,
+f101 date not null default '2000-01-01',
+f102 time not null default 20,
+f103 datetime not null default '2/2/2',
+f104 timestamp not null default 20001231235959,
+f105 year not null default 2000,
+f106 year(3) not null default 2000,
+f107 year(4) not null default 2000,
+f108 enum("1enum","2enum") not null default "1enum",
 f109 set("1set","2set") not null default "1set",
-f110 VARBINARY(64) null, 
-f111 VARBINARY(27) null , 
-f112 VARBINARY(64) null , 
-f113 VARBINARY(192) null , 
-f114 VARBINARY(192) , 
-f115 VARBINARY(27) null , 
-f116 VARBINARY(64) null, 
-f117 VARBINARY(192) null 
+f110 VARBINARY(64) null,
+f111 VARBINARY(27) null ,
+f112 VARBINARY(64) null ,
+f113 VARBINARY(192) null ,
+f114 VARBINARY(192) ,
+f115 VARBINARY(27) null ,
+f116 VARBINARY(64) null,
+f117 VARBINARY(192) null
 ) engine = myisam;
 
 # The original columns. They are replaced by varbinary, because the funcs_1 tests should
 # not depend on the optional availability of the geometry feature.
-# f110 geometry null, 
-# f111 point null , 
-# f112 linestring null , 
-# f113 polygon null , 
-# f114 geometrycollection , 
-# f115 multipoint null , 
-# f116 multilinestring null, 
-# f117 multipolygon null 
+# f110 geometry null,
+# f111 point null ,
+# f112 linestring null ,
+# f113 polygon null ,
+# f114 geometrycollection ,
+# f115 multipoint null ,
+# f116 multilinestring null,
+# f117 multipolygon null
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb2.txt' into table tb2 ;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+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

@@ -4,65 +4,67 @@
 drop table if exists tb3 ;
 --enable_warnings
 create table tb3 (
-f118 char not null DEFAULT 'a', 
-f119 char binary not null DEFAULT b'101', 
-f120 char ascii not null DEFAULT b'101', 
-f121 tinytext, 
-f122 text, 
-f123 mediumtext, 
-f124 longtext unicode, 
-f125 tinyblob, 
-f126 blob, 
-f127 mediumblob, 
-f128 longblob, 
-f129 binary not null DEFAULT b'101', 
-f130 tinyint not null DEFAULT 99, 
-f131 tinyint unsigned not null DEFAULT 99, 
-f132 tinyint zerofill not null DEFAULT 99, 
-f133 tinyint unsigned zerofill not null DEFAULT 99, 
-f134 smallint not null DEFAULT 999, 
-f135 smallint unsigned not null DEFAULT 999, 
-f136 smallint zerofill not null DEFAULT 999,  
-f137 smallint unsigned zerofill not null DEFAULT 999, 
-f138 mediumint not null DEFAULT 9999, 
-f139 mediumint unsigned not null DEFAULT 9999, 
-f140 mediumint zerofill not null DEFAULT 9999, 
-f141 mediumint unsigned zerofill not null DEFAULT 9999, 
-f142 int not null DEFAULT 99999, 
-f143 int unsigned not null DEFAULT 99999, 
-f144 int zerofill not null DEFAULT 99999, 
-f145 int unsigned zerofill not null DEFAULT 99999, 
-f146 bigint not null DEFAULT 999999, 
-f147 bigint unsigned not null DEFAULT 999999, 
-f148 bigint zerofill not null DEFAULT 999999, 
-f149 bigint unsigned zerofill not null DEFAULT 999999, 
-f150 decimal not null DEFAULT 999.999, 
-f151 decimal unsigned not null DEFAULT 999.17, 
-f152 decimal zerofill not null DEFAULT 999.999, 
-f153 decimal unsigned zerofill, 
-f154 decimal (0), 
-f155 decimal (64), 
-f156 decimal (0) unsigned, 
-f157 decimal (64) unsigned, 
-f158 decimal (0) zerofill, 
-f159 decimal (64) zerofill, 
-f160 decimal (0) unsigned zerofill, 
-f161 decimal (64) unsigned zerofill, 
-f162 decimal (0,0), 
-f163 decimal (63,30), 
-f164 decimal (0,0) unsigned, 
-f165 decimal (63,30) unsigned, 
-f166 decimal (0,0) zerofill, 
-f167 decimal (63,30) zerofill, 
-f168 decimal (0,0) unsigned zerofill, 
-f169 decimal (63,30) unsigned zerofill, 
-f170 numeric, 
-f171 numeric unsigned, 
-f172 numeric zerofill, 
-f173 numeric unsigned zerofill, 
-f174 numeric (0), 
-f175 numeric (64) 
+f118 char not null DEFAULT 'a',
+f119 char binary not null DEFAULT b'101',
+f120 char ascii not null DEFAULT b'101',
+f121 tinytext,
+f122 text,
+f123 mediumtext,
+f124 longtext unicode,
+f125 tinyblob,
+f126 blob,
+f127 mediumblob,
+f128 longblob,
+f129 binary not null DEFAULT b'101',
+f130 tinyint not null DEFAULT 99,
+f131 tinyint unsigned not null DEFAULT 99,
+f132 tinyint zerofill not null DEFAULT 99,
+f133 tinyint unsigned zerofill not null DEFAULT 99,
+f134 smallint not null DEFAULT 999,
+f135 smallint unsigned not null DEFAULT 999,
+f136 smallint zerofill not null DEFAULT 999,
+f137 smallint unsigned zerofill not null DEFAULT 999,
+f138 mediumint not null DEFAULT 9999,
+f139 mediumint unsigned not null DEFAULT 9999,
+f140 mediumint zerofill not null DEFAULT 9999,
+f141 mediumint unsigned zerofill not null DEFAULT 9999,
+f142 int not null DEFAULT 99999,
+f143 int unsigned not null DEFAULT 99999,
+f144 int zerofill not null DEFAULT 99999,
+f145 int unsigned zerofill not null DEFAULT 99999,
+f146 bigint not null DEFAULT 999999,
+f147 bigint unsigned not null DEFAULT 999999,
+f148 bigint zerofill not null DEFAULT 999999,
+f149 bigint unsigned zerofill not null DEFAULT 999999,
+f150 decimal not null DEFAULT 999.999,
+f151 decimal unsigned not null DEFAULT 999.17,
+f152 decimal zerofill not null DEFAULT 999.999,
+f153 decimal unsigned zerofill,
+f154 decimal (0),
+f155 decimal (64),
+f156 decimal (0) unsigned,
+f157 decimal (64) unsigned,
+f158 decimal (0) zerofill,
+f159 decimal (64) zerofill,
+f160 decimal (0) unsigned zerofill,
+f161 decimal (64) unsigned zerofill,
+f162 decimal (0,0),
+f163 decimal (63,30),
+f164 decimal (0,0) unsigned,
+f165 decimal (63,30) unsigned,
+f166 decimal (0,0) zerofill,
+f167 decimal (63,30) zerofill,
+f168 decimal (0,0) unsigned zerofill,
+f169 decimal (63,30) unsigned zerofill,
+f170 numeric,
+f171 numeric unsigned,
+f172 numeric zerofill,
+f173 numeric unsigned zerofill,
+f174 numeric (0),
+f175 numeric (64)
 ) Engine = myisam;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb3.txt' into table tb3 ;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+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

@@ -4,64 +4,64 @@
 drop table if exists tb4 ;
 --enable_warnings
 create table tb4 (
-f176 numeric (0) unsigned not null DEFAULT 9, 
-f177 numeric (64) unsigned not null DEFAULT 9, 
-f178 numeric (0) zerofill not null DEFAULT 9, 
-f179 numeric (64) zerofill not null DEFAULT 9, 
-f180 numeric (0) unsigned zerofill not null DEFAULT 9, 
-f181 numeric (64) unsigned zerofill not null DEFAULT 9, 
-f182 numeric (0,0) not null DEFAULT 9, 
-f183 numeric (63,30) not null DEFAULT 9, 
-f184 numeric (0,0) unsigned not null DEFAULT 9, 
-f185 numeric (63,30) unsigned not null DEFAULT 9, 
-f186 numeric (0,0) zerofill not null DEFAULT 9, 
-f187 numeric (63,30) zerofill not null DEFAULT 9, 
-f188 numeric (0,0) unsigned zerofill not null DEFAULT 9, 
-f189 numeric (63,30) unsigned zerofill not null DEFAULT 9, 
-f190 real not null DEFAULT 88.8, 
-f191 real unsigned not null DEFAULT 88.8, 
-f192 real zerofill not null DEFAULT 88.8, 
-f193 real unsigned zerofill not null DEFAULT 88.8, 
-f194 double not null DEFAULT 55.5, 
-f195 double unsigned not null DEFAULT 55.5, 
-f196 double zerofill not null DEFAULT 55.5, 
-f197 double unsigned zerofill not null DEFAULT 55.5, 
-f198 float, 
-f199 float unsigned, 
-f200 float zerofill, 
-f201 float unsigned zerofill, 
-f202 float(0), 
-f203 float(23), 
-f204 float(0) unsigned, 
-f205 float(23) unsigned, 
-f206 float(0) zerofill, 
-f207 float(23) zerofill, 
-f208 float(0) unsigned zerofill, 
-f209 float(23) unsigned zerofill, 
-f210 float(24), 
-f211 float(53), 
-f212 float(24) unsigned, 
-f213 float(53) unsigned, 
-f214 float(24) zerofill, 
-f215 float(53) zerofill, 
-f216 float(24) unsigned zerofill, 
-f217 float(53) unsigned zerofill, 
-f218 date, 
-f219 time, 
-f220 datetime, 
-f221 timestamp, 
-f222 year, 
-f223 year(3), 
-f224 year(4), 
-f225 enum("1enum","2enum"), 
-f226 set("1set","2set"), 
-f227 VARBINARY(64), 
-f228 VARBINARY(27), 
-f229 VARBINARY(64), 
-f230 VARBINARY(192), 
-f231 VARBINARY(192), 
-f232 VARBINARY(27), 
-f233 VARBINARY(64), 
+f176 numeric (0) unsigned not null DEFAULT 9,
+f177 numeric (64) unsigned not null DEFAULT 9,
+f178 numeric (0) zerofill not null DEFAULT 9,
+f179 numeric (64) zerofill not null DEFAULT 9,
+f180 numeric (0) unsigned zerofill not null DEFAULT 9,
+f181 numeric (64) unsigned zerofill not null DEFAULT 9,
+f182 numeric (0,0) not null DEFAULT 9,
+f183 numeric (63,30) not null DEFAULT 9,
+f184 numeric (0,0) unsigned not null DEFAULT 9,
+f185 numeric (63,30) unsigned not null DEFAULT 9,
+f186 numeric (0,0) zerofill not null DEFAULT 9,
+f187 numeric (63,30) zerofill not null DEFAULT 9,
+f188 numeric (0,0) unsigned zerofill not null DEFAULT 9,
+f189 numeric (63,30) unsigned zerofill not null DEFAULT 9,
+f190 real not null DEFAULT 88.8,
+f191 real unsigned not null DEFAULT 88.8,
+f192 real zerofill not null DEFAULT 88.8,
+f193 real unsigned zerofill not null DEFAULT 88.8,
+f194 double not null DEFAULT 55.5,
+f195 double unsigned not null DEFAULT 55.5,
+f196 double zerofill not null DEFAULT 55.5,
+f197 double unsigned zerofill not null DEFAULT 55.5,
+f198 float,
+f199 float unsigned,
+f200 float zerofill,
+f201 float unsigned zerofill,
+f202 float(0),
+f203 float(23),
+f204 float(0) unsigned,
+f205 float(23) unsigned,
+f206 float(0) zerofill,
+f207 float(23) zerofill,
+f208 float(0) unsigned zerofill,
+f209 float(23) unsigned zerofill,
+f210 float(24),
+f211 float(53),
+f212 float(24) unsigned,
+f213 float(53) unsigned,
+f214 float(24) zerofill,
+f215 float(53) zerofill,
+f216 float(24) unsigned zerofill,
+f217 float(53) unsigned zerofill,
+f218 date,
+f219 time,
+f220 datetime,
+f221 timestamp,
+f222 year,
+f223 year(3),
+f224 year(4),
+f225 enum("1enum","2enum"),
+f226 set("1set","2set"),
+f227 VARBINARY(64),
+f228 VARBINARY(27),
+f229 VARBINARY(64),
+f230 VARBINARY(192),
+f231 VARBINARY(192),
+f232 VARBINARY(27),
+f233 VARBINARY(64),
 f234 VARBINARY(192),
 f235 char(255) unicode,
 f236 char(60) ascii,
@@ -75,14 +75,16 @@ f242 bit(30)
 
 # The original columns. They are replaced by varbinary, because the funcs_1 tests should
 # not depend on the optional availability of the geometry feature.
-# f227 geometry, 
-# f228 point, 
-# f229 linestring, 
-# f230 polygon, 
-# f231 geometrycollection, 
-# f232 multipoint, 
-# f233 multilinestring, 
+# f227 geometry,
+# f228 point,
+# f229 linestring,
+# f230 polygon,
+# f231 geometrycollection,
+# f232 multipoint,
+# f233 multilinestring,
 # f234 multipolygon,
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb4.txt' into table tb4 ;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/myisam_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 CREATE TABLE t2  (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = $engine_type;
-eval CREATE TABLE t4  (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) 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 CREATE TABLE t11 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = $engine_type;
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t1;
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t2;
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t4;
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t10;
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t11;
+eval
+CREATE TABLE t1  (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+ENGINE = $engine_type;
+eval
+CREATE TABLE t2  (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+ENGINE = $engine_type;
+eval
+CREATE TABLE t4  (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+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
+CREATE TABLE t11 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+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;
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' INTO TABLE t3;
+eval
+CREATE TABLE t3 (f1 char(20), f2 char(20), f3 integer) ENGINE = $engine_type;
+--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;
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t6;
+eval
+CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int)
+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 CREATE TABLE t8 (f1 char(20), f2 char(25), f3 date, f4 int) ENGINE = $engine_type;
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t7;
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t8;
+eval
+CREATE TABLE t7 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = $engine_type;
+eval
+CREATE TABLE t8 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = $engine_type;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+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
-eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' INTO TABLE t9;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/t9.txt' INTO TABLE t9;
 

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;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1;
-create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2;
-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;
-create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4;
+create table t1(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 t1;
+create table t2(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 t2;
+create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
+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;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6;
+create table t6(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 t6;
 USE db_storedproc;
-create table t7 (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;
+create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
+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;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8;
+create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
+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;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/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;
-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) engine = innodb;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
+create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
+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 = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
+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:
@@ -164,7 +172,7 @@ declare y integer default 1;
 set @x = x;
 set @y = y;
 set @z = 234;
-SELECT f1, f2 into @x, @y from t2 limit 1;
+SELECT f1, f2 into @x, @y from t2 where f1='a`' and f2='a`' limit 1;
 SELECT @x, @y, @z, invar;
 BEGIN
 set @x = 2;
@@ -207,7 +215,7 @@ BEGIN
 declare x integer; declare y integer;
 set @x=x;
 set @y=y;
-SELECT f4, f3 into @x, @y from t2 limit 1;
+SELECT f4, f3 into @x, @y from t2 where f4=-5000 and f3='1000-01-01' limit 1;
 SELECT @x, @y;
 END//
 CALL sp1();
@@ -695,7 +703,7 @@ Testcase 3.1.2.54:
 ------------------
 
 Ensure that a handler with a condition defined with an SQLSTATE that begins with
-01 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;
@@ -794,7 +802,7 @@ Testcase 3.1.2.56:
 ------------------
 
 Ensure that a handler with a condition defined with an SQLSTATE that begins with
-02 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;
@@ -902,7 +910,7 @@ Testcase 3.1.2.58:
 ------------------
 
 Ensure that a handler with a condition defined with an SQLSTATE that begins with
-anything other that 01 or 02 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;
@@ -1082,7 +1090,8 @@ declare f2_value char(20);
 declare f5_value char(20);
 declare f4_value integer;
 declare f6_value integer;
-declare cur1 cursor for SELECT f1, f2, f4, f5, f6 from t2 limit 3;
+declare cur1 cursor for SELECT f1, f2, f4, f5, f6 from t2
+where f4 >=-5000 order by f4 limit 3;
 open cur1;
 while proceed do
 SELECT count AS 'loop';
@@ -1165,7 +1174,7 @@ of a compound statement ends.
 DROP TABLE IF EXISTS temp1;
 DROP PROCEDURE IF EXISTS sp1;
 create table temp1( f0 char(20), f1 char(20), f2 char(20), f3 int, f4 char(20) );
-SELECT f1, f2, f4, f5 from t2;
+SELECT f1, f2, f4, f5 from t2 order by f4;
 f1	f2	f4	f5
 a`	a`	-5000	a`
 aaa	aaa	-4999	aaa
@@ -1185,8 +1194,8 @@ declare newf1 char(20);
 declare newf2 char(20);
 declare newf5 char(20);
 declare newf4 integer;
-declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 limit 5;
-declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 limit 5;
+declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by f4 limit 5;
+declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by f4 limit 5;
 open cur1;
 open cur2;
 BEGIN
@@ -1268,8 +1277,10 @@ declare i_newf11 char(20);
 declare i_newf12 char(20);
 declare i_newf13 date;
 declare i_newf14 integer;
-declare cur1 cursor for SELECT f1, f2, f3, f4 from t2 limit 4;
-declare cur2 cursor for SELECT f1, f2, f3, f4 from t2 limit 3;
+declare cur1 cursor for SELECT f1, f2, f3, f4 from t2
+where f4>=-5000 order by f4 limit 4;
+declare cur2 cursor for SELECT f1, f2, f3, f4 from t2
+where f4>=-5000 order by f4 limit 3;
 declare continue handler for sqlstate '02000' set proceed=0;
 open cur1;
 open cur2;
@@ -1300,8 +1311,10 @@ DECLARE o_newf11 CHAR(20);
 DECLARE o_newf12 CHAR(20);
 DECLARE o_newf13 DATE;
 DECLARE o_newf14 INTEGER;
-DECLARE cur1 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2 LIMIT 5;
-DECLARE cur2 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2 LIMIT 5;
+DECLARE cur1 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2
+WHERE f4>=-5000 ORDER BY f4 LIMIT 5;
+DECLARE cur2 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2
+WHERE f4>=-5000 ORDER BY f4 LIMIT 5;
 DECLARE CONTINUE HANDLER FOR SQLSTATE '02000' SET proceed=0;
 OPEN cur1;
 OPEN cur2;

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;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1;
-create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2;
-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;
-create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4;
+create table t1(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 t1;
+create table t2(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 t2;
+create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
+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;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6;
+create table t6(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 t6;
 USE db_storedproc;
-create table t7 (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;
+create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
+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;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8;
+create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
+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;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/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;
-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) engine = innodb;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
+create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
+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 = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
+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;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1;
-create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2;
-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;
-create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4;
+create table t1(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 t1;
+create table t2(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 t2;
+create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
+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;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6;
+create table t6(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 t6;
 USE db_storedproc;
-create table t7 (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;
+create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
+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;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8;
+create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
+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;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/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;
-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) engine = innodb;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
+create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
+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 = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
+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:
 --------------------------------------------------------------------------------
@@ -79,6 +87,7 @@ BEGIN
 SELECT * from db_storedproc_1.t6 where t6.f2= 'xyz';
 END//
 ERROR 42000: Access denied for user 'user_1'@'localhost' to database 'db_storedproc_1'
+USE db_storedproc_1;
 	
 root@localhost	db_storedproc_1
 GRANT CREATE ROUTINE ON db_storedproc_1.* TO 'user_1'@'localhost';
@@ -90,6 +99,7 @@ CREATE PROCEDURE sp1(v1 char(20))
 BEGIN
 SELECT * from db_storedproc_1.t6 where t6.f2= 'xyz';
 END//
+USE db_storedproc_1;
 	
 root@localhost	db_storedproc_1
 DROP USER 'user_1'@'localhost';
@@ -115,6 +125,7 @@ CREATE FUNCTION fn1(v1 int) returns int
 BEGIN
 return v1;
 END//
+USE db_storedproc_1;
 	
 root@localhost	db_storedproc_1
 drop user 'user_1'@'localhost';

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;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1;
-create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2;
-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;
-create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4;
+create table t1(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 t1;
+create table t2(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 t2;
+create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
+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;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6;
+create table t6(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 t6;
 USE db_storedproc;
-create table t7 (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;
+create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
+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;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8;
+create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
+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;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/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;
-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) engine = innodb;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
+create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
+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 = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
+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;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t1;
-create table t2(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t2;
-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;
-create table t4(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = innodb;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t4;
+create table t1(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 t1;
+create table t2(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 t2;
+create table t3(f1 char(20),f2 char(20),f3 integer) engine = <engine_to_be_tested>;
+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;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t6;
+create table t6(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 t6;
 USE db_storedproc;
-create table t7 (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;
+create table t7 (f1 char(20), f2 char(25), f3 date, f4 int)
+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;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' into table t8;
+create table t8 (f1 char(20), f2 char(25), f3 date, f4 int)
+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;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/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;
-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) engine = innodb;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
+create table t9(f1 int, f2 char(25), f3 int) engine = <engine_to_be_tested>;
+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 = <engine_to_be_tested>;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t4.txt' into table t10;
+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_trig_09.result

 USE test;
 drop table if exists tb3 ;
 create table tb3 (
-f118 char not null DEFAULT 'a', 
-f119 char binary not null DEFAULT b'101', 
-f120 char ascii not null DEFAULT b'101', 
-f121 tinytext, 
-f122 text, 
-f123 mediumtext, 
-f124 longtext unicode, 
-f125 tinyblob, 
-f126 blob, 
-f127 mediumblob, 
-f128 longblob, 
-f129 binary not null DEFAULT b'101', 
-f130 tinyint not null DEFAULT 99, 
-f131 tinyint unsigned not null DEFAULT 99, 
-f132 tinyint zerofill not null DEFAULT 99, 
-f133 tinyint unsigned zerofill not null DEFAULT 99, 
-f134 smallint not null DEFAULT 999, 
-f135 smallint unsigned not null DEFAULT 999, 
-f136 smallint zerofill not null DEFAULT 999,  
-f137 smallint unsigned zerofill not null DEFAULT 999, 
-f138 mediumint not null DEFAULT 9999, 
-f139 mediumint unsigned not null DEFAULT 9999, 
-f140 mediumint zerofill not null DEFAULT 9999, 
-f141 mediumint unsigned zerofill not null DEFAULT 9999, 
-f142 int not null DEFAULT 99999, 
-f143 int unsigned not null DEFAULT 99999, 
-f144 int zerofill not null DEFAULT 99999, 
-f145 int unsigned zerofill not null DEFAULT 99999, 
-f146 bigint not null DEFAULT 999999, 
-f147 bigint unsigned not null DEFAULT 999999, 
-f148 bigint zerofill not null DEFAULT 999999, 
-f149 bigint unsigned zerofill not null DEFAULT 999999, 
-f150 decimal not null DEFAULT 999.999, 
-f151 decimal unsigned not null DEFAULT 999.17, 
-f152 decimal zerofill not null DEFAULT 999.999, 
-f153 decimal unsigned zerofill, 
-f154 decimal (0), 
-f155 decimal (64), 
-f156 decimal (0) unsigned, 
-f157 decimal (64) unsigned, 
-f158 decimal (0) zerofill, 
-f159 decimal (64) zerofill, 
-f160 decimal (0) unsigned zerofill, 
-f161 decimal (64) unsigned zerofill, 
-f162 decimal (0,0), 
-f163 decimal (63,30), 
-f164 decimal (0,0) unsigned, 
-f165 decimal (63,30) unsigned, 
-f166 decimal (0,0) zerofill, 
-f167 decimal (63,30) zerofill, 
-f168 decimal (0,0) unsigned zerofill, 
-f169 decimal (63,30) unsigned zerofill, 
-f170 numeric, 
-f171 numeric unsigned, 
-f172 numeric zerofill, 
-f173 numeric unsigned zerofill, 
-f174 numeric (0), 
-f175 numeric (64) 
+f118 char not null DEFAULT 'a',
+f119 char binary not null DEFAULT b'101',
+f120 char ascii not null DEFAULT b'101',
+f121 tinytext,
+f122 text,
+f123 mediumtext,
+f124 longtext unicode,
+f125 tinyblob,
+f126 blob,
+f127 mediumblob,
+f128 longblob,
+f129 binary not null DEFAULT b'101',
+f130 tinyint not null DEFAULT 99,
+f131 tinyint unsigned not null DEFAULT 99,
+f132 tinyint zerofill not null DEFAULT 99,
+f133 tinyint unsigned zerofill not null DEFAULT 99,
+f134 smallint not null DEFAULT 999,
+f135 smallint unsigned not null DEFAULT 999,
+f136 smallint zerofill not null DEFAULT 999,
+f137 smallint unsigned zerofill not null DEFAULT 999,
+f138 mediumint not null DEFAULT 9999,
+f139 mediumint unsigned not null DEFAULT 9999,
+f140 mediumint zerofill not null DEFAULT 9999,
+f141 mediumint unsigned zerofill not null DEFAULT 9999,
+f142 int not null DEFAULT 99999,
+f143 int unsigned not null DEFAULT 99999,
+f144 int zerofill not null DEFAULT 99999,
+f145 int unsigned zerofill not null DEFAULT 99999,
+f146 bigint not null DEFAULT 999999,
+f147 bigint unsigned not null DEFAULT 999999,
+f148 bigint zerofill not null DEFAULT 999999,
+f149 bigint unsigned zerofill not null DEFAULT 999999,
+f150 decimal not null DEFAULT 999.999,
+f151 decimal unsigned not null DEFAULT 999.17,
+f152 decimal zerofill not null DEFAULT 999.999,
+f153 decimal unsigned zerofill,
+f154 decimal (0),
+f155 decimal (64),
+f156 decimal (0) unsigned,
+f157 decimal (64) unsigned,
+f158 decimal (0) zerofill,
+f159 decimal (64) zerofill,
+f160 decimal (0) unsigned zerofill,
+f161 decimal (64) unsigned zerofill,
+f162 decimal (0,0),
+f163 decimal (63,30),
+f164 decimal (0,0) unsigned,
+f165 decimal (63,30) unsigned,
+f166 decimal (0,0) zerofill,
+f167 decimal (63,30) zerofill,
+f168 decimal (0,0) unsigned zerofill,
+f169 decimal (63,30) unsigned zerofill,
+f170 numeric,
+f171 numeric unsigned,
+f172 numeric zerofill,
+f173 numeric unsigned zerofill,
+f174 numeric (0),
+f175 numeric (64)
 ) engine = innodb;
 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:
 -------------------
-Create trigger trg1 BEFORE UPDATE on tb3 for each row 
+Create trigger trg1 BEFORE UPDATE on tb3 for each row
 set new.f142 = 94087, @counter=@counter+1;
 TotalRows
 10
@@ -80,15 +81,15 @@ NewValuew
 0
 set @counter=0;
 Update tb3 Set f142='1' where f130<100;
-select count(*) as ExpectedChanged, @counter as TrigCounter 
+select count(*) as ExpectedChanged, @counter as TrigCounter
 from tb3 where f142=94087;
 ExpectedChanged	TrigCounter
 8	8
-select count(*) as ExpectedNotChange from tb3 
+select count(*) as ExpectedNotChange from tb3
 where f130<100 and f142<>94087;
 ExpectedNotChange
 0
-select count(*) as NonExpectedChanged from tb3 
+select count(*) as NonExpectedChanged from tb3
 where f130>=130 and f142=94087;
 NonExpectedChanged
 0
@@ -116,17 +117,17 @@ set @tr_var_af_118=old.f118, @tr_var_af_121=old.f121,
 0	0	0	0	0
 @tr_var_af_118	@tr_var_af_121	@tr_var_af_122	@tr_var_af_136	@tr_var_af_163
 0	0	0	0	0
-Insert into tb3 (f122, f136, f163) 
+Insert into tb3 (f122, f136, f163)
 values ('Test 3.5.9.3', 7, 123.17);
 Update tb3 Set f136=8 where f122='Test 3.5.9.3';
-select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3';
+select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136;
 f118	f121	f122	f136	f163
 a	NULL	Test 3.5.9.3	00008	123.170000000000000000000000000000
-select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
+select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122,
 @tr_var_b4_136, @tr_var_b4_163;
 @tr_var_b4_118	@tr_var_b4_121	@tr_var_b4_122	@tr_var_b4_136	@tr_var_b4_163
 a	NULL	Test 3.5.9.3	7	123.170000000000000000000000000000
-select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122, 
+select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122,
 @tr_var_af_136, @tr_var_af_163;
 @tr_var_af_118	@tr_var_af_121	@tr_var_af_122	@tr_var_af_136	@tr_var_af_163
 a	NULL	Test 3.5.9.3	7	123.170000000000000000000000000000
@@ -135,13 +136,13 @@ a	NULL	Test 3.5.9.3	7	123.170000000000000000000000000000
 @tr_var_af_118	@tr_var_af_121	@tr_var_af_122	@tr_var_af_136	@tr_var_af_163
 0	0	0	0	0
 delete from tb3 where f122='Test 3.5.9.3';
-select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3';
+select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136;
 f118	f121	f122	f136	f163
-select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
+select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122,
 @tr_var_b4_136, @tr_var_b4_163;
 @tr_var_b4_118	@tr_var_b4_121	@tr_var_b4_122	@tr_var_b4_136	@tr_var_b4_163
 a	NULL	Test 3.5.9.3	8	123.170000000000000000000000000000
-select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122, 
+select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122,
 @tr_var_af_136, @tr_var_af_163;
 @tr_var_af_118	@tr_var_af_121	@tr_var_af_122	@tr_var_af_136	@tr_var_af_163
 a	NULL	Test 3.5.9.3	8	123.170000000000000000000000000000
@@ -172,17 +173,17 @@ set @tr_var_af_118=new.f118, @tr_var_af_121=new.f121,
 0	0	0	0	0	0
 @tr_var_af_118	@tr_var_af_121	@tr_var_af_122	@tr_var_af_136	@tr_var_af_151	@tr_var_af_163
 0	0	0	0	0	0
-Insert into tb3 (f122, f136, f151, f163) 
+Insert into tb3 (f122, f136, f151, f163)
 values ('Test 3.5.9.4', 7, DEFAULT, 995.24);
-select f118, f121, f122, f136, f151, f163 from tb3 
-where f122 like 'Test 3.5.9.4%';
+select f118, f121, f122, f136, f151, f163 from tb3
+where f122 like 'Test 3.5.9.4%' order by f163;
 f118	f121	f122	f136	f151	f163
 a	NULL	Test 3.5.9.4	00007	999	995.240000000000000000000000000000
-select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
+select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122,
 @tr_var_b4_136, @tr_var_b4_151, @tr_var_b4_163;
 @tr_var_b4_118	@tr_var_b4_121	@tr_var_b4_122	@tr_var_b4_136	@tr_var_b4_151	@tr_var_b4_163
 a	NULL	Test 3.5.9.4	7	999	995.240000000000000000000000000000
-select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122, 
+select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122,
 @tr_var_af_136, @tr_var_af_151, @tr_var_af_163;
 @tr_var_af_118	@tr_var_af_121	@tr_var_af_122	@tr_var_af_136	@tr_var_af_151	@tr_var_af_163
 a	NULL	Test 3.5.9.4	7	999	995.240000000000000000000000000000
@@ -194,15 +195,15 @@ Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
 Warnings:
 Warning	1048	Column 'f136' cannot be null
-select f118, f121, f122, f136, f151, f163 from tb3 
-where f122 like 'Test 3.5.9.4-trig';
+select f118, f121, f122, f136, f151, f163 from tb3
+where f122 like 'Test 3.5.9.4-trig' order by f163;
 f118	f121	f122	f136	f151	f163
 a	NULL	Test 3.5.9.4-trig	00000	999	NULL
-select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
+select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122,
 @tr_var_b4_136, @tr_var_b4_151, @tr_var_b4_163;
 @tr_var_b4_118	@tr_var_b4_121	@tr_var_b4_122	@tr_var_b4_136	@tr_var_b4_151	@tr_var_b4_163
 a	NULL	Test 3.5.9.4-trig	0	999	NULL
-select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122, 
+select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122,
 @tr_var_af_136, @tr_var_af_151, @tr_var_af_163;
 @tr_var_af_118	@tr_var_af_121	@tr_var_af_122	@tr_var_af_136	@tr_var_af_151	@tr_var_af_163
 a	NULL	Test 3.5.9.4-trig	0	999	NULL
@@ -240,6 +241,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

 USE test;
 drop table if exists tb3 ;
 create table tb3 (
-f118 char not null DEFAULT 'a', 
-f119 char binary not null DEFAULT b'101', 
-f120 char ascii not null DEFAULT b'101', 
-f121 tinytext, 
-f122 text, 
-f123 mediumtext, 
-f124 longtext unicode, 
-f125 tinyblob, 
-f126 blob, 
-f127 mediumblob, 
-f128 longblob, 
-f129 binary not null DEFAULT b'101', 
-f130 tinyint not null DEFAULT 99, 
-f131 tinyint unsigned not null DEFAULT 99, 
-f132 tinyint zerofill not null DEFAULT 99, 
-f133 tinyint unsigned zerofill not null DEFAULT 99, 
-f134 smallint not null DEFAULT 999, 
-f135 smallint unsigned not null DEFAULT 999, 
-f136 smallint zerofill not null DEFAULT 999,  
-f137 smallint unsigned zerofill not null DEFAULT 999, 
-f138 mediumint not null DEFAULT 9999, 
-f139 mediumint unsigned not null DEFAULT 9999, 
-f140 mediumint zerofill not null DEFAULT 9999, 
-f141 mediumint unsigned zerofill not null DEFAULT 9999, 
-f142 int not null DEFAULT 99999, 
-f143 int unsigned not null DEFAULT 99999, 
-f144 int zerofill not null DEFAULT 99999, 
-f145 int unsigned zerofill not null DEFAULT 99999, 
-f146 bigint not null DEFAULT 999999, 
-f147 bigint unsigned not null DEFAULT 999999, 
-f148 bigint zerofill not null DEFAULT 999999, 
-f149 bigint unsigned zerofill not null DEFAULT 999999, 
-f150 decimal not null DEFAULT 999.999, 
-f151 decimal unsigned not null DEFAULT 999.17, 
-f152 decimal zerofill not null DEFAULT 999.999, 
-f153 decimal unsigned zerofill, 
-f154 decimal (0), 
-f155 decimal (64), 
-f156 decimal (0) unsigned, 
-f157 decimal (64) unsigned, 
-f158 decimal (0) zerofill, 
-f159 decimal (64) zerofill, 
-f160 decimal (0) unsigned zerofill, 
-f161 decimal (64) unsigned zerofill, 
-f162 decimal (0,0), 
-f163 decimal (63,30), 
-f164 decimal (0,0) unsigned, 
-f165 decimal (63,30) unsigned, 
-f166 decimal (0,0) zerofill, 
-f167 decimal (63,30) zerofill, 
-f168 decimal (0,0) unsigned zerofill, 
-f169 decimal (63,30) unsigned zerofill, 
-f170 numeric, 
-f171 numeric unsigned, 
-f172 numeric zerofill, 
-f173 numeric unsigned zerofill, 
-f174 numeric (0), 
-f175 numeric (64) 
+f118 char not null DEFAULT 'a',
+f119 char binary not null DEFAULT b'101',
+f120 char ascii not null DEFAULT b'101',
+f121 tinytext,
+f122 text,
+f123 mediumtext,
+f124 longtext unicode,
+f125 tinyblob,
+f126 blob,
+f127 mediumblob,
+f128 longblob,
+f129 binary not null DEFAULT b'101',
+f130 tinyint not null DEFAULT 99,
+f131 tinyint unsigned not null DEFAULT 99,
+f132 tinyint zerofill not null DEFAULT 99,
+f133 tinyint unsigned zerofill not null DEFAULT 99,
+f134 smallint not null DEFAULT 999,
+f135 smallint unsigned not null DEFAULT 999,
+f136 smallint zerofill not null DEFAULT 999,
+f137 smallint unsigned zerofill not null DEFAULT 999,
+f138 mediumint not null DEFAULT 9999,
+f139 mediumint unsigned not null DEFAULT 9999,
+f140 mediumint zerofill not null DEFAULT 9999,
+f141 mediumint unsigned zerofill not null DEFAULT 9999,
+f142 int not null DEFAULT 99999,
+f143 int unsigned not null DEFAULT 99999,
+f144 int zerofill not null DEFAULT 99999,
+f145 int unsigned zerofill not null DEFAULT 99999,
+f146 bigint not null DEFAULT 999999,
+f147 bigint unsigned not null DEFAULT 999999,
+f148 bigint zerofill not null DEFAULT 999999,
+f149 bigint unsigned zerofill not null DEFAULT 999999,
+f150 decimal not null DEFAULT 999.999,
+f151 decimal unsigned not null DEFAULT 999.17,
+f152 decimal zerofill not null DEFAULT 999.999,
+f153 decimal unsigned zerofill,
+f154 decimal (0),
+f155 decimal (64),
+f156 decimal (0) unsigned,
+f157 decimal (64) unsigned,
+f158 decimal (0) zerofill,
+f159 decimal (64) zerofill,
+f160 decimal (0) unsigned zerofill,
+f161 decimal (64) unsigned zerofill,
+f162 decimal (0,0),
+f163 decimal (63,30),
+f164 decimal (0,0) unsigned,
+f165 decimal (63,30) unsigned,
+f166 decimal (0,0) zerofill,
+f167 decimal (63,30) zerofill,
+f168 decimal (0,0) unsigned zerofill,
+f169 decimal (63,30) unsigned zerofill,
+f170 numeric,
+f171 numeric unsigned,
+f172 numeric zerofill,
+f173 numeric unsigned zerofill,
+f174 numeric (0),
+f175 numeric (64)
 ) engine = innodb;
 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:
 ----------------------
@@ -86,7 +87,7 @@ Insert into vw11 (f122, f151) values ('Test 3.5.10.1/2/3', 1);
 Insert into vw11 (f122, f151) values ('Test 3.5.10.1/2/3', 2);
 Insert into vw11 (f122, f151) values ('Not in View', 3);
 select f121, f122, f151, f163
-from tb3 where f122 like 'Test 3.5.10.1/2/3%';
+from tb3 where f122 like 'Test 3.5.10.1/2/3%' order by f151;
 f121	f122	f151	f163
 NULL	Test 3.5.10.1/2/3	1	111.110000000000000000000000000000
 NULL	Test 3.5.10.1/2/3	2	111.110000000000000000000000000000
@@ -100,7 +101,7 @@ f121	f122	f151	f163
 NULL	Not in View	3	111.110000000000000000000000000000
 Update vw11 set f163=1;
 select f121, f122, f151, f163 from tb3
-where f122 like 'Test 3.5.10.1/2/3%';
+where f122 like 'Test 3.5.10.1/2/3%' order by f151;
 f121	f122	f151	f163
 Y	Test 3.5.10.1/2/3-Update	1	1.000000000000000000000000000000
 Y	Test 3.5.10.1/2/3-Update	2	1.000000000000000000000000000000
@@ -114,7 +115,7 @@ before delete
 0
 delete from vw11 where f151=1;
 select f121, f122, f151, f163 from tb3
-where f122 like 'Test 3.5.10.1/2/3%';
+where f122 like 'Test 3.5.10.1/2/3%' order by f151;
 f121	f122	f151	f163
 Y	Test 3.5.10.1/2/3-Update	2	1.000000000000000000000000000000
 select f121, f122, f151, f163 from vw11;
@@ -141,11 +142,11 @@ 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
-Select * from tb_load limit 10;
+Select * from tb_load order by f1 limit 10;
 f1	f2	f3
 -5000	a`	1000
 -4999	aaa	999
@@ -240,7 +241,7 @@ insert into t3 (f1) values (new.f1+1000);
 create trigger tr2_4 after insert on t2_4 for each row
 insert into t3 (f1) values (new.f1+10000);
 insert into t1 values (1);
-select * from t3;
+select * from t3 order by f1;
 f1
 12
 102
@@ -275,14 +276,14 @@ create trigger tr4 after insert on t4
 for each row insert into t1 (f1) values (new.f4+1);
 insert into t1 values (1);
 ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
-select * from t1;
+select * from t1 order by f1;
 f1
 0
-select * from t2;
+select * from t2 order by f2;
 f2
-select * from t3;
+select * from t3 order by f3;
 f3
-select * from t4;
+select * from t4 order by f4;
 f4
 drop trigger tr1;
 drop trigger tr2;
@@ -293,8 +294,8 @@ drop table t2;
 drop table t3;
 drop table t4;
 
-Testcase y.y.y.4: Recursive trigger/SP references (disabled bug 11889)
-----------------------------------------------------------------------
+Testcase y.y.y.4: Recursive trigger/SP references
+-------------------------------------------------
 set @sql_mode='traditional';
 create table t1_sp (
 count integer,
@@ -382,12 +383,12 @@ start transaction;
 insert into t1 values (1);
 ERROR 22003: Out of range value adjusted for column 'f4' at row 1
 commit;
-select * from t1;
+select * from t1 order by f1;
 f1
 1
-select * from t2;
+select * from t2 order by f2;
 f2
-select * from t3;
+select * from t3 order by f3;
 f3
 drop trigger tr1;
 drop trigger tr2;

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

 USE test;
 drop table if exists tb3 ;
 create table tb3 (
-f118 char not null DEFAULT 'a', 
-f119 char binary not null DEFAULT b'101', 
-f120 char ascii not null DEFAULT b'101', 
-f121 tinytext, 
-f122 text, 
-f123 mediumtext, 
-f124 longtext unicode, 
-f125 tinyblob, 
-f126 blob, 
-f127 mediumblob, 
-f128 longblob, 
-f129 binary not null DEFAULT b'101', 
-f130 tinyint not null DEFAULT 99, 
-f131 tinyint unsigned not null DEFAULT 99, 
-f132 tinyint zerofill not null DEFAULT 99, 
-f133 tinyint unsigned zerofill not null DEFAULT 99, 
-f134 smallint not null DEFAULT 999, 
-f135 smallint unsigned not null DEFAULT 999, 
-f136 smallint zerofill not null DEFAULT 999,  
-f137 smallint unsigned zerofill not null DEFAULT 999, 
-f138 mediumint not null DEFAULT 9999, 
-f139 mediumint unsigned not null DEFAULT 9999, 
-f140 mediumint zerofill not null DEFAULT 9999, 
-f141 mediumint unsigned zerofill not null DEFAULT 9999, 
-f142 int not null DEFAULT 99999, 
-f143 int unsigned not null DEFAULT 99999, 
-f144 int zerofill not null DEFAULT 99999, 
-f145 int unsigned zerofill not null DEFAULT 99999, 
-f146 bigint not null DEFAULT 999999, 
-f147 bigint unsigned not null DEFAULT 999999, 
-f148 bigint zerofill not null DEFAULT 999999, 
-f149 bigint unsigned zerofill not null DEFAULT 999999, 
-f150 decimal not null DEFAULT 999.999, 
-f151 decimal unsigned not null DEFAULT 999.17, 
-f152 decimal zerofill not null DEFAULT 999.999, 
-f153 decimal unsigned zerofill, 
-f154 decimal (0), 
-f155 decimal (64), 
-f156 decimal (0) unsigned, 
-f157 decimal (64) unsigned, 
-f158 decimal (0) zerofill, 
-f159 decimal (64) zerofill, 
-f160 decimal (0) unsigned zerofill, 
-f161 decimal (64) unsigned zerofill, 
-f162 decimal (0,0), 
-f163 decimal (63,30), 
-f164 decimal (0,0) unsigned, 
-f165 decimal (63,30) unsigned, 
-f166 decimal (0,0) zerofill, 
-f167 decimal (63,30) zerofill, 
-f168 decimal (0,0) unsigned zerofill, 
-f169 decimal (63,30) unsigned zerofill, 
-f170 numeric, 
-f171 numeric unsigned, 
-f172 numeric zerofill, 
-f173 numeric unsigned zerofill, 
-f174 numeric (0), 
-f175 numeric (64) 
+f118 char not null DEFAULT 'a',
+f119 char binary not null DEFAULT b'101',
+f120 char ascii not null DEFAULT b'101',
+f121 tinytext,
+f122 text,
+f123 mediumtext,
+f124 longtext unicode,
+f125 tinyblob,
+f126 blob,
+f127 mediumblob,
+f128 longblob,
+f129 binary not null DEFAULT b'101',
+f130 tinyint not null DEFAULT 99,
+f131 tinyint unsigned not null DEFAULT 99,
+f132 tinyint zerofill not null DEFAULT 99,
+f133 tinyint unsigned zerofill not null DEFAULT 99,
+f134 smallint not null DEFAULT 999,
+f135 smallint unsigned not null DEFAULT 999,
+f136 smallint zerofill not null DEFAULT 999,
+f137 smallint unsigned zerofill not null DEFAULT 999,
+f138 mediumint not null DEFAULT 9999,
+f139 mediumint unsigned not null DEFAULT 9999,
+f140 mediumint zerofill not null DEFAULT 9999,
+f141 mediumint unsigned zerofill not null DEFAULT 9999,
+f142 int not null DEFAULT 99999,
+f143 int unsigned not null DEFAULT 99999,
+f144 int zerofill not null DEFAULT 99999,
+f145 int unsigned zerofill not null DEFAULT 99999,
+f146 bigint not null DEFAULT 999999,
+f147 bigint unsigned not null DEFAULT 999999,
+f148 bigint zerofill not null DEFAULT 999999,
+f149 bigint unsigned zerofill not null DEFAULT 999999,
+f150 decimal not null DEFAULT 999.999,
+f151 decimal unsigned not null DEFAULT 999.17,
+f152 decimal zerofill not null DEFAULT 999.999,
+f153 decimal unsigned zerofill,
+f154 decimal (0),
+f155 decimal (64),
+f156 decimal (0) unsigned,
+f157 decimal (64) unsigned,
+f158 decimal (0) zerofill,
+f159 decimal (64) zerofill,
+f160 decimal (0) unsigned zerofill,
+f161 decimal (64) unsigned zerofill,
+f162 decimal (0,0),
+f163 decimal (63,30),
+f164 decimal (0,0) unsigned,
+f165 decimal (63,30) unsigned,
+f166 decimal (0,0) zerofill,
+f167 decimal (63,30) zerofill,
+f168 decimal (0,0) unsigned zerofill,
+f169 decimal (63,30) unsigned zerofill,
+f170 numeric,
+f171 numeric unsigned,
+f172 numeric zerofill,
+f173 numeric unsigned zerofill,
+f174 numeric (0),
+f175 numeric (64)
 ) engine = innodb;
 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

 USE test;
 drop table if exists tb2 ;
 create table tb2 (
-f59 numeric (0) unsigned, 
-f60 numeric (64) unsigned, 
-f61 numeric (0) zerofill, 
-f62 numeric (64) zerofill, 
-f63 numeric (0) unsigned zerofill, 
-f64 numeric (64) unsigned zerofill, 
-f65 numeric (0,0), 
-f66 numeric (63,30), 
-f67 numeric (0,0) unsigned, 
-f68 numeric (63,30) unsigned, 
-f69 numeric (0,0) zerofill, 
-f70 numeric (63,30) zerofill, 
-f71 numeric (0,0) unsigned zerofill, 
-f72 numeric (63,30) unsigned zerofill, 
-f73 real, 
-f74 real unsigned, 
-f75 real zerofill, 
-f76 real unsigned zerofill, 
-f77 double default 7.7, 
-f78 double unsigned default 7.7, 
-f79 double zerofill default 7.7, 
-f80 double unsigned zerofill default 8.8, 
-f81 float not null default 8.8, 
-f82 float unsigned not null default 8.8, 
-f83 float zerofill not null default 8.8, 
-f84 float unsigned zerofill not null default 8.8, 
-f85 float(0) not null default 8.8, 
-f86 float(23) not null default 8.8, 
-f87 float(0) unsigned not null default 8.8, 
-f88 float(23) unsigned not null default 8.8, 
-f89 float(0) zerofill not null default 8.8, 
-f90 float(23) zerofill not null default 8.8, 
-f91 float(0) unsigned zerofill not null default 8.8, 
-f92 float(23) unsigned zerofill not null default 8.8, 
-f93 float(24) not null default 8.8, 
-f94 float(53) not null default 8.8, 
-f95 float(24) unsigned not null default 8.8, 
-f96 float(53) unsigned not null default 8.8, 
-f97 float(24) zerofill not null default 8.8, 
-f98 float(53) zerofill not null default 8.8, 
-f99 float(24) unsigned zerofill not null default 8.8, 
-f100 float(53) unsigned zerofill not null default 8.8, 
-f101 date not null default '2000-01-01', 
-f102 time not null default 20, 
-f103 datetime not null default '2/2/2', 
-f104 timestamp not null default 20001231235959, 
-f105 year not null default 2000, 
-f106 year(3) not null default 2000, 
-f107 year(4) not null default 2000, 
-f108 enum("1enum","2enum") not null default "1enum", 
+f59 numeric (0) unsigned,
+f60 numeric (64) unsigned,
+f61 numeric (0) zerofill,
+f62 numeric (64) zerofill,
+f63 numeric (0) unsigned zerofill,
+f64 numeric (64) unsigned zerofill,
+f65 numeric (0,0),
+f66 numeric (63,30),
+f67 numeric (0,0) unsigned,
+f68 numeric (63,30) unsigned,
+f69 numeric (0,0) zerofill,
+f70 numeric (63,30) zerofill,
+f71 numeric (0,0) unsigned zerofill,
+f72 numeric (63,30) unsigned zerofill,
+f73 real,
+f74 real unsigned,
+f75 real zerofill,
+f76 real unsigned zerofill,
+f77 double default 7.7,
+f78 double unsigned default 7.7,
+f79 double zerofill default 7.7,
+f80 double unsigned zerofill default 8.8,
+f81 float not null default 8.8,
+f82 float unsigned not null default 8.8,
+f83 float zerofill not null default 8.8,
+f84 float unsigned zerofill not null default 8.8,
+f85 float(0) not null default 8.8,
+f86 float(23) not null default 8.8,
+f87 float(0) unsigned not null default 8.8,
+f88 float(23) unsigned not null default 8.8,
+f89 float(0) zerofill not null default 8.8,
+f90 float(23) zerofill not null default 8.8,
+f91 float(0) unsigned zerofill not null default 8.8,
+f92 float(23) unsigned zerofill not null default 8.8,
+f93 float(24) not null default 8.8,
+f94 float(53) not null default 8.8,
+f95 float(24) unsigned not null default 8.8,
+f96 float(53) unsigned not null default 8.8,
+f97 float(24) zerofill not null default 8.8,
+f98 float(53) zerofill not null default 8.8,
+f99 float(24) unsigned zerofill not null default 8.8,
+f100 float(53) unsigned zerofill not null default 8.8,
+f101 date not null default '2000-01-01',
+f102 time not null default 20,
+f103 datetime not null default '2/2/2',
+f104 timestamp not null default 20001231235959,
+f105 year not null default 2000,
+f106 year(3) not null default 2000,
+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;
 drop table if exists tb2 ;
 create table tb2 (
-f59 numeric (0) unsigned, 
-f60 numeric (64) unsigned, 
-f61 numeric (0) zerofill, 
-f62 numeric (64) zerofill, 
-f63 numeric (0) unsigned zerofill, 
-f64 numeric (64) unsigned zerofill, 
-f65 numeric (0,0), 
-f66 numeric (63,30), 
-f67 numeric (0,0) unsigned, 
-f68 numeric (63,30) unsigned, 
-f69 numeric (0,0) zerofill, 
-f70 numeric (63,30) zerofill, 
-f71 numeric (0,0) unsigned zerofill, 
-f72 numeric (63,30) unsigned zerofill, 
-f73 real, 
-f74 real unsigned, 
-f75 real zerofill, 
-f76 real unsigned zerofill, 
-f77 double default 7.7, 
-f78 double unsigned default 7.7, 
-f79 double zerofill default 7.7, 
-f80 double unsigned zerofill default 8.8, 
-f81 float not null default 8.8, 
-f82 float unsigned not null default 8.8, 
-f83 float zerofill not null default 8.8, 
-f84 float unsigned zerofill not null default 8.8, 
-f85 float(0) not null default 8.8, 
-f86 float(23) not null default 8.8, 
-f87 float(0) unsigned not null default 8.8, 
-f88 float(23) unsigned not null default 8.8, 
-f89 float(0) zerofill not null default 8.8, 
-f90 float(23) zerofill not null default 8.8, 
-f91 float(0) unsigned zerofill not null default 8.8, 
-f92 float(23) unsigned zerofill not null default 8.8, 
-f93 float(24) not null default 8.8, 
-f94 float(53) not null default 8.8, 
-f95 float(24) unsigned not null default 8.8, 
-f96 float(53) unsigned not null default 8.8, 
-f97 float(24) zerofill not null default 8.8, 
-f98 float(53) zerofill not null default 8.8, 
-f99 float(24) unsigned zerofill not null default 8.8, 
-f100 float(53) unsigned zerofill not null default 8.8, 
-f101 date not null default '2000-01-01', 
-f102 time not null default 20, 
-f103 datetime not null default '2/2/2', 
-f104 timestamp not null default 20001231235959, 
-f105 year not null default 2000, 
-f106 year(3) not null default 2000, 
-f107 year(4) not null default 2000, 
-f108 enum("1enum","2enum") not null default "1enum", 
+f59 numeric (0) unsigned,
+f60 numeric (64) unsigned,
+f61 numeric (0) zerofill,
+f62 numeric (64) zerofill,
+f63 numeric (0) unsigned zerofill,
+f64 numeric (64) unsigned zerofill,
+f65 numeric (0,0),
+f66 numeric (63,30),
+f67 numeric (0,0) unsigned,
+f68 numeric (63,30) unsigned,
+f69 numeric (0,0) zerofill,
+f70 numeric (63,30) zerofill,
+f71 numeric (0,0) unsigned zerofill,
+f72 numeric (63,30) unsigned zerofill,
+f73 real,
+f74 real unsigned,
+f75 real zerofill,
+f76 real unsigned zerofill,
+f77 double default 7.7,
+f78 double unsigned default 7.7,
+f79 double zerofill default 7.7,
+f80 double unsigned zerofill default 8.8,
+f81 float not null default 8.8,
+f82 float unsigned not null default 8.8,
+f83 float zerofill not null default 8.8,
+f84 float unsigned zerofill not null default 8.8,
+f85 float(0) not null default 8.8,
+f86 float(23) not null default 8.8,
+f87 float(0) unsigned not null default 8.8,
+f88 float(23) unsigned not null default 8.8,
+f89 float(0) zerofill not null default 8.8,
+f90 float(23) zerofill not null default 8.8,
+f91 float(0) unsigned zerofill not null default 8.8,
+f92 float(23) unsigned zerofill not null default 8.8,
+f93 float(24) not null default 8.8,
+f94 float(53) not null default 8.8,
+f95 float(24) unsigned not null default 8.8,
+f96 float(53) unsigned not null default 8.8,
+f97 float(24) zerofill not null default 8.8,
+f98 float(53) zerofill not null default 8.8,
+f99 float(24) unsigned zerofill not null default 8.8,
+f100 float(53) unsigned zerofill not null default 8.8,
+f101 date not null default '2000-01-01',
+f102 time not null default 20,
+f103 datetime not null default '2/2/2',
+f104 timestamp not null default 20001231235959,
+f105 year not null default 2000,
+f106 year(3) not null default 2000,
+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/storedproc/cleanup_sp_tb.inc

-let $message= --source suite/funcs_1/storedproc/cleanup_sp_tb.inc;
---source include/show_msg80.inc
+--echo
+--echo --source suite/funcs_1/storedproc/cleanup_sp_tb.inc
+--echo --------------------------------------------------------------------------------
 
 # called both to cleanup possibly existing data before and after the SP tests
 

mysql-test/suite/funcs_1/t/innodb_trig_0407.test

@@ -10,7 +10,7 @@ let $engine_type= innodb;
 # Create some objects needed in many testcases
 USE test;
 --source suite/funcs_1/include/innodb_tb3.inc
-    
+
 --source suite/funcs_1/triggers/triggers_0407.inc
 DROP TABLE test.tb3;
 

mysql-test/suite/funcs_1/t/is_basics_mixed.test

@@ -174,7 +174,7 @@ WHERE table_schema = 'db_datadict' ORDER BY table_name LIMIT 1;
 SELECT @table_name,@table_schema;
 #
 # SELECT INTO OUTFILE
-let $OUTFILE = $MYSQL_TMP_DIR/datadict.out;
+let $OUTFILE = $MYSQLTEST_VARDIR/tmp/datadict.out;
 --error 0,1
 remove_file $OUTFILE;
 --replace_result $OUTFILE <OUTFILE>

mysql-test/suite/funcs_1/t/memory_storedproc_02.test

 #### suite/funcs_1/t/memory_storedproc_02.test
 #
- 
+
 let $engine_type= memory;
- 
+
 --source suite/funcs_1/storedproc/storedproc_02.inc

mysql-test/suite/funcs_1/t/memory_storedproc_03.test

 #### suite/funcs_1/t/memory_storedproc_03.test
 #
- 
+
 let $engine_type= memory;
- 
+
 --source suite/funcs_1/storedproc/storedproc_03.inc

mysql-test/suite/funcs_1/t/memory_storedproc_06.test

 #### suite/funcs_1/t/memory_storedproc_06.test
 #
- 
+
 let $engine_type= memory;
- 
+
 --source suite/funcs_1/storedproc/storedproc_06.inc

mysql-test/suite/funcs_1/t/memory_storedproc_07.test

 #### suite/funcs_1/t/memory_storedproc_07.test
 #
- 
+
 let $engine_type= memory;
- 
+
 --source suite/funcs_1/storedproc/storedproc_07.inc