List:Commits« Previous MessageNext Message »
From:mleich Date:April 1 2008 9:01pm
Subject:bk commit into 6.0 tree (mleich:1.2615) BUG#35335
View as plain text  
Below is the list of changes that have just been committed into a local
6.0 repository of mleich.  When mleich does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-04-01 23:01:02+02:00, mleich@stripped +38 -0
  Post merge fix for
     ChangeSet@stripped, 2008-04-01 20:18:52+02:00
     Merge five.local.lan:/work/merge/mysql-5.1-Bug
     into  five.local.lan:/work/merge/mysql-6.0-Bug
     It is to expected that post merge fixes are needed.
     MERGE: 1.2497.95.26
  which contains
     ChangeSet@stripped, 2008-04-01
     Post merge fix for
        ChangeSet@stripped, 2008-03-31
        Merge five.local.lan:/work/merge/mysql-5.0-Bug
        into  five.local.lan:/work/merge/mysql-5.1-Bug
        Addditional manual fixes will be needed.
        MERGE: 1.1810.3667.16
  etc which contains
    ...
    ChangeSet@stripped, 2008-03-31
    Fix for Bug
        #35335 funcs_1: Some tests fail within load_file during ....

  mysql-test/Makefile.am@stripped, 2008-04-01 23:00:52+02:00, mleich@stripped +4 -0
    Use std_data for data to load

  mysql-test/suite/funcs_1/include/falcon_tb1.inc@stripped, 2008-04-01 23:00:52+02:00, mleich@stripped +4 -3
    Adjust to improvements made in other <engine>_tb*.inc scripts

  mysql-test/suite/funcs_1/include/falcon_tb2.inc@stripped, 2008-04-01 23:00:52+02:00, mleich@stripped +4 -2
    Adjust to improvements made in other <engine>_tb*.inc scripts

  mysql-test/suite/funcs_1/include/falcon_tb3.inc@stripped, 2008-04-01 23:00:52+02:00, mleich@stripped +4 -2
    Adjust to improvements made in other <engine>_tb*.inc scripts

  mysql-test/suite/funcs_1/include/falcon_tb4.inc@stripped, 2008-04-01 23:00:52+02:00, mleich@stripped +4 -2
    Adjust to improvements made in other <engine>_tb*.inc scripts

  mysql-test/suite/funcs_1/r/falcon_func_view.result@stripped, 2008-04-01 23:00:52+02:00, mleich@stripped +5007 -5032
    Updated results

  mysql-test/suite/funcs_1/r/falcon_storedproc.result@stripped, 2008-04-01 23:00:53+02:00, mleich@stripped +17981 -17975
    Updated results

  mysql-test/suite/funcs_1/r/falcon_storedproc_02.result@stripped, 2008-04-01 23:00:53+02:00, mleich@stripped +35 -27
    Updated results

  mysql-test/suite/funcs_1/r/falcon_storedproc_03.result@stripped, 2008-04-01 23:00:53+02:00, mleich@stripped +28 -20
    Updated results

  mysql-test/suite/funcs_1/r/falcon_storedproc_07.result@stripped, 2008-04-01 23:00:53+02:00, mleich@stripped +28 -20
    Updated results

  mysql-test/suite/funcs_1/r/falcon_storedproc_08.result@stripped, 2008-04-01 23:00:53+02:00, mleich@stripped +28 -20
    Updated results

  mysql-test/suite/funcs_1/r/falcon_storedproc_10.result@stripped, 2008-04-01 23:00:53+02:00, mleich@stripped +29 -21
    Updated results

  mysql-test/suite/funcs_1/r/falcon_trig_0102.result@stripped, 2008-04-01 23:00:53+02:00, mleich@stripped +30 -29
    Updated results

  mysql-test/suite/funcs_1/r/falcon_trig_03.result@stripped, 2008-04-01 23:00:53+02:00, mleich@stripped +4 -3
    Updated results

  mysql-test/suite/funcs_1/r/falcon_trig_03e.result@stripped, 2008-04-01 23:00:53+02:00, mleich@stripped +5 -5
    Updated results

  mysql-test/suite/funcs_1/r/falcon_trig_0407.result@stripped, 2008-04-01 23:00:53+02:00, mleich@stripped +21 -20
    Updated results

  mysql-test/suite/funcs_1/r/falcon_trig_08.result@stripped, 2008-04-01 23:00:53+02:00, mleich@stripped +60 -59
    Updated results

  mysql-test/suite/funcs_1/r/falcon_trig_09.result@stripped, 2008-04-01 23:00:53+02:00, mleich@stripped +18 -16
    Updated results

  mysql-test/suite/funcs_1/r/falcon_trig_1011ext.result@stripped, 2008-04-01 23:00:53+02:00, mleich@stripped +3 -2
    Updated results

  mysql-test/suite/funcs_1/r/falcon_trig_frkey.result@stripped, 2008-04-01 23:00:53+02:00, mleich@stripped +2 -1
    Updated results

  mysql-test/suite/funcs_1/r/falcon_views.result@stripped, 2008-04-01 23:00:53+02:00, mleich@stripped +4 -2
    Updated results

  mysql-test/suite/funcs_1/r/innodb_func_view.result@stripped, 2008-04-01 23:00:53+02:00, mleich@stripped +5007 -5032
    Updated results

  mysql-test/suite/funcs_1/r/innodb_storedproc.result@stripped, 2008-04-01 23:00:54+02:00, mleich@stripped +17981 -17975
    Updated results

  mysql-test/suite/funcs_1/r/innodb_trig_09.result@stripped, 2008-04-01 23:00:55+02:00, mleich@stripped +76 -74
    Updated results

  mysql-test/suite/funcs_1/r/is_columns_is.result@stripped, 2008-04-01 23:00:55+02:00, mleich@stripped +2 -0
    Updated results

  mysql-test/suite/funcs_1/r/is_columns_is_falcon.result@stripped, 2008-04-01 23:00:55+02:00, mleich@stripped +18 -24
    Updated results

  mysql-test/suite/funcs_1/r/memory_func_view.result@stripped, 2008-04-01 23:00:55+02:00, mleich@stripped +5007 -5032
    Updated results

  mysql-test/suite/funcs_1/r/memory_storedproc.result@stripped, 2008-04-01 23:00:56+02:00, mleich@stripped +17908 -17868
    Updated results

  mysql-test/suite/funcs_1/r/memory_trig_09.result@stripped, 2008-04-01 23:00:56+02:00, mleich@stripped +70 -68
    Updated results

  mysql-test/suite/funcs_1/r/myisam_func_view.result@stripped, 2008-04-01 23:00:56+02:00, mleich@stripped +5007 -5032
    Updated results

  mysql-test/suite/funcs_1/r/myisam_storedproc.result@stripped, 2008-04-01 23:00:57+02:00, mleich@stripped +17981 -17975
    Updated results

  mysql-test/suite/funcs_1/r/myisam_trig_09.result@stripped, 2008-04-01 23:00:58+02:00, mleich@stripped +76 -74
    Updated results

  mysql-test/suite/funcs_1/r/myisam_views.result@stripped, 2008-04-01 23:00:58+02:00, mleich@stripped +11370 -11373
    Updated results

  mysql-test/suite/funcs_1/r/ndb_func_view.result@stripped, 2008-04-01 23:00:59+02:00, mleich@stripped +4997 -5023
    Updated results

  mysql-test/suite/funcs_1/r/ndb_storedproc.result@stripped, 2008-04-01 23:01:00+02:00, mleich@stripped +17946 -17943
    Updated results

  mysql-test/suite/funcs_1/r/ndb_trig_09.result@stripped, 2008-04-01 23:01:01+02:00, mleich@stripped +76 -74
    Updated results

  mysql-test/suite/funcs_1/t/falcon_bitdata.test@stripped, 2008-04-01 23:01:01+02:00, mleich@stripped +0 -1
    Cleanup

  mysql-test/suite/funcs_1/triggers/triggers_09.inc@stripped, 2008-04-01 23:01:01+02:00, mleich@stripped +72 -74
    Cleanup

diff -Nrup a/mysql-test/Makefile.am b/mysql-test/Makefile.am
--- a/mysql-test/Makefile.am	2008-04-01 20:14:24 +02:00
+++ b/mysql-test/Makefile.am	2008-04-01 23:00:52 +02:00
@@ -49,6 +49,7 @@ dist-hook:
 		$(distdir)/std_data/ndb_backup51_d2_le \
 		$(distdir)/std_data/parts \
 		$(distdir)/lib \
+                $(distdir)/funcs_1 \
 		$(distdir)/lib/My
 	-$(INSTALL_DATA) $(srcdir)/t/*.def $(distdir)/t
 	$(INSTALL_DATA) $(srcdir)/t/*.test $(distdir)/t
@@ -81,6 +82,7 @@ dist-hook:
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_d2_be/BACKUP* $(distdir)/std_data/ndb_backup51_d2_be
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_d2_le/BACKUP* $(distdir)/std_data/ndb_backup51_d2_le
 	$(INSTALL_DATA) $(srcdir)/std_data/parts/part_* $(distdir)/std_data/parts
+	$(INSTALL_DATA) $(srcdir)/std_data/funcs_1/* $(distdir)/std_data/funcs_1
 	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(distdir)/lib
 	$(INSTALL_DATA) $(srcdir)/lib/My/*.pm $(distdir)/lib/My
 	-rm -rf `find $(distdir)/suite -type d -name SCCS` $(distdir)/suite/row_lock
@@ -102,6 +104,7 @@ install-data-local:
 		$(DESTDIR)$(testdir)/std_data/ndb_backup51_d2_le \
 		$(DESTDIR)$(testdir)/std_data/parts \
 		$(DESTDIR)$(testdir)/lib \
+		$(DESTDIR)$(testdir)/funcs_1 \
 		$(DESTDIR)$(testdir)/lib/My
 	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir)
 	-$(INSTALL_DATA) $(srcdir)/t/*.def $(DESTDIR)$(testdir)/t
@@ -139,6 +142,7 @@ install-data-local:
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_d2_be/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup51_d2_be
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_d2_le/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup51_d2_le
 	$(INSTALL_DATA) $(srcdir)/std_data/parts/part_* $(DESTDIR)$(testdir)/std_data/parts
+	$(INSTALL_DATA) $(srcdir)/std_data/funcs_1/* $(distdir)/std_data/funcs_1
 	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(DESTDIR)$(testdir)/lib
 	$(INSTALL_DATA) $(srcdir)/lib/My/*.pm $(DESTDIR)$(testdir)/lib/My
 	for f in `(cd $(srcdir); find suite -type f | egrep -v 'SCCS|row_lock')`; \
diff -Nrup a/mysql-test/suite/funcs_1/include/falcon_tb1.inc b/mysql-test/suite/funcs_1/include/falcon_tb1.inc
--- a/mysql-test/suite/funcs_1/include/falcon_tb1.inc	2007-11-05 15:34:30 +01:00
+++ b/mysql-test/suite/funcs_1/include/falcon_tb1.inc	2008-04-01 23:00:52 +02:00
@@ -64,6 +64,7 @@ f57 numeric (0) not null DEFAULT 99, 
 f58 numeric (64) not null DEFAULT 99
 ) engine = falcon;
 
-
---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;
diff -Nrup a/mysql-test/suite/funcs_1/include/falcon_tb2.inc b/mysql-test/suite/funcs_1/include/falcon_tb2.inc
--- a/mysql-test/suite/funcs_1/include/falcon_tb2.inc	2007-11-05 15:34:30 +01:00
+++ b/mysql-test/suite/funcs_1/include/falcon_tb2.inc	2008-04-01 23:00:52 +02:00
@@ -57,5 +57,7 @@ f108 enum("1enum","2enum") not null defa
 f109 set("1set","2set") not null default "1set"
 ) engine = falcon;
 
---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;
diff -Nrup a/mysql-test/suite/funcs_1/include/falcon_tb3.inc b/mysql-test/suite/funcs_1/include/falcon_tb3.inc
--- a/mysql-test/suite/funcs_1/include/falcon_tb3.inc	2007-11-05 15:34:30 +01:00
+++ b/mysql-test/suite/funcs_1/include/falcon_tb3.inc	2008-04-01 23:00:52 +02:00
@@ -64,5 +64,7 @@ f174 numeric (0), 
 f175 numeric (64) 
 ) engine = falcon;
 
---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;
diff -Nrup a/mysql-test/suite/funcs_1/include/falcon_tb4.inc b/mysql-test/suite/funcs_1/include/falcon_tb4.inc
--- a/mysql-test/suite/funcs_1/include/falcon_tb4.inc	2007-11-05 15:34:30 +01:00
+++ b/mysql-test/suite/funcs_1/include/falcon_tb4.inc	2008-04-01 23:00:52 +02:00
@@ -64,5 +64,7 @@ f240 varchar(2000) unicode,
 f241 char(100) unicode
 ) engine = falcon;
 
---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;
diff -Nrup a/mysql-test/suite/funcs_1/r/falcon_func_view.result b/mysql-test/suite/funcs_1/r/falcon_func_view.result
--- a/mysql-test/suite/funcs_1/r/falcon_func_view.result	2008-03-10 19:59:48 +01:00
+++ b/mysql-test/suite/funcs_1/r/falcon_func_view.result	2008-04-01 23:00:52 +02:00
@@ -35,10 +35,10 @@ my_bigint = -9223372036854775808,
 my_decimal = -9999999999999999999999999999999999.999999999999999999999999999999 ,
 my_double = -1.7976931348623E+308;
 INSERT INTO t1_values SET
-my_char_30 = '<--------30 characters------->', 
+my_char_30 = '<--------30 characters------->',
 my_varchar_1000 = CONCAT('<---------1000 characters',
 RPAD('',965,'-'),'--------->'),
-my_binary_30 = '<--------30 characters------->', 
+my_binary_30 = '<--------30 characters------->',
 my_varbinary_1000 = CONCAT('<---------1000 characters',
 RPAD('',965,'-'),'--------->'),
 my_datetime = '9999-12-31 23:59:59',
@@ -50,23 +50,23 @@ my_bigint = 9223372036854775807,
 my_decimal = +9999999999999999999999999999999999.999999999999999999999999999999 ,
 my_double = 1.7976931348623E+308;
 INSERT INTO t1_values SET
-my_char_30 = ' ---äÖüß@µ*$-- ', 
-my_varchar_1000 = ' ---äÖüß@µ*$-- ', 
-my_binary_30 = ' ---äÖüß@µ*$-- ', 
-my_varbinary_1000 = ' ---äÖüß@µ*$-- ', 
+my_char_30 = ' ---äÖüß@µ*$-- ',
+my_varchar_1000 = ' ---äÖüß@µ*$-- ',
+my_binary_30 = ' ---äÖüß@µ*$-- ',
+my_varbinary_1000 = ' ---äÖüß@µ*$-- ',
 my_datetime = '2004-02-29 23:59:59',
 my_date = '2004-02-29',
 my_timestamp = '2004-02-29 23:59:59',
 my_time = '13:00:00',
 my_year = 2000,
-my_bigint = 0,  	 
+my_bigint = 0,  	
 my_decimal = 0.0,
 my_double = 0;
 INSERT INTO t1_values SET
-my_char_30 = '-1', 
-my_varchar_1000 = '-1', 
-my_binary_30 = '-1', 
-my_varbinary_1000 = '-1', 
+my_char_30 = '-1',
+my_varchar_1000 = '-1',
+my_binary_30 = '-1',
+my_varbinary_1000 = '-1',
 my_datetime = '2005-06-28 10:00:00',
 my_date = '2005-06-28',
 my_timestamp = '2005-06-28 10:00:00',
@@ -152,21 +152,21 @@ my_double = -0.33333333E+4;
 some statements disabled because of
 Bug#5913 Traditional mode: BIGINT range not correctly delimited
 --------------------------------------------------------------------------------
-SET @my_select = 'SELECT CONVERT(my_char_30 USING utf8), 
+SET @my_select = 'SELECT CONVERT(my_char_30 USING utf8),
 my_char_30, id FROM t1_values';
-SET @my_select = 'SELECT CONVERT(my_varchar_1000 USING utf8), 
+SET @my_select = 'SELECT CONVERT(my_varchar_1000 USING utf8),
 my_varchar_1000, id FROM t1_values';
-SET @my_select = 'SELECT CONVERT(my_binary_30 USING utf8), 
+SET @my_select = 'SELECT CONVERT(my_binary_30 USING utf8),
 my_binary_30, id FROM t1_values';
-SET @my_select = 'SELECT CONVERT(my_varbinary_1000 USING utf8), 
+SET @my_select = 'SELECT CONVERT(my_varbinary_1000 USING utf8),
 my_varbinary_1000, id FROM t1_values';
-SET @my_select = 'SELECT CONVERT(my_char_30 USING koi8r), 
+SET @my_select = 'SELECT CONVERT(my_char_30 USING koi8r),
 my_char_30, id FROM t1_values';
-SET @my_select = 'SELECT CONVERT(my_varchar_1000 USING koi8r), 
+SET @my_select = 'SELECT CONVERT(my_varchar_1000 USING koi8r),
 my_varchar_1000, id FROM t1_values';
-SET @my_select = 'SELECT CONVERT(my_binary_30 USING koi8r), 
+SET @my_select = 'SELECT CONVERT(my_binary_30 USING koi8r),
 my_binary_30, id FROM t1_values';
-SET @my_select = 'SELECT CONVERT(my_varbinary_1000 USING koi8r), 
+SET @my_select = 'SELECT CONVERT(my_varbinary_1000 USING koi8r),
 my_varbinary_1000, id FROM t1_values';
 SET @my_select = 'SELECT BIT_LENGTH(my_char_30),
 my_char_30, id FROM t1_values';
@@ -180,15 +180,15 @@ SET @my_select = 'SELECT INSTR(my_char_3
 my_char_30, id FROM t1_values';
 SET @my_select = 'SELECT LCASE(my_varchar_1000),
 my_varchar_1000, id FROM t1_values';
-SET @my_select = 
+SET @my_select =
 'SELECT LEFT(my_char_30, 2), my_char_30, id FROM t1_values';
-SET @my_select = 
+SET @my_select =
 'SELECT LEFT(my_varchar_1000, 2), my_varchar_1000, id FROM t1_values';
-SET @my_select = 
+SET @my_select =
 'SELECT LEFT(my_binary_30, 2), my_binary_30, id FROM t1_values';
-SET @my_select = 
+SET @my_select =
 'SELECT LEFT(my_varbinary_1000, 2), my_varbinary_1000, id FROM t1_values';
-SET @my_select = 
+SET @my_select =
 'SELECT LEFT(''AaBbCcDdEeFfGgHhIiJjÄäÜüÖö'', my_bigint), my_bigint, id FROM t1_values';
 SET @my_select =
 'SELECT LEFT(''AaBbCcDdEeFfGgHhIiJjÄäÜüÖö'', my_decimal), my_decimal, id FROM t1_values';
@@ -202,9 +202,10 @@ SET @my_select = 'SELECT LENGTH(my_binar
 my_binary_30, id FROM t1_values';
 SET @my_select = 'SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values';
-SELECT 'äÄ@' INTO OUTFILE '../tmp/func_view.dat';
-SET @my_select = 
-'SELECT LOAD_FILE(''../tmp/func_view.dat''), id FROM t1_values';
+SET @my_select =
+'SELECT LOAD_FILE(''<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt'')
+           AS my_col,
+        id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_char_30),
 my_char_30, id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_varchar_1000),
@@ -810,36 +811,40 @@ WHERE select_id = 157 OR select_id IS NU
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values;
-SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values
+CREATE VIEW v1 AS SELECT LOAD_FILE('<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt')
+           AS my_col,
+        id FROM t1_values;
+SELECT LOAD_FILE('<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt')
+           AS my_col,
+        id FROM t1_values
 WHERE select_id = 156 OR select_id IS NULL order by id;
-LOAD_FILE('../tmp/func_view.dat')	id
-äÄ@
+my_col	id
+Here is content from load_file
 	1
-äÄ@
+Here is content from load_file
 	2
-äÄ@
+Here is content from load_file
 	3
-äÄ@
+Here is content from load_file
 	4
-äÄ@
+Here is content from load_file
 	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file('../tmp/func_view.dat') AS `LOAD_FILE('../tmp/func_view.dat')`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file('<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt') AS `my_col`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 156 OR select_id IS NULL) order by id;
-LOAD_FILE('../tmp/func_view.dat')	id
-äÄ@
+my_col	id
+Here is content from load_file
 	1
-äÄ@
+Here is content from load_file
 	2
-äÄ@
+Here is content from load_file
 	3
-äÄ@
+Here is content from load_file
 	4
-äÄ@
+Here is content from load_file
 	5
 DROP VIEW v1;
 
@@ -1013,10 +1018,10 @@ SELECT LEFT(my_binary_30, 2), my_binary_
 WHERE select_id = 147 OR select_id IS NULL order by id;
 LEFT(my_binary_30, 2)	my_binary_30	id
 NULL	NULL	1
-+		2
 <-	<--------30 characters------->	3
- -	 ---äÖüß@µ*$-- --1	-1+ -	 ---äÖüß@µ*$-- 	4
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_binary_30`,2) AS `LEFT(my_binary_30, 2)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -1141,10 +1146,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 141 OR select_id IS NULL order by id;
 BIT_LENGTH(my_binary_30)	my_binary_30	id
 NULL	NULL	1
-240	+240		2
 240	<--------30 characters------->	3
-240	 ---äÖüß@µ*$-- -240	-1+240	 ---äÖüß@µ*$-- 	4
+240	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_binary_30`) AS `BIT_LENGTH(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -1453,10 +1458,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 129 OR select_id IS NULL order by id;
 IFNULL(my_binary_30,'IS_NULL')	my_binary_30	id
 IS_NULL	NULL	1
-+		2
 <--------30 characters------->	<--------30 characters------->	3
- ---äÖüß@µ*$-- --1+ ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_binary_30`,'IS_NULL') AS `IFNULL(my_binary_30,'IS_NULL')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -1793,10 +1798,10 @@ WHERE select_id = 117 OR select_id IS NU
 IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_binary_30	id
 IS     NULL	NULL	1
-IS NOT NULL	+IS NOT NULL		2
 IS NOT NULL	<--------30 characters------->	3
-IS NOT NULL	 ---äÖüß@µ*$-- -IS NOT NULL	-1+IS NOT NULL	 ---äÖüß@µ*$-- 	4
+IS NOT NULL	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(isnull(`t1_values`.`my_binary_30`),'IS     NULL','IS NOT NULL') AS `IF(my_binary_30 IS NULL, 'IS     NULL',
@@ -2113,10 +2118,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 105 OR select_id IS NULL order by id;
 IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')	my_binary_30	id
 IS NOT TRUE	NULL	1
-IS NOT TRUE	+IS NOT TRUE		2
 IS NOT TRUE	<--------30 characters------->	3
-IS NOT TRUE	 ---äÖüß@µ*$-- -IS     TRUE	-1+IS NOT TRUE	 ---äÖüß@µ*$-- 	4
+IS     TRUE	-1	5
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: ''
 Warning	1292	Truncated incorrect DOUBLE value: '<--------30 characters------->'
@@ -2200,9 +2205,9 @@ Warning	1292	Truncated incorrect DOUBLE 
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING koi8r), 
+CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING koi8r),
 my_varbinary_1000, id FROM t1_values;
-SELECT CONVERT(my_varbinary_1000 USING koi8r), 
+SELECT CONVERT(my_varbinary_1000 USING koi8r),
 my_varbinary_1000, id FROM t1_values
 WHERE select_id = 102 OR select_id IS NULL order by id;
 CONVERT(my_varbinary_1000 USING koi8r)	my_varbinary_1000	id
@@ -2226,17 +2231,17 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING koi8r), 
+CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING koi8r),
 my_binary_30, id FROM t1_values;
-SELECT CONVERT(my_binary_30 USING koi8r), 
+SELECT CONVERT(my_binary_30 USING koi8r),
 my_binary_30, id FROM t1_values
 WHERE select_id = 101 OR select_id IS NULL order by id;
 CONVERT(my_binary_30 USING koi8r)	my_binary_30	id
 NULL	NULL	1
-+		2
 <--------30 characters------->	<--------30 characters------->	3
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using koi8r) AS `CONVERT(my_binary_30 USING koi8r)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -2252,9 +2257,9 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING koi8r), 
+CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING koi8r),
 my_varchar_1000, id FROM t1_values;
-SELECT CONVERT(my_varchar_1000 USING koi8r), 
+SELECT CONVERT(my_varchar_1000 USING koi8r),
 my_varchar_1000, id FROM t1_values
 WHERE select_id = 100 OR select_id IS NULL order by id;
 CONVERT(my_varchar_1000 USING koi8r)	my_varchar_1000	id
@@ -2278,9 +2283,9 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING koi8r), 
+CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING koi8r),
 my_char_30, id FROM t1_values;
-SELECT CONVERT(my_char_30 USING koi8r), 
+SELECT CONVERT(my_char_30 USING koi8r),
 my_char_30, id FROM t1_values
 WHERE select_id = 99 OR select_id IS NULL order by id;
 CONVERT(my_char_30 USING koi8r)	my_char_30	id
@@ -2304,9 +2309,9 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING utf8), 
+CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING utf8),
 my_varbinary_1000, id FROM t1_values;
-SELECT CONVERT(my_varbinary_1000 USING utf8), 
+SELECT CONVERT(my_varbinary_1000 USING utf8),
 my_varbinary_1000, id FROM t1_values
 WHERE select_id = 98 OR select_id IS NULL order by id;
 CONVERT(my_varbinary_1000 USING utf8)	my_varbinary_1000	id
@@ -2330,17 +2335,17 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING utf8), 
+CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING utf8),
 my_binary_30, id FROM t1_values;
-SELECT CONVERT(my_binary_30 USING utf8), 
+SELECT CONVERT(my_binary_30 USING utf8),
 my_binary_30, id FROM t1_values
 WHERE select_id = 97 OR select_id IS NULL order by id;
 CONVERT(my_binary_30 USING utf8)	my_binary_30	id
 NULL	NULL	1
-+		2
 <--------30 characters------->	<--------30 characters------->	3
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using utf8) AS `CONVERT(my_binary_30 USING utf8)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -2356,9 +2361,9 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING utf8), 
+CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING utf8),
 my_varchar_1000, id FROM t1_values;
-SELECT CONVERT(my_varchar_1000 USING utf8), 
+SELECT CONVERT(my_varchar_1000 USING utf8),
 my_varchar_1000, id FROM t1_values
 WHERE select_id = 96 OR select_id IS NULL order by id;
 CONVERT(my_varchar_1000 USING utf8)	my_varchar_1000	id
@@ -2382,9 +2387,9 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING utf8), 
+CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING utf8),
 my_char_30, id FROM t1_values;
-SELECT CONVERT(my_char_30 USING utf8), 
+SELECT CONVERT(my_char_30 USING utf8),
 my_char_30, id FROM t1_values
 WHERE select_id = 95 OR select_id IS NULL order by id;
 CONVERT(my_char_30 USING utf8)	my_char_30	id
@@ -2673,10 +2678,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 85 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS UNSIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
-0	+0		2
 0	<--------30 characters------->	3
-0	 ---äÖüß@µ*$-- -18446744073709551615	-1+0	 ---äÖüß@µ*$-- 	4
+18446744073709551615	-1	5
 Warnings:
 Warning	1292	Truncated incorrect INTEGER value: ''
 Warning	1292	Truncated incorrect INTEGER value: '<--------30 characters------->'
@@ -3037,10 +3042,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 73 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS SIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
-0	+0		2
 0	<--------30 characters------->	3
-0	 ---äÖüß@µ*$-- --1	-1+0	 ---äÖüß@µ*$-- 	4
+-1	-1	5
 Warnings:
 Warning	1292	Truncated incorrect INTEGER value: ''
 Warning	1292	Truncated incorrect INTEGER value: '<--------30 characters------->'
@@ -3397,11 +3402,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 61 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DECIMAL(37,2))	my_binary_30	id
 NULL	NULL	1
-0.00	+0.00		2
 0.00	<--------30 characters------->	3
-0.00	 ---äÖüß@µ*$-- --1.00	-1--3333.33	-3333.3333+0.00	 ---äÖüß@µ*$-- 	4
+-1.00	-1	5
+-3333.33	-3333.3333	28
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: ''
@@ -3755,11 +3760,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 50 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS TIME)	my_binary_30	id
 NULL	NULL	1
-00:00:00	+00:00:00		2
 00:00:00	<--------30 characters------->	3
--00:00:00	 ---äÖüß@µ*$-- -NULL	-1-41:58:00	1 17:58+-00:00:00	 ---äÖüß@µ*$-- 	4
+NULL	-1	5
+41:58:00	1 17:58	22
 Warnings:
 Warning	1292	Truncated incorrect time value: ''
 Warning	1292	Truncated incorrect time value: '<--------30 characters------->'
@@ -4131,11 +4136,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 39 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DATETIME)	my_binary_30	id
 NULL	NULL	1
-NULL	+NULL		2
 NULL	<--------30 characters------->	3
-NULL	 ---äÖüß@µ*$-- -NULL	-1-2005-06-27 17:58:00	2005-06-27 17:58+NULL	 ---äÖüß@µ*$-- 	4
+NULL	-1	5
+2005-06-27 17:58:00	2005-06-27 17:58	16
 Warnings:
 Warning	1292	Incorrect datetime value: ''
 Warning	1292	Incorrect datetime value: '<--------30 characters------->'
@@ -4501,11 +4506,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 28 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DATE)	my_binary_30	id
 NULL	NULL	1
-NULL	+NULL		2
 NULL	<--------30 characters------->	3
-NULL	 ---äÖüß@µ*$-- -NULL	-1-2005-06-27	2005-06-27+NULL	 ---äÖüß@µ*$-- 	4
+NULL	-1	5
+2005-06-27	2005-06-27	10
 Warnings:
 Warning	1292	Incorrect datetime value: ''
 Warning	1292	Incorrect datetime value: '<--------30 characters------->'
@@ -4851,10 +4856,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 16 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS CHAR)	my_binary_30	id
 NULL	NULL	1
-+		2
 <--------30 characters------->	<--------30 characters------->	3
- ---äÖüß@µ*$-- --1+ ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset latin1) AS `CAST(my_binary_30 AS CHAR)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -5163,10 +5168,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 4 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS BINARY)	my_binary_30	id
 NULL	NULL	1
-+		2
 <--------30 characters------->	<--------30 characters------->	3
- ---äÖüß@µ*$-- --1+ ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset binary) AS `CAST(my_binary_30 AS BINARY)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
diff -Nrup a/mysql-test/suite/funcs_1/r/falcon_storedproc.result b/mysql-test/suite/funcs_1/r/falcon_storedproc.result
--- a/mysql-test/suite/funcs_1/r/falcon_storedproc.result	2008-03-10 19:59:49 +01:00
+++ b/mysql-test/suite/funcs_1/r/falcon_storedproc.result	2008-04-01 23:00:53 +02:00
@@ -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 = falcon;
-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 = falcon;
-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 = falcon;
-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 = falcon;
-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 = falcon;
-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 = falcon;
-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 '
 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 = falcon;
-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 '
 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 = falcon;
-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 = falcon;
-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 = falcon;
-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.1 - Syntax checks for the CREATE PROCEDURE, CREATE
 FUNCTION, ALTER PROCEDURE, ALTER FUNCTION, DROP PROCEDURE, DROP FUNCTION, SHOW
@@ -14862,46 +14870,47 @@ USE db_storedproc;
 Testcase 4.3.1:
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp1;
-drop table IF EXISTS res_t3_itisalongname_1381742_itsaverylongname_1381742;
+DROP TABLE IF EXISTS res_t3_itisalongname_1381742_itsaverylongname_1381742;
 CREATE TABLE res_t3_itisalongname_1381742_itsaverylongname_1381742(
-middleinitial CHAR,
-lastname VARCHAR(50),
-age_averylongfieldname_averylongname_1234569 int,
-COMMENT TEXT) ENGINE=falcon;
+middleinitial CHAR, lastname VARCHAR(50),
+age_averylongfieldname_averylongname_1234569 INT, COMMENT VARCHAR(100))
+ENGINE=<engine_to_be_tested>;
 INSERT INTO res_t3_itisalongname_1381742_itsaverylongname_1381742
 VALUES('a', 'aaaaaaaaaabbbbbbbbc', 0, 'default');
-CREATE PROCEDURE sp1(a int)
+CREATE PROCEDURE sp1(a INT)
 BEGIN
-declare itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx char;
-declare itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx varchar(100);
-declare itisjustamediumsizeintintegervariablename integer;
-set itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx = 'b';
-set itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx = 'oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%';
-set itisjustamediumsizeintintegervariablename = 5;
-set @comment='a';
-label1: loop
-if a>100 then
-set @comment='value of a is greater than 100';
-elseif a<100 then
-if a<50 then
-set @comment='value of a is less than 50';
-elseif a<25 then
-set @comment='value of a is less than 25';
-else
-set @comment='value of a is greater than 50 and less than 100';
-END if;
-else
-set @comment='value of a is 100';
-END if;
-if itisjustamediumsizeintintegervariablename = 0 then leave label1;
-END if;
-insert into res_t3_itisalongname_1381742_itsaverylongname_1381742
-values( itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx,
-concat(itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx, '  ', a),
-a, @comment );
-set itisjustamediumsizeintintegervariablename = itisjustamediumsizeintintegervariablename - 1;
-iterate label1;
-END loop label1;
+DECLARE itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx CHAR;
+DECLARE itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx VARCHAR(100);
+DECLARE itisjustamediumsizeintintegervariablename INTEGER;
+SET itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx = 'b';
+SET itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx
+= 'oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%';
+SET itisjustamediumsizeintintegervariablename = 5;
+SET @comment='a';
+label1: LOOP
+IF a > 100 THEN
+SET @comment = 'value of a is greater than 100';
+ELSEIF a < 100 THEN
+IF a < 50 THEN
+SET @comment = 'value of a is less than 50';
+ELSEIF a < 25 THEN
+SET @comment = 'value of a is less than 25';
+ELSE
+SET @comment = 'value of a is greater than 50 and less than 100';
+END IF;
+ELSE
+SET @comment = 'value of a is 100';
+END IF;
+IF itisjustamediumsizeintintegervariablename = 0 THEN LEAVE label1;
+END IF;
+INSERT INTO res_t3_itisalongname_1381742_itsaverylongname_1381742
+VALUES(itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx,
+CONCAT(itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx,
+'  ', a), a, @comment);
+SET itisjustamediumsizeintintegervariablename
+= itisjustamediumsizeintintegervariablename - 1;
+ITERATE label1;
+END LOOP label1;
 END//
 CALL sp1(101);
 CALL sp1(100);
diff -Nrup a/mysql-test/suite/funcs_1/r/falcon_storedproc_02.result b/mysql-test/suite/funcs_1/r/falcon_storedproc_02.result
--- a/mysql-test/suite/funcs_1/r/falcon_storedproc_02.result	2008-03-10 19:59:50 +01:00
+++ b/mysql-test/suite/funcs_1/r/falcon_storedproc_02.result	2008-04-01 23:00:53 +02:00
@@ -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 = falcon;
-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 = falcon;
-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 = falcon;
-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 = falcon;
-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 = falcon;
-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 = falcon;
-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 '
 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 = falcon;
-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 '
 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 = falcon;
-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 = falcon;
-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 = falcon;
-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:
@@ -698,7 +706,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
 condition.
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp0;
@@ -797,7 +805,7 @@ Testcase 3.1.2.56:
 ------------------
 
 Ensure that a handler with a condition defined with an SQLSTATE that begins with
+“02“ is always exactly equivalent in action to a handler with a NOT FOUND
 condition.
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp0;
@@ -905,7 +913,7 @@ Testcase 3.1.2.58:
 ------------------
 
 Ensure that a handler with a condition defined with an SQLSTATE that begins with
+anything other that “01“ or “02“ is always exactly equivalent in action to a
 handler with an SQLEXCEPTION condition.
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp0;
@@ -1194,16 +1202,16 @@ declare cur2 cursor for SELECT f1, f2, f
 open cur1;
 open cur2;
 BEGIN
-declare continue handler for sqlstate '02000' set count=1;
+declare continue handler for sqlstate '02000' set count = 1;
 fetch cur1 into newf1, newf2, newf4, newf5;
 SELECT '-1-', count, newf1, newf2, newf4, newf5;
 insert into temp1 values ('cur1_out', newf1, newf2, newf4, newf5);
-set count= 4;
+set count = 4;
 BEGIN
-while count> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf5;
 SELECT '-2-', count, newf1, newf2, newf4, newf5;
-set count = count- 1;
+set count = count - 1;
 END while;
 SELECT '-3-', count, newf1, newf2, newf4, newf4;
 END;
diff -Nrup a/mysql-test/suite/funcs_1/r/falcon_storedproc_03.result b/mysql-test/suite/funcs_1/r/falcon_storedproc_03.result
--- a/mysql-test/suite/funcs_1/r/falcon_storedproc_03.result	2008-03-10 19:59:50 +01:00
+++ b/mysql-test/suite/funcs_1/r/falcon_storedproc_03.result	2008-04-01 23:00:53 +02:00
@@ -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 = falcon;
-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 = falcon;
-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 = falcon;
-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 = falcon;
-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 = falcon;
-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 = falcon;
-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 '
 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 = falcon;
-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 '
 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 = falcon;
-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 = falcon;
-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 = falcon;
-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:
diff -Nrup a/mysql-test/suite/funcs_1/r/falcon_storedproc_07.result b/mysql-test/suite/funcs_1/r/falcon_storedproc_07.result
--- a/mysql-test/suite/funcs_1/r/falcon_storedproc_07.result	2008-03-10 19:59:50 +01:00
+++ b/mysql-test/suite/funcs_1/r/falcon_storedproc_07.result	2008-04-01 23:00:53 +02:00
@@ -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 = falcon;
-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 = falcon;
-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 = falcon;
-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 = falcon;
-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 = falcon;
-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 = falcon;
-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 '
 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 = falcon;
-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 '
 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 = falcon;
-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 = falcon;
-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 = falcon;
-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:
 --------------------------------------------------------------------------------
diff -Nrup a/mysql-test/suite/funcs_1/r/falcon_storedproc_08.result b/mysql-test/suite/funcs_1/r/falcon_storedproc_08.result
--- a/mysql-test/suite/funcs_1/r/falcon_storedproc_08.result	2008-03-10 19:59:50 +01:00
+++ b/mysql-test/suite/funcs_1/r/falcon_storedproc_08.result	2008-04-01 23:00:53 +02:00
@@ -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 = falcon;
-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 = falcon;
-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 = falcon;
-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 = falcon;
-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 = falcon;
-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 = falcon;
-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 '
 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 = falcon;
-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 '
 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 = falcon;
-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 = falcon;
-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 = falcon;
-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:
 --------------------------------------------------------------------------------
diff -Nrup a/mysql-test/suite/funcs_1/r/falcon_storedproc_10.result b/mysql-test/suite/funcs_1/r/falcon_storedproc_10.result
--- a/mysql-test/suite/funcs_1/r/falcon_storedproc_10.result	2008-03-10 19:59:50 +01:00
+++ b/mysql-test/suite/funcs_1/r/falcon_storedproc_10.result	2008-04-01 23:00:53 +02:00
@@ -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 = falcon;
-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 = falcon;
-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 = falcon;
-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 = falcon;
-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 = falcon;
-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 = falcon;
-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 '
 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 = falcon;
-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 '
 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 = falcon;
-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 = falcon;
-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 = falcon;
-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.10 - CALL checks:
 --------------------------------------------------------------------------------
@@ -383,7 +391,7 @@ DROP TABLE temp;
 Testcase 3.1.10.8:
 ------------------
 
-Ensure that the mysql_affected_rows() C API function always returns the correct 
+Ensure that the mysql_affected_rows() C API function always returns the correct
 number of rows affected by the execution of a stored procedure.
 --------------------------------------------------------------------------------
 
diff -Nrup a/mysql-test/suite/funcs_1/r/falcon_trig_0102.result b/mysql-test/suite/funcs_1/r/falcon_trig_0102.result
--- a/mysql-test/suite/funcs_1/r/falcon_trig_0102.result	2008-03-10 19:59:50 +01:00
+++ b/mysql-test/suite/funcs_1/r/falcon_trig_0102.result	2008-04-01 23:00:53 +02:00
@@ -64,33 +64,34 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb3.txt' into table tb3 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb3.txt'
+into table tb3;
 
 Testcase: 3.5.1.1:
 ------------------
 use test;
-Create trigger trg1_1 BEFORE INSERT 
+Create trigger trg1_1 BEFORE INSERT
 on tb3 for each row set @test_before = 2, new.f142 = @test_before;
-Create trigger trg1_2 AFTER INSERT 
+Create trigger trg1_2 AFTER INSERT
 on tb3 for each row set @test_after = 6;
-Create trigger trg1_4 BEFORE UPDATE 
-on tb3 for each row set @test_before = 27, 
-new.f142 = @test_before, 
+Create trigger trg1_4 BEFORE UPDATE
+on tb3 for each row set @test_before = 27,
+new.f142 = @test_before,
 new.f122 = 'Before Update Trigger';
-Create trigger trg1_3 AFTER UPDATE 
+Create trigger trg1_3 AFTER UPDATE
 on tb3 for each row set @test_after = '15';
-Create trigger trg1_5 BEFORE DELETE on tb3 for each row  
-select count(*) into @test_before from tb3 as tr_tb3 
+Create trigger trg1_5 BEFORE DELETE on tb3 for each row
+select count(*) into @test_before from tb3 as tr_tb3
 where f121 = 'Test 3.5.1.1';
-Create trigger trg1_6 AFTER DELETE on tb3 for each row  
-select count(*) into @test_after from tb3 as tr_tb3 
+Create trigger trg1_6 AFTER DELETE on tb3 for each row
+select count(*) into @test_after from tb3 as tr_tb3
 where f121 = 'Test 3.5.1.1';
 set @test_before = 1;
 set @test_after = 5;
 select @test_before, @test_after;
 @test_before	@test_after
 1	5
-Insert into tb3 (f121, f122, f142, f144, f134) 
+Insert into tb3 (f121, f122, f142, f144, f134)
 values ('Test 3.5.1.1', 'First Row', @test_before, @test_after, 1);
 select f121, f122, f142, f144, f134 from tb3 where f121 = 'Test 3.5.1.1';
 f121	f122	f142	f144	f134
@@ -103,9 +104,9 @@ set @test_after = 8;
 select @test_before, @test_after;
 @test_before	@test_after
 18	8
-Update tb3 set  tb3.f122 = 'Update', 
-tb3.f142 = @test_before, 
-tb3.f144 = @test_after 
+Update tb3 set  tb3.f122 = 'Update',
+tb3.f142 = @test_before,
+tb3.f144 = @test_after
 where tb3.f121 = 'Test 3.5.1.1';
 select f121, f122, f142, f144, f134 from tb3 where f121 = 'Test 3.5.1.1';
 f121	f122	f142	f144	f134
@@ -113,7 +114,7 @@ Test 3.5.1.1	Before Update Trigger	27	00
 select @test_before, @test_after;
 @test_before	@test_after
 27	15
-Insert into tb3 (f121, f122, f142, f144, f134) 
+Insert into tb3 (f121, f122, f142, f144, f134)
 values ('Test 3.5.1.1', 'Second Row', 5, 6, 2);
 set @test_before = 0;
 set @test_after = 0;
@@ -141,7 +142,7 @@ delete from tb3 where f121='Test 3.5.1.1
 
 Testcase: 3.5.1.2:
 ------------------
-Create trigger trg_1 after insert 
+Create trigger trg_1 after insert
 on tb3 for each statement set @x= 1;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'statement set @x= 1' at line 2
 drop trigger trg_1;
@@ -192,7 +193,7 @@ Testcase 3.5.1.7: - need to fix
 -------------------------------
 drop table if exists t1;
 create table t1 (f1 int, f2 char(25),f3 int) engine=falcon;
-CREATE TRIGGER trg5_1 BEFORE INSERT on test.t1 
+CREATE TRIGGER trg5_1 BEFORE INSERT on test.t1
 for each row set new.f3 = '14';
 CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ
 BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
@@ -229,7 +230,7 @@ CREATE TRIGGER @@view before insert on t
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@@view before insert on tb3 for each row set new.f120 = 't'' at line 1
 CREATE TRIGGER @name before insert on tb3 for each row set new.f120 = 't';
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@name before insert on tb3 for each row set new.f120 = 't'' at line 1
-CREATE TRIGGER tb3.trg6_1 BEFORE INSERT on test.tb3 
+CREATE TRIGGER tb3.trg6_1 BEFORE INSERT on test.tb3
 for each row set new.f120 ='X';
 ERROR HY000: Trigger in wrong schema
 drop database if exists trig_db;
@@ -237,11 +238,11 @@ create database trig_db;
 use trig_db;
 create table t1 (f1 integer) engine = falcon;
 use test;
-CREATE TRIGGER trig_db.trg6_2 AFTER INSERT on tb3 
+CREATE TRIGGER trig_db.trg6_2 AFTER INSERT on tb3
 for each row set @ret_trg6_2 = 5;
 ERROR 42S02: Table 'trig_db.tb3' doesn't exist
 use trig_db;
-CREATE TRIGGER trg6_3 AFTER INSERT on test.tb3 
+CREATE TRIGGER trg6_3 AFTER INSERT on test.tb3
 for each row set @ret_trg6_3 = 18;
 ERROR HY000: Trigger in wrong schema
 use test;
@@ -265,9 +266,9 @@ drop table if exists t1;
 drop table if exists t2;
 create table t1 (f1 char(50), f2 integer) engine = falcon;
 create table t2 (f1 char(50), f2 integer) engine = falcon;
-create trigger trig before insert on t1 
+create trigger trig before insert on t1
 for each row set new.f1 ='trig t1';
-create trigger trig before update on t2 
+create trigger trig before update on t2
 for each row set new.f1 ='trig t2';
 ERROR HY000: Trigger already exists
 insert into t1 value ('insert to t1',1);
@@ -297,15 +298,15 @@ create database trig_db2;
 create database trig_db3;
 use trig_db1;
 create table t1 (f1 char(50), f2 integer) engine = falcon;
-create trigger trig before insert on t1 
+create trigger trig before insert on t1
 for each row set new.f1 ='trig1', @test_var1='trig1';
 use trig_db2;
 create table t2 (f1 char(50), f2 integer) engine = falcon;
-create trigger trig before insert on t2 
+create trigger trig before insert on t2
 for each row set new.f1 ='trig2', @test_var2='trig2';
 use trig_db3;
 create table t1 (f1 char(50), f2 integer) engine = falcon;
-create trigger trig before insert on t1 
+create trigger trig before insert on t1
 for each row set new.f1 ='trig3', @test_var3='trig3';
 set @test_var1= '', @test_var2= '', @test_var3= '';
 use trig_db1;
@@ -344,11 +345,11 @@ create database trig_db2;
 use trig_db1;
 create table t1 (f1 char(50), f2 integer) engine = falcon;
 create table trig_db2.t1 (f1 char(50), f2 integer) engine = falcon;
-create trigger trig1_b before insert on t1 
+create trigger trig1_b before insert on t1
 for each row set @test_var1='trig1_b';
-create trigger trig_db1.trig1_a after insert on t1 
+create trigger trig_db1.trig1_a after insert on t1
 for each row set @test_var2='trig1_a';
-create trigger trig_db2.trig2 before insert on trig_db2.t1 
+create trigger trig_db2.trig2 before insert on trig_db2.t1
 for each row set @test_var3='trig2';
 select trigger_schema, trigger_name, event_object_table
 from information_schema.triggers order by trigger_name;
diff -Nrup a/mysql-test/suite/funcs_1/r/falcon_trig_03.result b/mysql-test/suite/funcs_1/r/falcon_trig_03.result
--- a/mysql-test/suite/funcs_1/r/falcon_trig_03.result	2008-03-10 19:59:50 +01:00
+++ b/mysql-test/suite/funcs_1/r/falcon_trig_03.result	2008-04-01 23:00:53 +02:00
@@ -64,7 +64,8 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb3.txt' into table tb3 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb3.txt'
+into table tb3;
 
 Testcase 3.5.3:
 ---------------
@@ -103,7 +104,7 @@ test_noprivs@localhost
 use priv_db;
 create trigger trg1_1 before INSERT on t1 for each row
 set new.f1 = 'trig 3.5.3.2_1-no';
-Got one of the listed errors
+ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1'
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.2-no');
 select f1 from t1 order by f1;
@@ -135,7 +136,7 @@ Testcase 3.5.3.6:
 -----------------
 use priv_db;
 drop trigger trg1_2;
-Got one of the listed errors
+ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1'
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.6-yes');
 select f1 from t1 order by f1;
diff -Nrup a/mysql-test/suite/funcs_1/r/falcon_trig_03e.result b/mysql-test/suite/funcs_1/r/falcon_trig_03e.result
--- a/mysql-test/suite/funcs_1/r/falcon_trig_03e.result	2008-03-12 14:18:08 +01:00
+++ b/mysql-test/suite/funcs_1/r/falcon_trig_03e.result	2008-04-01 23:00:53 +02:00
@@ -989,7 +989,7 @@ root@localhost
 show triggers;
 Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
 grant  select, insert, update ,trigger
-on priv_db.t1 to test_yesprivs@localhost 
+on priv_db.t1 to test_yesprivs@localhost
 with grant option;
 grant  select
 on priv_db.t1 to test_useprivs@localhost;
@@ -1214,7 +1214,7 @@ create definer=not_ex_user@localhost tri
 before INSERT on t1 for each row
 set new.f1 = 'trig 1_0-yes';
 Warnings:
-Note	1449	There is no 'not_ex_user'@'localhost' registered
+Note	1449	The user specified as a definer ('not_ex_user'@'localhost') does not exist
 drop trigger trg1_0;
 create definer=test_yesprivs@localhost trigger trg1_0
 before INSERT on t1 for each row
@@ -1252,7 +1252,7 @@ create definer=not_ex_user@localhost tri
 before INSERT on t1 for each row
 set new.f1 = 'trig 1_0-yes';
 ERROR 42000: Access denied; you need the SUPER privilege for this operation
-create definer=current_user trigger trg1_1 
+create definer=current_user trigger trg1_1
 before INSERT on t1 for each row
 set new.f1 = 'trig 1_1-yes';
 insert into t1 (f1) values ('insert-no');
@@ -1318,7 +1318,7 @@ current_user
 test_yesprivs@localhost
 use priv_db;
 set autocommit=0;
-create definer=current_user trigger trg1_1 
+create definer=current_user trigger trg1_1
 before INSERT on t1 for each row
 set new.f1 = 'trig 1_1-yes';
 rollback work;
@@ -1564,7 +1564,7 @@ select current_user;
 current_user
 root@localhost
 revoke UPDATE(f1) on priv_db.t1 from test_yesprivs@localhost;
-grant TRIGGER,UPDATE(f2),UPDATE(f3) on priv_db.t1 
+grant TRIGGER,UPDATE(f2),UPDATE(f3) on priv_db.t1
 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
diff -Nrup a/mysql-test/suite/funcs_1/r/falcon_trig_0407.result b/mysql-test/suite/funcs_1/r/falcon_trig_0407.result
--- a/mysql-test/suite/funcs_1/r/falcon_trig_0407.result	2008-03-10 19:59:50 +01:00
+++ b/mysql-test/suite/funcs_1/r/falcon_trig_0407.result	2008-04-01 23:00:53 +02:00
@@ -64,7 +64,8 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb3.txt' into table tb3 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb3.txt'
+into table tb3;
 
 Testcase: 3.5:
 --------------
@@ -88,7 +89,7 @@ Use db_drop;
 create table t1 (f1 char(30)) engine=falcon;
 grant INSERT, SELECT on db_drop.t1 to test_general;
 Use db_drop;
-Create trigger trg1 BEFORE INSERT on t1 
+Create trigger trg1 BEFORE INSERT on t1
 for each row set new.f1='Trigger 3.5.4.1';
 Use db_drop;
 Insert into t1 values ('Insert error 3.5.4.1');
@@ -127,7 +128,7 @@ drop table if exists t1_433 ;
 drop table if exists t1_433a ;
 create table t1_433 (f1 char (30)) engine=falcon;
 create table t1_433a (f1a char (5)) engine=falcon;
-CREATE TRIGGER trg3 BEFORE INSERT on t1_433 for each row 
+CREATE TRIGGER trg3 BEFORE INSERT on t1_433 for each row
 set new.f1 = 'Trigger 3.5.4.3';
 Drop trigger t1.433.trg3;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.trg3' at line 1
@@ -148,7 +149,7 @@ create database db_drop4;
 Use db_drop4;
 create table t1 (f1 char(30)) engine=falcon;
 grant INSERT, SELECT on db_drop4.t1 to test_general;
-Create trigger trg4 BEFORE INSERT on t1 
+Create trigger trg4 BEFORE INSERT on t1
 for each row set new.f1='Trigger 3.5.4.4';
 Use db_drop4;
 Insert into t1 values ('Insert 3.5.4.4');
@@ -184,7 +185,7 @@ create database db_drop5;
 Use db_drop5;
 create table t1 (f1 char(50)) engine=falcon;
 grant INSERT, SELECT on t1 to test_general;
-Create trigger trg5 BEFORE INSERT on t1 
+Create trigger trg5 BEFORE INSERT on t1
 for each row set new.f1='Trigger 3.5.4.5';
 Use db_drop5;
 Insert into t1 values ('Insert 3.5.4.5');
@@ -221,7 +222,7 @@ ERROR 42S02: Table 'test.t100' doesn't e
 Testcase 3.5.5.2:
 -----------------
 Create temporary table t1_temp (f1 bigint signed, f2 bigint unsigned);
-Create trigger trg2 before INSERT 
+Create trigger trg2 before INSERT
 on t1_temp for each row set new.f2=9999;
 ERROR HY000: Trigger's 't1_temp' is view or temporary table
 drop table t1_temp;
@@ -229,7 +230,7 @@ drop table t1_temp;
 Testcase 3.5.5.3:
 -----------------
 Create view vw3 as select f118 from tb3;
-Create trigger trg3 before INSERT 
+Create trigger trg3 before INSERT
 on vw3 for each row set new.f118='s';
 ERROR HY000: 'test.vw3' is not BASE TABLE
 drop view vw3;
@@ -310,9 +311,9 @@ drop trigger tb3.trg4_2;
 
 Testcase 3.5.7.5 / 3.5.7.6:
 ---------------------------
-Create trigger trg5_1 BEFORE INSERT 
+Create trigger trg5_1 BEFORE INSERT
 on tb3 for each row set new.f122='Trigger1 3.5.7.5/6';
-Create trigger trg5_2 BEFORE INSERT 
+Create trigger trg5_2 BEFORE INSERT
 on tb3 for each row set new.f122='Trigger2 3.5.7.5';
 ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table'
 Insert into tb3 (f121,f122) values ('Test 3.5.7.5/6','Insert 3.5.7.5');
@@ -330,9 +331,9 @@ delete from tb3 where f121='Test 3.5.7.5
 Testcase 3.5.7.7 / 3.5.7.8:
 ---------------------------
 set @test_var='Before trig 3.5.7.7';
-Create trigger trg6_1 AFTER INSERT 
+Create trigger trg6_1 AFTER INSERT
 on tb3 for each row set @test_var='Trigger1 3.5.7.7/8';
-Create trigger trg6_2 AFTER INSERT 
+Create trigger trg6_2 AFTER INSERT
 on tb3 for each row set @test_var='Trigger2 3.5.7.7';
 ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table'
 select @test_var;
@@ -358,9 +359,9 @@ delete from tb3 where f121='Test 3.5.7.7
 
 Testcase 3.5.7.9/10:
 --------------------
-Create trigger trg7_1 BEFORE UPDATE 
+Create trigger trg7_1 BEFORE UPDATE
 on tb3 for each row set new.f122='Trigger1 3.5.7.9/10';
-Create trigger trg7_2 BEFORE UPDATE 
+Create trigger trg7_2 BEFORE UPDATE
 on tb3 for each row set new.f122='Trigger2 3.5.7.9';
 ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table'
 Insert into tb3 (f121,f122) values ('Test 3.5.7.9/10','Insert 3.5.7.9');
@@ -378,9 +379,9 @@ delete from tb3 where f121='Test 3.5.7.9
 Testcase 3.5.7.11/12:
 ---------------------
 set @test_var='Before trig 3.5.7.11';
-Create trigger trg8_1 AFTER UPDATE 
+Create trigger trg8_1 AFTER UPDATE
 on tb3 for each row set @test_var='Trigger 3.5.7.11/12';
-Create trigger trg8_2 AFTER UPDATE 
+Create trigger trg8_2 AFTER UPDATE
 on tb3 for each row set @test_var='Trigger2 3.5.7.11';
 ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table'
 select @test_var;
@@ -408,9 +409,9 @@ delete from tb3 where f121='Test 3.5.7.1
 Testcase 3.5.7.13/14:
 ---------------------
 set @test_var=1;
-Create trigger trg9_1 BEFORE DELETE 
+Create trigger trg9_1 BEFORE DELETE
 on tb3 for each row set @test_var=@test_var+1;
-Create trigger trg9_2 BEFORE DELETE 
+Create trigger trg9_2 BEFORE DELETE
 on tb3 for each row set @test_var=@test_var+10;
 ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table'
 select @test_var;
@@ -440,12 +441,12 @@ delete from tb3 where f121='Test 3.5.7.1
 Testcase 3.5.7.15/16:
 ---------------------
 set @test_var=1;
-Create trigger trg_3_406010_1 AFTER DELETE 
+Create trigger trg_3_406010_1 AFTER DELETE
 on tb3 for each row set @test_var=@test_var+5;
-Create trigger trg_3_406010_2 AFTER DELETE 
+Create trigger trg_3_406010_2 AFTER DELETE
 on tb3 for each row set @test_var=@test_var+50;
 ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table'
-Create trigger trg_3_406010_1 AFTER INSERT 
+Create trigger trg_3_406010_1 AFTER INSERT
 on tb3 for each row set @test_var=@test_var+1;
 ERROR HY000: Trigger already exists
 select @test_var;
diff -Nrup a/mysql-test/suite/funcs_1/r/falcon_trig_08.result b/mysql-test/suite/funcs_1/r/falcon_trig_08.result
--- a/mysql-test/suite/funcs_1/r/falcon_trig_08.result	2008-03-10 19:59:50 +01:00
+++ b/mysql-test/suite/funcs_1/r/falcon_trig_08.result	2008-04-01 23:00:53 +02:00
@@ -64,7 +64,8 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb3.txt' into table tb3 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb3.txt'
+into table tb3;
 
 Testcase: 3.5:
 --------------
@@ -89,17 +90,17 @@ create database db_test;
 grant SELECT, INSERT, UPDATE, DELETE on db_test.* to test_general;
 grant LOCK TABLES on db_test.* to test_general;
 Use db_test;
-create table t1_i ( 
+create table t1_i (
 i120 char ascii not null DEFAULT b'101',
 i136 smallint zerofill not null DEFAULT 999,
 i144 int zerofill not null DEFAULT 99999,
 i163 decimal (63,30)) engine=falcon;
-create table t1_u ( 
+create table t1_u (
 u120 char ascii not null DEFAULT b'101',
 u136 smallint zerofill not null DEFAULT 999,
 u144 int zerofill not null DEFAULT 99999,
 u163 decimal (63,30)) engine=falcon;
-create table t1_d ( 
+create table t1_d (
 d120 char ascii not null DEFAULT b'101',
 d136 smallint zerofill not null DEFAULT 999,
 d144 int zerofill not null DEFAULT 99999,
@@ -122,18 +123,18 @@ Insert into t1_d values ('f',222,99999,9
 use test;
 Create trigger trg1 AFTER INSERT on tb3 for each row
 BEGIN
-insert into db_test.t1_i 
+insert into db_test.t1_i
 values (new.f120, new.f136, new.f144, new.f163);
-update db_test.t1_u 
+update db_test.t1_u
 set u144=new.f144, u163=new.f163
-where u136=new.f136; 
+where u136=new.f136;
 delete from db_test.t1_d where d136= new.f136;
-select sum(db_test.t1_u.u163) into @test_var from db_test.t1_u 
-where u136= new.f136; 
+select sum(db_test.t1_u.u163) into @test_var from db_test.t1_u
+where u136= new.f136;
 END//
 Use test;
 set @test_var=0;
-Insert into tb3 (f120, f122, f136, f144, f163) 
+Insert into tb3 (f120, f122, f136, f144, f163)
 values ('1', 'Test 3.5.8.4', 222, 23456, 1.05);
 Select f120, f122, f136, f144, f163 from tb3 where f122= 'Test 3.5.8.4';
 f120	f122	f136	f144	f163
@@ -162,7 +163,7 @@ select @test_var;
 -----------------------------
 Create trigger trg2 BEFORE UPDATE on tb3 for each row
 BEGIN
-insert into db_test.t1_i 
+insert into db_test.t1_i
 values (new.f120, new.f136, new.f144, new.f163);
 END//
 Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
@@ -185,7 +186,7 @@ I	00222	0000023456	1.0500000000000000000
 -----------------------------
 drop trigger trg2;
 Create trigger trg3 BEFORE UPDATE on tb3 for each row
-update db_test.t1_u 
+update db_test.t1_u
 set u120=new.f120
 where u136=new.f136;
 update tb3 set f120='U', f122='Test 3.5.8.4-Single Update'
@@ -207,7 +208,7 @@ U	00222	0000023456	1.0500000000000000000
 drop trigger trg3;
 Create trigger trg4 AFTER UPDATE on tb3 for each row
 delete from db_test.t1_d where d136= new.f136;
-update tb3 set f120='D', f136=444, 
+update tb3 set f120='D', f136=444,
 f122='Test 3.5.8.4-Single Delete'
 		 where f122='Test 3.5.8.4-Single Update';
 Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
@@ -222,10 +223,10 @@ c	00333	0000099999	999.99000000000000000
 -------------------------------
 drop trigger trg4;
 Create trigger trg5 AFTER UPDATE on tb3 for each row
-select sum(db_test.t1_u.u163) into @test_var from db_test.t1_u 
+select sum(db_test.t1_u.u163) into @test_var from db_test.t1_u
 where u136= new.f136;
 set @test_var=0;
-update tb3 set f120='S', f136=111, 
+update tb3 set f120='S', f136=111,
 f122='Test 3.5.8.4-Single Select'
 		 where f122='Test 3.5.8.4-Single Delete';
 Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
@@ -253,31 +254,31 @@ set @test_var='three', new.f120='4';
 END IF;
 IF (new.f120='4') and (new.f136=10) then
 set @test_var2='2nd if', new.f120='d';
-ELSE 
+ELSE
 set @test_var2='2nd else', new.f120='D';
 END IF;
 END//
 set @test_var='Empty', @test_var2=0;
 Insert into tb3 (f120, f122, f136) values ('1', 'Test 3.5.8.5-if', 101);
-select f120, f122, f136, @test_var, @test_var2 
+select f120, f122, f136, @test_var, @test_var2
 from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 f120	f122	f136	@test_var	@test_var2
 D	Test 3.5.8.5-if	00101	one	2nd else
 Insert into tb3 (f120, f122, f136) values ('2', 'Test 3.5.8.5-if', 102);
-select f120, f122, f136, @test_var, @test_var2 
+select f120, f122, f136, @test_var, @test_var2
 from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 f120	f122	f136	@test_var	@test_var2
 D	Test 3.5.8.5-if	00101	two	2nd else
 D	Test 3.5.8.5-if	00102	two	2nd else
 Insert into tb3 (f120, f122, f136) values ('3', 'Test 3.5.8.5-if', 10);
-select f120, f122, f136, @test_var, @test_var2 
+select f120, f122, f136, @test_var, @test_var2
 from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 f120	f122	f136	@test_var	@test_var2
 d	Test 3.5.8.5-if	00010	three	2nd if
 D	Test 3.5.8.5-if	00101	three	2nd if
 D	Test 3.5.8.5-if	00102	three	2nd if
 Insert into tb3 (f120, f122, f136) values ('3', 'Test 3.5.8.5-if', 103);
-select f120, f122, f136, @test_var, @test_var2 
+select f120, f122, f136, @test_var, @test_var2
 from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 f120	f122	f136	@test_var	@test_var2
 d	Test 3.5.8.5-if	00010	three	2nd else
@@ -297,7 +298,7 @@ create trigger trg4 before update on tb3
 BEGIN
 IF (new.f120='4') and (new.f136=10) then
 set @test_var2='2nd if', new.f120='d';
-ELSE 
+ELSE
 set @test_var2='2nd else', new.f120='D';
 END//
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 7
@@ -339,43 +340,43 @@ ELSE set @test_var=CONCAT(new.f120, '*',
 END case;
 END//
 set @test_var='Empty';
-Insert into tb3 (f120, f122, f136, f144) 
+Insert into tb3 (f120, f122, f136, f144)
 values ('a', 'Test 3.5.8.5-case', 5, 7);
-select f120, f122, f136, f144, @test_var 
+select f120, f122, f136, f144, @test_var
 from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	A*seven
-Insert into tb3 (f120, f122, f136, f144) 
+Insert into tb3 (f120, f122, f136, f144)
 values ('b', 'Test 3.5.8.5-case', 71,16);
-select f120, f122, f136, f144, @test_var 
+select f120, f122, f136, f144, @test_var
 from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	B*0000000016
 B	Test 3.5.8.5-case	00191	0000000016	B*0000000016
-Insert into tb3 (f120, f122, f136, f144) 
+Insert into tb3 (f120, f122, f136, f144)
 values ('c', 'Test 3.5.8.5-case', 80,1);
-select f120, f122, f136, f144, @test_var 
+select f120, f122, f136, f144, @test_var
 from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	C=one
 B	Test 3.5.8.5-case	00191	0000000016	C=one
 C	Test 3.5.8.5-case	00200	0000000001	C=one
-Insert into tb3 (f120, f122, f136) 
+Insert into tb3 (f120, f122, f136)
 values ('d', 'Test 3.5.8.5-case', 152);
 Warnings:
 Warning	1265	Data truncated for column 'f120' at row 1
-select f120, f122, f136, f144, @test_var 
+select f120, f122, f136, f144, @test_var
 from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 f120	f122	f136	f144	@test_var
 1	Test 3.5.8.5-case	00152	0000099999	1*0000099999
 A	Test 3.5.8.5-case	00125	0000000007	1*0000099999
 B	Test 3.5.8.5-case	00191	0000000016	1*0000099999
 C	Test 3.5.8.5-case	00200	0000000001	1*0000099999
-Insert into tb3 (f120, f122, f136, f144) 
+Insert into tb3 (f120, f122, f136, f144)
 values ('e', 'Test 3.5.8.5-case', 200, 8);
 Warnings:
 Warning	1265	Data truncated for column 'f120' at row 1
-select f120, f122, f136, f144, @test_var 
+select f120, f122, f136, f144, @test_var
 from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 f120	f122	f136	f144	@test_var
 1	Test 3.5.8.5-case	00152	0000099999	1=eight
@@ -383,9 +384,9 @@ f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	1=eight
 B	Test 3.5.8.5-case	00191	0000000016	1=eight
 C	Test 3.5.8.5-case	00200	0000000001	1=eight
-Insert into tb3 (f120, f122, f136, f144) 
+Insert into tb3 (f120, f122, f136, f144)
 values ('f', 'Test 3.5.8.5-case', 100, 8);
-select f120, f122, f136, f144, @test_var 
+select f120, f122, f136, f144, @test_var
 from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 f120	f122	f136	f144	@test_var
 1	Test 3.5.8.5-case	00152	0000099999	1=eight
@@ -406,40 +407,40 @@ delete from tb3 where f121='Test 3.5.8.5
 Testcase 3.5.8.5-loop/leave:
 ----------------------------
 Create trigger trg4 after insert on tb3 for each row
-BEGIN 
+BEGIN
 set @counter=0, @flag='Initial';
-Label1: loop 
+Label1: loop
 if new.f136<new.f144 then
 set @counter='Nothing to loop';
-leave Label1; 
+leave Label1;
 else
 set @counter=@counter+1;
 if new.f136=new.f144+@counter then
 set @counter=concat(@counter, ' loops');
 leave Label1;
-end if; 
-end if; 
-iterate label1; 
+end if;
+end if;
+iterate label1;
 set @flag='Final';
-END loop Label1; 
+END loop Label1;
 END//
-Insert into tb3 (f122, f136, f144) 
+Insert into tb3 (f122, f136, f144)
 values ('Test 3.5.8.5-loop', 2, 8);
 select @counter, @flag;
 @counter	@flag
 Nothing to loop	Initial
-Insert into tb3 (f122, f136, f144) 
+Insert into tb3 (f122, f136, f144)
 values ('Test 3.5.8.5-loop', 11, 8);
 select @counter, @flag;
 @counter	@flag
 3 loops	Initial
 Create trigger trg4_2 after update on tb3 for each row
-BEGIN 
-Label1: loop 
+BEGIN
+Label1: loop
 set @counter=@counter+1;
-END;  
+END;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ';  
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ';
 END' at line 5
 drop trigger trg4_2;
 drop trigger trg4;
@@ -449,23 +450,23 @@ Testcase 3.5.8.5-repeat:
 ------------------------
 Create trigger trg6 after insert on tb3 for each row
 BEGIN
-rp_label: REPEAT 
-SET @counter1 = @counter1 + 1; 
+rp_label: REPEAT
+SET @counter1 = @counter1 + 1;
 IF (@counter1 MOD 2 = 0) THEN ITERATE rp_label; 	
 END IF;
-SET @counter2 = @counter2 + 1; 
+SET @counter2 = @counter2 + 1;
 UNTIL @counter1> new.f136 END REPEAT rp_label;
 END//
 set @counter1= 0, @counter2= 0;
-Insert into tb3 (f122, f136) 
+Insert into tb3 (f122, f136)
 values ('Test 3.5.8.5-repeat', 13);
 select @counter1, @counter2;
 @counter1	@counter2
 15	8
 Create trigger trg6_2 after update on tb3 for each row
 BEGIN
-REPEAT 
-SET @counter2 = @counter2 + 1; 
+REPEAT
+SET @counter2 = @counter2 + 1;
 END//
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'END' at line 5
 drop trigger trg6;
@@ -474,24 +475,24 @@ delete from tb3 where f122='Test 3.5.8.5
 Testcase 3.5.8.5-while:
 -----------------------
 Create trigger trg7 after insert on tb3 for each row
-wl_label: WHILE @counter1 < new.f136 DO 
-SET @counter1 = @counter1 + 1; 
+wl_label: WHILE @counter1 < new.f136 DO
+SET @counter1 = @counter1 + 1;
 IF (@counter1 MOD 2 = 0) THEN ITERATE wl_label; 	
 END IF;
-SET @counter2 = @counter2 + 1; 
+SET @counter2 = @counter2 + 1;
 END WHILE wl_label//
 set @counter1= 0, @counter2= 0;
-Insert into tb3 (f122, f136) 
+Insert into tb3 (f122, f136)
 values ('Test 3.5.8.5-while', 7);
 select @counter1, @counter2;
 @counter1	@counter2
 7	4
 Create trigger trg7_2 after update on tb3 for each row
 BEGIN
-WHILE @counter1 < new.f136 
-SET @counter1 = @counter1 + 1; 
+WHILE @counter1 < new.f136
+SET @counter1 = @counter1 + 1;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SET @counter1 = @counter1 + 1; 
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SET @counter1 = @counter1 + 1;
 END' at line 4
 delete from tb3 where f122='Test 3.5.8.5-while';
 drop trigger trg7;
diff -Nrup a/mysql-test/suite/funcs_1/r/falcon_trig_09.result b/mysql-test/suite/funcs_1/r/falcon_trig_09.result
--- a/mysql-test/suite/funcs_1/r/falcon_trig_09.result	2008-03-10 19:59:50 +01:00
+++ b/mysql-test/suite/funcs_1/r/falcon_trig_09.result	2008-04-01 23:00:53 +02:00
@@ -64,11 +64,12 @@ 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_
 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' 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
@@ -137,7 +138,7 @@ a	NULL	Test 3.5.9.3	7	123.17000000000000
 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' 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
@@ -168,17 +169,17 @@ set @tr_var_af_118=new.f118, @tr_var_af_
 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 
+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
@@ -191,15 +192,15 @@ where f122='Test 3.5.9.4';
 ERROR 23000: Column 'f136' cannot be null
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=0, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
-select f118, f121, f122, f136, f151, f163 from tb3 
+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
@@ -237,6 +238,7 @@ ERROR HY000: There is no NEW row in on D
 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)
diff -Nrup a/mysql-test/suite/funcs_1/r/falcon_trig_1011ext.result b/mysql-test/suite/funcs_1/r/falcon_trig_1011ext.result
--- a/mysql-test/suite/funcs_1/r/falcon_trig_1011ext.result	2008-03-10 19:59:50 +01:00
+++ b/mysql-test/suite/funcs_1/r/falcon_trig_1011ext.result	2008-04-01 23:00:53 +02:00
@@ -64,7 +64,8 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb3.txt' into table tb3 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb3.txt'
+into table tb3;
 
 Testcase 3.5.10.1/2/3:
 ----------------------
@@ -141,7 +142,7 @@ set @counter= 0;
 select @counter as 'Rows Loaded Before';
 Rows Loaded Before
 0
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table tb_load;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table tb_load;
 select @counter as 'Rows Loaded After';
 Rows Loaded After
 10
diff -Nrup a/mysql-test/suite/funcs_1/r/falcon_trig_frkey.result b/mysql-test/suite/funcs_1/r/falcon_trig_frkey.result
--- a/mysql-test/suite/funcs_1/r/falcon_trig_frkey.result	2008-03-10 19:59:50 +01:00
+++ b/mysql-test/suite/funcs_1/r/falcon_trig_frkey.result	2008-04-01 23:00:53 +02:00
@@ -64,7 +64,8 @@ Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb3.txt' into table tb3 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb3.txt'
+into table tb3;
 
 Testcase x.x.x.1:
 -----------------
diff -Nrup a/mysql-test/suite/funcs_1/r/falcon_views.result b/mysql-test/suite/funcs_1/r/falcon_views.result
--- a/mysql-test/suite/funcs_1/r/falcon_views.result	2008-03-10 19:59:50 +01:00
+++ b/mysql-test/suite/funcs_1/r/falcon_views.result	2008-04-01 23:00:53 +02:00
@@ -53,7 +53,8 @@ f107 year(4) not null default 2000, 
 f108 enum("1enum","2enum") not null default "1enum", 
 f109 set("1set","2set") not null default "1set"
 ) engine = falcon;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb2.txt' into table tb2 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb2.txt'
+into table tb2;
 DROP DATABASE IF EXISTS test1;
 CREATE DATABASE test1;
 USE test1;
@@ -111,7 +112,8 @@ f107 year(4) not null default 2000, 
 f108 enum("1enum","2enum") not null default "1enum", 
 f109 set("1set","2set") not null default "1set"
 ) engine = falcon;
-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
diff -Nrup a/mysql-test/suite/funcs_1/r/innodb_func_view.result b/mysql-test/suite/funcs_1/r/innodb_func_view.result
--- a/mysql-test/suite/funcs_1/r/innodb_func_view.result	2008-04-01 20:18:45 +02:00
+++ b/mysql-test/suite/funcs_1/r/innodb_func_view.result	2008-04-01 23:00:53 +02:00
@@ -35,10 +35,10 @@ my_bigint = -9223372036854775808,
 my_decimal = -9999999999999999999999999999999999.999999999999999999999999999999 ,
 my_double = -1.7976931348623E+308;
 INSERT INTO t1_values SET
-my_char_30 = '<--------30 characters------->', 
+my_char_30 = '<--------30 characters------->',
 my_varchar_1000 = CONCAT('<---------1000 characters',
 RPAD('',965,'-'),'--------->'),
-my_binary_30 = '<--------30 characters------->', 
+my_binary_30 = '<--------30 characters------->',
 my_varbinary_1000 = CONCAT('<---------1000 characters',
 RPAD('',965,'-'),'--------->'),
 my_datetime = '9999-12-31 23:59:59',
@@ -50,23 +50,23 @@ my_bigint = 9223372036854775807,
 my_decimal = +9999999999999999999999999999999999.999999999999999999999999999999 ,
 my_double = 1.7976931348623E+308;
 INSERT INTO t1_values SET
-my_char_30 = ' ---äÖüß@µ*$-- ', 
-my_varchar_1000 = ' ---äÖüß@µ*$-- ', 
-my_binary_30 = ' ---äÖüß@µ*$-- ', 
-my_varbinary_1000 = ' ---äÖüß@µ*$-- ', 
+my_char_30 = ' ---äÖüß@µ*$-- ',
+my_varchar_1000 = ' ---äÖüß@µ*$-- ',
+my_binary_30 = ' ---äÖüß@µ*$-- ',
+my_varbinary_1000 = ' ---äÖüß@µ*$-- ',
 my_datetime = '2004-02-29 23:59:59',
 my_date = '2004-02-29',
 my_timestamp = '2004-02-29 23:59:59',
 my_time = '13:00:00',
 my_year = 2000,
-my_bigint = 0,  	 
+my_bigint = 0,  	
 my_decimal = 0.0,
 my_double = 0;
 INSERT INTO t1_values SET
-my_char_30 = '-1', 
-my_varchar_1000 = '-1', 
-my_binary_30 = '-1', 
-my_varbinary_1000 = '-1', 
+my_char_30 = '-1',
+my_varchar_1000 = '-1',
+my_binary_30 = '-1',
+my_varbinary_1000 = '-1',
 my_datetime = '2005-06-28 10:00:00',
 my_date = '2005-06-28',
 my_timestamp = '2005-06-28 10:00:00',
@@ -152,21 +152,21 @@ my_double = -0.33333333E+4;
 some statements disabled because of
 Bug#5913 Traditional mode: BIGINT range not correctly delimited
 --------------------------------------------------------------------------------
-SET @my_select = 'SELECT CONVERT(my_char_30 USING utf8), 
+SET @my_select = 'SELECT CONVERT(my_char_30 USING utf8),
 my_char_30, id FROM t1_values';
-SET @my_select = 'SELECT CONVERT(my_varchar_1000 USING utf8), 
+SET @my_select = 'SELECT CONVERT(my_varchar_1000 USING utf8),
 my_varchar_1000, id FROM t1_values';
-SET @my_select = 'SELECT CONVERT(my_binary_30 USING utf8), 
+SET @my_select = 'SELECT CONVERT(my_binary_30 USING utf8),
 my_binary_30, id FROM t1_values';
-SET @my_select = 'SELECT CONVERT(my_varbinary_1000 USING utf8), 
+SET @my_select = 'SELECT CONVERT(my_varbinary_1000 USING utf8),
 my_varbinary_1000, id FROM t1_values';
-SET @my_select = 'SELECT CONVERT(my_char_30 USING koi8r), 
+SET @my_select = 'SELECT CONVERT(my_char_30 USING koi8r),
 my_char_30, id FROM t1_values';
-SET @my_select = 'SELECT CONVERT(my_varchar_1000 USING koi8r), 
+SET @my_select = 'SELECT CONVERT(my_varchar_1000 USING koi8r),
 my_varchar_1000, id FROM t1_values';
-SET @my_select = 'SELECT CONVERT(my_binary_30 USING koi8r), 
+SET @my_select = 'SELECT CONVERT(my_binary_30 USING koi8r),
 my_binary_30, id FROM t1_values';
-SET @my_select = 'SELECT CONVERT(my_varbinary_1000 USING koi8r), 
+SET @my_select = 'SELECT CONVERT(my_varbinary_1000 USING koi8r),
 my_varbinary_1000, id FROM t1_values';
 SET @my_select = 'SELECT BIT_LENGTH(my_char_30),
 my_char_30, id FROM t1_values';
@@ -180,15 +180,15 @@ SET @my_select = 'SELECT INSTR(my_char_3
 my_char_30, id FROM t1_values';
 SET @my_select = 'SELECT LCASE(my_varchar_1000),
 my_varchar_1000, id FROM t1_values';
-SET @my_select = 
+SET @my_select =
 'SELECT LEFT(my_char_30, 2), my_char_30, id FROM t1_values';
-SET @my_select = 
+SET @my_select =
 'SELECT LEFT(my_varchar_1000, 2), my_varchar_1000, id FROM t1_values';
-SET @my_select = 
+SET @my_select =
 'SELECT LEFT(my_binary_30, 2), my_binary_30, id FROM t1_values';
-SET @my_select = 
+SET @my_select =
 'SELECT LEFT(my_varbinary_1000, 2), my_varbinary_1000, id FROM t1_values';
-SET @my_select = 
+SET @my_select =
 'SELECT LEFT(''AaBbCcDdEeFfGgHhIiJjÄäÜüÖö'', my_bigint), my_bigint, id FROM t1_values';
 SET @my_select =
 'SELECT LEFT(''AaBbCcDdEeFfGgHhIiJjÄäÜüÖö'', my_decimal), my_decimal, id FROM t1_values';
@@ -202,9 +202,10 @@ SET @my_select = 'SELECT LENGTH(my_binar
 my_binary_30, id FROM t1_values';
 SET @my_select = 'SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values';
-SELECT 'äÄ@' INTO OUTFILE '../tmp/func_view.dat';
-SET @my_select = 
-'SELECT LOAD_FILE(''../tmp/func_view.dat''), id FROM t1_values';
+SET @my_select =
+'SELECT LOAD_FILE(''<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt'')
+           AS my_col,
+        id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_char_30),
 my_char_30, id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_varchar_1000),
@@ -810,36 +811,40 @@ WHERE select_id = 157 OR select_id IS NU
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values;
-SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values
+CREATE VIEW v1 AS SELECT LOAD_FILE('<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt')
+           AS my_col,
+        id FROM t1_values;
+SELECT LOAD_FILE('<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt')
+           AS my_col,
+        id FROM t1_values
 WHERE select_id = 156 OR select_id IS NULL order by id;
-LOAD_FILE('../tmp/func_view.dat')	id
-äÄ@
+my_col	id
+Here is content from load_file
 	1
-äÄ@
+Here is content from load_file
 	2
-äÄ@
+Here is content from load_file
 	3
-äÄ@
+Here is content from load_file
 	4
-äÄ@
+Here is content from load_file
 	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file('../tmp/func_view.dat') AS `LOAD_FILE('../tmp/func_view.dat')`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file('<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt') AS `my_col`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 156 OR select_id IS NULL) order by id;
-LOAD_FILE('../tmp/func_view.dat')	id
-äÄ@
+my_col	id
+Here is content from load_file
 	1
-äÄ@
+Here is content from load_file
 	2
-äÄ@
+Here is content from load_file
 	3
-äÄ@
+Here is content from load_file
 	4
-äÄ@
+Here is content from load_file
 	5
 DROP VIEW v1;
 
@@ -1013,10 +1018,10 @@ SELECT LEFT(my_binary_30, 2), my_binary_
 WHERE select_id = 147 OR select_id IS NULL order by id;
 LEFT(my_binary_30, 2)	my_binary_30	id
 NULL	NULL	1
-+		2
 <-	<--------30 characters------->	3
- -	 ---äÖüß@µ*$-- --1	-1+ -	 ---äÖüß@µ*$-- 	4
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_binary_30`,2) AS `LEFT(my_binary_30, 2)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -1141,10 +1146,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 141 OR select_id IS NULL order by id;
 BIT_LENGTH(my_binary_30)	my_binary_30	id
 NULL	NULL	1
-240	+240		2
 240	<--------30 characters------->	3
-240	 ---äÖüß@µ*$-- -240	-1+240	 ---äÖüß@µ*$-- 	4
+240	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_binary_30`) AS `BIT_LENGTH(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -1453,10 +1458,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 129 OR select_id IS NULL order by id;
 IFNULL(my_binary_30,'IS_NULL')	my_binary_30	id
 IS_NULL	NULL	1
-+		2
 <--------30 characters------->	<--------30 characters------->	3
- ---äÖüß@µ*$-- --1+ ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_binary_30`,'IS_NULL') AS `IFNULL(my_binary_30,'IS_NULL')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -1793,10 +1798,10 @@ WHERE select_id = 117 OR select_id IS NU
 IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_binary_30	id
 IS     NULL	NULL	1
-IS NOT NULL	+IS NOT NULL		2
 IS NOT NULL	<--------30 characters------->	3
-IS NOT NULL	 ---äÖüß@µ*$-- -IS NOT NULL	-1+IS NOT NULL	 ---äÖüß@µ*$-- 	4
+IS NOT NULL	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(isnull(`t1_values`.`my_binary_30`),'IS     NULL','IS NOT NULL') AS `IF(my_binary_30 IS NULL, 'IS     NULL',
@@ -2113,10 +2118,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 105 OR select_id IS NULL order by id;
 IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')	my_binary_30	id
 IS NOT TRUE	NULL	1
-IS NOT TRUE	+IS NOT TRUE		2
 IS NOT TRUE	<--------30 characters------->	3
-IS NOT TRUE	 ---äÖüß@µ*$-- -IS     TRUE	-1+IS NOT TRUE	 ---äÖüß@µ*$-- 	4
+IS     TRUE	-1	5
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: ''
 Warning	1292	Truncated incorrect DOUBLE value: '<--------30 characters------->'
@@ -2200,9 +2205,9 @@ Warning	1292	Truncated incorrect DOUBLE 
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING koi8r), 
+CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING koi8r),
 my_varbinary_1000, id FROM t1_values;
-SELECT CONVERT(my_varbinary_1000 USING koi8r), 
+SELECT CONVERT(my_varbinary_1000 USING koi8r),
 my_varbinary_1000, id FROM t1_values
 WHERE select_id = 102 OR select_id IS NULL order by id;
 CONVERT(my_varbinary_1000 USING koi8r)	my_varbinary_1000	id
@@ -2226,17 +2231,17 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING koi8r), 
+CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING koi8r),
 my_binary_30, id FROM t1_values;
-SELECT CONVERT(my_binary_30 USING koi8r), 
+SELECT CONVERT(my_binary_30 USING koi8r),
 my_binary_30, id FROM t1_values
 WHERE select_id = 101 OR select_id IS NULL order by id;
 CONVERT(my_binary_30 USING koi8r)	my_binary_30	id
 NULL	NULL	1
-+		2
 <--------30 characters------->	<--------30 characters------->	3
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using koi8r) AS `CONVERT(my_binary_30 USING koi8r)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -2252,9 +2257,9 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING koi8r), 
+CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING koi8r),
 my_varchar_1000, id FROM t1_values;
-SELECT CONVERT(my_varchar_1000 USING koi8r), 
+SELECT CONVERT(my_varchar_1000 USING koi8r),
 my_varchar_1000, id FROM t1_values
 WHERE select_id = 100 OR select_id IS NULL order by id;
 CONVERT(my_varchar_1000 USING koi8r)	my_varchar_1000	id
@@ -2278,9 +2283,9 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING koi8r), 
+CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING koi8r),
 my_char_30, id FROM t1_values;
-SELECT CONVERT(my_char_30 USING koi8r), 
+SELECT CONVERT(my_char_30 USING koi8r),
 my_char_30, id FROM t1_values
 WHERE select_id = 99 OR select_id IS NULL order by id;
 CONVERT(my_char_30 USING koi8r)	my_char_30	id
@@ -2304,9 +2309,9 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING utf8), 
+CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING utf8),
 my_varbinary_1000, id FROM t1_values;
-SELECT CONVERT(my_varbinary_1000 USING utf8), 
+SELECT CONVERT(my_varbinary_1000 USING utf8),
 my_varbinary_1000, id FROM t1_values
 WHERE select_id = 98 OR select_id IS NULL order by id;
 CONVERT(my_varbinary_1000 USING utf8)	my_varbinary_1000	id
@@ -2330,17 +2335,17 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING utf8), 
+CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING utf8),
 my_binary_30, id FROM t1_values;
-SELECT CONVERT(my_binary_30 USING utf8), 
+SELECT CONVERT(my_binary_30 USING utf8),
 my_binary_30, id FROM t1_values
 WHERE select_id = 97 OR select_id IS NULL order by id;
 CONVERT(my_binary_30 USING utf8)	my_binary_30	id
 NULL	NULL	1
-+		2
 <--------30 characters------->	<--------30 characters------->	3
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using utf8) AS `CONVERT(my_binary_30 USING utf8)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -2356,9 +2361,9 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING utf8), 
+CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING utf8),
 my_varchar_1000, id FROM t1_values;
-SELECT CONVERT(my_varchar_1000 USING utf8), 
+SELECT CONVERT(my_varchar_1000 USING utf8),
 my_varchar_1000, id FROM t1_values
 WHERE select_id = 96 OR select_id IS NULL order by id;
 CONVERT(my_varchar_1000 USING utf8)	my_varchar_1000	id
@@ -2382,9 +2387,9 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING utf8), 
+CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING utf8),
 my_char_30, id FROM t1_values;
-SELECT CONVERT(my_char_30 USING utf8), 
+SELECT CONVERT(my_char_30 USING utf8),
 my_char_30, id FROM t1_values
 WHERE select_id = 95 OR select_id IS NULL order by id;
 CONVERT(my_char_30 USING utf8)	my_char_30	id
@@ -2673,10 +2678,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 85 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS UNSIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
-0	+0		2
 0	<--------30 characters------->	3
-0	 ---äÖüß@µ*$-- -18446744073709551615	-1+0	 ---äÖüß@µ*$-- 	4
+18446744073709551615	-1	5
 Warnings:
 Warning	1292	Truncated incorrect INTEGER value: ''
 Warning	1292	Truncated incorrect INTEGER value: '<--------30 characters------->'
@@ -3037,10 +3042,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 73 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS SIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
-0	+0		2
 0	<--------30 characters------->	3
-0	 ---äÖüß@µ*$-- --1	-1+0	 ---äÖüß@µ*$-- 	4
+-1	-1	5
 Warnings:
 Warning	1292	Truncated incorrect INTEGER value: ''
 Warning	1292	Truncated incorrect INTEGER value: '<--------30 characters------->'
@@ -3397,11 +3402,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 61 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DECIMAL(37,2))	my_binary_30	id
 NULL	NULL	1
-0.00	+0.00		2
 0.00	<--------30 characters------->	3
-0.00	 ---äÖüß@µ*$-- --1.00	-1--3333.33	-3333.3333+0.00	 ---äÖüß@µ*$-- 	4
+-1.00	-1	5
+-3333.33	-3333.3333	28
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: ''
@@ -3755,11 +3760,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 50 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS TIME)	my_binary_30	id
 NULL	NULL	1
-00:00:00	+00:00:00		2
 00:00:00	<--------30 characters------->	3
--00:00:00	 ---äÖüß@µ*$-- -NULL	-1-41:58:00	1 17:58+-00:00:00	 ---äÖüß@µ*$-- 	4
+NULL	-1	5
+41:58:00	1 17:58	22
 Warnings:
 Warning	1292	Truncated incorrect time value: ''
 Warning	1292	Truncated incorrect time value: '<--------30 characters------->'
@@ -4131,11 +4136,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 39 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DATETIME)	my_binary_30	id
 NULL	NULL	1
-NULL	+NULL		2
 NULL	<--------30 characters------->	3
-NULL	 ---äÖüß@µ*$-- -NULL	-1-2005-06-27 17:58:00	2005-06-27 17:58+NULL	 ---äÖüß@µ*$-- 	4
+NULL	-1	5
+2005-06-27 17:58:00	2005-06-27 17:58	16
 Warnings:
 Warning	1292	Incorrect datetime value: ''
 Warning	1292	Incorrect datetime value: '<--------30 characters------->'
@@ -4501,11 +4506,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 28 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DATE)	my_binary_30	id
 NULL	NULL	1
-NULL	+NULL		2
 NULL	<--------30 characters------->	3
-NULL	 ---äÖüß@µ*$-- -NULL	-1-2005-06-27	2005-06-27+NULL	 ---äÖüß@µ*$-- 	4
+NULL	-1	5
+2005-06-27	2005-06-27	10
 Warnings:
 Warning	1292	Incorrect datetime value: ''
 Warning	1292	Incorrect datetime value: '<--------30 characters------->'
@@ -4851,10 +4856,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 16 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS CHAR)	my_binary_30	id
 NULL	NULL	1
-+		2
 <--------30 characters------->	<--------30 characters------->	3
- ---äÖüß@µ*$-- --1+ ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset latin1) AS `CAST(my_binary_30 AS CHAR)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -5163,10 +5168,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 4 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS BINARY)	my_binary_30	id
 NULL	NULL	1
-+		2
 <--------30 characters------->	<--------30 characters------->	3
- ---äÖüß@µ*$-- --1+ ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset binary) AS `CAST(my_binary_30 AS BINARY)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
diff -Nrup a/mysql-test/suite/funcs_1/r/innodb_storedproc.result b/mysql-test/suite/funcs_1/r/innodb_storedproc.result
--- a/mysql-test/suite/funcs_1/r/innodb_storedproc.result	2008-04-01 20:18:46 +02:00
+++ b/mysql-test/suite/funcs_1/r/innodb_storedproc.result	2008-04-01 23:00:54 +02:00
@@ -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 '
 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 '
 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.1 - Syntax checks for the CREATE PROCEDURE, CREATE
 FUNCTION, ALTER PROCEDURE, ALTER FUNCTION, DROP PROCEDURE, DROP FUNCTION, SHOW
@@ -14862,46 +14870,47 @@ USE db_storedproc;
 Testcase 4.3.1:
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp1;
-drop table IF EXISTS res_t3_itisalongname_1381742_itsaverylongname_1381742;
+DROP TABLE IF EXISTS res_t3_itisalongname_1381742_itsaverylongname_1381742;
 CREATE TABLE res_t3_itisalongname_1381742_itsaverylongname_1381742(
-middleinitial CHAR,
-lastname VARCHAR(50),
-age_averylongfieldname_averylongname_1234569 int,
-COMMENT TEXT) ENGINE=innodb;
+middleinitial CHAR, lastname VARCHAR(50),
+age_averylongfieldname_averylongname_1234569 INT, COMMENT VARCHAR(100))
+ENGINE=<engine_to_be_tested>;
 INSERT INTO res_t3_itisalongname_1381742_itsaverylongname_1381742
 VALUES('a', 'aaaaaaaaaabbbbbbbbc', 0, 'default');
-CREATE PROCEDURE sp1(a int)
+CREATE PROCEDURE sp1(a INT)
 BEGIN
-declare itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx char;
-declare itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx varchar(100);
-declare itisjustamediumsizeintintegervariablename integer;
-set itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx = 'b';
-set itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx = 'oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%';
-set itisjustamediumsizeintintegervariablename = 5;
-set @comment='a';
-label1: loop
-if a>100 then
-set @comment='value of a is greater than 100';
-elseif a<100 then
-if a<50 then
-set @comment='value of a is less than 50';
-elseif a<25 then
-set @comment='value of a is less than 25';
-else
-set @comment='value of a is greater than 50 and less than 100';
-END if;
-else
-set @comment='value of a is 100';
-END if;
-if itisjustamediumsizeintintegervariablename = 0 then leave label1;
-END if;
-insert into res_t3_itisalongname_1381742_itsaverylongname_1381742
-values( itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx,
-concat(itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx, '  ', a),
-a, @comment );
-set itisjustamediumsizeintintegervariablename = itisjustamediumsizeintintegervariablename - 1;
-iterate label1;
-END loop label1;
+DECLARE itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx CHAR;
+DECLARE itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx VARCHAR(100);
+DECLARE itisjustamediumsizeintintegervariablename INTEGER;
+SET itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx = 'b';
+SET itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx
+= 'oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%';
+SET itisjustamediumsizeintintegervariablename = 5;
+SET @comment='a';
+label1: LOOP
+IF a > 100 THEN
+SET @comment = 'value of a is greater than 100';
+ELSEIF a < 100 THEN
+IF a < 50 THEN
+SET @comment = 'value of a is less than 50';
+ELSEIF a < 25 THEN
+SET @comment = 'value of a is less than 25';
+ELSE
+SET @comment = 'value of a is greater than 50 and less than 100';
+END IF;
+ELSE
+SET @comment = 'value of a is 100';
+END IF;
+IF itisjustamediumsizeintintegervariablename = 0 THEN LEAVE label1;
+END IF;
+INSERT INTO res_t3_itisalongname_1381742_itsaverylongname_1381742
+VALUES(itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx,
+CONCAT(itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx,
+'  ', a), a, @comment);
+SET itisjustamediumsizeintintegervariablename
+= itisjustamediumsizeintintegervariablename - 1;
+ITERATE label1;
+END LOOP label1;
 END//
 CALL sp1(101);
 CALL sp1(100);
diff -Nrup a/mysql-test/suite/funcs_1/r/innodb_trig_09.result b/mysql-test/suite/funcs_1/r/innodb_trig_09.result
--- a/mysql-test/suite/funcs_1/r/innodb_trig_09.result	2008-04-01 20:14:39 +02:00
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_09.result	2008-04-01 23:00:55 +02:00
@@ -1,74 +1,75 @@
 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_
 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' 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
@@ -137,7 +138,7 @@ a	NULL	Test 3.5.9.3	7	123.17000000000000
 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' 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
@@ -168,17 +169,17 @@ set @tr_var_af_118=new.f118, @tr_var_af_
 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 
+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
@@ -191,15 +192,15 @@ where f122='Test 3.5.9.4';
 ERROR 23000: Column 'f136' cannot be null
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=0, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
-select f118, f121, f122, f136, f151, f163 from tb3 
+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
@@ -237,6 +238,7 @@ ERROR HY000: There is no NEW row in on D
 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)
diff -Nrup a/mysql-test/suite/funcs_1/r/is_columns_is.result b/mysql-test/suite/funcs_1/r/is_columns_is.result
--- a/mysql-test/suite/funcs_1/r/is_columns_is.result	2008-03-10 19:59:52 +01:00
+++ b/mysql-test/suite/funcs_1/r/is_columns_is.result	2008-04-01 23:00:55 +02:00
@@ -138,6 +138,7 @@ NULL	information_schema	PARAMETERS	NUMER
 NULL	information_schema	PARAMETERS	ORDINAL_POSITION	4	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(21)			select		Default	Default
 NULL	information_schema	PARAMETERS	PARAMETER_MODE	5	NULL	YES	varchar	5	20	NULL	NULL	utf8	utf8_general_ci	varchar(5)			select		Default	Default
 NULL	information_schema	PARAMETERS	PARAMETER_NAME	6	NULL	YES	varchar	256	1024	NULL	NULL	utf8	utf8_general_ci	varchar(256)			select		Default	Default
+NULL	information_schema	PARAMETERS	ROUTINE_TYPE	15		NO	varchar	9	36	NULL	NULL	utf8	utf8_general_ci	varchar(9)			select		Default	Default
 NULL	information_schema	PARAMETERS	SPECIFIC_CATALOG	1	NULL	YES	varchar	512	2048	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select		Default	Default
 NULL	information_schema	PARAMETERS	SPECIFIC_NAME	3		NO	varchar	256	1024	NULL	NULL	utf8	utf8_general_ci	varchar(256)			select		Default	Default
 NULL	information_schema	PARAMETERS	SPECIFIC_SCHEMA	2		NO	varchar	256	1024	NULL	NULL	utf8	utf8_general_ci	varchar(256)			select		Default	Default
@@ -520,6 +521,7 @@ NULL	information_schema	PARAMETERS	NUMER
 4.0000	information_schema	PARAMETERS	CHARACTER_SET_NAME	varchar	64	256	utf8	utf8_general_ci	varchar(64)
 4.0000	information_schema	PARAMETERS	COLLATION_NAME	varchar	64	256	utf8	utf8_general_ci	varchar(64)
 1.0000	information_schema	PARAMETERS	DTD_IDENTIFIER	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+4.0000	information_schema	PARAMETERS	ROUTINE_TYPE	varchar	9	36	utf8	utf8_general_ci	varchar(9)
 4.0000	information_schema	PARTITIONS	TABLE_CATALOG	varchar	512	2048	utf8	utf8_general_ci	varchar(512)
 4.0000	information_schema	PARTITIONS	TABLE_SCHEMA	varchar	64	256	utf8	utf8_general_ci	varchar(64)
 4.0000	information_schema	PARTITIONS	TABLE_NAME	varchar	64	256	utf8	utf8_general_ci	varchar(64)
diff -Nrup a/mysql-test/suite/funcs_1/r/is_columns_is_falcon.result b/mysql-test/suite/funcs_1/r/is_columns_is_falcon.result
--- a/mysql-test/suite/funcs_1/r/is_columns_is_falcon.result	2008-03-10 20:00:00 +01:00
+++ b/mysql-test/suite/funcs_1/r/is_columns_is_falcon.result	2008-04-01 23:00:55 +02:00
@@ -22,11 +22,10 @@ NULL	information_schema	FALCON_RECORD_CA
 NULL	information_schema	FALCON_RECORD_CACHE_SUMMARY	SMALL_HUNKS	5	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select		Default	Default
 NULL	information_schema	FALCON_RECORD_CACHE_SUMMARY	TOTAL_SPACE	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select		Default	Default
 NULL	information_schema	FALCON_RECORD_CACHE_SUMMARY	UNIQUE_SIZES	6	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select		Default	Default
-NULL	information_schema	FALCON_SERIAL_LOG_INFO	BLOCKS	3	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(8)			select		Default	Default
-NULL	information_schema	FALCON_SERIAL_LOG_INFO	BUFFERS	5	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select		Default	Default
-NULL	information_schema	FALCON_SERIAL_LOG_INFO	DATABASE	1		NO	varchar	120	480	NULL	NULL	utf8	utf8_general_ci	varchar(120)			select		Default	Default
-NULL	information_schema	FALCON_SERIAL_LOG_INFO	TRANSACTIONS	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select		Default	Default
-NULL	information_schema	FALCON_SERIAL_LOG_INFO	WINDOWS	4	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select		Default	Default
+NULL	information_schema	FALCON_SERIAL_LOG_INFO	BLOCKS	2	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(8)			select		Default	Default
+NULL	information_schema	FALCON_SERIAL_LOG_INFO	BUFFERS	4	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select		Default	Default
+NULL	information_schema	FALCON_SERIAL_LOG_INFO	TRANSACTIONS	1	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select		Default	Default
+NULL	information_schema	FALCON_SERIAL_LOG_INFO	WINDOWS	3	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select		Default	Default
 NULL	information_schema	FALCON_SYNCOBJECTS	CALLER	1		NO	varchar	120	480	NULL	NULL	utf8	utf8_general_ci	varchar(120)			select		Default	Default
 NULL	information_schema	FALCON_SYNCOBJECTS	EXCLUSIVE	3	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select		Default	Default
 NULL	information_schema	FALCON_SYNCOBJECTS	QUEUE_LENGTH	5	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select		Default	Default
@@ -49,23 +48,21 @@ NULL	information_schema	FALCON_TABLES	PA
 NULL	information_schema	FALCON_TABLES	SCHEMA_NAME	1		NO	varchar	127	508	NULL	NULL	utf8	utf8_general_ci	varchar(127)			select		Default	Default
 NULL	information_schema	FALCON_TABLES	TABLESPACE	4		NO	varchar	127	508	NULL	NULL	utf8	utf8_general_ci	varchar(127)			select		Default	Default
 NULL	information_schema	FALCON_TABLES	TABLE_NAME	2		NO	varchar	127	508	NULL	NULL	utf8	utf8_general_ci	varchar(127)			select		Default	Default
-NULL	information_schema	FALCON_TRANSACTIONS	DATABASE	1		NO	varchar	120	480	NULL	NULL	utf8	utf8_general_ci	varchar(120)			select		Default	Default
-NULL	information_schema	FALCON_TRANSACTIONS	DEP	7	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select		Default	Default
+NULL	information_schema	FALCON_TRANSACTIONS	DEP	6	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select		Default	Default
 NULL	information_schema	FALCON_TRANSACTIONS	ID	3	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select		Default	Default
-NULL	information_schema	FALCON_TRANSACTIONS	OLDEST	8	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select		Default	Default
-NULL	information_schema	FALCON_TRANSACTIONS	PENDING	6	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select		Default	Default
-NULL	information_schema	FALCON_TRANSACTIONS	RECORDS	9	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select		Default	Default
-NULL	information_schema	FALCON_TRANSACTIONS	STATE	4		NO	varchar	10	40	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select		Default	Default
-NULL	information_schema	FALCON_TRANSACTIONS	STATEMENT	11		NO	varchar	120	480	NULL	NULL	utf8	utf8_general_ci	varchar(120)			select		Default	Default
+NULL	information_schema	FALCON_TRANSACTIONS	OLDEST	7	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select		Default	Default
+NULL	information_schema	FALCON_TRANSACTIONS	PENDING	5	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select		Default	Default
+NULL	information_schema	FALCON_TRANSACTIONS	RECORDS	8	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select		Default	Default
+NULL	information_schema	FALCON_TRANSACTIONS	STATE	1		NO	varchar	120	480	NULL	NULL	utf8	utf8_general_ci	varchar(120)			select		Default	Default
+NULL	information_schema	FALCON_TRANSACTIONS	STATEMENT	10		NO	varchar	120	480	NULL	NULL	utf8	utf8_general_ci	varchar(120)			select		Default	Default
 NULL	information_schema	FALCON_TRANSACTIONS	THREAD_ID	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select		Default	Default
-NULL	information_schema	FALCON_TRANSACTIONS	UPDATES	5	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select		Default	Default
-NULL	information_schema	FALCON_TRANSACTIONS	WAITING_FOR	10	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select		Default	Default
-NULL	information_schema	FALCON_TRANSACTION_SUMMARY	ACTIVE	4	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select		Default	Default
-NULL	information_schema	FALCON_TRANSACTION_SUMMARY	COMMITTED	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select		Default	Default
-NULL	information_schema	FALCON_TRANSACTION_SUMMARY	DATABASE	1		NO	varchar	120	480	NULL	NULL	utf8	utf8_general_ci	varchar(120)			select		Default	Default
-NULL	information_schema	FALCON_TRANSACTION_SUMMARY	PENDING_COMMIT	5	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select		Default	Default
-NULL	information_schema	FALCON_TRANSACTION_SUMMARY	PENDING_COMPLETION	6	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select		Default	Default
-NULL	information_schema	FALCON_TRANSACTION_SUMMARY	ROLLED_BACK	3	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select		Default	Default
+NULL	information_schema	FALCON_TRANSACTIONS	UPDATES	4	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select		Default	Default
+NULL	information_schema	FALCON_TRANSACTIONS	WAITING_FOR	9	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select		Default	Default
+NULL	information_schema	FALCON_TRANSACTION_SUMMARY	ACTIVE	3	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select		Default	Default
+NULL	information_schema	FALCON_TRANSACTION_SUMMARY	COMMITTED	1	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select		Default	Default
+NULL	information_schema	FALCON_TRANSACTION_SUMMARY	PENDING_COMMIT	4	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select		Default	Default
+NULL	information_schema	FALCON_TRANSACTION_SUMMARY	PENDING_COMPLETION	5	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select		Default	Default
+NULL	information_schema	FALCON_TRANSACTION_SUMMARY	ROLLED_BACK	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select		Default	Default
 NULL	information_schema	FALCON_VERSION	Date	2		NO	varchar	32	128	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select		Default	Default
 NULL	information_schema	FALCON_VERSION	Version	1		NO	varchar	32	128	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select		Default	Default
 ##########################################################################
@@ -143,7 +140,6 @@ NULL	information_schema	FALCON_RECORD_CA
 NULL	information_schema	FALCON_RECORD_CACHE_SUMMARY	BIG_HUNKS	int	NULL	NULL	NULL	NULL	int(4)
 NULL	information_schema	FALCON_RECORD_CACHE_SUMMARY	SMALL_HUNKS	int	NULL	NULL	NULL	NULL	int(4)
 NULL	information_schema	FALCON_RECORD_CACHE_SUMMARY	UNIQUE_SIZES	int	NULL	NULL	NULL	NULL	int(4)
-4.0000	information_schema	FALCON_SERIAL_LOG_INFO	DATABASE	varchar	120	480	utf8	utf8_general_ci	varchar(120)
 NULL	information_schema	FALCON_SERIAL_LOG_INFO	TRANSACTIONS	int	NULL	NULL	NULL	NULL	int(4)
 NULL	information_schema	FALCON_SERIAL_LOG_INFO	BLOCKS	bigint	NULL	NULL	NULL	NULL	bigint(8)
 NULL	information_schema	FALCON_SERIAL_LOG_INFO	WINDOWS	int	NULL	NULL	NULL	NULL	int(4)
@@ -170,10 +166,9 @@ NULL	information_schema	FALCON_SYSTEM_ME
 4.0000	information_schema	FALCON_TABLES	PARTITION	varchar	127	508	utf8	utf8_general_ci	varchar(127)
 4.0000	information_schema	FALCON_TABLES	TABLESPACE	varchar	127	508	utf8	utf8_general_ci	varchar(127)
 4.0000	information_schema	FALCON_TABLES	INTERNAL_NAME	varchar	127	508	utf8	utf8_general_ci	varchar(127)
-4.0000	information_schema	FALCON_TRANSACTIONS	DATABASE	varchar	120	480	utf8	utf8_general_ci	varchar(120)
+4.0000	information_schema	FALCON_TRANSACTIONS	STATE	varchar	120	480	utf8	utf8_general_ci	varchar(120)
 NULL	information_schema	FALCON_TRANSACTIONS	THREAD_ID	int	NULL	NULL	NULL	NULL	int(4)
 NULL	information_schema	FALCON_TRANSACTIONS	ID	int	NULL	NULL	NULL	NULL	int(4)
-4.0000	information_schema	FALCON_TRANSACTIONS	STATE	varchar	10	40	utf8	utf8_general_ci	varchar(10)
 NULL	information_schema	FALCON_TRANSACTIONS	UPDATES	int	NULL	NULL	NULL	NULL	int(4)
 NULL	information_schema	FALCON_TRANSACTIONS	PENDING	int	NULL	NULL	NULL	NULL	int(4)
 NULL	information_schema	FALCON_TRANSACTIONS	DEP	int	NULL	NULL	NULL	NULL	int(4)
@@ -181,7 +176,6 @@ NULL	information_schema	FALCON_TRANSACTI
 NULL	information_schema	FALCON_TRANSACTIONS	RECORDS	int	NULL	NULL	NULL	NULL	int(4)
 NULL	information_schema	FALCON_TRANSACTIONS	WAITING_FOR	int	NULL	NULL	NULL	NULL	int(4)
 4.0000	information_schema	FALCON_TRANSACTIONS	STATEMENT	varchar	120	480	utf8	utf8_general_ci	varchar(120)
-4.0000	information_schema	FALCON_TRANSACTION_SUMMARY	DATABASE	varchar	120	480	utf8	utf8_general_ci	varchar(120)
 NULL	information_schema	FALCON_TRANSACTION_SUMMARY	COMMITTED	int	NULL	NULL	NULL	NULL	int(4)
 NULL	information_schema	FALCON_TRANSACTION_SUMMARY	ROLLED_BACK	int	NULL	NULL	NULL	NULL	int(4)
 NULL	information_schema	FALCON_TRANSACTION_SUMMARY	ACTIVE	int	NULL	NULL	NULL	NULL	int(4)
diff -Nrup a/mysql-test/suite/funcs_1/r/memory_func_view.result b/mysql-test/suite/funcs_1/r/memory_func_view.result
--- a/mysql-test/suite/funcs_1/r/memory_func_view.result	2008-04-01 20:18:46 +02:00
+++ b/mysql-test/suite/funcs_1/r/memory_func_view.result	2008-04-01 23:00:55 +02:00
@@ -35,10 +35,10 @@ my_bigint = -9223372036854775808,
 my_decimal = -9999999999999999999999999999999999.999999999999999999999999999999 ,
 my_double = -1.7976931348623E+308;
 INSERT INTO t1_values SET
-my_char_30 = '<--------30 characters------->', 
+my_char_30 = '<--------30 characters------->',
 my_varchar_1000 = CONCAT('<---------1000 characters',
 RPAD('',965,'-'),'--------->'),
-my_binary_30 = '<--------30 characters------->', 
+my_binary_30 = '<--------30 characters------->',
 my_varbinary_1000 = CONCAT('<---------1000 characters',
 RPAD('',965,'-'),'--------->'),
 my_datetime = '9999-12-31 23:59:59',
@@ -50,23 +50,23 @@ my_bigint = 9223372036854775807,
 my_decimal = +9999999999999999999999999999999999.999999999999999999999999999999 ,
 my_double = 1.7976931348623E+308;
 INSERT INTO t1_values SET
-my_char_30 = ' ---äÖüß@µ*$-- ', 
-my_varchar_1000 = ' ---äÖüß@µ*$-- ', 
-my_binary_30 = ' ---äÖüß@µ*$-- ', 
-my_varbinary_1000 = ' ---äÖüß@µ*$-- ', 
+my_char_30 = ' ---äÖüß@µ*$-- ',
+my_varchar_1000 = ' ---äÖüß@µ*$-- ',
+my_binary_30 = ' ---äÖüß@µ*$-- ',
+my_varbinary_1000 = ' ---äÖüß@µ*$-- ',
 my_datetime = '2004-02-29 23:59:59',
 my_date = '2004-02-29',
 my_timestamp = '2004-02-29 23:59:59',
 my_time = '13:00:00',
 my_year = 2000,
-my_bigint = 0,  	 
+my_bigint = 0,  	
 my_decimal = 0.0,
 my_double = 0;
 INSERT INTO t1_values SET
-my_char_30 = '-1', 
-my_varchar_1000 = '-1', 
-my_binary_30 = '-1', 
-my_varbinary_1000 = '-1', 
+my_char_30 = '-1',
+my_varchar_1000 = '-1',
+my_binary_30 = '-1',
+my_varbinary_1000 = '-1',
 my_datetime = '2005-06-28 10:00:00',
 my_date = '2005-06-28',
 my_timestamp = '2005-06-28 10:00:00',
@@ -152,21 +152,21 @@ my_double = -0.33333333E+4;
 some statements disabled because of
 Bug#5913 Traditional mode: BIGINT range not correctly delimited
 --------------------------------------------------------------------------------
-SET @my_select = 'SELECT CONVERT(my_char_30 USING utf8), 
+SET @my_select = 'SELECT CONVERT(my_char_30 USING utf8),
 my_char_30, id FROM t1_values';
-SET @my_select = 'SELECT CONVERT(my_varchar_1000 USING utf8), 
+SET @my_select = 'SELECT CONVERT(my_varchar_1000 USING utf8),
 my_varchar_1000, id FROM t1_values';
-SET @my_select = 'SELECT CONVERT(my_binary_30 USING utf8), 
+SET @my_select = 'SELECT CONVERT(my_binary_30 USING utf8),
 my_binary_30, id FROM t1_values';
-SET @my_select = 'SELECT CONVERT(my_varbinary_1000 USING utf8), 
+SET @my_select = 'SELECT CONVERT(my_varbinary_1000 USING utf8),
 my_varbinary_1000, id FROM t1_values';
-SET @my_select = 'SELECT CONVERT(my_char_30 USING koi8r), 
+SET @my_select = 'SELECT CONVERT(my_char_30 USING koi8r),
 my_char_30, id FROM t1_values';
-SET @my_select = 'SELECT CONVERT(my_varchar_1000 USING koi8r), 
+SET @my_select = 'SELECT CONVERT(my_varchar_1000 USING koi8r),
 my_varchar_1000, id FROM t1_values';
-SET @my_select = 'SELECT CONVERT(my_binary_30 USING koi8r), 
+SET @my_select = 'SELECT CONVERT(my_binary_30 USING koi8r),
 my_binary_30, id FROM t1_values';
-SET @my_select = 'SELECT CONVERT(my_varbinary_1000 USING koi8r), 
+SET @my_select = 'SELECT CONVERT(my_varbinary_1000 USING koi8r),
 my_varbinary_1000, id FROM t1_values';
 SET @my_select = 'SELECT BIT_LENGTH(my_char_30),
 my_char_30, id FROM t1_values';
@@ -180,15 +180,15 @@ SET @my_select = 'SELECT INSTR(my_char_3
 my_char_30, id FROM t1_values';
 SET @my_select = 'SELECT LCASE(my_varchar_1000),
 my_varchar_1000, id FROM t1_values';
-SET @my_select = 
+SET @my_select =
 'SELECT LEFT(my_char_30, 2), my_char_30, id FROM t1_values';
-SET @my_select = 
+SET @my_select =
 'SELECT LEFT(my_varchar_1000, 2), my_varchar_1000, id FROM t1_values';
-SET @my_select = 
+SET @my_select =
 'SELECT LEFT(my_binary_30, 2), my_binary_30, id FROM t1_values';
-SET @my_select = 
+SET @my_select =
 'SELECT LEFT(my_varbinary_1000, 2), my_varbinary_1000, id FROM t1_values';
-SET @my_select = 
+SET @my_select =
 'SELECT LEFT(''AaBbCcDdEeFfGgHhIiJjÄäÜüÖö'', my_bigint), my_bigint, id FROM t1_values';
 SET @my_select =
 'SELECT LEFT(''AaBbCcDdEeFfGgHhIiJjÄäÜüÖö'', my_decimal), my_decimal, id FROM t1_values';
@@ -202,9 +202,10 @@ SET @my_select = 'SELECT LENGTH(my_binar
 my_binary_30, id FROM t1_values';
 SET @my_select = 'SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values';
-SELECT 'äÄ@' INTO OUTFILE '../tmp/func_view.dat';
-SET @my_select = 
-'SELECT LOAD_FILE(''../tmp/func_view.dat''), id FROM t1_values';
+SET @my_select =
+'SELECT LOAD_FILE(''<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt'')
+           AS my_col,
+        id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_char_30),
 my_char_30, id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_varchar_1000),
@@ -810,36 +811,40 @@ WHERE select_id = 157 OR select_id IS NU
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values;
-SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values
+CREATE VIEW v1 AS SELECT LOAD_FILE('<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt')
+           AS my_col,
+        id FROM t1_values;
+SELECT LOAD_FILE('<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt')
+           AS my_col,
+        id FROM t1_values
 WHERE select_id = 156 OR select_id IS NULL order by id;
-LOAD_FILE('../tmp/func_view.dat')	id
-äÄ@
+my_col	id
+Here is content from load_file
 	1
-äÄ@
+Here is content from load_file
 	2
-äÄ@
+Here is content from load_file
 	3
-äÄ@
+Here is content from load_file
 	4
-äÄ@
+Here is content from load_file
 	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file('../tmp/func_view.dat') AS `LOAD_FILE('../tmp/func_view.dat')`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file('<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt') AS `my_col`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 156 OR select_id IS NULL) order by id;
-LOAD_FILE('../tmp/func_view.dat')	id
-äÄ@
+my_col	id
+Here is content from load_file
 	1
-äÄ@
+Here is content from load_file
 	2
-äÄ@
+Here is content from load_file
 	3
-äÄ@
+Here is content from load_file
 	4
-äÄ@
+Here is content from load_file
 	5
 DROP VIEW v1;
 
@@ -1013,10 +1018,10 @@ SELECT LEFT(my_binary_30, 2), my_binary_
 WHERE select_id = 147 OR select_id IS NULL order by id;
 LEFT(my_binary_30, 2)	my_binary_30	id
 NULL	NULL	1
-+		2
 <-	<--------30 characters------->	3
- -	 ---äÖüß@µ*$-- --1	-1+ -	 ---äÖüß@µ*$-- 	4
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_binary_30`,2) AS `LEFT(my_binary_30, 2)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -1141,10 +1146,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 141 OR select_id IS NULL order by id;
 BIT_LENGTH(my_binary_30)	my_binary_30	id
 NULL	NULL	1
-240	+240		2
 240	<--------30 characters------->	3
-240	 ---äÖüß@µ*$-- -240	-1+240	 ---äÖüß@µ*$-- 	4
+240	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_binary_30`) AS `BIT_LENGTH(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -1453,10 +1458,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 129 OR select_id IS NULL order by id;
 IFNULL(my_binary_30,'IS_NULL')	my_binary_30	id
 IS_NULL	NULL	1
-+		2
 <--------30 characters------->	<--------30 characters------->	3
- ---äÖüß@µ*$-- --1+ ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_binary_30`,'IS_NULL') AS `IFNULL(my_binary_30,'IS_NULL')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -1793,10 +1798,10 @@ WHERE select_id = 117 OR select_id IS NU
 IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_binary_30	id
 IS     NULL	NULL	1
-IS NOT NULL	+IS NOT NULL		2
 IS NOT NULL	<--------30 characters------->	3
-IS NOT NULL	 ---äÖüß@µ*$-- -IS NOT NULL	-1+IS NOT NULL	 ---äÖüß@µ*$-- 	4
+IS NOT NULL	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(isnull(`t1_values`.`my_binary_30`),'IS     NULL','IS NOT NULL') AS `IF(my_binary_30 IS NULL, 'IS     NULL',
@@ -2113,10 +2118,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 105 OR select_id IS NULL order by id;
 IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')	my_binary_30	id
 IS NOT TRUE	NULL	1
-IS NOT TRUE	+IS NOT TRUE		2
 IS NOT TRUE	<--------30 characters------->	3
-IS NOT TRUE	 ---äÖüß@µ*$-- -IS     TRUE	-1+IS NOT TRUE	 ---äÖüß@µ*$-- 	4
+IS     TRUE	-1	5
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: ''
 Warning	1292	Truncated incorrect DOUBLE value: '<--------30 characters------->'
@@ -2200,9 +2205,9 @@ Warning	1292	Truncated incorrect DOUBLE 
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING koi8r), 
+CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING koi8r),
 my_varbinary_1000, id FROM t1_values;
-SELECT CONVERT(my_varbinary_1000 USING koi8r), 
+SELECT CONVERT(my_varbinary_1000 USING koi8r),
 my_varbinary_1000, id FROM t1_values
 WHERE select_id = 102 OR select_id IS NULL order by id;
 CONVERT(my_varbinary_1000 USING koi8r)	my_varbinary_1000	id
@@ -2226,17 +2231,17 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING koi8r), 
+CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING koi8r),
 my_binary_30, id FROM t1_values;
-SELECT CONVERT(my_binary_30 USING koi8r), 
+SELECT CONVERT(my_binary_30 USING koi8r),
 my_binary_30, id FROM t1_values
 WHERE select_id = 101 OR select_id IS NULL order by id;
 CONVERT(my_binary_30 USING koi8r)	my_binary_30	id
 NULL	NULL	1
-+		2
 <--------30 characters------->	<--------30 characters------->	3
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using koi8r) AS `CONVERT(my_binary_30 USING koi8r)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -2252,9 +2257,9 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING koi8r), 
+CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING koi8r),
 my_varchar_1000, id FROM t1_values;
-SELECT CONVERT(my_varchar_1000 USING koi8r), 
+SELECT CONVERT(my_varchar_1000 USING koi8r),
 my_varchar_1000, id FROM t1_values
 WHERE select_id = 100 OR select_id IS NULL order by id;
 CONVERT(my_varchar_1000 USING koi8r)	my_varchar_1000	id
@@ -2278,9 +2283,9 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING koi8r), 
+CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING koi8r),
 my_char_30, id FROM t1_values;
-SELECT CONVERT(my_char_30 USING koi8r), 
+SELECT CONVERT(my_char_30 USING koi8r),
 my_char_30, id FROM t1_values
 WHERE select_id = 99 OR select_id IS NULL order by id;
 CONVERT(my_char_30 USING koi8r)	my_char_30	id
@@ -2304,9 +2309,9 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING utf8), 
+CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING utf8),
 my_varbinary_1000, id FROM t1_values;
-SELECT CONVERT(my_varbinary_1000 USING utf8), 
+SELECT CONVERT(my_varbinary_1000 USING utf8),
 my_varbinary_1000, id FROM t1_values
 WHERE select_id = 98 OR select_id IS NULL order by id;
 CONVERT(my_varbinary_1000 USING utf8)	my_varbinary_1000	id
@@ -2330,17 +2335,17 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING utf8), 
+CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING utf8),
 my_binary_30, id FROM t1_values;
-SELECT CONVERT(my_binary_30 USING utf8), 
+SELECT CONVERT(my_binary_30 USING utf8),
 my_binary_30, id FROM t1_values
 WHERE select_id = 97 OR select_id IS NULL order by id;
 CONVERT(my_binary_30 USING utf8)	my_binary_30	id
 NULL	NULL	1
-+		2
 <--------30 characters------->	<--------30 characters------->	3
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using utf8) AS `CONVERT(my_binary_30 USING utf8)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -2356,9 +2361,9 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING utf8), 
+CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING utf8),
 my_varchar_1000, id FROM t1_values;
-SELECT CONVERT(my_varchar_1000 USING utf8), 
+SELECT CONVERT(my_varchar_1000 USING utf8),
 my_varchar_1000, id FROM t1_values
 WHERE select_id = 96 OR select_id IS NULL order by id;
 CONVERT(my_varchar_1000 USING utf8)	my_varchar_1000	id
@@ -2382,9 +2387,9 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING utf8), 
+CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING utf8),
 my_char_30, id FROM t1_values;
-SELECT CONVERT(my_char_30 USING utf8), 
+SELECT CONVERT(my_char_30 USING utf8),
 my_char_30, id FROM t1_values
 WHERE select_id = 95 OR select_id IS NULL order by id;
 CONVERT(my_char_30 USING utf8)	my_char_30	id
@@ -2673,10 +2678,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 85 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS UNSIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
-0	+0		2
 0	<--------30 characters------->	3
-0	 ---äÖüß@µ*$-- -18446744073709551615	-1+0	 ---äÖüß@µ*$-- 	4
+18446744073709551615	-1	5
 Warnings:
 Warning	1292	Truncated incorrect INTEGER value: ''
 Warning	1292	Truncated incorrect INTEGER value: '<--------30 characters------->'
@@ -3037,10 +3042,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 73 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS SIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
-0	+0		2
 0	<--------30 characters------->	3
-0	 ---äÖüß@µ*$-- --1	-1+0	 ---äÖüß@µ*$-- 	4
+-1	-1	5
 Warnings:
 Warning	1292	Truncated incorrect INTEGER value: ''
 Warning	1292	Truncated incorrect INTEGER value: '<--------30 characters------->'
@@ -3397,11 +3402,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 61 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DECIMAL(37,2))	my_binary_30	id
 NULL	NULL	1
-0.00	+0.00		2
 0.00	<--------30 characters------->	3
-0.00	 ---äÖüß@µ*$-- --1.00	-1--3333.33	-3333.3333+0.00	 ---äÖüß@µ*$-- 	4
+-1.00	-1	5
+-3333.33	-3333.3333	28
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: ''
@@ -3755,11 +3760,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 50 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS TIME)	my_binary_30	id
 NULL	NULL	1
-00:00:00	+00:00:00		2
 00:00:00	<--------30 characters------->	3
--00:00:00	 ---äÖüß@µ*$-- -NULL	-1-41:58:00	1 17:58+-00:00:00	 ---äÖüß@µ*$-- 	4
+NULL	-1	5
+41:58:00	1 17:58	22
 Warnings:
 Warning	1292	Truncated incorrect time value: ''
 Warning	1292	Truncated incorrect time value: '<--------30 characters------->'
@@ -4131,11 +4136,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 39 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DATETIME)	my_binary_30	id
 NULL	NULL	1
-NULL	+NULL		2
 NULL	<--------30 characters------->	3
-NULL	 ---äÖüß@µ*$-- -NULL	-1-2005-06-27 17:58:00	2005-06-27 17:58+NULL	 ---äÖüß@µ*$-- 	4
+NULL	-1	5
+2005-06-27 17:58:00	2005-06-27 17:58	16
 Warnings:
 Warning	1292	Incorrect datetime value: ''
 Warning	1292	Incorrect datetime value: '<--------30 characters------->'
@@ -4501,11 +4506,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 28 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DATE)	my_binary_30	id
 NULL	NULL	1
-NULL	+NULL		2
 NULL	<--------30 characters------->	3
-NULL	 ---äÖüß@µ*$-- -NULL	-1-2005-06-27	2005-06-27+NULL	 ---äÖüß@µ*$-- 	4
+NULL	-1	5
+2005-06-27	2005-06-27	10
 Warnings:
 Warning	1292	Incorrect datetime value: ''
 Warning	1292	Incorrect datetime value: '<--------30 characters------->'
@@ -4851,10 +4856,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 16 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS CHAR)	my_binary_30	id
 NULL	NULL	1
-+		2
 <--------30 characters------->	<--------30 characters------->	3
- ---äÖüß@µ*$-- --1+ ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset latin1) AS `CAST(my_binary_30 AS CHAR)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -5163,10 +5168,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 4 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS BINARY)	my_binary_30	id
 NULL	NULL	1
-+		2
 <--------30 characters------->	<--------30 characters------->	3
- ---äÖüß@µ*$-- --1+ ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset binary) AS `CAST(my_binary_30 AS BINARY)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
diff -Nrup a/mysql-test/suite/funcs_1/r/memory_storedproc.result b/mysql-test/suite/funcs_1/r/memory_storedproc.result
--- a/mysql-test/suite/funcs_1/r/memory_storedproc.result	2008-04-01 20:18:47 +02:00
+++ b/mysql-test/suite/funcs_1/r/memory_storedproc.result	2008-04-01 23:00:56 +02:00
@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
 CREATE DATABASE db_storedproc;
 CREATE DATABASE db_storedproc_1;
 USE db_storedproc;
-create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
-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 = memory;
-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 = memory;
-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 = memory;
-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 = memory;
-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 = memory;
-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 '
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = memory;
-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 '
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t9(f1 int, f2 char(25), f3 int) engine = memory;
-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 = memory;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10;
-create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = memory;
-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.1 - Syntax checks for the CREATE PROCEDURE, CREATE
 FUNCTION, ALTER PROCEDURE, ALTER FUNCTION, DROP PROCEDURE, DROP FUNCTION, SHOW
@@ -14862,66 +14870,89 @@ USE db_storedproc;
 Testcase 4.3.1:
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp1;
-drop table IF EXISTS res_t3_itisalongname_1381742_itsaverylongname_1381742;
+DROP TABLE IF EXISTS res_t3_itisalongname_1381742_itsaverylongname_1381742;
 CREATE TABLE res_t3_itisalongname_1381742_itsaverylongname_1381742(
-middleinitial CHAR,
-lastname VARCHAR(50),
-age_averylongfieldname_averylongname_1234569 int,
-COMMENT TEXT) ENGINE=memory;
-ERROR 42000: The used table type doesn't support BLOB/TEXT columns
+middleinitial CHAR, lastname VARCHAR(50),
+age_averylongfieldname_averylongname_1234569 INT, COMMENT VARCHAR(100))
+ENGINE=<engine_to_be_tested>;
 INSERT INTO res_t3_itisalongname_1381742_itsaverylongname_1381742
 VALUES('a', 'aaaaaaaaaabbbbbbbbc', 0, 'default');
-ERROR 42S02: Table 'db_storedproc.res_t3_itisalongname_1381742_itsaverylongname_1381742' doesn't exist
-CREATE PROCEDURE sp1(a int)
+CREATE PROCEDURE sp1(a INT)
 BEGIN
-declare itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx char;
-declare itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx varchar(100);
-declare itisjustamediumsizeintintegervariablename integer;
-set itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx = 'b';
-set itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx = 'oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%';
-set itisjustamediumsizeintintegervariablename = 5;
-set @comment='a';
-label1: loop
-if a>100 then
-set @comment='value of a is greater than 100';
-elseif a<100 then
-if a<50 then
-set @comment='value of a is less than 50';
-elseif a<25 then
-set @comment='value of a is less than 25';
-else
-set @comment='value of a is greater than 50 and less than 100';
-END if;
-else
-set @comment='value of a is 100';
-END if;
-if itisjustamediumsizeintintegervariablename = 0 then leave label1;
-END if;
-insert into res_t3_itisalongname_1381742_itsaverylongname_1381742
-values( itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx,
-concat(itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx, '  ', a),
-a, @comment );
-set itisjustamediumsizeintintegervariablename = itisjustamediumsizeintintegervariablename - 1;
-iterate label1;
-END loop label1;
+DECLARE itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx CHAR;
+DECLARE itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx VARCHAR(100);
+DECLARE itisjustamediumsizeintintegervariablename INTEGER;
+SET itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx = 'b';
+SET itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx
+= 'oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%';
+SET itisjustamediumsizeintintegervariablename = 5;
+SET @comment='a';
+label1: LOOP
+IF a > 100 THEN
+SET @comment = 'value of a is greater than 100';
+ELSEIF a < 100 THEN
+IF a < 50 THEN
+SET @comment = 'value of a is less than 50';
+ELSEIF a < 25 THEN
+SET @comment = 'value of a is less than 25';
+ELSE
+SET @comment = 'value of a is greater than 50 and less than 100';
+END IF;
+ELSE
+SET @comment = 'value of a is 100';
+END IF;
+IF itisjustamediumsizeintintegervariablename = 0 THEN LEAVE label1;
+END IF;
+INSERT INTO res_t3_itisalongname_1381742_itsaverylongname_1381742
+VALUES(itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx,
+CONCAT(itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx,
+'  ', a), a, @comment);
+SET itisjustamediumsizeintintegervariablename
+= itisjustamediumsizeintintegervariablename - 1;
+ITERATE label1;
+END LOOP label1;
 END//
 CALL sp1(101);
-ERROR 42S02: Table 'db_storedproc.res_t3_itisalongname_1381742_itsaverylongname_1381742' doesn't exist
 CALL sp1(100);
-ERROR 42S02: Table 'db_storedproc.res_t3_itisalongname_1381742_itsaverylongname_1381742' doesn't exist
 CALL sp1(75);
-ERROR 42S02: Table 'db_storedproc.res_t3_itisalongname_1381742_itsaverylongname_1381742' doesn't exist
 CALL sp1(40);
-ERROR 42S02: Table 'db_storedproc.res_t3_itisalongname_1381742_itsaverylongname_1381742' doesn't exist
 CALL sp1(20);
-ERROR 42S02: Table 'db_storedproc.res_t3_itisalongname_1381742_itsaverylongname_1381742' doesn't exist
 CALL sp1(-1);
-ERROR 42S02: Table 'db_storedproc.res_t3_itisalongname_1381742_itsaverylongname_1381742' doesn't exist
 SELECT * from res_t3_itisalongname_1381742_itsaverylongname_1381742
 ORDER BY middleinitial, lastname, age_averylongfieldname_averylongname_1234569;
-ERROR 42S02: Table 'db_storedproc.res_t3_itisalongname_1381742_itsaverylongname_1381742' doesn't exist
+middleinitial	lastname	age_averylongfieldname_averylongname_1234569	COMMENT
+a	aaaaaaaaaabbbbbbbbc	0	default
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  -1	-1	value of a is less than 50
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  -1	-1	value of a is less than 50
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  -1	-1	value of a is less than 50
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  -1	-1	value of a is less than 50
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  -1	-1	value of a is less than 50
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  100	100	value of a is 100
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  100	100	value of a is 100
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  100	100	value of a is 100
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  100	100	value of a is 100
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  100	100	value of a is 100
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  101	101	value of a is greater than 100
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  101	101	value of a is greater than 100
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  101	101	value of a is greater than 100
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  101	101	value of a is greater than 100
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  101	101	value of a is greater than 100
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  20	20	value of a is less than 50
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  20	20	value of a is less than 50
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  20	20	value of a is less than 50
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  20	20	value of a is less than 50
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  20	20	value of a is less than 50
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  40	40	value of a is less than 50
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  40	40	value of a is less than 50
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  40	40	value of a is less than 50
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  40	40	value of a is less than 50
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  40	40	value of a is less than 50
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  75	75	value of a is greater than 50 and less than 100
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  75	75	value of a is greater than 50 and less than 100
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  75	75	value of a is greater than 50 and less than 100
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  75	75	value of a is greater than 50 and less than 100
+b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  75	75	value of a is greater than 50 and less than 100
 drop table res_t3_itisalongname_1381742_itsaverylongname_1381742;
-ERROR 42S02: Unknown table 'res_t3_itisalongname_1381742_itsaverylongname_1381742'
 DROP PROCEDURE sp1;
 
 Testcase 4.3.2:
diff -Nrup a/mysql-test/suite/funcs_1/r/memory_trig_09.result b/mysql-test/suite/funcs_1/r/memory_trig_09.result
--- a/mysql-test/suite/funcs_1/r/memory_trig_09.result	2008-04-01 20:14:50 +02:00
+++ b/mysql-test/suite/funcs_1/r/memory_trig_09.result	2008-04-01 23:00:56 +02:00
@@ -1,68 +1,69 @@
 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 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;
 Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb3.txt' into table tb3 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/memory_tb3.txt'
+into table tb3;
 
 Testcase 3.5.9.1/2:
 -------------------
-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
@@ -74,15 +75,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
 9	9
-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
@@ -110,17 +111,17 @@ set @tr_var_af_118=old.f118, @tr_var_af_
 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' 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
@@ -131,7 +132,7 @@ a	NULL	Test 3.5.9.3	7	123.17000000000000
 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' 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
@@ -162,17 +163,17 @@ set @tr_var_af_118=new.f118, @tr_var_af_
 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 
+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
@@ -185,15 +186,15 @@ where f122='Test 3.5.9.4';
 ERROR 23000: Column 'f136' cannot be null
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=0, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
-select f118, f121, f122, f136, f151, f163 from tb3 
+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
@@ -231,6 +232,7 @@ ERROR HY000: There is no NEW row in on D
 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)
diff -Nrup a/mysql-test/suite/funcs_1/r/myisam_func_view.result b/mysql-test/suite/funcs_1/r/myisam_func_view.result
--- a/mysql-test/suite/funcs_1/r/myisam_func_view.result	2008-04-01 20:18:48 +02:00
+++ b/mysql-test/suite/funcs_1/r/myisam_func_view.result	2008-04-01 23:00:56 +02:00
@@ -35,10 +35,10 @@ my_bigint = -9223372036854775808,
 my_decimal = -9999999999999999999999999999999999.999999999999999999999999999999 ,
 my_double = -1.7976931348623E+308;
 INSERT INTO t1_values SET
-my_char_30 = '<--------30 characters------->', 
+my_char_30 = '<--------30 characters------->',
 my_varchar_1000 = CONCAT('<---------1000 characters',
 RPAD('',965,'-'),'--------->'),
-my_binary_30 = '<--------30 characters------->', 
+my_binary_30 = '<--------30 characters------->',
 my_varbinary_1000 = CONCAT('<---------1000 characters',
 RPAD('',965,'-'),'--------->'),
 my_datetime = '9999-12-31 23:59:59',
@@ -50,23 +50,23 @@ my_bigint = 9223372036854775807,
 my_decimal = +9999999999999999999999999999999999.999999999999999999999999999999 ,
 my_double = 1.7976931348623E+308;
 INSERT INTO t1_values SET
-my_char_30 = ' ---äÖüß@µ*$-- ', 
-my_varchar_1000 = ' ---äÖüß@µ*$-- ', 
-my_binary_30 = ' ---äÖüß@µ*$-- ', 
-my_varbinary_1000 = ' ---äÖüß@µ*$-- ', 
+my_char_30 = ' ---äÖüß@µ*$-- ',
+my_varchar_1000 = ' ---äÖüß@µ*$-- ',
+my_binary_30 = ' ---äÖüß@µ*$-- ',
+my_varbinary_1000 = ' ---äÖüß@µ*$-- ',
 my_datetime = '2004-02-29 23:59:59',
 my_date = '2004-02-29',
 my_timestamp = '2004-02-29 23:59:59',
 my_time = '13:00:00',
 my_year = 2000,
-my_bigint = 0,  	 
+my_bigint = 0,  	
 my_decimal = 0.0,
 my_double = 0;
 INSERT INTO t1_values SET
-my_char_30 = '-1', 
-my_varchar_1000 = '-1', 
-my_binary_30 = '-1', 
-my_varbinary_1000 = '-1', 
+my_char_30 = '-1',
+my_varchar_1000 = '-1',
+my_binary_30 = '-1',
+my_varbinary_1000 = '-1',
 my_datetime = '2005-06-28 10:00:00',
 my_date = '2005-06-28',
 my_timestamp = '2005-06-28 10:00:00',
@@ -152,21 +152,21 @@ my_double = -0.33333333E+4;
 some statements disabled because of
 Bug#5913 Traditional mode: BIGINT range not correctly delimited
 --------------------------------------------------------------------------------
-SET @my_select = 'SELECT CONVERT(my_char_30 USING utf8), 
+SET @my_select = 'SELECT CONVERT(my_char_30 USING utf8),
 my_char_30, id FROM t1_values';
-SET @my_select = 'SELECT CONVERT(my_varchar_1000 USING utf8), 
+SET @my_select = 'SELECT CONVERT(my_varchar_1000 USING utf8),
 my_varchar_1000, id FROM t1_values';
-SET @my_select = 'SELECT CONVERT(my_binary_30 USING utf8), 
+SET @my_select = 'SELECT CONVERT(my_binary_30 USING utf8),
 my_binary_30, id FROM t1_values';
-SET @my_select = 'SELECT CONVERT(my_varbinary_1000 USING utf8), 
+SET @my_select = 'SELECT CONVERT(my_varbinary_1000 USING utf8),
 my_varbinary_1000, id FROM t1_values';
-SET @my_select = 'SELECT CONVERT(my_char_30 USING koi8r), 
+SET @my_select = 'SELECT CONVERT(my_char_30 USING koi8r),
 my_char_30, id FROM t1_values';
-SET @my_select = 'SELECT CONVERT(my_varchar_1000 USING koi8r), 
+SET @my_select = 'SELECT CONVERT(my_varchar_1000 USING koi8r),
 my_varchar_1000, id FROM t1_values';
-SET @my_select = 'SELECT CONVERT(my_binary_30 USING koi8r), 
+SET @my_select = 'SELECT CONVERT(my_binary_30 USING koi8r),
 my_binary_30, id FROM t1_values';
-SET @my_select = 'SELECT CONVERT(my_varbinary_1000 USING koi8r), 
+SET @my_select = 'SELECT CONVERT(my_varbinary_1000 USING koi8r),
 my_varbinary_1000, id FROM t1_values';
 SET @my_select = 'SELECT BIT_LENGTH(my_char_30),
 my_char_30, id FROM t1_values';
@@ -180,15 +180,15 @@ SET @my_select = 'SELECT INSTR(my_char_3
 my_char_30, id FROM t1_values';
 SET @my_select = 'SELECT LCASE(my_varchar_1000),
 my_varchar_1000, id FROM t1_values';
-SET @my_select = 
+SET @my_select =
 'SELECT LEFT(my_char_30, 2), my_char_30, id FROM t1_values';
-SET @my_select = 
+SET @my_select =
 'SELECT LEFT(my_varchar_1000, 2), my_varchar_1000, id FROM t1_values';
-SET @my_select = 
+SET @my_select =
 'SELECT LEFT(my_binary_30, 2), my_binary_30, id FROM t1_values';
-SET @my_select = 
+SET @my_select =
 'SELECT LEFT(my_varbinary_1000, 2), my_varbinary_1000, id FROM t1_values';
-SET @my_select = 
+SET @my_select =
 'SELECT LEFT(''AaBbCcDdEeFfGgHhIiJjÄäÜüÖö'', my_bigint), my_bigint, id FROM t1_values';
 SET @my_select =
 'SELECT LEFT(''AaBbCcDdEeFfGgHhIiJjÄäÜüÖö'', my_decimal), my_decimal, id FROM t1_values';
@@ -202,9 +202,10 @@ SET @my_select = 'SELECT LENGTH(my_binar
 my_binary_30, id FROM t1_values';
 SET @my_select = 'SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values';
-SELECT 'äÄ@' INTO OUTFILE '../tmp/func_view.dat';
-SET @my_select = 
-'SELECT LOAD_FILE(''../tmp/func_view.dat''), id FROM t1_values';
+SET @my_select =
+'SELECT LOAD_FILE(''<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt'')
+           AS my_col,
+        id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_char_30),
 my_char_30, id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_varchar_1000),
@@ -810,36 +811,40 @@ WHERE select_id = 157 OR select_id IS NU
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values;
-SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values
+CREATE VIEW v1 AS SELECT LOAD_FILE('<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt')
+           AS my_col,
+        id FROM t1_values;
+SELECT LOAD_FILE('<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt')
+           AS my_col,
+        id FROM t1_values
 WHERE select_id = 156 OR select_id IS NULL order by id;
-LOAD_FILE('../tmp/func_view.dat')	id
-äÄ@
+my_col	id
+Here is content from load_file
 	1
-äÄ@
+Here is content from load_file
 	2
-äÄ@
+Here is content from load_file
 	3
-äÄ@
+Here is content from load_file
 	4
-äÄ@
+Here is content from load_file
 	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file('../tmp/func_view.dat') AS `LOAD_FILE('../tmp/func_view.dat')`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file('<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt') AS `my_col`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 156 OR select_id IS NULL) order by id;
-LOAD_FILE('../tmp/func_view.dat')	id
-äÄ@
+my_col	id
+Here is content from load_file
 	1
-äÄ@
+Here is content from load_file
 	2
-äÄ@
+Here is content from load_file
 	3
-äÄ@
+Here is content from load_file
 	4
-äÄ@
+Here is content from load_file
 	5
 DROP VIEW v1;
 
@@ -1013,10 +1018,10 @@ SELECT LEFT(my_binary_30, 2), my_binary_
 WHERE select_id = 147 OR select_id IS NULL order by id;
 LEFT(my_binary_30, 2)	my_binary_30	id
 NULL	NULL	1
-+		2
 <-	<--------30 characters------->	3
- -	 ---äÖüß@µ*$-- --1	-1+ -	 ---äÖüß@µ*$-- 	4
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_binary_30`,2) AS `LEFT(my_binary_30, 2)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -1141,10 +1146,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 141 OR select_id IS NULL order by id;
 BIT_LENGTH(my_binary_30)	my_binary_30	id
 NULL	NULL	1
-240	+240		2
 240	<--------30 characters------->	3
-240	 ---äÖüß@µ*$-- -240	-1+240	 ---äÖüß@µ*$-- 	4
+240	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_binary_30`) AS `BIT_LENGTH(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -1453,10 +1458,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 129 OR select_id IS NULL order by id;
 IFNULL(my_binary_30,'IS_NULL')	my_binary_30	id
 IS_NULL	NULL	1
-+		2
 <--------30 characters------->	<--------30 characters------->	3
- ---äÖüß@µ*$-- --1+ ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_binary_30`,'IS_NULL') AS `IFNULL(my_binary_30,'IS_NULL')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -1793,10 +1798,10 @@ WHERE select_id = 117 OR select_id IS NU
 IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_binary_30	id
 IS     NULL	NULL	1
-IS NOT NULL	+IS NOT NULL		2
 IS NOT NULL	<--------30 characters------->	3
-IS NOT NULL	 ---äÖüß@µ*$-- -IS NOT NULL	-1+IS NOT NULL	 ---äÖüß@µ*$-- 	4
+IS NOT NULL	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(isnull(`t1_values`.`my_binary_30`),'IS     NULL','IS NOT NULL') AS `IF(my_binary_30 IS NULL, 'IS     NULL',
@@ -2113,10 +2118,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 105 OR select_id IS NULL order by id;
 IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')	my_binary_30	id
 IS NOT TRUE	NULL	1
-IS NOT TRUE	+IS NOT TRUE		2
 IS NOT TRUE	<--------30 characters------->	3
-IS NOT TRUE	 ---äÖüß@µ*$-- -IS     TRUE	-1+IS NOT TRUE	 ---äÖüß@µ*$-- 	4
+IS     TRUE	-1	5
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: ''
 Warning	1292	Truncated incorrect DOUBLE value: '<--------30 characters------->'
@@ -2200,9 +2205,9 @@ Warning	1292	Truncated incorrect DOUBLE 
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING koi8r), 
+CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING koi8r),
 my_varbinary_1000, id FROM t1_values;
-SELECT CONVERT(my_varbinary_1000 USING koi8r), 
+SELECT CONVERT(my_varbinary_1000 USING koi8r),
 my_varbinary_1000, id FROM t1_values
 WHERE select_id = 102 OR select_id IS NULL order by id;
 CONVERT(my_varbinary_1000 USING koi8r)	my_varbinary_1000	id
@@ -2226,17 +2231,17 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING koi8r), 
+CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING koi8r),
 my_binary_30, id FROM t1_values;
-SELECT CONVERT(my_binary_30 USING koi8r), 
+SELECT CONVERT(my_binary_30 USING koi8r),
 my_binary_30, id FROM t1_values
 WHERE select_id = 101 OR select_id IS NULL order by id;
 CONVERT(my_binary_30 USING koi8r)	my_binary_30	id
 NULL	NULL	1
-+		2
 <--------30 characters------->	<--------30 characters------->	3
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using koi8r) AS `CONVERT(my_binary_30 USING koi8r)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -2252,9 +2257,9 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING koi8r), 
+CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING koi8r),
 my_varchar_1000, id FROM t1_values;
-SELECT CONVERT(my_varchar_1000 USING koi8r), 
+SELECT CONVERT(my_varchar_1000 USING koi8r),
 my_varchar_1000, id FROM t1_values
 WHERE select_id = 100 OR select_id IS NULL order by id;
 CONVERT(my_varchar_1000 USING koi8r)	my_varchar_1000	id
@@ -2278,9 +2283,9 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING koi8r), 
+CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING koi8r),
 my_char_30, id FROM t1_values;
-SELECT CONVERT(my_char_30 USING koi8r), 
+SELECT CONVERT(my_char_30 USING koi8r),
 my_char_30, id FROM t1_values
 WHERE select_id = 99 OR select_id IS NULL order by id;
 CONVERT(my_char_30 USING koi8r)	my_char_30	id
@@ -2304,9 +2309,9 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING utf8), 
+CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING utf8),
 my_varbinary_1000, id FROM t1_values;
-SELECT CONVERT(my_varbinary_1000 USING utf8), 
+SELECT CONVERT(my_varbinary_1000 USING utf8),
 my_varbinary_1000, id FROM t1_values
 WHERE select_id = 98 OR select_id IS NULL order by id;
 CONVERT(my_varbinary_1000 USING utf8)	my_varbinary_1000	id
@@ -2330,17 +2335,17 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING utf8), 
+CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING utf8),
 my_binary_30, id FROM t1_values;
-SELECT CONVERT(my_binary_30 USING utf8), 
+SELECT CONVERT(my_binary_30 USING utf8),
 my_binary_30, id FROM t1_values
 WHERE select_id = 97 OR select_id IS NULL order by id;
 CONVERT(my_binary_30 USING utf8)	my_binary_30	id
 NULL	NULL	1
-+		2
 <--------30 characters------->	<--------30 characters------->	3
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using utf8) AS `CONVERT(my_binary_30 USING utf8)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -2356,9 +2361,9 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING utf8), 
+CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING utf8),
 my_varchar_1000, id FROM t1_values;
-SELECT CONVERT(my_varchar_1000 USING utf8), 
+SELECT CONVERT(my_varchar_1000 USING utf8),
 my_varchar_1000, id FROM t1_values
 WHERE select_id = 96 OR select_id IS NULL order by id;
 CONVERT(my_varchar_1000 USING utf8)	my_varchar_1000	id
@@ -2382,9 +2387,9 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING utf8), 
+CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING utf8),
 my_char_30, id FROM t1_values;
-SELECT CONVERT(my_char_30 USING utf8), 
+SELECT CONVERT(my_char_30 USING utf8),
 my_char_30, id FROM t1_values
 WHERE select_id = 95 OR select_id IS NULL order by id;
 CONVERT(my_char_30 USING utf8)	my_char_30	id
@@ -2673,10 +2678,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 85 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS UNSIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
-0	+0		2
 0	<--------30 characters------->	3
-0	 ---äÖüß@µ*$-- -18446744073709551615	-1+0	 ---äÖüß@µ*$-- 	4
+18446744073709551615	-1	5
 Warnings:
 Warning	1292	Truncated incorrect INTEGER value: ''
 Warning	1292	Truncated incorrect INTEGER value: '<--------30 characters------->'
@@ -3037,10 +3042,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 73 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS SIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
-0	+0		2
 0	<--------30 characters------->	3
-0	 ---äÖüß@µ*$-- --1	-1+0	 ---äÖüß@µ*$-- 	4
+-1	-1	5
 Warnings:
 Warning	1292	Truncated incorrect INTEGER value: ''
 Warning	1292	Truncated incorrect INTEGER value: '<--------30 characters------->'
@@ -3397,11 +3402,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 61 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DECIMAL(37,2))	my_binary_30	id
 NULL	NULL	1
-0.00	+0.00		2
 0.00	<--------30 characters------->	3
-0.00	 ---äÖüß@µ*$-- --1.00	-1--3333.33	-3333.3333+0.00	 ---äÖüß@µ*$-- 	4
+-1.00	-1	5
+-3333.33	-3333.3333	28
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: ''
@@ -3755,11 +3760,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 50 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS TIME)	my_binary_30	id
 NULL	NULL	1
-00:00:00	+00:00:00		2
 00:00:00	<--------30 characters------->	3
--00:00:00	 ---äÖüß@µ*$-- -NULL	-1-41:58:00	1 17:58+-00:00:00	 ---äÖüß@µ*$-- 	4
+NULL	-1	5
+41:58:00	1 17:58	22
 Warnings:
 Warning	1292	Truncated incorrect time value: ''
 Warning	1292	Truncated incorrect time value: '<--------30 characters------->'
@@ -4131,11 +4136,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 39 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DATETIME)	my_binary_30	id
 NULL	NULL	1
-NULL	+NULL		2
 NULL	<--------30 characters------->	3
-NULL	 ---äÖüß@µ*$-- -NULL	-1-2005-06-27 17:58:00	2005-06-27 17:58+NULL	 ---äÖüß@µ*$-- 	4
+NULL	-1	5
+2005-06-27 17:58:00	2005-06-27 17:58	16
 Warnings:
 Warning	1292	Incorrect datetime value: ''
 Warning	1292	Incorrect datetime value: '<--------30 characters------->'
@@ -4501,11 +4506,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 28 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DATE)	my_binary_30	id
 NULL	NULL	1
-NULL	+NULL		2
 NULL	<--------30 characters------->	3
-NULL	 ---äÖüß@µ*$-- -NULL	-1-2005-06-27	2005-06-27+NULL	 ---äÖüß@µ*$-- 	4
+NULL	-1	5
+2005-06-27	2005-06-27	10
 Warnings:
 Warning	1292	Incorrect datetime value: ''
 Warning	1292	Incorrect datetime value: '<--------30 characters------->'
@@ -4851,10 +4856,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 16 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS CHAR)	my_binary_30	id
 NULL	NULL	1
-+		2
 <--------30 characters------->	<--------30 characters------->	3
- ---äÖüß@µ*$-- --1+ ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset latin1) AS `CAST(my_binary_30 AS CHAR)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -5163,10 +5168,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 4 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS BINARY)	my_binary_30	id
 NULL	NULL	1
-+		2
 <--------30 characters------->	<--------30 characters------->	3
- ---äÖüß@µ*$-- --1+ ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset binary) AS `CAST(my_binary_30 AS BINARY)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
diff -Nrup a/mysql-test/suite/funcs_1/r/myisam_storedproc.result b/mysql-test/suite/funcs_1/r/myisam_storedproc.result
--- a/mysql-test/suite/funcs_1/r/myisam_storedproc.result	2008-04-01 20:18:48 +02:00
+++ b/mysql-test/suite/funcs_1/r/myisam_storedproc.result	2008-04-01 23:00:57 +02:00
@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
 CREATE DATABASE db_storedproc;
 CREATE DATABASE db_storedproc_1;
 USE db_storedproc;
-create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
-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 = myisam;
-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 = myisam;
-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 = myisam;
-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 = myisam;
-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 = myisam;
-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 '
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = myisam;
-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 '
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t9(f1 int, f2 char(25), f3 int) engine = myisam;
-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 = myisam;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10;
-create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = myisam;
-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.1 - Syntax checks for the CREATE PROCEDURE, CREATE
 FUNCTION, ALTER PROCEDURE, ALTER FUNCTION, DROP PROCEDURE, DROP FUNCTION, SHOW
@@ -14862,46 +14870,47 @@ USE db_storedproc;
 Testcase 4.3.1:
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp1;
-drop table IF EXISTS res_t3_itisalongname_1381742_itsaverylongname_1381742;
+DROP TABLE IF EXISTS res_t3_itisalongname_1381742_itsaverylongname_1381742;
 CREATE TABLE res_t3_itisalongname_1381742_itsaverylongname_1381742(
-middleinitial CHAR,
-lastname VARCHAR(50),
-age_averylongfieldname_averylongname_1234569 int,
-COMMENT TEXT) ENGINE=myisam;
+middleinitial CHAR, lastname VARCHAR(50),
+age_averylongfieldname_averylongname_1234569 INT, COMMENT VARCHAR(100))
+ENGINE=<engine_to_be_tested>;
 INSERT INTO res_t3_itisalongname_1381742_itsaverylongname_1381742
 VALUES('a', 'aaaaaaaaaabbbbbbbbc', 0, 'default');
-CREATE PROCEDURE sp1(a int)
+CREATE PROCEDURE sp1(a INT)
 BEGIN
-declare itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx char;
-declare itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx varchar(100);
-declare itisjustamediumsizeintintegervariablename integer;
-set itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx = 'b';
-set itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx = 'oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%';
-set itisjustamediumsizeintintegervariablename = 5;
-set @comment='a';
-label1: loop
-if a>100 then
-set @comment='value of a is greater than 100';
-elseif a<100 then
-if a<50 then
-set @comment='value of a is less than 50';
-elseif a<25 then
-set @comment='value of a is less than 25';
-else
-set @comment='value of a is greater than 50 and less than 100';
-END if;
-else
-set @comment='value of a is 100';
-END if;
-if itisjustamediumsizeintintegervariablename = 0 then leave label1;
-END if;
-insert into res_t3_itisalongname_1381742_itsaverylongname_1381742
-values( itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx,
-concat(itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx, '  ', a),
-a, @comment );
-set itisjustamediumsizeintintegervariablename = itisjustamediumsizeintintegervariablename - 1;
-iterate label1;
-END loop label1;
+DECLARE itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx CHAR;
+DECLARE itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx VARCHAR(100);
+DECLARE itisjustamediumsizeintintegervariablename INTEGER;
+SET itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx = 'b';
+SET itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx
+= 'oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%';
+SET itisjustamediumsizeintintegervariablename = 5;
+SET @comment='a';
+label1: LOOP
+IF a > 100 THEN
+SET @comment = 'value of a is greater than 100';
+ELSEIF a < 100 THEN
+IF a < 50 THEN
+SET @comment = 'value of a is less than 50';
+ELSEIF a < 25 THEN
+SET @comment = 'value of a is less than 25';
+ELSE
+SET @comment = 'value of a is greater than 50 and less than 100';
+END IF;
+ELSE
+SET @comment = 'value of a is 100';
+END IF;
+IF itisjustamediumsizeintintegervariablename = 0 THEN LEAVE label1;
+END IF;
+INSERT INTO res_t3_itisalongname_1381742_itsaverylongname_1381742
+VALUES(itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx,
+CONCAT(itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx,
+'  ', a), a, @comment);
+SET itisjustamediumsizeintintegervariablename
+= itisjustamediumsizeintintegervariablename - 1;
+ITERATE label1;
+END LOOP label1;
 END//
 CALL sp1(101);
 CALL sp1(100);
diff -Nrup a/mysql-test/suite/funcs_1/r/myisam_trig_09.result b/mysql-test/suite/funcs_1/r/myisam_trig_09.result
--- a/mysql-test/suite/funcs_1/r/myisam_trig_09.result	2008-04-01 20:14:59 +02:00
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_09.result	2008-04-01 23:00:58 +02:00
@@ -1,74 +1,75 @@
 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 = myisam;
 Warnings:
 Note	1265	Data truncated for column 'f150' at row 1
 Note	1265	Data truncated for column 'f151' at row 1
 Note	1265	Data truncated for column 'f152' at row 1
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb3.txt' into table tb3 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb3.txt'
+into table tb3;
 
 Testcase 3.5.9.1/2:
 -------------------
-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_
 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' 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
@@ -137,7 +138,7 @@ a	NULL	Test 3.5.9.3	7	123.17000000000000
 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' 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
@@ -168,17 +169,17 @@ set @tr_var_af_118=new.f118, @tr_var_af_
 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 
+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
@@ -191,15 +192,15 @@ where f122='Test 3.5.9.4';
 ERROR 23000: Column 'f136' cannot be null
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=0, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
-select f118, f121, f122, f136, f151, f163 from tb3 
+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
@@ -237,6 +238,7 @@ ERROR HY000: There is no NEW row in on D
 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)
diff -Nrup a/mysql-test/suite/funcs_1/r/myisam_views.result b/mysql-test/suite/funcs_1/r/myisam_views.result
--- a/mysql-test/suite/funcs_1/r/myisam_views.result	2008-04-01 20:18:49 +02:00
+++ b/mysql-test/suite/funcs_1/r/myisam_views.result	2008-04-01 23:00:58 +02:00
@@ -1,133 +1,135 @@
 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",
-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;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb2.txt' into table tb2 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb2.txt'
+into table tb2;
 DROP DATABASE IF EXISTS test1;
 CREATE DATABASE test1;
 USE test1;
 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",
-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;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb2.txt' into table tb2 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/myisam_tb2.txt'
+into table tb2;
 USE test;
 
 Attention: The nesting level @max_level in Testcase 3.3.1.A6
diff -Nrup a/mysql-test/suite/funcs_1/r/ndb_func_view.result b/mysql-test/suite/funcs_1/r/ndb_func_view.result
--- a/mysql-test/suite/funcs_1/r/ndb_func_view.result	2008-04-01 20:18:50 +02:00
+++ b/mysql-test/suite/funcs_1/r/ndb_func_view.result	2008-04-01 23:00:59 +02:00
@@ -57,10 +57,10 @@ my_bigint = -9223372036854775808,
 my_decimal = -9999999999999999999999999999999999.999999999999999999999999999999 ,
 my_double = -1.7976931348623E+308;
 INSERT INTO t1_values SET
-my_char_30 = '<--------30 characters------->', 
+my_char_30 = '<--------30 characters------->',
 my_varchar_1000 = CONCAT('<---------1000 characters',
 RPAD('',965,'-'),'--------->'),
-my_binary_30 = '<--------30 characters------->', 
+my_binary_30 = '<--------30 characters------->',
 my_varbinary_1000 = CONCAT('<---------1000 characters',
 RPAD('',965,'-'),'--------->'),
 my_datetime = '9999-12-31 23:59:59',
@@ -72,23 +72,23 @@ my_bigint = 9223372036854775807,
 my_decimal = +9999999999999999999999999999999999.999999999999999999999999999999 ,
 my_double = 1.7976931348623E+308;
 INSERT INTO t1_values SET
-my_char_30 = ' ---äÖüß@µ*$-- ', 
-my_varchar_1000 = ' ---äÖüß@µ*$-- ', 
-my_binary_30 = ' ---äÖüß@µ*$-- ', 
-my_varbinary_1000 = ' ---äÖüß@µ*$-- ', 
+my_char_30 = ' ---äÖüß@µ*$-- ',
+my_varchar_1000 = ' ---äÖüß@µ*$-- ',
+my_binary_30 = ' ---äÖüß@µ*$-- ',
+my_varbinary_1000 = ' ---äÖüß@µ*$-- ',
 my_datetime = '2004-02-29 23:59:59',
 my_date = '2004-02-29',
 my_timestamp = '2004-02-29 23:59:59',
 my_time = '13:00:00',
 my_year = 2000,
-my_bigint = 0,  	 
+my_bigint = 0,  	
 my_decimal = 0.0,
 my_double = 0;
 INSERT INTO t1_values SET
-my_char_30 = '-1', 
-my_varchar_1000 = '-1', 
-my_binary_30 = '-1', 
-my_varbinary_1000 = '-1', 
+my_char_30 = '-1',
+my_varchar_1000 = '-1',
+my_binary_30 = '-1',
+my_varbinary_1000 = '-1',
 my_datetime = '2005-06-28 10:00:00',
 my_date = '2005-06-28',
 my_timestamp = '2005-06-28 10:00:00',
@@ -174,21 +174,21 @@ my_double = -0.33333333E+4;
 some statements disabled because of
 Bug#5913 Traditional mode: BIGINT range not correctly delimited
 --------------------------------------------------------------------------------
-SET @my_select = 'SELECT CONVERT(my_char_30 USING utf8), 
+SET @my_select = 'SELECT CONVERT(my_char_30 USING utf8),
 my_char_30, id FROM t1_values';
-SET @my_select = 'SELECT CONVERT(my_varchar_1000 USING utf8), 
+SET @my_select = 'SELECT CONVERT(my_varchar_1000 USING utf8),
 my_varchar_1000, id FROM t1_values';
-SET @my_select = 'SELECT CONVERT(my_binary_30 USING utf8), 
+SET @my_select = 'SELECT CONVERT(my_binary_30 USING utf8),
 my_binary_30, id FROM t1_values';
-SET @my_select = 'SELECT CONVERT(my_varbinary_1000 USING utf8), 
+SET @my_select = 'SELECT CONVERT(my_varbinary_1000 USING utf8),
 my_varbinary_1000, id FROM t1_values';
-SET @my_select = 'SELECT CONVERT(my_char_30 USING koi8r), 
+SET @my_select = 'SELECT CONVERT(my_char_30 USING koi8r),
 my_char_30, id FROM t1_values';
-SET @my_select = 'SELECT CONVERT(my_varchar_1000 USING koi8r), 
+SET @my_select = 'SELECT CONVERT(my_varchar_1000 USING koi8r),
 my_varchar_1000, id FROM t1_values';
-SET @my_select = 'SELECT CONVERT(my_binary_30 USING koi8r), 
+SET @my_select = 'SELECT CONVERT(my_binary_30 USING koi8r),
 my_binary_30, id FROM t1_values';
-SET @my_select = 'SELECT CONVERT(my_varbinary_1000 USING koi8r), 
+SET @my_select = 'SELECT CONVERT(my_varbinary_1000 USING koi8r),
 my_varbinary_1000, id FROM t1_values';
 SET @my_select = 'SELECT BIT_LENGTH(my_char_30),
 my_char_30, id FROM t1_values';
@@ -202,15 +202,15 @@ SET @my_select = 'SELECT INSTR(my_char_3
 my_char_30, id FROM t1_values';
 SET @my_select = 'SELECT LCASE(my_varchar_1000),
 my_varchar_1000, id FROM t1_values';
-SET @my_select = 
+SET @my_select =
 'SELECT LEFT(my_char_30, 2), my_char_30, id FROM t1_values';
-SET @my_select = 
+SET @my_select =
 'SELECT LEFT(my_varchar_1000, 2), my_varchar_1000, id FROM t1_values';
-SET @my_select = 
+SET @my_select =
 'SELECT LEFT(my_binary_30, 2), my_binary_30, id FROM t1_values';
-SET @my_select = 
+SET @my_select =
 'SELECT LEFT(my_varbinary_1000, 2), my_varbinary_1000, id FROM t1_values';
-SET @my_select = 
+SET @my_select =
 'SELECT LEFT(''AaBbCcDdEeFfGgHhIiJjÄäÜüÖö'', my_bigint), my_bigint, id FROM t1_values';
 SET @my_select =
 'SELECT LEFT(''AaBbCcDdEeFfGgHhIiJjÄäÜüÖö'', my_decimal), my_decimal, id FROM t1_values';
@@ -224,9 +224,10 @@ SET @my_select = 'SELECT LENGTH(my_binar
 my_binary_30, id FROM t1_values';
 SET @my_select = 'SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values';
-SELECT 'äÄ@' INTO OUTFILE '../tmp/func_view.dat';
-SET @my_select = 
-'SELECT LOAD_FILE(''../tmp/func_view.dat''), id FROM t1_values';
+SET @my_select =
+'SELECT LOAD_FILE(''<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt'')
+           AS my_col,
+        id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_char_30),
 my_char_30, id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_varchar_1000),
@@ -832,36 +833,40 @@ WHERE select_id = 157 OR select_id IS NU
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values;
-SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values
+CREATE VIEW v1 AS SELECT LOAD_FILE('<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt')
+           AS my_col,
+        id FROM t1_values;
+SELECT LOAD_FILE('<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt')
+           AS my_col,
+        id FROM t1_values
 WHERE select_id = 156 OR select_id IS NULL order by id;
-LOAD_FILE('../tmp/func_view.dat')	id
-äÄ@
+my_col	id
+Here is content from load_file
 	1
-äÄ@
+Here is content from load_file
 	2
-äÄ@
+Here is content from load_file
 	3
-äÄ@
+Here is content from load_file
 	4
-äÄ@
+Here is content from load_file
 	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file('../tmp/func_view.dat') AS `LOAD_FILE('../tmp/func_view.dat')`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file('<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt') AS `my_col`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 156 OR select_id IS NULL) order by id;
-LOAD_FILE('../tmp/func_view.dat')	id
-äÄ@
+my_col	id
+Here is content from load_file
 	1
-äÄ@
+Here is content from load_file
 	2
-äÄ@
+Here is content from load_file
 	3
-äÄ@
+Here is content from load_file
 	4
-äÄ@
+Here is content from load_file
 	5
 DROP VIEW v1;
 
@@ -1035,10 +1040,10 @@ SELECT LEFT(my_binary_30, 2), my_binary_
 WHERE select_id = 147 OR select_id IS NULL order by id;
 LEFT(my_binary_30, 2)	my_binary_30	id
 NULL	NULL	1
-+		2
 <-	<--------30 characters------->	3
- -	 ---äÖüß@µ*$-- --1	-1+ -	 ---äÖüß@µ*$-- 	4
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_binary_30`,2) AS `LEFT(my_binary_30, 2)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -1163,10 +1168,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 141 OR select_id IS NULL order by id;
 BIT_LENGTH(my_binary_30)	my_binary_30	id
 NULL	NULL	1
-240	+240		2
 240	<--------30 characters------->	3
-240	 ---äÖüß@µ*$-- -240	-1+240	 ---äÖüß@µ*$-- 	4
+240	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_binary_30`) AS `BIT_LENGTH(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -1475,10 +1480,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 129 OR select_id IS NULL order by id;
 IFNULL(my_binary_30,'IS_NULL')	my_binary_30	id
 IS_NULL	NULL	1
-+		2
 <--------30 characters------->	<--------30 characters------->	3
- ---äÖüß@µ*$-- --1+ ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_binary_30`,'IS_NULL') AS `IFNULL(my_binary_30,'IS_NULL')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -1815,10 +1820,10 @@ WHERE select_id = 117 OR select_id IS NU
 IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_binary_30	id
 IS     NULL	NULL	1
-IS NOT NULL	+IS NOT NULL		2
 IS NOT NULL	<--------30 characters------->	3
-IS NOT NULL	 ---äÖüß@µ*$-- -IS NOT NULL	-1+IS NOT NULL	 ---äÖüß@µ*$-- 	4
+IS NOT NULL	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(isnull(`t1_values`.`my_binary_30`),'IS     NULL','IS NOT NULL') AS `IF(my_binary_30 IS NULL, 'IS     NULL',
@@ -2135,10 +2140,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 105 OR select_id IS NULL order by id;
 IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')	my_binary_30	id
 IS NOT TRUE	NULL	1
-IS NOT TRUE	+IS NOT TRUE		2
 IS NOT TRUE	<--------30 characters------->	3
-IS NOT TRUE	 ---äÖüß@µ*$-- -IS     TRUE	-1+IS NOT TRUE	 ---äÖüß@µ*$-- 	4
+IS     TRUE	-1	5
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: ''
 Warning	1292	Truncated incorrect DOUBLE value: '<--------30 characters------->'
@@ -2222,9 +2227,9 @@ Warning	1292	Truncated incorrect DOUBLE 
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING koi8r), 
+CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING koi8r),
 my_varbinary_1000, id FROM t1_values;
-SELECT CONVERT(my_varbinary_1000 USING koi8r), 
+SELECT CONVERT(my_varbinary_1000 USING koi8r),
 my_varbinary_1000, id FROM t1_values
 WHERE select_id = 102 OR select_id IS NULL order by id;
 CONVERT(my_varbinary_1000 USING koi8r)	my_varbinary_1000	id
@@ -2248,17 +2253,17 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING koi8r), 
+CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING koi8r),
 my_binary_30, id FROM t1_values;
-SELECT CONVERT(my_binary_30 USING koi8r), 
+SELECT CONVERT(my_binary_30 USING koi8r),
 my_binary_30, id FROM t1_values
 WHERE select_id = 101 OR select_id IS NULL order by id;
 CONVERT(my_binary_30 USING koi8r)	my_binary_30	id
 NULL	NULL	1
-+		2
 <--------30 characters------->	<--------30 characters------->	3
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using koi8r) AS `CONVERT(my_binary_30 USING koi8r)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -2274,9 +2279,9 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING koi8r), 
+CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING koi8r),
 my_varchar_1000, id FROM t1_values;
-SELECT CONVERT(my_varchar_1000 USING koi8r), 
+SELECT CONVERT(my_varchar_1000 USING koi8r),
 my_varchar_1000, id FROM t1_values
 WHERE select_id = 100 OR select_id IS NULL order by id;
 CONVERT(my_varchar_1000 USING koi8r)	my_varchar_1000	id
@@ -2300,9 +2305,9 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING koi8r), 
+CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING koi8r),
 my_char_30, id FROM t1_values;
-SELECT CONVERT(my_char_30 USING koi8r), 
+SELECT CONVERT(my_char_30 USING koi8r),
 my_char_30, id FROM t1_values
 WHERE select_id = 99 OR select_id IS NULL order by id;
 CONVERT(my_char_30 USING koi8r)	my_char_30	id
@@ -2326,9 +2331,9 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING utf8), 
+CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING utf8),
 my_varbinary_1000, id FROM t1_values;
-SELECT CONVERT(my_varbinary_1000 USING utf8), 
+SELECT CONVERT(my_varbinary_1000 USING utf8),
 my_varbinary_1000, id FROM t1_values
 WHERE select_id = 98 OR select_id IS NULL order by id;
 CONVERT(my_varbinary_1000 USING utf8)	my_varbinary_1000	id
@@ -2352,17 +2357,17 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING utf8), 
+CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING utf8),
 my_binary_30, id FROM t1_values;
-SELECT CONVERT(my_binary_30 USING utf8), 
+SELECT CONVERT(my_binary_30 USING utf8),
 my_binary_30, id FROM t1_values
 WHERE select_id = 97 OR select_id IS NULL order by id;
 CONVERT(my_binary_30 USING utf8)	my_binary_30	id
 NULL	NULL	1
-+		2
 <--------30 characters------->	<--------30 characters------->	3
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using utf8) AS `CONVERT(my_binary_30 USING utf8)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -2378,9 +2383,9 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING utf8), 
+CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING utf8),
 my_varchar_1000, id FROM t1_values;
-SELECT CONVERT(my_varchar_1000 USING utf8), 
+SELECT CONVERT(my_varchar_1000 USING utf8),
 my_varchar_1000, id FROM t1_values
 WHERE select_id = 96 OR select_id IS NULL order by id;
 CONVERT(my_varchar_1000 USING utf8)	my_varchar_1000	id
@@ -2404,9 +2409,9 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING utf8), 
+CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING utf8),
 my_char_30, id FROM t1_values;
-SELECT CONVERT(my_char_30 USING utf8), 
+SELECT CONVERT(my_char_30 USING utf8),
 my_char_30, id FROM t1_values
 WHERE select_id = 95 OR select_id IS NULL order by id;
 CONVERT(my_char_30 USING utf8)	my_char_30	id
@@ -2695,10 +2700,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 85 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS UNSIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
-0	+0		2
 0	<--------30 characters------->	3
-0	 ---äÖüß@µ*$-- -18446744073709551615	-1+0	 ---äÖüß@µ*$-- 	4
+18446744073709551615	-1	5
 Warnings:
 Warning	1292	Truncated incorrect INTEGER value: ''
 Warning	1292	Truncated incorrect INTEGER value: '<--------30 characters------->'
@@ -3059,10 +3064,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 73 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS SIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
-0	+0		2
 0	<--------30 characters------->	3
-0	 ---äÖüß@µ*$-- --1	-1+0	 ---äÖüß@µ*$-- 	4
+-1	-1	5
 Warnings:
 Warning	1292	Truncated incorrect INTEGER value: ''
 Warning	1292	Truncated incorrect INTEGER value: '<--------30 characters------->'
@@ -3419,11 +3424,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 61 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DECIMAL(37,2))	my_binary_30	id
 NULL	NULL	1
-0.00	+0.00		2
 0.00	<--------30 characters------->	3
-0.00	 ---äÖüß@µ*$-- --1.00	-1--3333.33	-3333.3333+0.00	 ---äÖüß@µ*$-- 	4
+-1.00	-1	5
+-3333.33	-3333.3333	28
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: ''
@@ -3777,11 +3782,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 50 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS TIME)	my_binary_30	id
 NULL	NULL	1
-00:00:00	+00:00:00		2
 00:00:00	<--------30 characters------->	3
--00:00:00	 ---äÖüß@µ*$-- -NULL	-1-41:58:00	1 17:58+-00:00:00	 ---äÖüß@µ*$-- 	4
+NULL	-1	5
+41:58:00	1 17:58	22
 Warnings:
 Warning	1292	Truncated incorrect time value: ''
 Warning	1292	Truncated incorrect time value: '<--------30 characters------->'
@@ -4153,11 +4158,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 39 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DATETIME)	my_binary_30	id
 NULL	NULL	1
-NULL	+NULL		2
 NULL	<--------30 characters------->	3
-NULL	 ---äÖüß@µ*$-- -NULL	-1-2005-06-27 17:58:00	2005-06-27 17:58+NULL	 ---äÖüß@µ*$-- 	4
+NULL	-1	5
+2005-06-27 17:58:00	2005-06-27 17:58	16
 Warnings:
 Warning	1292	Incorrect datetime value: ''
 Warning	1292	Incorrect datetime value: '<--------30 characters------->'
@@ -4523,11 +4528,11 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 28 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DATE)	my_binary_30	id
 NULL	NULL	1
-NULL	+NULL		2
 NULL	<--------30 characters------->	3
-NULL	 ---äÖüß@µ*$-- -NULL	-1-2005-06-27	2005-06-27+NULL	 ---äÖüß@µ*$-- 	4
+NULL	-1	5
+2005-06-27	2005-06-27	10
 Warnings:
 Warning	1292	Incorrect datetime value: ''
 Warning	1292	Incorrect datetime value: '<--------30 characters------->'
@@ -4873,10 +4878,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 16 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS CHAR)	my_binary_30	id
 NULL	NULL	1
-+		2
 <--------30 characters------->	<--------30 characters------->	3
- ---äÖüß@µ*$-- --1+ ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset latin1) AS `CAST(my_binary_30 AS CHAR)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -5185,10 +5190,10 @@ my_binary_30, id FROM t1_values
 WHERE select_id = 4 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS BINARY)	my_binary_30	id
 NULL	NULL	1
-+		2
 <--------30 characters------->	<--------30 characters------->	3
- ---äÖüß@µ*$-- --1+ ---äÖüß@µ*$-- 	 ---äÖüß@µ*$-- 	4
+-1	-1	5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset binary) AS `CAST(my_binary_30 AS BINARY)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
diff -Nrup a/mysql-test/suite/funcs_1/r/ndb_storedproc.result b/mysql-test/suite/funcs_1/r/ndb_storedproc.result
--- a/mysql-test/suite/funcs_1/r/ndb_storedproc.result	2008-04-01 20:18:50 +02:00
+++ b/mysql-test/suite/funcs_1/r/ndb_storedproc.result	2008-04-01 23:01:00 +02:00
@@ -9,20 +9,25 @@ DROP DATABASE IF EXISTS db_storedproc_1;
 CREATE DATABASE db_storedproc;
 CREATE DATABASE db_storedproc_1;
 USE db_storedproc;
-create table t1(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = ndb;
-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 = ndb;
-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 = ndb;
-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 = ndb;
-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 = ndb;
-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 = ndb;
-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 '
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t8 (f1 char(20), f2 char(25), f3 date, f4 int) engine = ndb;
-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 '
 Warning	1265	Data truncated for column 'f3' at row 8
 Warning	1265	Data truncated for column 'f3' at row 9
 Warning	1265	Data truncated for column 'f3' at row 10
-create table t9(f1 int, f2 char(25), f3 int) engine = ndb;
-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 = ndb;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t10;
-create table t11(f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int) engine = ndb;
-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.1 - Syntax checks for the CREATE PROCEDURE, CREATE
 FUNCTION, ALTER PROCEDURE, ALTER FUNCTION, DROP PROCEDURE, DROP FUNCTION, SHOW
@@ -14862,48 +14870,47 @@ USE db_storedproc;
 Testcase 4.3.1:
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp1;
-drop table IF EXISTS res_t3_itisalongname_1381742_itsaverylongname_1381742;
+DROP TABLE IF EXISTS res_t3_itisalongname_1381742_itsaverylongname_1381742;
 CREATE TABLE res_t3_itisalongname_1381742_itsaverylongname_1381742(
-middleinitial CHAR,
-lastname VARCHAR(50),
-age_averylongfieldname_averylongname_1234569 int,
-COMMENT TEXT) ENGINE=ndb;
-Warnings:
-Error	1478	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
+middleinitial CHAR, lastname VARCHAR(50),
+age_averylongfieldname_averylongname_1234569 INT, COMMENT VARCHAR(100))
+ENGINE=<engine_to_be_tested>;
 INSERT INTO res_t3_itisalongname_1381742_itsaverylongname_1381742
 VALUES('a', 'aaaaaaaaaabbbbbbbbc', 0, 'default');
-CREATE PROCEDURE sp1(a int)
+CREATE PROCEDURE sp1(a INT)
 BEGIN
-declare itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx char;
-declare itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx varchar(100);
-declare itisjustamediumsizeintintegervariablename integer;
-set itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx = 'b';
-set itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx = 'oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%';
-set itisjustamediumsizeintintegervariablename = 5;
-set @comment='a';
-label1: loop
-if a>100 then
-set @comment='value of a is greater than 100';
-elseif a<100 then
-if a<50 then
-set @comment='value of a is less than 50';
-elseif a<25 then
-set @comment='value of a is less than 25';
-else
-set @comment='value of a is greater than 50 and less than 100';
-END if;
-else
-set @comment='value of a is 100';
-END if;
-if itisjustamediumsizeintintegervariablename = 0 then leave label1;
-END if;
-insert into res_t3_itisalongname_1381742_itsaverylongname_1381742
-values( itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx,
-concat(itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx, '  ', a),
-a, @comment );
-set itisjustamediumsizeintintegervariablename = itisjustamediumsizeintintegervariablename - 1;
-iterate label1;
-END loop label1;
+DECLARE itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx CHAR;
+DECLARE itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx VARCHAR(100);
+DECLARE itisjustamediumsizeintintegervariablename INTEGER;
+SET itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx = 'b';
+SET itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx
+= 'oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%';
+SET itisjustamediumsizeintintegervariablename = 5;
+SET @comment='a';
+label1: LOOP
+IF a > 100 THEN
+SET @comment = 'value of a is greater than 100';
+ELSEIF a < 100 THEN
+IF a < 50 THEN
+SET @comment = 'value of a is less than 50';
+ELSEIF a < 25 THEN
+SET @comment = 'value of a is less than 25';
+ELSE
+SET @comment = 'value of a is greater than 50 and less than 100';
+END IF;
+ELSE
+SET @comment = 'value of a is 100';
+END IF;
+IF itisjustamediumsizeintintegervariablename = 0 THEN LEAVE label1;
+END IF;
+INSERT INTO res_t3_itisalongname_1381742_itsaverylongname_1381742
+VALUES(itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx,
+CONCAT(itisjustaverylargevarcharvariablename_xxxxxxxxxxxxxxxxxxxxx,
+'  ', a), a, @comment);
+SET itisjustamediumsizeintintegervariablename
+= itisjustamediumsizeintintegervariablename - 1;
+ITERATE label1;
+END LOOP label1;
 END//
 CALL sp1(101);
 CALL sp1(100);
diff -Nrup a/mysql-test/suite/funcs_1/r/ndb_trig_09.result b/mysql-test/suite/funcs_1/r/ndb_trig_09.result
--- a/mysql-test/suite/funcs_1/r/ndb_trig_09.result	2008-04-01 20:15:10 +02:00
+++ b/mysql-test/suite/funcs_1/r/ndb_trig_09.result	2008-04-01 23:01:01 +02:00
@@ -1,75 +1,76 @@
 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 = ndb;
 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
 Error	1478	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb3.txt' into table tb3 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/ndb_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
@@ -81,15 +82,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
@@ -117,17 +118,17 @@ set @tr_var_af_118=old.f118, @tr_var_af_
 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' 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
@@ -138,7 +139,7 @@ a	NULL	Test 3.5.9.3	7	123.17000000000000
 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' 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
@@ -169,17 +170,17 @@ set @tr_var_af_118=new.f118, @tr_var_af_
 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 
+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
@@ -192,15 +193,15 @@ where f122='Test 3.5.9.4';
 ERROR 23000: Column 'f136' cannot be null
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=0, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
-select f118, f121, f122, f136, f151, f163 from tb3 
+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
@@ -238,6 +239,7 @@ ERROR HY000: There is no NEW row in on D
 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)
diff -Nrup a/mysql-test/suite/funcs_1/t/falcon_bitdata.test b/mysql-test/suite/funcs_1/t/falcon_bitdata.test
--- a/mysql-test/suite/funcs_1/t/falcon_bitdata.test	2008-03-10 20:00:00 +01:00
+++ b/mysql-test/suite/funcs_1/t/falcon_bitdata.test	2008-04-01 23:01:01 +02:00
@@ -16,4 +16,3 @@ exit;
 USE test;
 --source suite/funcs_1/include/falcon_tb4.inc
 --source suite/funcs_1/bitdata/bitdata_master.test
-
diff -Nrup a/mysql-test/suite/funcs_1/triggers/triggers_09.inc b/mysql-test/suite/funcs_1/triggers/triggers_09.inc
--- a/mysql-test/suite/funcs_1/triggers/triggers_09.inc	2008-04-01 20:15:38 +02:00
+++ b/mysql-test/suite/funcs_1/triggers/triggers_09.inc	2008-04-01 23:01:01 +02:00
@@ -1,7 +1,7 @@
 #======================================================================
 #
-# Trigger Tests 
-# (test case numbering refer to requirement document TP v1.1) 
+# Trigger Tests
+# (test case numbering refer to requirement document TP v1.1)
 #======================================================================
 
 
@@ -11,15 +11,15 @@
 #################################
 
 #Section 3.5.9.1
-#Test case: Ensure that every trigger executes its triggered action on each row 
+#Test case: Ensure that every trigger executes its triggered action on each row
 #           that meets the conditions stated in the trigger definition.
 #Section 3.5.9.2
-#Testcase: Ensure that a trigger never executes its triggered action on any row 
+#Testcase: Ensure that a trigger never executes its triggered action on any row
 #          that doesn't meet the conditions stated in the trigger definition.
 let $message= Testcase 3.5.9.1/2:;
 --source include/show_msg.inc
 
-	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;
 --disable_query_log
 	select count(*) as TotalRows from tb3;
@@ -29,22 +29,22 @@ let $message= Testcase 3.5.9.1/2:;
 --enable_query_log
 	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;
-	select count(*) as ExpectedNotChange from tb3 
+	select count(*) as ExpectedNotChange from tb3
 		where f130<100 and f142<>94087;
-	select count(*) as NonExpectedChanged from tb3 
+	select count(*) as NonExpectedChanged from tb3
 		where f130>=130 and f142=94087;
 
 #Cleanup
-	--disable_warnings 
+	--disable_warnings
 	drop trigger trg1;
 	--enable_warnings
 
 
 #Section 3.5.9.3
-#Test case: Ensure that a reference to OLD.<column name> always correctly refers 
-#           to the values of the specified column of the subject table before a 
+#Test case: Ensure that a reference to OLD.<column name> always correctly refers
+#           to the values of the specified column of the subject table before a
 #           data row is updated or deleted.
 let $message= Testcase 3.5.9.3:;
 --source include/show_msg.inc
@@ -71,47 +71,47 @@ let $message= Testcase 3.5.9.3:;
 
 
 --disable_query_log
-	set @tr_var_b4_118=0, @tr_var_b4_121=0, @tr_var_b4_122=0, 
+	set @tr_var_b4_118=0, @tr_var_b4_121=0, @tr_var_b4_122=0,
 		@tr_var_b4_136=0, @tr_var_b4_163=0;
-	set @tr_var_af_118=0, @tr_var_af_121=0, @tr_var_af_122=0, 
+	set @tr_var_af_118=0, @tr_var_af_121=0, @tr_var_af_122=0,
 		@tr_var_af_136=0, @tr_var_af_163=0;
-	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;
-	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;
 --enable_query_log
 
-	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' order by f136;
-	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;
-	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;
 
 --disable_query_log
-	set @tr_var_b4_118=0, @tr_var_b4_121=0, @tr_var_b4_122=0, 
+	set @tr_var_b4_118=0, @tr_var_b4_121=0, @tr_var_b4_122=0,
 		@tr_var_b4_136=0, @tr_var_b4_163=0;
-	set @tr_var_af_118=0, @tr_var_af_121=0, @tr_var_af_122=0, 
+	set @tr_var_af_118=0, @tr_var_af_121=0, @tr_var_af_122=0,
 		@tr_var_af_136=0, @tr_var_af_163=0;
-	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;
-	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;
 --enable_query_log
 
 	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' order by f136;
-	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;
 #FIXME 31561
-#	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;
 #Cleanup
-	--disable_warnings 
+	--disable_warnings
 	drop trigger trg2_a;
 	drop trigger trg2_b;
 	drop trigger trg2_c;
@@ -119,8 +119,8 @@ let $message= Testcase 3.5.9.3:;
 	--enable_warnings
 
 #Section 3.5.9.4
-#Test case: Ensure that a reference to NEW.<column name> always correctly refers 
-#           to the values of the specified column of the subject table after an 
+#Test case: Ensure that a reference to NEW.<column name> always correctly refers
+#           to the values of the specified column of the subject table after an
 #           existing data row has been updated or a new data row has been inserted.
 let $message= Testcase 3.5.9.4:;
 --source include/show_msg.inc
@@ -146,34 +146,34 @@ let $message= Testcase 3.5.9.4:;
 		    @tr_var_af_151=new.f151, @tr_var_af_163=new.f163;
 
 --disable_query_log
-	set @tr_var_b4_118=0, @tr_var_b4_121=0, @tr_var_b4_122=0, 
+	set @tr_var_b4_118=0, @tr_var_b4_121=0, @tr_var_b4_122=0,
 		@tr_var_b4_136=0, @tr_var_b4_151=0, @tr_var_b4_163=0;
-	set @tr_var_af_118=0, @tr_var_af_121=0, @tr_var_af_122=0, 
+	set @tr_var_af_118=0, @tr_var_af_121=0, @tr_var_af_122=0,
 		@tr_var_af_136=0, @tr_var_af_151=0, @tr_var_af_163=0;
-	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;
-	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;
 --enable_query_log
 
-	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 
+	select f118, f121, f122, f136, f151, f163 from tb3
 		where f122 like 'Test 3.5.9.4%' order by 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_151, @tr_var_b4_163;
-	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;
 
 --disable_query_log
-	set @tr_var_b4_118=0, @tr_var_b4_121=0, @tr_var_b4_122=0, 
+	set @tr_var_b4_118=0, @tr_var_b4_121=0, @tr_var_b4_122=0,
 		@tr_var_b4_136=0, @tr_var_b4_151=0, @tr_var_b4_163=0;
-	set @tr_var_af_118=0, @tr_var_af_121=0, @tr_var_af_122=0, 
+	set @tr_var_af_118=0, @tr_var_af_121=0, @tr_var_af_122=0,
 		@tr_var_af_136=0, @tr_var_af_151=0, @tr_var_af_163=0;
-	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;
-	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;
 --enable_query_log
 
@@ -184,14 +184,14 @@ let $message= Testcase 3.5.9.4:;
         Update tb3 Set f122='Test 3.5.9.4-trig', f136=0, f151=DEFAULT, f163=NULL
                  where f122='Test 3.5.9.4';
 
-	select f118, f121, f122, f136, f151, f163 from tb3 
+	select f118, f121, f122, f136, f151, f163 from tb3
 		where f122 like 'Test 3.5.9.4-trig' order by 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_151, @tr_var_b4_163;
-	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;
 #Cleanup
-	--disable_warnings 
+	--disable_warnings
 	drop trigger trg3_a;
 	drop trigger trg3_b;
 	drop trigger trg3_c;
@@ -201,121 +201,119 @@ let $message= Testcase 3.5.9.4:;
 
 
 #Section 3.5.9.5
-# Test case: Ensure that the definition of an INSERT trigger can include a 
+# Test case: Ensure that the definition of an INSERT trigger can include a
 #            reference to NEW. <Column name>.
 let $message= Testcase 3.5.9.5: (implied in previous tests);
 --source include/show_msg.inc
 	
 #Section 3.5.9.6
-# Test case: Ensure that the definition of an INSERT trigger cannot include 
+# Test case: Ensure that the definition of an INSERT trigger cannot include
 #            a reference to OLD. <Column name>.
 let $message= Testcase 3.5.9.6:;
 --source include/show_msg.inc
 	
-	--error 1363
+	--error ER_TRG_NO_SUCH_ROW_IN_TRG
 	create trigger trg4a before insert on tb3 for each row
 		set @temp1= old.f120;
-	--error 1362
+	--error ER_TRG_CANT_CHANGE_ROW
 	create trigger trg4b after insert on tb3 for each row
 		set old.f120= 'test';
 
 #Cleanup
-	--disable_warnings 
-	--error 0, 1360
+	--disable_warnings
+	--error 0, ER_TRG_DOES_NOT_EXIST
 	drop trigger trg4a;
-	--error 0, 1360
+	--error 0, ER_TRG_DOES_NOT_EXIST
 	drop trigger trg4b;
 	--enable_warnings
 
 
 #Section 3.5.9.7
-# Test case: Ensure that the definition of an UPDATE trigger can include a 
+# Test case: Ensure that the definition of an UPDATE trigger can include a
 #            reference to NEW. <Column name>.
 let $message= Testcase 3.5.9.7: (implied in previous tests);
 --source include/show_msg.inc
 	
 #Section 3.5.9.8
-# Test case: Ensure that the definition of an UPDATE trigger cannot include a 
+# Test case: Ensure that the definition of an UPDATE trigger cannot include a
 #            reference to OLD. <Column name>.
 let $message= Testcase 3.5.9.8: (implied in previous tests);
 --source include/show_msg.inc
 	
 #Section 3.5.9.9
-# Test case: Ensure that the definition of a DELETE trigger cannot include a 
+# Test case: Ensure that the definition of a DELETE trigger cannot include a
 #            reference to NEW.<column name>.
 let $message= Testcase 3.5.9.9:;
 --source include/show_msg.inc
 	
-	--error 1363
+	--error ER_TRG_NO_SUCH_ROW_IN_TRG
 	create trigger trg5a before DELETE on tb3 for each row
 		set @temp1=new.f122;
-	--error 1363
+	--error ER_TRG_NO_SUCH_ROW_IN_TRG
 	create trigger trg5b after DELETE on tb3 for each row
 		set new.f122='test';
-let $message= The above returns the wrong error, should be error 1362 (Bug 11648)
---source include/show_msg.inc
 
 #Cleanup
-	--disable_warnings 
-	--error 0, 1360
+	--disable_warnings
+	--error 0, ER_TRG_DOES_NOT_EXIST
 	drop trigger trg5a;
-	--error 0, 1360
+	--error 0, ER_TRG_DOES_NOT_EXIST
 	drop trigger trg5b;
 	--enable_warnings
 
 
 #Section 3.5.9.10
-# Test case: Ensure that the definition of a DELETE trigger can include a reference 
+# Test case: Ensure that the definition of a DELETE trigger can include a reference
 #            to OLD.<column name>.
 let $message= Testcase 3.5.9.10: (implied in previous tests);
 --source include/show_msg.inc
 	
 
 #Section 3.5.9.11
-# Testcase: Ensure that trigger definition that includes a referance to 
-#           NEW.<colunm name> fails with an appropriate error message, 
+# Testcase: Ensure that trigger definition that includes a referance to
+#           NEW.<colunm name> fails with an appropriate error message,
 #           at CREATE TRIGGER time, if the trigger event in not INSERT or UPDATE
 let $message= Testcase 3.5.9.11: covered by 3.5.9.9;
 --source include/show_msg.inc
 
 
 #Section 3.5.9.12
-# Testcase: Ensure that trigger definition that includes a referance to 
-#           OLD.<column name> fails with an appropriate error message, at 
+# Testcase: Ensure that trigger definition that includes a referance to
+#           OLD.<column name> fails with an appropriate error message, at
 #           CREATE TRIGGER time, if the trigger event is not DELETE or UPDATE
 let $message= Testcase 3.5.9.12: covered by 3.5.9.6;
 --source include/show_msg.inc
 
 
 #Section 3.5.9.13
-# Test case: Ensure that all references to OLD. <Column name> are read-only, 
+# Test case: Ensure that all references to OLD. <Column name> are read-only,
 #            that is, that they cannot be used to modify a data row.
 let $message= Testcase 3.5.9.13:;
 --source include/show_msg.inc
 	
-	--error 1362
+	--error ER_TRG_CANT_CHANGE_ROW
 	create trigger trg6a before UPDATE on tb3 for each row
 		set old.f118='C', new.f118='U';
-	--error 1362
+	--error ER_TRG_CANT_CHANGE_ROW
 	create trigger trg6b after INSERT on tb3 for each row
 		set old.f136=163, new.f118='U';
-	--error 1362
+	--error ER_TRG_CANT_CHANGE_ROW
 	create trigger trg6c after UPDATE on tb3 for each row
 		set old.f136=NULL;
 
 #Cleanup
-	--disable_warnings 
-	--error 0, 1360
+	--disable_warnings
+	--error 0, ER_TRG_DOES_NOT_EXIST
 	drop trigger trg6a;
-	--error 0, 1360
+	--error 0, ER_TRG_DOES_NOT_EXIST
 	drop trigger trg6b;
-	--error 0, 1360
+	--error 0, ER_TRG_DOES_NOT_EXIST
 	drop trigger trg6c;
 	--enable_warnings
 
 
 #Section 3.5.9.14
-# Test case: Ensure that all references to NEW. <Column name> may be used both to 
+# Test case: Ensure that all references to NEW. <Column name> may be used both to
 #            read a data row and to modify a data row
 let $message= Testcase 3.5.9.14: (implied in previous tests);
 --source include/show_msg.inc
Thread
bk commit into 6.0 tree (mleich:1.2615) BUG#35335mleich1 Apr