MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:mleich Date:April 1 2008 11:18am
Subject:bk commit into 5.1 tree (mleich:1.2584) BUG#35335
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 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 13:18:31+02:00, mleich@stripped +71 -0
  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
  
     Which contains
        ChangeSet@stripped, 2008-03-31
        Fix for Bug
          #35335 funcs_1: Some tests fail within load_file during
                          pushbuild runs
     ...

  mysql-test/Makefile.am@stripped, 2008-04-01 13:18:22+02:00, mleich@stripped +4 -0
    

  mysql-test/std_data/funcs_1/ndb_tb1.txt@stripped, 2008-04-01 11:40:00+02:00, mleich@stripped +0 -0
    Rename: mysql-test/suite/funcs_1/data/ndb_tb1.txt -> mysql-test/std_data/funcs_1/ndb_tb1.txt

  mysql-test/std_data/funcs_1/ndb_tb2.txt@stripped, 2008-04-01 11:40:00+02:00, mleich@stripped +0 -0
    Rename: mysql-test/suite/funcs_1/data/ndb_tb2.txt -> mysql-test/std_data/funcs_1/ndb_tb2.txt

  mysql-test/std_data/funcs_1/ndb_tb3.txt@stripped, 2008-04-01 11:40:00+02:00, mleich@stripped +0 -0
    Rename: mysql-test/suite/funcs_1/data/ndb_tb3.txt -> mysql-test/std_data/funcs_1/ndb_tb3.txt

  mysql-test/std_data/funcs_1/ndb_tb4.txt@stripped, 2008-04-01 11:40:00+02:00, mleich@stripped +0 -0
    Rename: mysql-test/suite/funcs_1/data/ndb_tb4.txt -> mysql-test/std_data/funcs_1/ndb_tb4.txt

  mysql-test/suite/funcs_1/datadict/datadict_load.inc@stripped, 2008-04-01 13:18:22+02:00, mleich@stripped +8 -8
    

  mysql-test/suite/funcs_1/datadict/processlist_val.inc@stripped, 2008-04-01 13:18:23+02:00, mleich@stripped +1 -1
    

  mysql-test/suite/funcs_1/include/ndb_tb1.inc@stripped, 2008-04-01 13:18:23+02:00, mleich@stripped +60 -59
    

  mysql-test/suite/funcs_1/include/ndb_tb2.inc@stripped, 2008-04-01 13:18:23+02:00, mleich@stripped +54 -52
    

  mysql-test/suite/funcs_1/include/ndb_tb3.inc@stripped, 2008-04-01 13:18:23+02:00, mleich@stripped +62 -60
    

  mysql-test/suite/funcs_1/include/ndb_tb4.inc@stripped, 2008-04-01 13:18:23+02:00, mleich@stripped +54 -52
    

  mysql-test/suite/funcs_1/r/innodb_func_view.result@stripped, 2008-04-01 13:18:23+02:00, mleich@stripped +4996 -5022
    

  mysql-test/suite/funcs_1/r/innodb_storedproc.result@stripped, 2008-04-01 13:18:24+02:00, mleich@stripped +18024 -18019
    

  mysql-test/suite/funcs_1/r/innodb_storedproc_02.result@stripped, 2008-04-01 13:18:24+02:00, mleich@stripped +4 -4
    

  mysql-test/suite/funcs_1/r/innodb_trig_03.result@stripped, 2008-04-01 13:18:24+02:00, mleich@stripped +62 -61
    

  mysql-test/suite/funcs_1/r/innodb_trig_03e.result@stripped, 2008-04-01 13:18:24+02:00, mleich@stripped +5 -5
    

  mysql-test/suite/funcs_1/r/innodb_trig_08.result@stripped, 2008-04-01 13:18:24+02:00, mleich@stripped +118 -117
    

  mysql-test/suite/funcs_1/r/innodb_trig_09.result@stripped, 2008-04-01 13:18:24+02:00, mleich@stripped +77 -75
    

  mysql-test/suite/funcs_1/r/memory_func_view.result@stripped, 2008-04-01 13:18:24+02:00, mleich@stripped +4996 -5022
    

  mysql-test/suite/funcs_1/r/memory_storedproc.result@stripped, 2008-04-01 13:18:25+02:00, mleich@stripped +17958 -17918
    

  mysql-test/suite/funcs_1/r/memory_storedproc_02.result@stripped, 2008-04-01 13:18:25+02:00, mleich@stripped +4 -4
    

  mysql-test/suite/funcs_1/r/memory_trig_03.result@stripped, 2008-04-01 13:18:25+02:00, mleich@stripped +56 -55
    

  mysql-test/suite/funcs_1/r/memory_trig_03e.result@stripped, 2008-04-01 13:18:25+02:00, mleich@stripped +4 -4
    

  mysql-test/suite/funcs_1/r/memory_trig_08.result@stripped, 2008-04-01 13:18:25+02:00, mleich@stripped +112 -111
    

  mysql-test/suite/funcs_1/r/memory_trig_09.result@stripped, 2008-04-01 13:18:25+02:00, mleich@stripped +71 -69
    

  mysql-test/suite/funcs_1/r/myisam_func_view.result@stripped, 2008-04-01 13:18:25+02:00, mleich@stripped +4996 -5022
    

  mysql-test/suite/funcs_1/r/myisam_storedproc.result@stripped, 2008-04-01 13:18:26+02:00, mleich@stripped +18024 -18019
    

  mysql-test/suite/funcs_1/r/myisam_storedproc_02.result@stripped, 2008-04-01 13:18:27+02:00, mleich@stripped +4 -4
    
    

  mysql-test/suite/funcs_1/r/myisam_trig_03.result@stripped, 2008-04-01 13:18:27+02:00, mleich@stripped +62 -61
    

  mysql-test/suite/funcs_1/r/myisam_trig_03e.result@stripped, 2008-04-01 13:18:27+02:00, mleich@stripped +4 -4
    

  mysql-test/suite/funcs_1/r/myisam_trig_08.result@stripped, 2008-04-01 13:18:27+02:00, mleich@stripped +118 -117
    

  mysql-test/suite/funcs_1/r/myisam_trig_09.result@stripped, 2008-04-01 13:18:27+02:00, mleich@stripped +77 -75
    

  mysql-test/suite/funcs_1/r/myisam_views.result@stripped, 2008-04-01 13:18:27+02:00, mleich@stripped +11372 -11374
    

  mysql-test/suite/funcs_1/r/ndb_func_view.result@stripped, 2008-04-01 13:18:28+02:00, mleich@stripped +4996 -5022
    

  mysql-test/suite/funcs_1/r/ndb_storedproc.result@stripped, 2008-04-01 13:18:29+02:00, mleich@stripped +17981 -17978
    

  mysql-test/suite/funcs_1/r/ndb_storedproc_02.result@stripped, 2008-04-01 13:18:29+02:00, mleich@stripped +35 -27
    

  mysql-test/suite/funcs_1/r/ndb_storedproc_03.result@stripped, 2008-04-01 13:18:29+02:00, mleich@stripped +28 -20
    

  mysql-test/suite/funcs_1/r/ndb_storedproc_06.result@stripped, 2008-04-01 13:18:29+02:00, mleich@stripped +28 -22
    

  mysql-test/suite/funcs_1/r/ndb_storedproc_07.result@stripped, 2008-04-01 13:18:29+02:00, mleich@stripped +28 -20
    

  mysql-test/suite/funcs_1/r/ndb_storedproc_08.result@stripped, 2008-04-01 13:18:29+02:00, mleich@stripped +28 -20
    

  mysql-test/suite/funcs_1/r/ndb_storedproc_10.result@stripped, 2008-04-01 13:18:29+02:00, mleich@stripped +29 -21
    

  mysql-test/suite/funcs_1/r/ndb_trig_0102.result@stripped, 2008-04-01 13:18:29+02:00, mleich@stripped +88 -87
    

  mysql-test/suite/funcs_1/r/ndb_trig_03.result@stripped, 2008-04-01 13:18:29+02:00, mleich@stripped +62 -61
    

  mysql-test/suite/funcs_1/r/ndb_trig_03e.result@stripped, 2008-04-01 13:18:29+02:00, mleich@stripped +5 -5
    

  mysql-test/suite/funcs_1/r/ndb_trig_0407.result@stripped, 2008-04-01 13:18:29+02:00, mleich@stripped +79 -78
    

  mysql-test/suite/funcs_1/r/ndb_trig_08.result@stripped, 2008-04-01 13:18:29+02:00, mleich@stripped +118 -117
    

  mysql-test/suite/funcs_1/r/ndb_trig_09.result@stripped, 2008-04-01 13:18:29+02:00, mleich@stripped +77 -75
    

  mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result@stripped, 2008-04-01 13:18:29+02:00, mleich@stripped +61 -60
    

  mysql-test/suite/funcs_1/r/ndb_views.result@stripped, 2008-04-01 13:18:29+02:00, mleich@stripped +104 -102
    

  mysql-test/suite/funcs_1/storedproc/storedproc_02.inc@stripped, 2008-04-01 13:18:29+02:00, mleich@stripped +4 -4
    

  mysql-test/suite/funcs_1/storedproc/storedproc_master.inc@stripped, 2008-04-01 13:18:29+02:00, mleich@stripped +42 -43
    

  mysql-test/suite/funcs_1/t/is_engines.test@stripped, 2008-04-01 13:18:29+02:00, mleich@stripped +1 -1
    

  mysql-test/suite/funcs_1/t/ndb_trig_03.test@stripped, 2008-04-01 13:18:29+02:00, mleich@stripped +1 -1
    

  mysql-test/suite/funcs_1/t/ndb_trig_08.test@stripped, 2008-04-01 13:18:29+02:00, mleich@stripped +1 -1
    

  mysql-test/suite/funcs_1/t/ndb_views.test@stripped, 2008-04-01 13:18:29+02:00, mleich@stripped +1 -1
    

  mysql-test/suite/funcs_1/t/suite.opt@stripped, 2008-04-01 13:18:29+02:00, mleich@stripped +1 -1
    

  mysql-test/suite/funcs_1/triggers/trig_frkey.inc@stripped, 2008-04-01 13:18:29+02:00, mleich@stripped +1 -1
    

  mysql-test/suite/funcs_1/triggers/triggers_0102.inc@stripped, 2008-04-01 13:18:29+02:00, mleich@stripped +3 -3
    

  mysql-test/suite/funcs_1/triggers/triggers_03.inc@stripped, 2008-04-01 13:18:29+02:00, mleich@stripped +4 -7
    

  mysql-test/suite/funcs_1/triggers/triggers_03e_columns.inc@stripped, 2008-04-01 13:18:29+02:00, mleich@stripped +11 -11
    

  mysql-test/suite/funcs_1/triggers/triggers_03e_db_level.inc@stripped, 2008-04-01 13:18:29+02:00, mleich@stripped +9 -9
    

  mysql-test/suite/funcs_1/triggers/triggers_03e_db_table_mix.inc@stripped, 2008-04-01 13:18:29+02:00, mleich@stripped +8 -8
    

  mysql-test/suite/funcs_1/triggers/triggers_03e_definer.inc@stripped, 2008-04-01 13:18:29+02:00, mleich@stripped +10 -8
    

  mysql-test/suite/funcs_1/triggers/triggers_03e_global_db_mix.inc@stripped, 2008-04-01 13:18:29+02:00, mleich@stripped +8 -8
    

  mysql-test/suite/funcs_1/triggers/triggers_03e_prepare.inc@stripped, 2008-04-01 13:18:29+02:00, mleich@stripped +6 -6
    

  mysql-test/suite/funcs_1/triggers/triggers_03e_table_level.inc@stripped, 2008-04-01 13:18:29+02:00, mleich@stripped +9 -9
    

  mysql-test/suite/funcs_1/triggers/triggers_03e_transaction.inc@stripped, 2008-04-01 13:18:29+02:00, mleich@stripped +3 -3
    

  mysql-test/suite/funcs_1/triggers/triggers_0407.inc@stripped, 2008-04-01 13:18:30+02:00, mleich@stripped +104 -104
    

  mysql-test/suite/funcs_1/triggers/triggers_08.inc@stripped, 2008-04-01 13:18:30+02:00, mleich@stripped +95 -95
    

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

  mysql-test/suite/funcs_1/views/func_view.inc@stripped, 2008-04-01 13:18:30+02:00, mleich@stripped +68 -64
    

diff -Nrup a/mysql-test/Makefile.am b/mysql-test/Makefile.am
--- a/mysql-test/Makefile.am	2008-03-31 23:35:37 +02:00
+++ b/mysql-test/Makefile.am	2008-04-01 13:18:22 +02:00
@@ -46,6 +46,7 @@ dist-hook:
 		$(distdir)/std_data/ndb_backup51_data_le \
 		$(distdir)/std_data/parts \
 		$(distdir)/lib \
+                $(distdir)/funcs_1 \
 		$(distdir)/lib/My
 	-$(INSTALL_DATA) $(srcdir)/t/*.def $(distdir)/t
 	$(INSTALL_DATA) $(srcdir)/t/*.test $(distdir)/t
@@ -75,6 +76,7 @@ dist-hook:
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_be/BACKUP* $(distdir)/std_data/ndb_backup51_data_be
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_le/BACKUP* $(distdir)/std_data/ndb_backup51_data_le
 	$(INSTALL_DATA) $(srcdir)/std_data/parts/part_* $(distdir)/std_data/parts
+	$(INSTALL_DATA) $(srcdir)/std_data/funcs_1/* $(distdir)/std_data/funcs_1
 	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(distdir)/lib
 	$(INSTALL_DATA) $(srcdir)/lib/My/*.pm $(distdir)/lib/My
 	-rm -rf `find $(distdir)/suite -type d -name SCCS` $(distdir)/suite/row_lock
@@ -93,6 +95,7 @@ install-data-local:
 		$(DESTDIR)$(testdir)/std_data/ndb_backup51_data_le \
 		$(DESTDIR)$(testdir)/std_data/parts \
 		$(DESTDIR)$(testdir)/lib \
+		$(DESTDIR)$(testdir)/funcs_1 \
 		$(DESTDIR)$(testdir)/lib/My
 	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir)
 	-$(INSTALL_DATA) $(srcdir)/t/*.def $(DESTDIR)$(testdir)/t
@@ -127,6 +130,7 @@ install-data-local:
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_be/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup51_data_be
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_le/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup51_data_le
 	$(INSTALL_DATA) $(srcdir)/std_data/parts/part_* $(DESTDIR)$(testdir)/std_data/parts
+	$(INSTALL_DATA) $(srcdir)/std_data/funcs_1/* $(distdir)/std_data/funcs_1
 	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(DESTDIR)$(testdir)/lib
 	$(INSTALL_DATA) $(srcdir)/lib/My/*.pm $(DESTDIR)$(testdir)/lib/My
 	for f in `(cd $(srcdir); find suite -type f | egrep -v 'SCCS|row_lock')`; \
diff -Nrup a/mysql-test/std_data/funcs_1/ndb_tb1.txt b/mysql-test/std_data/funcs_1/ndb_tb1.txt
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/std_data/funcs_1/ndb_tb1.txt	2008-04-01 11:40:00 +02:00
@@ -0,0 +1,10 @@
+			a`0	a`0	0`	0`	a`0	a`0	0`	0`	!	6	163	103	238	3058	30243	22056	9444	-5	1	1	1	-5	1	1	1	-5	1	1	1	-5	1	1	1	-5	-5	1	1	1	1	1	1	-5	0.0	1	0.0	1	0.0	1	0.0	-5	1	1	1	-5	-5
+			aa0	aa0	1aa	1aa	aa0	aa0	1aa	1aa	@	9	207	1	246	13214	57220	1505	58996	-4	2	2	2	-4	2	2	2	-4	2	2	2	-4	2	2	2	-4	-4	2	2	2	2	2	2	-4	1.1	2	1.1	2	1.1	2	1.1	-4	2	2	2	-4	-4
+			ab0	ab0	2baa	2baa	ab0	ab0	2baa	2baa	#	3	50	103	193	10965	3038	31585	20149	-3	3	3	3	-3	3	3	3	-3	3	3	3	-3	3	3	3	-3	-3	3	3	3	3	3	3	-3	2.2	3	2.2	3	2.2	3	2.2	-3	3	3	3	-3	-3
+			ac0	ac0	3caaa	3caaa	ac0	ac0	3caaa	3caaa	$	62	188	47	176	5103	58378	13178	38317	-2	4	4	4	-2	4	4	4	-2	4	4	4	-2	4	4	4	-2	-2	4	4	4	4	4	4	-2	3.3	4	3.3	4	3.3	4	3.3	-2	4	4	4	-2	-2
+			ad0	ad0	4daaaa	4daaaa	ad0	ad0	4daaaa	4daaaa	%	59	15	21	80	17942	48443	12646	53903	-1	5	5	5	-1	5	5	5	-1	5	5	5	-1	5	5	5	-1	-1	5	5	5	5	5	5	-1	4.4	5	4.4	5	4.4	5	4.4	-1	5	5	5	-1	-1
+			ae0	ae0	5eaaaaa	5eaaaaa	ae0	ae0	5eaaaaa	5eaaaaa	^	86	223	103	88	3880	31147	5801	28348	0	6	6	6	0	6	6	6	0	6	6	6	0	6	6	6	0	0	6	6	6	6	6	6	0	5.5	6	5.5	6	5.5	6	5.5	0	6	6	6	0	0
+			af0	af0	6faaaaaa	6faaaaaa	af0	af0	6faaaaaa	6faaaaaa	&	124	125	77	208	2591	29533	18803	21557	1	7	7	7	1	7	7	7	1	7	7	7	1	7	7	7	1	1	7	7	7	7	7	7	1	6.6	7	6.6	7	6.6	7	6.6	1	7	7	7	1	1
+			ag0	ag0	7gaaaaaaa	7gaaaaaaa	ag0	ag0	7gaaaaaaa	7gaaaaaaa	*	123	103	80	92	10179	60769	25778	58195	2	8	8	8	2	8	8	8	2	8	8	8	2	8	8	8	2	2	8	8	8	8	8	8	2	7.7	8	7.7	8	7.7	8	7.7	2	8	8	8	2	2
+			a^0	a^0	8^aaaaaaaa	8^aaaaaaaa	a^0	a^0	8^aaaaaaaa	8^aaaaaaaa	(	111	166	81	66	5159	2177	6774	38396	3	9	9	9	3	9	9	9	3	9	9	9	3	9	9	9	3	3	9	9	9	9	9	9	3	8.8	9	8.8	9	8.8	9	8.8	3	9	9	9	3	3
+			a_0	a_0	9_aaaaaaaaa	9_aaaaaaaaa	a_0	a_0	9_aaaaaaaaa	9_aaaaaaaaa	)	37	174	97	34	9183	16470	13064	6297	4	10	10	10	4	10	10	10	4	10	10	10	4	10	10	10	4	4	10	10	10	10	10	10	4	9.9	10	9.9	10	9.9	10	9.9	4	10	10	10	4	4
diff -Nrup a/mysql-test/std_data/funcs_1/ndb_tb2.txt b/mysql-test/std_data/funcs_1/ndb_tb2.txt
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/std_data/funcs_1/ndb_tb2.txt	2008-04-01 11:40:00 +02:00
@@ -0,0 +1,10 @@
+1	1	1	1	1	1	-5	0.0	1	0.0	1	0.0	1	0.0	-1.17549435e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	-1.17549435e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	-1.17549435e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	-1.17549435e-38	-1.17549435e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	-1.17549435e-38	-1.17549435e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	19700102000001	1902	1902	1902	2	2
+2	2	2	2	2	2	-4	1.1	2	1.1	2	1.1	2	1.1	-1.175494349e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	-1.175494349e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	-1.175494349e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	-1.175494349e-38	-1.175494349e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	-1.175494349e-38	-1.175494349e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	19700103000002	1903	1903	1903	1	3
+3	3	3	3	3	3	-3	2.2	3	2.2	3	2.2	3	2.2	-1.175494348e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	-1.175494348e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	-1.175494348e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	-1.175494348e-38	-1.175494348e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	-1.175494348e-38	-1.175494348e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	1000-01-03	838:59:56	1970-01-04 00:00:03	19700104000003	1904	1904	1904	2	1
+4	4	4	4	4	4	-2	3.3	4	3.3	4	3.3	4	3.3	-1.175494347e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	-1.175494347e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	-1.175494347e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	-1.175494347e-38	-1.175494347e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	-1.175494347e-38	-1.175494347e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	1000-01-04	838:59:55	1970-01-05 00:00:04	19700105000004	1905	1905	1905	1	2
+5	5	5	5	5	5	-1	4.4	5	4.4	5	4.4	5	4.4	-1.175494346e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	-1.175494346e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	-1.175494346e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	-1.175494346e-38	-1.175494346e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	-1.175494346e-38	-1.175494346e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	1000-01-05	838:59:54	1970-01-06 00:00:05	19700106000005	1906	1906	1906	2	3
+6	6	6	6	6	6	0	5.5	6	5.5	6	5.5	6	5.5	-1.175494345e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	-1.175494345e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	-1.175494345e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	-1.175494345e-38	-1.175494345e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	-1.175494345e-38	-1.175494345e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	1000-01-06	838:59:53	1970-01-07 00:00:06	19700107000006	1907	1907	1907	1	1
+7	7	7	7	7	7	1	6.6	7	6.6	7	6.6	7	6.6	-1.175494344e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	-1.175494344e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	-1.175494344e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	-1.175494344e-38	-1.175494344e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	-1.175494344e-38	-1.175494344e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	1000-01-07	838:59:52	1970-01-08 00:00:07	19700108000007	1908	1908	1908	2	2
+8	8	8	8	8	8	2	7.7	8	7.7	8	7.7	8	7.7	-1.175494343e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	-1.175494343e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	-1.175494343e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	-1.175494343e-38	-1.175494343e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	-1.175494343e-38	-1.175494343e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	1000-01-08	838:59:51	1970-01-09 00:00:08	19700109000008	1909	1909	1909	1	3
+9	9	9	9	9	9	3	8.8	9	8.8	9	8.8	9	8.8	-1.175494342e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	-1.175494342e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	-1.175494342e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	-1.175494342e-38	-1.175494342e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	-1.175494342e-38	-1.175494342e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	1000-01-09	838:59:50	1970-01-10 00:00:09	19700110000009	1910	1910	1910	2	1
+10	10	10	10	10	10	4	9.9	10	9.9	10	9.9	10	9.9	-1.175494341e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	-1.175494341e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	-1.175494341e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	-1.175494341e-38	-1.175494341e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	-1.175494341e-38	-1.175494341e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	1000-01-10	838:59:49	1970-01-11 00:00:10	19700111000010	1911	1911	1911	1	2
diff -Nrup a/mysql-test/std_data/funcs_1/ndb_tb3.txt b/mysql-test/std_data/funcs_1/ndb_tb3.txt
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/std_data/funcs_1/ndb_tb3.txt	2008-04-01 11:40:00 +02:00
@@ -0,0 +1,10 @@
+!	!	!	a`0	a`0	0`	0`	a`0	a`0	0`	0`	!	37	102	115	214	22348	22112	23636	18043	-5	1	1	1	-5	1	1	1	-5	1	1	1	-5	1	1	1	-5	-5	1	1	1	1	1	1	-5	0.0	1	0.0	1	0.0	1	0.0	-5	1	1	1	-5	-5
+@	@	@	aa0	aa0	1aa	1aa	aa0	aa0	1aa	1aa	@	30	114	62	146	22059	6000	19024	8674	-4	2	2	2	-4	2	2	2	-4	2	2	2	-4	2	2	2	-4	-4	2	2	2	2	2	2	-4	1.1	2	1.1	2	1.1	2	1.1	-4	2	2	2	-4	-4
+#	#	#	ab0	ab0	2baa	2baa	ab0	ab0	2baa	2baa	#	113	254	52	51	27963	63797	516	63989	-3	3	3	3	-3	3	3	3	-3	3	3	3	-3	3	3	3	-3	-3	3	3	3	3	3	3	-3	2.2	3	2.2	3	2.2	3	2.2	-3	3	3	3	-3	-3
+$	$	$	ac0	ac0	3caaa	3caaa	ac0	ac0	3caaa	3caaa	$	70	78	40	203	28716	18828	14939	30960	-2	4	4	4	-2	4	4	4	-2	4	4	4	-2	4	4	4	-2	-2	4	4	4	4	4	4	-2	3.3	4	3.3	4	3.3	4	3.3	-2	4	4	4	-2	-2
+%	%	%	ad0	ad0	4daaaa	4daaaa	ad0	ad0	4daaaa	4daaaa	%	1	228	76	249	16746	12853	8405	35402	-1	5	5	5	-1	5	5	5	-1	5	5	5	-1	5	5	5	-1	-1	5	5	5	5	5	5	-1	4.4	5	4.4	5	4.4	5	4.4	-1	5	5	5	-1	-1
+^	^	^	ae0	ae0	5eaaaaa	5eaaaaa	ae0	ae0	5eaaaaa	5eaaaaa	^	116	52	51	248	26877	15243	20063	65464	0	6	6	6	0	6	6	6	0	6	6	6	0	6	6	6	0	0	6	6	6	6	6	6	0	5.5	6	5.5	6	5.5	6	5.5	0	6	6	6	0	0
+&	&	&	af0	af0	6faaaaaa	6faaaaaa	af0	af0	6faaaaaa	6faaaaaa	&	59	163	63	26	24559	55618	27326	12704	1	7	7	7	1	7	7	7	1	7	7	7	1	7	7	7	1	1	7	7	7	7	7	7	1	6.6	7	6.6	7	6.6	7	6.6	1	7	7	7	1	1
+*	*	*	ag0	ag0	7gaaaaaaa	7gaaaaaaa	ag0	ag0	7gaaaaaaa	7gaaaaaaa	*	69	229	119	159	11779	48557	14747	42703	2	8	8	8	2	8	8	8	2	8	8	8	2	8	8	8	2	2	8	8	8	8	8	8	2	7.7	8	7.7	8	7.7	8	7.7	2	8	8	8	2	2
+(	(	(	a^0	a^0	8^aaaaaaaa	8^aaaaaaaa	a^0	a^0	8^aaaaaaaa	8^aaaaaaaa	(	54	89	113	155	1068	61537	14823	43439	3	9	9	9	3	9	9	9	3	9	9	9	3	9	9	9	3	3	9	9	9	9	9	9	3	8.8	9	8.8	9	8.8	9	8.8	3	9	9	9	3	3
+)	)	)	a_0	a_0	9_aaaaaaaaa	9_aaaaaaaaa	a_0	a_0	9_aaaaaaaaa	9_aaaaaaaaa	)	68	34	44	175	32453	44381	506	37695	4	10	10	10	4	10	10	10	4	10	10	10	4	10	10	10	4	4	10	10	10	10	10	10	4	9.9	10	9.9	10	9.9	10	9.9	4	10	10	10	4	4
diff -Nrup a/mysql-test/std_data/funcs_1/ndb_tb4.txt b/mysql-test/std_data/funcs_1/ndb_tb4.txt
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/std_data/funcs_1/ndb_tb4.txt	2008-04-01 11:40:00 +02:00
@@ -0,0 +1,10 @@
+1	1	1	1	1	1	-5	0.0	1	0.0	1	0.0	1	0.0	-1.17549435e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	-1.17549435e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	-1.17549435e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	-1.17549435e-38	-1.17549435e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	-1.17549435e-38	-1.17549435e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	19700102000001	1902	1902	1902	2	2		0!	0		0	0	0!
+2	2	2	2	2	2	-4	1.1	2	1.1	2	1.1	2	1.1	-1.175494349e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	-1.175494349e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	-1.175494349e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	-1.175494349e-38	-1.175494349e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	-1.175494349e-38	-1.175494349e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	19700103000002	1903	1903	1903	1	3		1@#	1@		1@	1@	1@#
+3	3	3	3	3	3	-3	2.2	3	2.2	3	2.2	3	2.2	-1.175494348e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	-1.175494348e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	-1.175494348e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	-1.175494348e-38	-1.175494348e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	-1.175494348e-38	-1.175494348e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	1000-01-03	838:59:56	1970-01-04 00:00:03	19700104000003	1904	1904	1904	2	1		2#$%	2#$		2#$	2#$	2#$%
+4	4	4	4	4	4	-2	3.3	4	3.3	4	3.3	4	3.3	-1.175494347e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	-1.175494347e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	-1.175494347e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	-1.175494347e-38	-1.175494347e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	-1.175494347e-38	-1.175494347e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	1000-01-04	838:59:55	1970-01-05 00:00:04	19700105000004	1905	1905	1905	1	2		3$%^&	3$%^		3$%^	3$%^	3$%^&
+5	5	5	5	5	5	-1	4.4	5	4.4	5	4.4	5	4.4	-1.175494346e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	-1.175494346e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	-1.175494346e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	-1.175494346e-38	-1.175494346e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	-1.175494346e-38	-1.175494346e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	1000-01-05	838:59:54	1970-01-06 00:00:05	19700106000005	1906	1906	1906	2	3		4%^&*(	4%^&*		4%^&*	4%^&*	4%^&*(
+6	6	6	6	6	6	0	5.5	6	5.5	6	5.5	6	5.5	-1.175494345e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	-1.175494345e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	-1.175494345e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	-1.175494345e-38	-1.175494345e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	-1.175494345e-38	-1.175494345e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	1000-01-06	838:59:53	1970-01-07 00:00:06	19700107000006	1907	1907	1907	1	1		5^&*()_	5^&*()		5^&*()	5^&*()	5^&*()_
+7	7	7	7	7	7	1	6.6	7	6.6	7	6.6	7	6.6	-1.175494344e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	-1.175494344e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	-1.175494344e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	-1.175494344e-38	-1.175494344e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	-1.175494344e-38	-1.175494344e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	1000-01-07	838:59:52	1970-01-08 00:00:07	19700108000007	1908	1908	1908	2	2		6&*()_+=	6&*()_+		6&*()_+	6&*()_+	6&*()_+=
+8	8	8	8	8	8	2	7.7	8	7.7	8	7.7	8	7.7	-1.175494343e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	-1.175494343e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	-1.175494343e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	-1.175494343e-38	-1.175494343e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	-1.175494343e-38	-1.175494343e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	1000-01-08	838:59:51	1970-01-09 00:00:08	19700109000008	1909	1909	1909	1	3		7*()_+=-|	7*()_+=-		7*()_+=-	7*()_+=-	7*()_+=-|
+9	9	9	9	9	9	3	8.8	9	8.8	9	8.8	9	8.8	-1.175494342e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	-1.175494342e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	-1.175494342e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	-1.175494342e-38	-1.175494342e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	-1.175494342e-38	-1.175494342e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	1000-01-09	838:59:50	1970-01-10 00:00:09	19700110000009	1910	1910	1910	2	1		8()_+=-|{}	8()_+=-|{		8()_+=-|{	8()_+=-|{	8()_+=-|{}
+10	10	10	10	10	10	4	9.9	10	9.9	10	9.9	10	9.9	-1.175494341e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	-1.175494341e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	-1.175494341e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	-1.175494341e-38	-1.175494341e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	-1.175494341e-38	-1.175494341e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	1000-01-10	838:59:49	1970-01-11 00:00:10	19700111000010	1911	1911	1911	1	2		9)_+=-|{}[]	9)_+=-|{}[		9)_+=-|{}[	9)_+=-|{}[	9)_+=-|{}[]
diff -Nrup a/mysql-test/suite/funcs_1/data/ndb_tb1.txt b/mysql-test/suite/funcs_1/data/ndb_tb1.txt
--- a/mysql-test/suite/funcs_1/data/ndb_tb1.txt	2007-02-06 13:19:28 +01:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1,10 +0,0 @@
-			a`0	a`0	0`	0`	a`0	a`0	0`	0`	!	6	163	103	238	3058	30243	22056	9444	-5	1	1	1	-5	1	1	1	-5	1	1	1	-5	1	1	1	-5	-5	1	1	1	1	1	1	-5	0.0	1	0.0	1	0.0	1	0.0	-5	1	1	1	-5	-5
-			aa0	aa0	1aa	1aa	aa0	aa0	1aa	1aa	@	9	207	1	246	13214	57220	1505	58996	-4	2	2	2	-4	2	2	2	-4	2	2	2	-4	2	2	2	-4	-4	2	2	2	2	2	2	-4	1.1	2	1.1	2	1.1	2	1.1	-4	2	2	2	-4	-4
-			ab0	ab0	2baa	2baa	ab0	ab0	2baa	2baa	#	3	50	103	193	10965	3038	31585	20149	-3	3	3	3	-3	3	3	3	-3	3	3	3	-3	3	3	3	-3	-3	3	3	3	3	3	3	-3	2.2	3	2.2	3	2.2	3	2.2	-3	3	3	3	-3	-3
-			ac0	ac0	3caaa	3caaa	ac0	ac0	3caaa	3caaa	$	62	188	47	176	5103	58378	13178	38317	-2	4	4	4	-2	4	4	4	-2	4	4	4	-2	4	4	4	-2	-2	4	4	4	4	4	4	-2	3.3	4	3.3	4	3.3	4	3.3	-2	4	4	4	-2	-2
-			ad0	ad0	4daaaa	4daaaa	ad0	ad0	4daaaa	4daaaa	%	59	15	21	80	17942	48443	12646	53903	-1	5	5	5	-1	5	5	5	-1	5	5	5	-1	5	5	5	-1	-1	5	5	5	5	5	5	-1	4.4	5	4.4	5	4.4	5	4.4	-1	5	5	5	-1	-1
-			ae0	ae0	5eaaaaa	5eaaaaa	ae0	ae0	5eaaaaa	5eaaaaa	^	86	223	103	88	3880	31147	5801	28348	0	6	6	6	0	6	6	6	0	6	6	6	0	6	6	6	0	0	6	6	6	6	6	6	0	5.5	6	5.5	6	5.5	6	5.5	0	6	6	6	0	0
-			af0	af0	6faaaaaa	6faaaaaa	af0	af0	6faaaaaa	6faaaaaa	&	124	125	77	208	2591	29533	18803	21557	1	7	7	7	1	7	7	7	1	7	7	7	1	7	7	7	1	1	7	7	7	7	7	7	1	6.6	7	6.6	7	6.6	7	6.6	1	7	7	7	1	1
-			ag0	ag0	7gaaaaaaa	7gaaaaaaa	ag0	ag0	7gaaaaaaa	7gaaaaaaa	*	123	103	80	92	10179	60769	25778	58195	2	8	8	8	2	8	8	8	2	8	8	8	2	8	8	8	2	2	8	8	8	8	8	8	2	7.7	8	7.7	8	7.7	8	7.7	2	8	8	8	2	2
-			a^0	a^0	8^aaaaaaaa	8^aaaaaaaa	a^0	a^0	8^aaaaaaaa	8^aaaaaaaa	(	111	166	81	66	5159	2177	6774	38396	3	9	9	9	3	9	9	9	3	9	9	9	3	9	9	9	3	3	9	9	9	9	9	9	3	8.8	9	8.8	9	8.8	9	8.8	3	9	9	9	3	3
-			a_0	a_0	9_aaaaaaaaa	9_aaaaaaaaa	a_0	a_0	9_aaaaaaaaa	9_aaaaaaaaa	)	37	174	97	34	9183	16470	13064	6297	4	10	10	10	4	10	10	10	4	10	10	10	4	10	10	10	4	4	10	10	10	10	10	10	4	9.9	10	9.9	10	9.9	10	9.9	4	10	10	10	4	4
diff -Nrup a/mysql-test/suite/funcs_1/data/ndb_tb2.txt b/mysql-test/suite/funcs_1/data/ndb_tb2.txt
--- a/mysql-test/suite/funcs_1/data/ndb_tb2.txt	2007-02-06 13:19:28 +01:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1,10 +0,0 @@
-1	1	1	1	1	1	-5	0.0	1	0.0	1	0.0	1	0.0	-1.17549435e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	-1.17549435e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	-1.17549435e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	-1.17549435e-38	-1.17549435e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	-1.17549435e-38	-1.17549435e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	19700102000001	1902	1902	1902	2	2
-2	2	2	2	2	2	-4	1.1	2	1.1	2	1.1	2	1.1	-1.175494349e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	-1.175494349e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	-1.175494349e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	-1.175494349e-38	-1.175494349e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	-1.175494349e-38	-1.175494349e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	19700103000002	1903	1903	1903	1	3
-3	3	3	3	3	3	-3	2.2	3	2.2	3	2.2	3	2.2	-1.175494348e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	-1.175494348e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	-1.175494348e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	-1.175494348e-38	-1.175494348e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	-1.175494348e-38	-1.175494348e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	1000-01-03	838:59:56	1970-01-04 00:00:03	19700104000003	1904	1904	1904	2	1
-4	4	4	4	4	4	-2	3.3	4	3.3	4	3.3	4	3.3	-1.175494347e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	-1.175494347e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	-1.175494347e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	-1.175494347e-38	-1.175494347e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	-1.175494347e-38	-1.175494347e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	1000-01-04	838:59:55	1970-01-05 00:00:04	19700105000004	1905	1905	1905	1	2
-5	5	5	5	5	5	-1	4.4	5	4.4	5	4.4	5	4.4	-1.175494346e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	-1.175494346e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	-1.175494346e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	-1.175494346e-38	-1.175494346e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	-1.175494346e-38	-1.175494346e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	1000-01-05	838:59:54	1970-01-06 00:00:05	19700106000005	1906	1906	1906	2	3
-6	6	6	6	6	6	0	5.5	6	5.5	6	5.5	6	5.5	-1.175494345e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	-1.175494345e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	-1.175494345e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	-1.175494345e-38	-1.175494345e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	-1.175494345e-38	-1.175494345e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	1000-01-06	838:59:53	1970-01-07 00:00:06	19700107000006	1907	1907	1907	1	1
-7	7	7	7	7	7	1	6.6	7	6.6	7	6.6	7	6.6	-1.175494344e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	-1.175494344e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	-1.175494344e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	-1.175494344e-38	-1.175494344e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	-1.175494344e-38	-1.175494344e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	1000-01-07	838:59:52	1970-01-08 00:00:07	19700108000007	1908	1908	1908	2	2
-8	8	8	8	8	8	2	7.7	8	7.7	8	7.7	8	7.7	-1.175494343e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	-1.175494343e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	-1.175494343e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	-1.175494343e-38	-1.175494343e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	-1.175494343e-38	-1.175494343e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	1000-01-08	838:59:51	1970-01-09 00:00:08	19700109000008	1909	1909	1909	1	3
-9	9	9	9	9	9	3	8.8	9	8.8	9	8.8	9	8.8	-1.175494342e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	-1.175494342e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	-1.175494342e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	-1.175494342e-38	-1.175494342e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	-1.175494342e-38	-1.175494342e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	1000-01-09	838:59:50	1970-01-10 00:00:09	19700110000009	1910	1910	1910	2	1
-10	10	10	10	10	10	4	9.9	10	9.9	10	9.9	10	9.9	-1.175494341e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	-1.175494341e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	-1.175494341e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	-1.175494341e-38	-1.175494341e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	-1.175494341e-38	-1.175494341e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	1000-01-10	838:59:49	1970-01-11 00:00:10	19700111000010	1911	1911	1911	1	2
diff -Nrup a/mysql-test/suite/funcs_1/data/ndb_tb3.txt b/mysql-test/suite/funcs_1/data/ndb_tb3.txt
--- a/mysql-test/suite/funcs_1/data/ndb_tb3.txt	2007-02-06 13:19:28 +01:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1,10 +0,0 @@
-!	!	!	a`0	a`0	0`	0`	a`0	a`0	0`	0`	!	37	102	115	214	22348	22112	23636	18043	-5	1	1	1	-5	1	1	1	-5	1	1	1	-5	1	1	1	-5	-5	1	1	1	1	1	1	-5	0.0	1	0.0	1	0.0	1	0.0	-5	1	1	1	-5	-5
-@	@	@	aa0	aa0	1aa	1aa	aa0	aa0	1aa	1aa	@	30	114	62	146	22059	6000	19024	8674	-4	2	2	2	-4	2	2	2	-4	2	2	2	-4	2	2	2	-4	-4	2	2	2	2	2	2	-4	1.1	2	1.1	2	1.1	2	1.1	-4	2	2	2	-4	-4
-#	#	#	ab0	ab0	2baa	2baa	ab0	ab0	2baa	2baa	#	113	254	52	51	27963	63797	516	63989	-3	3	3	3	-3	3	3	3	-3	3	3	3	-3	3	3	3	-3	-3	3	3	3	3	3	3	-3	2.2	3	2.2	3	2.2	3	2.2	-3	3	3	3	-3	-3
-$	$	$	ac0	ac0	3caaa	3caaa	ac0	ac0	3caaa	3caaa	$	70	78	40	203	28716	18828	14939	30960	-2	4	4	4	-2	4	4	4	-2	4	4	4	-2	4	4	4	-2	-2	4	4	4	4	4	4	-2	3.3	4	3.3	4	3.3	4	3.3	-2	4	4	4	-2	-2
-%	%	%	ad0	ad0	4daaaa	4daaaa	ad0	ad0	4daaaa	4daaaa	%	1	228	76	249	16746	12853	8405	35402	-1	5	5	5	-1	5	5	5	-1	5	5	5	-1	5	5	5	-1	-1	5	5	5	5	5	5	-1	4.4	5	4.4	5	4.4	5	4.4	-1	5	5	5	-1	-1
-^	^	^	ae0	ae0	5eaaaaa	5eaaaaa	ae0	ae0	5eaaaaa	5eaaaaa	^	116	52	51	248	26877	15243	20063	65464	0	6	6	6	0	6	6	6	0	6	6	6	0	6	6	6	0	0	6	6	6	6	6	6	0	5.5	6	5.5	6	5.5	6	5.5	0	6	6	6	0	0
-&	&	&	af0	af0	6faaaaaa	6faaaaaa	af0	af0	6faaaaaa	6faaaaaa	&	59	163	63	26	24559	55618	27326	12704	1	7	7	7	1	7	7	7	1	7	7	7	1	7	7	7	1	1	7	7	7	7	7	7	1	6.6	7	6.6	7	6.6	7	6.6	1	7	7	7	1	1
-*	*	*	ag0	ag0	7gaaaaaaa	7gaaaaaaa	ag0	ag0	7gaaaaaaa	7gaaaaaaa	*	69	229	119	159	11779	48557	14747	42703	2	8	8	8	2	8	8	8	2	8	8	8	2	8	8	8	2	2	8	8	8	8	8	8	2	7.7	8	7.7	8	7.7	8	7.7	2	8	8	8	2	2
-(	(	(	a^0	a^0	8^aaaaaaaa	8^aaaaaaaa	a^0	a^0	8^aaaaaaaa	8^aaaaaaaa	(	54	89	113	155	1068	61537	14823	43439	3	9	9	9	3	9	9	9	3	9	9	9	3	9	9	9	3	3	9	9	9	9	9	9	3	8.8	9	8.8	9	8.8	9	8.8	3	9	9	9	3	3
-)	)	)	a_0	a_0	9_aaaaaaaaa	9_aaaaaaaaa	a_0	a_0	9_aaaaaaaaa	9_aaaaaaaaa	)	68	34	44	175	32453	44381	506	37695	4	10	10	10	4	10	10	10	4	10	10	10	4	10	10	10	4	4	10	10	10	10	10	10	4	9.9	10	9.9	10	9.9	10	9.9	4	10	10	10	4	4
diff -Nrup a/mysql-test/suite/funcs_1/data/ndb_tb4.txt b/mysql-test/suite/funcs_1/data/ndb_tb4.txt
--- a/mysql-test/suite/funcs_1/data/ndb_tb4.txt	2007-02-06 13:19:28 +01:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1,10 +0,0 @@
-1	1	1	1	1	1	-5	0.0	1	0.0	1	0.0	1	0.0	-1.17549435e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	-1.17549435e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	-1.17549435e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	-1.17549435e-38	-1.17549435e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	-1.17549435e-38	-1.17549435e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	1.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	19700102000001	1902	1902	1902	2	2		0!	0		0	0	0!
-2	2	2	2	2	2	-4	1.1	2	1.1	2	1.1	2	1.1	-1.175494349e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	-1.175494349e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	-1.175494349e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	-1.175494349e-38	-1.175494349e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	-1.175494349e-38	-1.175494349e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	1.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	19700103000002	1903	1903	1903	1	3		1@#	1@		1@	1@	1@#
-3	3	3	3	3	3	-3	2.2	3	2.2	3	2.2	3	2.2	-1.175494348e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	-1.175494348e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	-1.175494348e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	-1.175494348e-38	-1.175494348e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	-1.175494348e-38	-1.175494348e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	1.175494354e-38	1000-01-03	838:59:56	1970-01-04 00:00:03	19700104000003	1904	1904	1904	2	1		2#$%	2#$		2#$	2#$	2#$%
-4	4	4	4	4	4	-2	3.3	4	3.3	4	3.3	4	3.3	-1.175494347e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	-1.175494347e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	-1.175494347e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	-1.175494347e-38	-1.175494347e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	-1.175494347e-38	-1.175494347e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	1.175494355e-38	1000-01-04	838:59:55	1970-01-05 00:00:04	19700105000004	1905	1905	1905	1	2		3$%^&	3$%^		3$%^	3$%^	3$%^&
-5	5	5	5	5	5	-1	4.4	5	4.4	5	4.4	5	4.4	-1.175494346e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	-1.175494346e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	-1.175494346e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	-1.175494346e-38	-1.175494346e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	-1.175494346e-38	-1.175494346e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	1.175494356e-38	1000-01-05	838:59:54	1970-01-06 00:00:05	19700106000005	1906	1906	1906	2	3		4%^&*(	4%^&*		4%^&*	4%^&*	4%^&*(
-6	6	6	6	6	6	0	5.5	6	5.5	6	5.5	6	5.5	-1.175494345e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	-1.175494345e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	-1.175494345e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	-1.175494345e-38	-1.175494345e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	-1.175494345e-38	-1.175494345e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	1.175494357e-38	1000-01-06	838:59:53	1970-01-07 00:00:06	19700107000006	1907	1907	1907	1	1		5^&*()_	5^&*()		5^&*()	5^&*()	5^&*()_
-7	7	7	7	7	7	1	6.6	7	6.6	7	6.6	7	6.6	-1.175494344e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	-1.175494344e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	-1.175494344e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	-1.175494344e-38	-1.175494344e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	-1.175494344e-38	-1.175494344e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	1.175494358e-38	1000-01-07	838:59:52	1970-01-08 00:00:07	19700108000007	1908	1908	1908	2	2		6&*()_+=	6&*()_+		6&*()_+	6&*()_+	6&*()_+=
-8	8	8	8	8	8	2	7.7	8	7.7	8	7.7	8	7.7	-1.175494343e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	-1.175494343e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	-1.175494343e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	-1.175494343e-38	-1.175494343e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	-1.175494343e-38	-1.175494343e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	1.175494359e-38	1000-01-08	838:59:51	1970-01-09 00:00:08	19700109000008	1909	1909	1909	1	3		7*()_+=-|	7*()_+=-		7*()_+=-	7*()_+=-	7*()_+=-|
-9	9	9	9	9	9	3	8.8	9	8.8	9	8.8	9	8.8	-1.175494342e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	-1.175494342e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	-1.175494342e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	-1.175494342e-38	-1.175494342e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	-1.175494342e-38	-1.175494342e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	1.17549436e-38	1000-01-09	838:59:50	1970-01-10 00:00:09	19700110000009	1910	1910	1910	2	1		8()_+=-|{}	8()_+=-|{		8()_+=-|{	8()_+=-|{	8()_+=-|{}
-10	10	10	10	10	10	4	9.9	10	9.9	10	9.9	10	9.9	-1.175494341e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	-1.175494341e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	-1.175494341e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	-1.175494341e-38	-1.175494341e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	-1.175494341e-38	-1.175494341e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	1.175494361e-38	1000-01-10	838:59:49	1970-01-11 00:00:10	19700111000010	1911	1911	1911	1	2		9)_+=-|{}[]	9)_+=-|{}[		9)_+=-|{}[	9)_+=-|{}[	9)_+=-|{}[]
diff -Nrup a/mysql-test/suite/funcs_1/datadict/datadict_load.inc b/mysql-test/suite/funcs_1/datadict/datadict_load.inc
--- a/mysql-test/suite/funcs_1/datadict/datadict_load.inc	2008-03-31 23:36:02 +02:00
+++ b/mysql-test/suite/funcs_1/datadict/datadict_load.inc	2008-04-01 13:18:22 +02:00
@@ -12,14 +12,14 @@
 --disable_query_log
 
 # ------------------------------------------------------------------------------
-# Get the size of ONE known colum and check the size against some values to 
-# be able to use the correct --replace_result statement. Using this only the 
-# one pair of 'wrong' values is replaced and not all occurrencies of all 
+# Get the size of ONE known colum and check the size against some values to
+# be able to use the correct --replace_result statement. Using this only the
+# one pair of 'wrong' values is replaced and not all occurrencies of all
 # possible pairs of values. See bug #12777 for details.
-SELECT character_maximum_length INTO @CML 
-  FROM information_schema.columns 
- WHERE table_schema = 'information_schema' 
-   AND table_name   = 'columns' 
+SELECT character_maximum_length INTO @CML
+  FROM information_schema.columns
+ WHERE table_schema = 'information_schema'
+   AND table_name   = 'columns'
    AND column_name  = 'table_catalog';
 
 let $bug_12777_0512= `SELECT @CML =  512`;
@@ -53,7 +53,7 @@ let $SERVER_NAME= `SELECT DISTINCT host 
 #  load tables
 #  -----------
 #
-#  this was part of the 4 files $<engine>_datadict.test, but it has been moved 
+#  this was part of the 4 files $<engine>_datadict.test, but it has been moved
 #  here to have only one place where all preparation for the test is done.
 #
 ################################################################################
diff -Nrup a/mysql-test/suite/funcs_1/datadict/processlist_val.inc b/mysql-test/suite/funcs_1/datadict/processlist_val.inc
--- a/mysql-test/suite/funcs_1/datadict/processlist_val.inc	2008-03-07 20:18:05 +01:00
+++ b/mysql-test/suite/funcs_1/datadict/processlist_val.inc	2008-04-01 13:18:23 +02:00
@@ -123,7 +123,7 @@ let $wait_timeout= 4;
 let $wait_condition= SELECT id,user,host,db,command,@time2:=time,state,info FROM INFORMATION_SCHEMA.PROCESSLIST
         WHERE TIME > @time;
 --source include/wait_condition.inc
-# 
+#
 # Expect to hit TIME > @time
 SELECT @time < @time2;
 #
diff -Nrup a/mysql-test/suite/funcs_1/include/ndb_tb1.inc b/mysql-test/suite/funcs_1/include/ndb_tb1.inc
--- a/mysql-test/suite/funcs_1/include/ndb_tb1.inc	2007-02-06 13:19:30 +01:00
+++ b/mysql-test/suite/funcs_1/include/ndb_tb1.inc	2008-04-01 13:18:23 +02:00
@@ -4,66 +4,67 @@
 drop table if exists tb1 ;
 --enable_warnings
 create table tb1 (
-f1 char(0), 
-f2 char(0) binary, 
-f3 char(0) ascii, 
-f4 tinytext unicode, 
-f5 text, 
-f6 mediumtext, 
-f7 longtext, 
-f8 tinyblob, 
+f1 char(0),
+f2 char(0) binary,
+f3 char(0) ascii,
+f4 tinytext unicode,
+f5 text,
+f6 mediumtext,
+f7 longtext,
+f8 tinyblob,
 f9 blob,
-f10 mediumblob, 
-f11 longblob, 
-f12 binary, 
-f13 tinyint, 
-f14 tinyint unsigned, 
-f15 tinyint zerofill, 
-f16 tinyint unsigned zerofill, 
-f17 smallint, 
-f18 smallint unsigned,  
-f19 smallint zerofill, 
-f20 smallint unsigned zerofill, 
-f21 mediumint, 
-f22 mediumint unsigned, 
-f23 mediumint zerofill, 
-f24 mediumint unsigned zerofill, 
-f25 int, 
-f26 int unsigned, 
-f27 int zerofill, 
-f28 int unsigned zerofill, 
-f29 bigint, 
-f30 bigint unsigned, 
-f31 bigint zerofill, 
-f32 bigint unsigned zerofill, 
-f33 decimal, 
-f34 decimal unsigned, 
-f35 decimal zerofill, 
-f36 decimal unsigned zerofill not null DEFAULT 9.9, 
-f37 decimal (0) not null DEFAULT 9.9, 
-f38 decimal (64) not null DEFAULT 9.9, 
-f39 decimal (0) unsigned not null DEFAULT 9.9, 
-f40 decimal (64) unsigned not null DEFAULT 9.9, 
-f41 decimal (0) zerofill not null DEFAULT 9.9, 
-f42 decimal (64) zerofill not null DEFAULT 9.9, 
-f43 decimal (0) unsigned zerofill not null DEFAULT 9.9, 
-f44 decimal (64) unsigned zerofill not null DEFAULT 9.9, 
-f45 decimal (0,0) not null DEFAULT 9.9, 
-f46 decimal (63,30) not null DEFAULT 9.9, 
-f47 decimal (0,0) unsigned not null DEFAULT 9.9, 
-f48 decimal (63,30) unsigned not null DEFAULT 9.9, 
-f49 decimal (0,0) zerofill not null DEFAULT 9.9, 
-f50 decimal (63,30) zerofill not null DEFAULT 9.9, 
-f51 decimal (0,0) unsigned zerofill not null DEFAULT 9.9, 
-f52 decimal (63,30) unsigned zerofill not null DEFAULT 9.9, 
-f53 numeric not null DEFAULT 99, 
-f54 numeric unsigned not null DEFAULT 99, 
-f55 numeric zerofill not null DEFAULT 99, 
-f56 numeric unsigned zerofill not null DEFAULT 99, 
-f57 numeric (0) not null DEFAULT 99, 
+f10 mediumblob,
+f11 longblob,
+f12 binary,
+f13 tinyint,
+f14 tinyint unsigned,
+f15 tinyint zerofill,
+f16 tinyint unsigned zerofill,
+f17 smallint,
+f18 smallint unsigned,
+f19 smallint zerofill,
+f20 smallint unsigned zerofill,
+f21 mediumint,
+f22 mediumint unsigned,
+f23 mediumint zerofill,
+f24 mediumint unsigned zerofill,
+f25 int,
+f26 int unsigned,
+f27 int zerofill,
+f28 int unsigned zerofill,
+f29 bigint,
+f30 bigint unsigned,
+f31 bigint zerofill,
+f32 bigint unsigned zerofill,
+f33 decimal,
+f34 decimal unsigned,
+f35 decimal zerofill,
+f36 decimal unsigned zerofill not null DEFAULT 9.9,
+f37 decimal (0) not null DEFAULT 9.9,
+f38 decimal (64) not null DEFAULT 9.9,
+f39 decimal (0) unsigned not null DEFAULT 9.9,
+f40 decimal (64) unsigned not null DEFAULT 9.9,
+f41 decimal (0) zerofill not null DEFAULT 9.9,
+f42 decimal (64) zerofill not null DEFAULT 9.9,
+f43 decimal (0) unsigned zerofill not null DEFAULT 9.9,
+f44 decimal (64) unsigned zerofill not null DEFAULT 9.9,
+f45 decimal (0,0) not null DEFAULT 9.9,
+f46 decimal (63,30) not null DEFAULT 9.9,
+f47 decimal (0,0) unsigned not null DEFAULT 9.9,
+f48 decimal (63,30) unsigned not null DEFAULT 9.9,
+f49 decimal (0,0) zerofill not null DEFAULT 9.9,
+f50 decimal (63,30) zerofill not null DEFAULT 9.9,
+f51 decimal (0,0) unsigned zerofill not null DEFAULT 9.9,
+f52 decimal (63,30) unsigned zerofill not null DEFAULT 9.9,
+f53 numeric not null DEFAULT 99,
+f54 numeric unsigned not null DEFAULT 99,
+f55 numeric zerofill not null DEFAULT 99,
+f56 numeric unsigned zerofill not null DEFAULT 99,
+f57 numeric (0) not null DEFAULT 99,
 f58 numeric (64) not null DEFAULT 99
 ) engine = ndb;
 
-
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb1.txt' into table tb1 ;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/ndb_tb1.txt'
+into table tb1 ;
diff -Nrup a/mysql-test/suite/funcs_1/include/ndb_tb2.inc b/mysql-test/suite/funcs_1/include/ndb_tb2.inc
--- a/mysql-test/suite/funcs_1/include/ndb_tb2.inc	2007-09-24 15:30:27 +02:00
+++ b/mysql-test/suite/funcs_1/include/ndb_tb2.inc	2008-04-01 13:18:23 +02:00
@@ -4,58 +4,60 @@
 drop table if exists tb2 ;
 --enable_warnings
 create table tb2 (
-f59 numeric (0) unsigned, 
-f60 numeric (64) unsigned, 
-f61 numeric (0) zerofill, 
-f62 numeric (64) zerofill, 
-f63 numeric (0) unsigned zerofill, 
-f64 numeric (64) unsigned zerofill, 
-f65 numeric (0,0), 
-f66 numeric (63,30), 
-f67 numeric (0,0) unsigned, 
-f68 numeric (63,30) unsigned, 
-f69 numeric (0,0) zerofill, 
-f70 numeric (63,30) zerofill, 
-f71 numeric (0,0) unsigned zerofill, 
-f72 numeric (63,30) unsigned zerofill, 
-f73 real, 
-f74 real unsigned, 
-f75 real zerofill, 
-f76 real unsigned zerofill, 
-f77 double default 7.7, 
-f78 double unsigned default 7.7, 
-f79 double zerofill default 7.7, 
-f80 double unsigned zerofill default 8.8, 
-f81 float not null default 8.8, 
-f82 float unsigned not null default 8.8, 
-f83 float zerofill not null default 8.8, 
-f84 float unsigned zerofill not null default 8.8, 
-f85 float(0) not null default 8.8, 
-f86 float(23) not null default 8.8, 
-f87 float(0) unsigned not null default 8.8, 
-f88 float(23) unsigned not null default 8.8, 
-f89 float(0) zerofill not null default 8.8, 
-f90 float(23) zerofill not null default 8.8, 
-f91 float(0) unsigned zerofill not null default 8.8, 
-f92 float(23) unsigned zerofill not null default 8.8, 
-f93 float(24) not null default 8.8, 
-f94 float(53) not null default 8.8, 
-f95 float(24) unsigned not null default 8.8, 
-f96 float(53) unsigned not null default 8.8, 
-f97 float(24) zerofill not null default 8.8, 
-f98 float(53) zerofill not null default 8.8, 
-f99 float(24) unsigned zerofill not null default 8.8, 
-f100 float(53) unsigned zerofill not null default 8.8, 
-f101 date not null default '2000-01-01', 
-f102 time not null default 20, 
-f103 datetime not null default '2/2/2', 
-f104 timestamp not null default 20001231235959, 
-f105 year not null default 2000, 
-f106 year(3) not null default 2000, 
-f107 year(4) not null default 2000, 
-f108 enum("1enum","2enum") not null default "1enum", 
+f59 numeric (0) unsigned,
+f60 numeric (64) unsigned,
+f61 numeric (0) zerofill,
+f62 numeric (64) zerofill,
+f63 numeric (0) unsigned zerofill,
+f64 numeric (64) unsigned zerofill,
+f65 numeric (0,0),
+f66 numeric (63,30),
+f67 numeric (0,0) unsigned,
+f68 numeric (63,30) unsigned,
+f69 numeric (0,0) zerofill,
+f70 numeric (63,30) zerofill,
+f71 numeric (0,0) unsigned zerofill,
+f72 numeric (63,30) unsigned zerofill,
+f73 real,
+f74 real unsigned,
+f75 real zerofill,
+f76 real unsigned zerofill,
+f77 double default 7.7,
+f78 double unsigned default 7.7,
+f79 double zerofill default 7.7,
+f80 double unsigned zerofill default 8.8,
+f81 float not null default 8.8,
+f82 float unsigned not null default 8.8,
+f83 float zerofill not null default 8.8,
+f84 float unsigned zerofill not null default 8.8,
+f85 float(0) not null default 8.8,
+f86 float(23) not null default 8.8,
+f87 float(0) unsigned not null default 8.8,
+f88 float(23) unsigned not null default 8.8,
+f89 float(0) zerofill not null default 8.8,
+f90 float(23) zerofill not null default 8.8,
+f91 float(0) unsigned zerofill not null default 8.8,
+f92 float(23) unsigned zerofill not null default 8.8,
+f93 float(24) not null default 8.8,
+f94 float(53) not null default 8.8,
+f95 float(24) unsigned not null default 8.8,
+f96 float(53) unsigned not null default 8.8,
+f97 float(24) zerofill not null default 8.8,
+f98 float(53) zerofill not null default 8.8,
+f99 float(24) unsigned zerofill not null default 8.8,
+f100 float(53) unsigned zerofill not null default 8.8,
+f101 date not null default '2000-01-01',
+f102 time not null default 20,
+f103 datetime not null default '2/2/2',
+f104 timestamp not null default 20001231235959,
+f105 year not null default 2000,
+f106 year(3) not null default 2000,
+f107 year(4) not null default 2000,
+f108 enum("1enum","2enum") not null default "1enum",
 f109 set("1set","2set") not null default "1set"
 ) engine = ndb;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb2.txt' into table tb2 ;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/ndb_tb2.txt'
+into table tb2 ;
diff -Nrup a/mysql-test/suite/funcs_1/include/ndb_tb3.inc b/mysql-test/suite/funcs_1/include/ndb_tb3.inc
--- a/mysql-test/suite/funcs_1/include/ndb_tb3.inc	2007-02-06 13:19:30 +01:00
+++ b/mysql-test/suite/funcs_1/include/ndb_tb3.inc	2008-04-01 13:18:23 +02:00
@@ -4,65 +4,67 @@
 drop table if exists tb3 ;
 --enable_warnings
 create table tb3 (
-f118 char not null DEFAULT 'a', 
-f119 char binary not null DEFAULT b'101', 
-f120 char ascii not null DEFAULT b'101', 
-f121 tinytext, 
-f122 text, 
-f123 mediumtext, 
-f124 longtext unicode, 
-f125 tinyblob, 
-f126 blob, 
-f127 mediumblob, 
-f128 longblob, 
-f129 binary not null DEFAULT b'101', 
-f130 tinyint not null DEFAULT 99, 
-f131 tinyint unsigned not null DEFAULT 99, 
-f132 tinyint zerofill not null DEFAULT 99, 
-f133 tinyint unsigned zerofill not null DEFAULT 99, 
-f134 smallint not null DEFAULT 999, 
-f135 smallint unsigned not null DEFAULT 999, 
-f136 smallint zerofill not null DEFAULT 999,  
-f137 smallint unsigned zerofill not null DEFAULT 999, 
-f138 mediumint not null DEFAULT 9999, 
-f139 mediumint unsigned not null DEFAULT 9999, 
-f140 mediumint zerofill not null DEFAULT 9999, 
-f141 mediumint unsigned zerofill not null DEFAULT 9999, 
-f142 int not null DEFAULT 99999, 
-f143 int unsigned not null DEFAULT 99999, 
-f144 int zerofill not null DEFAULT 99999, 
-f145 int unsigned zerofill not null DEFAULT 99999, 
-f146 bigint not null DEFAULT 999999, 
-f147 bigint unsigned not null DEFAULT 999999, 
-f148 bigint zerofill not null DEFAULT 999999, 
-f149 bigint unsigned zerofill not null DEFAULT 999999, 
-f150 decimal not null DEFAULT 999.999, 
-f151 decimal unsigned not null DEFAULT 999.17, 
-f152 decimal zerofill not null DEFAULT 999.999, 
-f153 decimal unsigned zerofill, 
-f154 decimal (0), 
-f155 decimal (64), 
-f156 decimal (0) unsigned, 
-f157 decimal (64) unsigned, 
-f158 decimal (0) zerofill, 
-f159 decimal (64) zerofill, 
-f160 decimal (0) unsigned zerofill, 
-f161 decimal (64) unsigned zerofill, 
-f162 decimal (0,0), 
-f163 decimal (63,30), 
-f164 decimal (0,0) unsigned, 
-f165 decimal (63,30) unsigned, 
-f166 decimal (0,0) zerofill, 
-f167 decimal (63,30) zerofill, 
-f168 decimal (0,0) unsigned zerofill, 
-f169 decimal (63,30) unsigned zerofill, 
-f170 numeric, 
-f171 numeric unsigned, 
-f172 numeric zerofill, 
-f173 numeric unsigned zerofill, 
-f174 numeric (0), 
-f175 numeric (64) 
+f118 char not null DEFAULT 'a',
+f119 char binary not null DEFAULT b'101',
+f120 char ascii not null DEFAULT b'101',
+f121 tinytext,
+f122 text,
+f123 mediumtext,
+f124 longtext unicode,
+f125 tinyblob,
+f126 blob,
+f127 mediumblob,
+f128 longblob,
+f129 binary not null DEFAULT b'101',
+f130 tinyint not null DEFAULT 99,
+f131 tinyint unsigned not null DEFAULT 99,
+f132 tinyint zerofill not null DEFAULT 99,
+f133 tinyint unsigned zerofill not null DEFAULT 99,
+f134 smallint not null DEFAULT 999,
+f135 smallint unsigned not null DEFAULT 999,
+f136 smallint zerofill not null DEFAULT 999,
+f137 smallint unsigned zerofill not null DEFAULT 999,
+f138 mediumint not null DEFAULT 9999,
+f139 mediumint unsigned not null DEFAULT 9999,
+f140 mediumint zerofill not null DEFAULT 9999,
+f141 mediumint unsigned zerofill not null DEFAULT 9999,
+f142 int not null DEFAULT 99999,
+f143 int unsigned not null DEFAULT 99999,
+f144 int zerofill not null DEFAULT 99999,
+f145 int unsigned zerofill not null DEFAULT 99999,
+f146 bigint not null DEFAULT 999999,
+f147 bigint unsigned not null DEFAULT 999999,
+f148 bigint zerofill not null DEFAULT 999999,
+f149 bigint unsigned zerofill not null DEFAULT 999999,
+f150 decimal not null DEFAULT 999.999,
+f151 decimal unsigned not null DEFAULT 999.17,
+f152 decimal zerofill not null DEFAULT 999.999,
+f153 decimal unsigned zerofill,
+f154 decimal (0),
+f155 decimal (64),
+f156 decimal (0) unsigned,
+f157 decimal (64) unsigned,
+f158 decimal (0) zerofill,
+f159 decimal (64) zerofill,
+f160 decimal (0) unsigned zerofill,
+f161 decimal (64) unsigned zerofill,
+f162 decimal (0,0),
+f163 decimal (63,30),
+f164 decimal (0,0) unsigned,
+f165 decimal (63,30) unsigned,
+f166 decimal (0,0) zerofill,
+f167 decimal (63,30) zerofill,
+f168 decimal (0,0) unsigned zerofill,
+f169 decimal (63,30) unsigned zerofill,
+f170 numeric,
+f171 numeric unsigned,
+f172 numeric zerofill,
+f173 numeric unsigned zerofill,
+f174 numeric (0),
+f175 numeric (64)
 ) engine = ndb;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb3.txt' into table tb3 ;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/ndb_tb3.txt'
+into table tb3;
diff -Nrup a/mysql-test/suite/funcs_1/include/ndb_tb4.inc b/mysql-test/suite/funcs_1/include/ndb_tb4.inc
--- a/mysql-test/suite/funcs_1/include/ndb_tb4.inc	2007-02-06 13:19:30 +01:00
+++ b/mysql-test/suite/funcs_1/include/ndb_tb4.inc	2008-04-01 13:18:23 +02:00
@@ -4,56 +4,56 @@
 drop table if exists tb4;
 --enable_warnings
 create table tb4 (
-f176 numeric (0) unsigned not null DEFAULT 9, 
-f177 numeric (64) unsigned not null DEFAULT 9, 
-f178 numeric (0) zerofill not null DEFAULT 9, 
-f179 numeric (64) zerofill not null DEFAULT 9, 
-f180 numeric (0) unsigned zerofill not null DEFAULT 9, 
-f181 numeric (64) unsigned zerofill not null DEFAULT 9, 
-f182 numeric (0,0) not null DEFAULT 9, 
-f183 numeric (63,30) not null DEFAULT 9, 
-f184 numeric (0,0) unsigned not null DEFAULT 9, 
-f185 numeric (63,30) unsigned not null DEFAULT 9, 
-f186 numeric (0,0) zerofill not null DEFAULT 9, 
-f187 numeric (63,30) zerofill not null DEFAULT 9, 
-f188 numeric (0,0) unsigned zerofill not null DEFAULT 9, 
-f189 numeric (63,30) unsigned zerofill not null DEFAULT 9, 
-f190 real not null DEFAULT 88.8, 
-f191 real unsigned not null DEFAULT 88.8, 
-f192 real zerofill not null DEFAULT 88.8, 
-f193 real unsigned zerofill not null DEFAULT 88.8, 
-f194 double not null DEFAULT 55.5, 
-f195 double unsigned not null DEFAULT 55.5, 
-f196 double zerofill not null DEFAULT 55.5, 
-f197 double unsigned zerofill not null DEFAULT 55.5, 
-f198 float, 
-f199 float unsigned, 
-f200 float zerofill, 
-f201 float unsigned zerofill, 
-f202 float(0), 
-f203 float(23), 
-f204 float(0) unsigned, 
-f205 float(23) unsigned, 
-f206 float(0) zerofill, 
-f207 float(23) zerofill, 
-f208 float(0) unsigned zerofill, 
-f209 float(23) unsigned zerofill, 
-f210 float(24), 
-f211 float(53), 
-f212 float(24) unsigned, 
-f213 float(53) unsigned, 
-f214 float(24) zerofill, 
-f215 float(53) zerofill, 
-f216 float(24) unsigned zerofill, 
-f217 float(53) unsigned zerofill, 
-f218 date, 
-f219 time, 
-f220 datetime, 
-f221 timestamp, 
-f222 year, 
-f223 year(3), 
-f224 year(4), 
-f225 enum("1enum","2enum"), 
+f176 numeric (0) unsigned not null DEFAULT 9,
+f177 numeric (64) unsigned not null DEFAULT 9,
+f178 numeric (0) zerofill not null DEFAULT 9,
+f179 numeric (64) zerofill not null DEFAULT 9,
+f180 numeric (0) unsigned zerofill not null DEFAULT 9,
+f181 numeric (64) unsigned zerofill not null DEFAULT 9,
+f182 numeric (0,0) not null DEFAULT 9,
+f183 numeric (63,30) not null DEFAULT 9,
+f184 numeric (0,0) unsigned not null DEFAULT 9,
+f185 numeric (63,30) unsigned not null DEFAULT 9,
+f186 numeric (0,0) zerofill not null DEFAULT 9,
+f187 numeric (63,30) zerofill not null DEFAULT 9,
+f188 numeric (0,0) unsigned zerofill not null DEFAULT 9,
+f189 numeric (63,30) unsigned zerofill not null DEFAULT 9,
+f190 real not null DEFAULT 88.8,
+f191 real unsigned not null DEFAULT 88.8,
+f192 real zerofill not null DEFAULT 88.8,
+f193 real unsigned zerofill not null DEFAULT 88.8,
+f194 double not null DEFAULT 55.5,
+f195 double unsigned not null DEFAULT 55.5,
+f196 double zerofill not null DEFAULT 55.5,
+f197 double unsigned zerofill not null DEFAULT 55.5,
+f198 float,
+f199 float unsigned,
+f200 float zerofill,
+f201 float unsigned zerofill,
+f202 float(0),
+f203 float(23),
+f204 float(0) unsigned,
+f205 float(23) unsigned,
+f206 float(0) zerofill,
+f207 float(23) zerofill,
+f208 float(0) unsigned zerofill,
+f209 float(23) unsigned zerofill,
+f210 float(24),
+f211 float(53),
+f212 float(24) unsigned,
+f213 float(53) unsigned,
+f214 float(24) zerofill,
+f215 float(53) zerofill,
+f216 float(24) unsigned zerofill,
+f217 float(53) unsigned zerofill,
+f218 date,
+f219 time,
+f220 datetime,
+f221 timestamp,
+f222 year,
+f223 year(3),
+f224 year(4),
+f225 enum("1enum","2enum"),
 f226 set("1set","2set"),
 f235 char(0) unicode,
 f236 char(90),
@@ -64,5 +64,7 @@ f240 varchar(2000) unicode,
 f241 char(100) unicode
 ) engine = ndb;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb4.txt' into table tb4 ;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/ndb_tb4.txt'
+into table tb4 ;
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-03-31 23:39:48 +02:00
+++ b/mysql-test/suite/funcs_1/r/innodb_func_view.result	2008-04-01 13:18:23 +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-03-07 20:18:07 +01:00
+++ b/mysql-test/suite/funcs_1/r/innodb_storedproc.result	2008-04-01 13:18:24 +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
@@ -14949,46 +14957,47 @@ USE db_storedproc;
 Testcase 4.3.1:
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp1;
-drop table IF EXISTS res_t3_itisalongname_1381742_itsaverylongname_1381742;
+DROP TABLE IF EXISTS res_t3_itisalongname_1381742_itsaverylongname_1381742;
 CREATE TABLE res_t3_itisalongname_1381742_itsaverylongname_1381742(
-middleinitial CHAR,
-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_storedproc_02.result b/mysql-test/suite/funcs_1/r/innodb_storedproc_02.result
--- a/mysql-test/suite/funcs_1/r/innodb_storedproc_02.result	2008-03-31 23:34:57 +02:00
+++ b/mysql-test/suite/funcs_1/r/innodb_storedproc_02.result	2008-04-01 13:18:24 +02:00
@@ -1202,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/innodb_trig_03.result b/mysql-test/suite/funcs_1/r/innodb_trig_03.result
--- a/mysql-test/suite/funcs_1/r/innodb_trig_03.result	2008-03-31 23:36:08 +02:00
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_03.result	2008-04-01 13:18:24 +02:00
@@ -1,70 +1,71 @@
 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.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/innodb_trig_03e.result b/mysql-test/suite/funcs_1/r/innodb_trig_03e.result
--- a/mysql-test/suite/funcs_1/r/innodb_trig_03e.result	2008-03-12 12:56:05 +01:00
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_03e.result	2008-04-01 13:18:24 +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/innodb_trig_08.result b/mysql-test/suite/funcs_1/r/innodb_trig_08.result
--- a/mysql-test/suite/funcs_1/r/innodb_trig_08.result	2008-03-31 23:36:11 +02:00
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_08.result	2008-04-01 13:18:24 +02:00
@@ -1,70 +1,71 @@
 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:
 --------------
@@ -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=innodb;
-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=innodb;
-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/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-03-31 23:36:14 +02:00
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_09.result	2008-04-01 13:18:24 +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,11 +138,11 @@ 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
-select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122, 
+select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122,
 @tr_var_af_136, @tr_var_af_163;
 @tr_var_af_118	@tr_var_af_121	@tr_var_af_122	@tr_var_af_136	@tr_var_af_163
 a	NULL	Test 3.5.9.3	8	123.170000000000000000000000000000
@@ -172,17 +173,17 @@ set @tr_var_af_118=new.f118, @tr_var_af_
 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
@@ -195,15 +196,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
@@ -241,6 +242,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/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-03-31 23:39:48 +02:00
+++ b/mysql-test/suite/funcs_1/r/memory_func_view.result	2008-04-01 13:18:24 +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-03-07 20:18:09 +01:00
+++ b/mysql-test/suite/funcs_1/r/memory_storedproc.result	2008-04-01 13:18:25 +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
@@ -14949,66 +14957,89 @@ USE db_storedproc;
 Testcase 4.3.1:
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp1;
-drop table IF EXISTS res_t3_itisalongname_1381742_itsaverylongname_1381742;
+DROP TABLE IF EXISTS res_t3_itisalongname_1381742_itsaverylongname_1381742;
 CREATE TABLE res_t3_itisalongname_1381742_itsaverylongname_1381742(
-middleinitial CHAR,
-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_storedproc_02.result b/mysql-test/suite/funcs_1/r/memory_storedproc_02.result
--- a/mysql-test/suite/funcs_1/r/memory_storedproc_02.result	2008-03-31 23:34:57 +02:00
+++ b/mysql-test/suite/funcs_1/r/memory_storedproc_02.result	2008-04-01 13:18:25 +02:00
@@ -1202,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/memory_trig_03.result b/mysql-test/suite/funcs_1/r/memory_trig_03.result
--- a/mysql-test/suite/funcs_1/r/memory_trig_03.result	2008-03-31 23:36:19 +02:00
+++ b/mysql-test/suite/funcs_1/r/memory_trig_03.result	2008-04-01 13:18:25 +02:00
@@ -1,64 +1,65 @@
 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.3:
 ---------------
@@ -97,7 +98,7 @@ test_noprivs@localhost
 use priv_db;
 create trigger trg1_1 before INSERT on t1 for each row
 set new.f1 = 'trig 3.5.3.2_1-no';
-Got one of the listed errors
+ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1'
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.2-no');
 select f1 from t1 order by f1;
@@ -129,7 +130,7 @@ Testcase 3.5.3.6:
 -----------------
 use priv_db;
 drop trigger trg1_2;
-Got one of the listed errors
+ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1'
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.6-yes');
 select f1 from t1 order by f1;
diff -Nrup a/mysql-test/suite/funcs_1/r/memory_trig_03e.result b/mysql-test/suite/funcs_1/r/memory_trig_03e.result
--- a/mysql-test/suite/funcs_1/r/memory_trig_03e.result	2008-03-12 12:56:05 +01:00
+++ b/mysql-test/suite/funcs_1/r/memory_trig_03e.result	2008-04-01 13:18:25 +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');
@@ -1507,7 +1507,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/memory_trig_08.result b/mysql-test/suite/funcs_1/r/memory_trig_08.result
--- a/mysql-test/suite/funcs_1/r/memory_trig_08.result	2008-03-31 23:36:23 +02:00
+++ b/mysql-test/suite/funcs_1/r/memory_trig_08.result	2008-04-01 13:18:25 +02:00
@@ -1,64 +1,65 @@
 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:
 --------------
@@ -83,17 +84,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=memory;
-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=memory;
-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,
@@ -116,18 +117,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
@@ -156,7 +157,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%';
@@ -179,7 +180,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'
@@ -201,7 +202,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%';
@@ -216,10 +217,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%';
@@ -247,31 +248,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
@@ -291,7 +292,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
@@ -333,43 +334,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
@@ -377,9 +378,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
@@ -400,40 +401,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;
@@ -443,23 +444,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;
@@ -468,24 +469,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/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-03-31 23:36:25 +02:00
+++ b/mysql-test/suite/funcs_1/r/memory_trig_09.result	2008-04-01 13:18:25 +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,11 +132,11 @@ 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
-select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122, 
+select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122,
 @tr_var_af_136, @tr_var_af_163;
 @tr_var_af_118	@tr_var_af_121	@tr_var_af_122	@tr_var_af_136	@tr_var_af_163
 a	NULL	Test 3.5.9.3	8	123.170000000000000000000000000000
@@ -166,17 +167,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
@@ -189,15 +190,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
@@ -235,6 +236,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-03-31 23:39:49 +02:00
+++ b/mysql-test/suite/funcs_1/r/myisam_func_view.result	2008-04-01 13:18:25 +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-03-07 20:18:10 +01:00
+++ b/mysql-test/suite/funcs_1/r/myisam_storedproc.result	2008-04-01 13:18:26 +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
@@ -14949,46 +14957,47 @@ USE db_storedproc;
 Testcase 4.3.1:
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp1;
-drop table IF EXISTS res_t3_itisalongname_1381742_itsaverylongname_1381742;
+DROP TABLE IF EXISTS res_t3_itisalongname_1381742_itsaverylongname_1381742;
 CREATE TABLE res_t3_itisalongname_1381742_itsaverylongname_1381742(
-middleinitial CHAR,
-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_storedproc_02.result b/mysql-test/suite/funcs_1/r/myisam_storedproc_02.result
--- a/mysql-test/suite/funcs_1/r/myisam_storedproc_02.result	2008-03-31 23:34:57 +02:00
+++ b/mysql-test/suite/funcs_1/r/myisam_storedproc_02.result	2008-04-01 13:18:27 +02:00
@@ -1202,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/myisam_trig_03.result b/mysql-test/suite/funcs_1/r/myisam_trig_03.result
--- a/mysql-test/suite/funcs_1/r/myisam_trig_03.result	2008-03-31 23:36:29 +02:00
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_03.result	2008-04-01 13:18:27 +02:00
@@ -1,70 +1,71 @@
 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.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/myisam_trig_03e.result b/mysql-test/suite/funcs_1/r/myisam_trig_03e.result
--- a/mysql-test/suite/funcs_1/r/myisam_trig_03e.result	2008-03-12 12:56:05 +01:00
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_03e.result	2008-04-01 13:18:27 +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');
@@ -1507,7 +1507,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/myisam_trig_08.result b/mysql-test/suite/funcs_1/r/myisam_trig_08.result
--- a/mysql-test/suite/funcs_1/r/myisam_trig_08.result	2008-03-31 23:36:33 +02:00
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_08.result	2008-04-01 13:18:27 +02:00
@@ -1,70 +1,71 @@
 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:
 --------------
@@ -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=myisam;
-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=myisam;
-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/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-03-31 23:36:35 +02:00
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_09.result	2008-04-01 13:18:27 +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,11 +138,11 @@ 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
-select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122, 
+select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122,
 @tr_var_af_136, @tr_var_af_163;
 @tr_var_af_118	@tr_var_af_121	@tr_var_af_122	@tr_var_af_136	@tr_var_af_163
 a	NULL	Test 3.5.9.3	8	123.170000000000000000000000000000
@@ -172,17 +173,17 @@ set @tr_var_af_118=new.f118, @tr_var_af_
 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
@@ -195,15 +196,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
@@ -241,6 +242,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-03-31 23:39:49 +02:00
+++ b/mysql-test/suite/funcs_1/r/myisam_views.result	2008-04-01 13:18:27 +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-03-07 20:18:11 +01:00
+++ b/mysql-test/suite/funcs_1/r/ndb_func_view.result	2008-04-01 13:18:28 +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/ndb_storedproc.result b/mysql-test/suite/funcs_1/r/ndb_storedproc.result
--- a/mysql-test/suite/funcs_1/r/ndb_storedproc.result	2008-03-07 20:18:12 +01:00
+++ b/mysql-test/suite/funcs_1/r/ndb_storedproc.result	2008-04-01 13:18:29 +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
@@ -14949,48 +14957,47 @@ USE db_storedproc;
 Testcase 4.3.1:
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp1;
-drop table IF EXISTS res_t3_itisalongname_1381742_itsaverylongname_1381742;
+DROP TABLE IF EXISTS res_t3_itisalongname_1381742_itsaverylongname_1381742;
 CREATE TABLE res_t3_itisalongname_1381742_itsaverylongname_1381742(
-middleinitial CHAR,
-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_storedproc_02.result b/mysql-test/suite/funcs_1/r/ndb_storedproc_02.result
--- a/mysql-test/suite/funcs_1/r/ndb_storedproc_02.result	2008-03-07 20:18:12 +01:00
+++ b/mysql-test/suite/funcs_1/r/ndb_storedproc_02.result	2008-04-01 13:18:29 +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.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/ndb_storedproc_03.result b/mysql-test/suite/funcs_1/r/ndb_storedproc_03.result
--- a/mysql-test/suite/funcs_1/r/ndb_storedproc_03.result	2008-03-07 20:18:12 +01:00
+++ b/mysql-test/suite/funcs_1/r/ndb_storedproc_03.result	2008-04-01 13:18:29 +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.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/ndb_storedproc_06.result b/mysql-test/suite/funcs_1/r/ndb_storedproc_06.result
--- a/mysql-test/suite/funcs_1/r/ndb_storedproc_06.result	2007-09-07 07:02:57 +02:00
+++ b/mysql-test/suite/funcs_1/r/ndb_storedproc_06.result	2008-04-01 13:18:29 +02:00
@@ -1,8 +1,6 @@
 
 --source suite/funcs_1/storedproc/load_sp_tb.inc
 --------------------------------------------------------------------------------
-SET @@global.max_heap_table_size=4294967295;
-SET @@session.max_heap_table_size=4294967295;
 
 --source suite/funcs_1/storedproc/cleanup_sp_tb.inc
 --------------------------------------------------------------------------------
@@ -11,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
@@ -36,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
@@ -49,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.6 - Privilege Checks:
 --------------------------------------------------------------------------------
diff -Nrup a/mysql-test/suite/funcs_1/r/ndb_storedproc_07.result b/mysql-test/suite/funcs_1/r/ndb_storedproc_07.result
--- a/mysql-test/suite/funcs_1/r/ndb_storedproc_07.result	2008-03-07 20:18:12 +01:00
+++ b/mysql-test/suite/funcs_1/r/ndb_storedproc_07.result	2008-04-01 13:18:29 +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.7 - SQL mode checks:
 --------------------------------------------------------------------------------
diff -Nrup a/mysql-test/suite/funcs_1/r/ndb_storedproc_08.result b/mysql-test/suite/funcs_1/r/ndb_storedproc_08.result
--- a/mysql-test/suite/funcs_1/r/ndb_storedproc_08.result	2008-03-07 20:18:12 +01:00
+++ b/mysql-test/suite/funcs_1/r/ndb_storedproc_08.result	2008-04-01 13:18:29 +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.8 - SHOW statement checks:
 --------------------------------------------------------------------------------
diff -Nrup a/mysql-test/suite/funcs_1/r/ndb_storedproc_10.result b/mysql-test/suite/funcs_1/r/ndb_storedproc_10.result
--- a/mysql-test/suite/funcs_1/r/ndb_storedproc_10.result	2008-03-07 20:18:12 +01:00
+++ b/mysql-test/suite/funcs_1/r/ndb_storedproc_10.result	2008-04-01 13:18:29 +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.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/ndb_trig_0102.result b/mysql-test/suite/funcs_1/r/ndb_trig_0102.result
--- a/mysql-test/suite/funcs_1/r/ndb_trig_0102.result	2008-03-12 12:56:05 +01:00
+++ b/mysql-test/suite/funcs_1/r/ndb_trig_0102.result	2008-04-01 13:18:29 +02:00
@@ -1,97 +1,98 @@
 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.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
@@ -104,9 +105,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
@@ -114,7 +115,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;
@@ -142,7 +143,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;
@@ -195,7 +196,7 @@ drop table if exists t1;
 Warnings:
 Note	1051	Unknown table 't1'
 create table t1 (f1 int, f2 char(25),f3 int) engine=ndb;
-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';
@@ -232,7 +233,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;
@@ -240,11 +241,11 @@ create database trig_db;
 use trig_db;
 create table t1 (f1 integer) engine = ndb;
 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;
@@ -268,9 +269,9 @@ drop table if exists t1;
 drop table if exists t2;
 create table t1 (f1 char(50), f2 integer) engine = ndb;
 create table t2 (f1 char(50), f2 integer) engine = ndb;
-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);
@@ -300,15 +301,15 @@ create database trig_db2;
 create database trig_db3;
 use trig_db1;
 create table t1 (f1 char(50), f2 integer) engine = ndb;
-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 = ndb;
-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 = ndb;
-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;
@@ -347,11 +348,11 @@ create database trig_db2;
 use trig_db1;
 create table t1 (f1 char(50), f2 integer) engine = ndb;
 create table trig_db2.t1 (f1 char(50), f2 integer) engine = ndb;
-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/ndb_trig_03.result b/mysql-test/suite/funcs_1/r/ndb_trig_03.result
--- a/mysql-test/suite/funcs_1/r/ndb_trig_03.result	2008-03-12 12:56:05 +01:00
+++ b/mysql-test/suite/funcs_1/r/ndb_trig_03.result	2008-04-01 13:18:29 +02:00
@@ -1,71 +1,72 @@
 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.3:
 ---------------
@@ -104,7 +105,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;
@@ -136,7 +137,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/ndb_trig_03e.result b/mysql-test/suite/funcs_1/r/ndb_trig_03e.result
--- a/mysql-test/suite/funcs_1/r/ndb_trig_03e.result	2008-03-12 12:56:05 +01:00
+++ b/mysql-test/suite/funcs_1/r/ndb_trig_03e.result	2008-04-01 13:18:29 +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/ndb_trig_0407.result b/mysql-test/suite/funcs_1/r/ndb_trig_0407.result
--- a/mysql-test/suite/funcs_1/r/ndb_trig_0407.result	2008-03-12 12:56:05 +01:00
+++ b/mysql-test/suite/funcs_1/r/ndb_trig_0407.result	2008-04-01 13:18:29 +02:00
@@ -1,71 +1,72 @@
 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:
 --------------
@@ -89,7 +90,7 @@ Use db_drop;
 create table t1 (f1 char(30)) engine=ndb;
 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');
@@ -128,7 +129,7 @@ drop table if exists t1_433 ;
 drop table if exists t1_433a ;
 create table t1_433 (f1 char (30)) engine=ndb;
 create table t1_433a (f1a char (5)) engine=ndb;
-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
@@ -149,7 +150,7 @@ create database db_drop4;
 Use db_drop4;
 create table t1 (f1 char(30)) engine=ndb;
 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');
@@ -185,7 +186,7 @@ create database db_drop5;
 Use db_drop5;
 create table t1 (f1 char(50)) engine=ndb;
 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');
@@ -222,7 +223,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;
@@ -230,7 +231,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;
@@ -311,9 +312,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');
@@ -331,9 +332,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;
@@ -359,9 +360,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');
@@ -379,9 +380,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;
@@ -409,9 +410,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;
@@ -441,12 +442,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/ndb_trig_08.result b/mysql-test/suite/funcs_1/r/ndb_trig_08.result
--- a/mysql-test/suite/funcs_1/r/ndb_trig_08.result	2008-03-12 12:56:05 +01:00
+++ b/mysql-test/suite/funcs_1/r/ndb_trig_08.result	2008-04-01 13:18:29 +02:00
@@ -1,71 +1,72 @@
 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:
 --------------
@@ -90,17 +91,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=ndb;
-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=ndb;
-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,
@@ -123,18 +124,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
@@ -163,7 +164,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%';
@@ -186,7 +187,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'
@@ -208,7 +209,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%';
@@ -223,10 +224,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%';
@@ -254,31 +255,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
@@ -298,7 +299,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
@@ -340,43 +341,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
@@ -384,9 +385,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
@@ -407,40 +408,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;
@@ -450,23 +451,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;
@@ -475,24 +476,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/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-03-12 12:56:05 +01:00
+++ b/mysql-test/suite/funcs_1/r/ndb_trig_09.result	2008-04-01 13:18:29 +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,11 +139,11 @@ 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
-select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122, 
+select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122,
 @tr_var_af_136, @tr_var_af_163;
 @tr_var_af_118	@tr_var_af_121	@tr_var_af_122	@tr_var_af_136	@tr_var_af_163
 a	NULL	Test 3.5.9.3	8	123.170000000000000000000000000000
@@ -173,17 +174,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
@@ -196,15 +197,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
@@ -242,6 +243,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/ndb_trig_1011ext.result b/mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result
--- a/mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result	2008-03-12 12:56:05 +01:00
+++ b/mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result	2008-04-01 13:18:29 +02:00
@@ -1,71 +1,72 @@
 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.10.1/2/3:
 ----------------------
@@ -142,7 +143,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/ndb_views.result b/mysql-test/suite/funcs_1/r/ndb_views.result
--- a/mysql-test/suite/funcs_1/r/ndb_views.result	2008-03-12 12:56:05 +01:00
+++ b/mysql-test/suite/funcs_1/r/ndb_views.result	2008-04-01 13:18:29 +02:00
@@ -1,117 +1,119 @@
 USE test;
 drop table if exists tb2 ;
 create table tb2 (
-f59 numeric (0) unsigned, 
-f60 numeric (64) unsigned, 
-f61 numeric (0) zerofill, 
-f62 numeric (64) zerofill, 
-f63 numeric (0) unsigned zerofill, 
-f64 numeric (64) unsigned zerofill, 
-f65 numeric (0,0), 
-f66 numeric (63,30), 
-f67 numeric (0,0) unsigned, 
-f68 numeric (63,30) unsigned, 
-f69 numeric (0,0) zerofill, 
-f70 numeric (63,30) zerofill, 
-f71 numeric (0,0) unsigned zerofill, 
-f72 numeric (63,30) unsigned zerofill, 
-f73 real, 
-f74 real unsigned, 
-f75 real zerofill, 
-f76 real unsigned zerofill, 
-f77 double default 7.7, 
-f78 double unsigned default 7.7, 
-f79 double zerofill default 7.7, 
-f80 double unsigned zerofill default 8.8, 
-f81 float not null default 8.8, 
-f82 float unsigned not null default 8.8, 
-f83 float zerofill not null default 8.8, 
-f84 float unsigned zerofill not null default 8.8, 
-f85 float(0) not null default 8.8, 
-f86 float(23) not null default 8.8, 
-f87 float(0) unsigned not null default 8.8, 
-f88 float(23) unsigned not null default 8.8, 
-f89 float(0) zerofill not null default 8.8, 
-f90 float(23) zerofill not null default 8.8, 
-f91 float(0) unsigned zerofill not null default 8.8, 
-f92 float(23) unsigned zerofill not null default 8.8, 
-f93 float(24) not null default 8.8, 
-f94 float(53) not null default 8.8, 
-f95 float(24) unsigned not null default 8.8, 
-f96 float(53) unsigned not null default 8.8, 
-f97 float(24) zerofill not null default 8.8, 
-f98 float(53) zerofill not null default 8.8, 
-f99 float(24) unsigned zerofill not null default 8.8, 
-f100 float(53) unsigned zerofill not null default 8.8, 
-f101 date not null default '2000-01-01', 
-f102 time not null default 20, 
-f103 datetime not null default '2/2/2', 
-f104 timestamp not null default 20001231235959, 
-f105 year not null default 2000, 
-f106 year(3) not null default 2000, 
-f107 year(4) not null default 2000, 
-f108 enum("1enum","2enum") not null default "1enum", 
+f59 numeric (0) unsigned,
+f60 numeric (64) unsigned,
+f61 numeric (0) zerofill,
+f62 numeric (64) zerofill,
+f63 numeric (0) unsigned zerofill,
+f64 numeric (64) unsigned zerofill,
+f65 numeric (0,0),
+f66 numeric (63,30),
+f67 numeric (0,0) unsigned,
+f68 numeric (63,30) unsigned,
+f69 numeric (0,0) zerofill,
+f70 numeric (63,30) zerofill,
+f71 numeric (0,0) unsigned zerofill,
+f72 numeric (63,30) unsigned zerofill,
+f73 real,
+f74 real unsigned,
+f75 real zerofill,
+f76 real unsigned zerofill,
+f77 double default 7.7,
+f78 double unsigned default 7.7,
+f79 double zerofill default 7.7,
+f80 double unsigned zerofill default 8.8,
+f81 float not null default 8.8,
+f82 float unsigned not null default 8.8,
+f83 float zerofill not null default 8.8,
+f84 float unsigned zerofill not null default 8.8,
+f85 float(0) not null default 8.8,
+f86 float(23) not null default 8.8,
+f87 float(0) unsigned not null default 8.8,
+f88 float(23) unsigned not null default 8.8,
+f89 float(0) zerofill not null default 8.8,
+f90 float(23) zerofill not null default 8.8,
+f91 float(0) unsigned zerofill not null default 8.8,
+f92 float(23) unsigned zerofill not null default 8.8,
+f93 float(24) not null default 8.8,
+f94 float(53) not null default 8.8,
+f95 float(24) unsigned not null default 8.8,
+f96 float(53) unsigned not null default 8.8,
+f97 float(24) zerofill not null default 8.8,
+f98 float(53) zerofill not null default 8.8,
+f99 float(24) unsigned zerofill not null default 8.8,
+f100 float(53) unsigned zerofill not null default 8.8,
+f101 date not null default '2000-01-01',
+f102 time not null default 20,
+f103 datetime not null default '2/2/2',
+f104 timestamp not null default 20001231235959,
+f105 year not null default 2000,
+f106 year(3) not null default 2000,
+f107 year(4) not null default 2000,
+f108 enum("1enum","2enum") not null default "1enum",
 f109 set("1set","2set") not null default "1set"
 ) engine = ndb;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb2.txt' into table tb2 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/ndb_tb2.txt'
+into table tb2 ;
 DROP DATABASE IF EXISTS test1;
 CREATE DATABASE test1;
 USE test1;
 drop table if exists tb2 ;
 create table tb2 (
-f59 numeric (0) unsigned, 
-f60 numeric (64) unsigned, 
-f61 numeric (0) zerofill, 
-f62 numeric (64) zerofill, 
-f63 numeric (0) unsigned zerofill, 
-f64 numeric (64) unsigned zerofill, 
-f65 numeric (0,0), 
-f66 numeric (63,30), 
-f67 numeric (0,0) unsigned, 
-f68 numeric (63,30) unsigned, 
-f69 numeric (0,0) zerofill, 
-f70 numeric (63,30) zerofill, 
-f71 numeric (0,0) unsigned zerofill, 
-f72 numeric (63,30) unsigned zerofill, 
-f73 real, 
-f74 real unsigned, 
-f75 real zerofill, 
-f76 real unsigned zerofill, 
-f77 double default 7.7, 
-f78 double unsigned default 7.7, 
-f79 double zerofill default 7.7, 
-f80 double unsigned zerofill default 8.8, 
-f81 float not null default 8.8, 
-f82 float unsigned not null default 8.8, 
-f83 float zerofill not null default 8.8, 
-f84 float unsigned zerofill not null default 8.8, 
-f85 float(0) not null default 8.8, 
-f86 float(23) not null default 8.8, 
-f87 float(0) unsigned not null default 8.8, 
-f88 float(23) unsigned not null default 8.8, 
-f89 float(0) zerofill not null default 8.8, 
-f90 float(23) zerofill not null default 8.8, 
-f91 float(0) unsigned zerofill not null default 8.8, 
-f92 float(23) unsigned zerofill not null default 8.8, 
-f93 float(24) not null default 8.8, 
-f94 float(53) not null default 8.8, 
-f95 float(24) unsigned not null default 8.8, 
-f96 float(53) unsigned not null default 8.8, 
-f97 float(24) zerofill not null default 8.8, 
-f98 float(53) zerofill not null default 8.8, 
-f99 float(24) unsigned zerofill not null default 8.8, 
-f100 float(53) unsigned zerofill not null default 8.8, 
-f101 date not null default '2000-01-01', 
-f102 time not null default 20, 
-f103 datetime not null default '2/2/2', 
-f104 timestamp not null default 20001231235959, 
-f105 year not null default 2000, 
-f106 year(3) not null default 2000, 
-f107 year(4) not null default 2000, 
-f108 enum("1enum","2enum") not null default "1enum", 
+f59 numeric (0) unsigned,
+f60 numeric (64) unsigned,
+f61 numeric (0) zerofill,
+f62 numeric (64) zerofill,
+f63 numeric (0) unsigned zerofill,
+f64 numeric (64) unsigned zerofill,
+f65 numeric (0,0),
+f66 numeric (63,30),
+f67 numeric (0,0) unsigned,
+f68 numeric (63,30) unsigned,
+f69 numeric (0,0) zerofill,
+f70 numeric (63,30) zerofill,
+f71 numeric (0,0) unsigned zerofill,
+f72 numeric (63,30) unsigned zerofill,
+f73 real,
+f74 real unsigned,
+f75 real zerofill,
+f76 real unsigned zerofill,
+f77 double default 7.7,
+f78 double unsigned default 7.7,
+f79 double zerofill default 7.7,
+f80 double unsigned zerofill default 8.8,
+f81 float not null default 8.8,
+f82 float unsigned not null default 8.8,
+f83 float zerofill not null default 8.8,
+f84 float unsigned zerofill not null default 8.8,
+f85 float(0) not null default 8.8,
+f86 float(23) not null default 8.8,
+f87 float(0) unsigned not null default 8.8,
+f88 float(23) unsigned not null default 8.8,
+f89 float(0) zerofill not null default 8.8,
+f90 float(23) zerofill not null default 8.8,
+f91 float(0) unsigned zerofill not null default 8.8,
+f92 float(23) unsigned zerofill not null default 8.8,
+f93 float(24) not null default 8.8,
+f94 float(53) not null default 8.8,
+f95 float(24) unsigned not null default 8.8,
+f96 float(53) unsigned not null default 8.8,
+f97 float(24) zerofill not null default 8.8,
+f98 float(53) zerofill not null default 8.8,
+f99 float(24) unsigned zerofill not null default 8.8,
+f100 float(53) unsigned zerofill not null default 8.8,
+f101 date not null default '2000-01-01',
+f102 time not null default 20,
+f103 datetime not null default '2/2/2',
+f104 timestamp not null default 20001231235959,
+f105 year not null default 2000,
+f106 year(3) not null default 2000,
+f107 year(4) not null default 2000,
+f108 enum("1enum","2enum") not null default "1enum",
 f109 set("1set","2set") not null default "1set"
 ) engine = ndb;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb2.txt' into table tb2 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/ndb_tb2.txt'
+into table tb2 ;
 USE test;
 
 ! Attention: The file with the expected results is not
diff -Nrup a/mysql-test/suite/funcs_1/storedproc/storedproc_02.inc b/mysql-test/suite/funcs_1/storedproc/storedproc_02.inc
--- a/mysql-test/suite/funcs_1/storedproc/storedproc_02.inc	2008-03-31 23:34:58 +02:00
+++ b/mysql-test/suite/funcs_1/storedproc/storedproc_02.inc	2008-04-01 13:18:29 +02:00
@@ -1503,16 +1503,16 @@ BEGIN
    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/storedproc/storedproc_master.inc b/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
--- a/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc	2008-03-07 20:18:12 +01:00
+++ b/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc	2008-04-01 13:18:29 +02:00
@@ -6,10 +6,6 @@
 ############################################################################
 --enable_query_log
 
-# prepare a variable to be able to suppress machine dependant diffs
-#let $SERVER_NAME= `SELECT DISTINCT host FROM mysql.user WHERE host LIKE "%\%" AND host NOT In ("localhost", "127.0.0.1", "%")`;
-# can be used in: --replace_result $SERVER_NAME <SERVER_NAME>
-
 # ==============================================================================
 let $message= Section 3.1.1 - Syntax checks for the CREATE PROCEDURE, CREATE
 FUNCTION, ALTER PROCEDURE, ALTER FUNCTION, DROP PROCEDURE, DROP FUNCTION, SHOW
@@ -18116,53 +18112,56 @@ let $message= Testcase 4.3.1:;
 
 --disable_warnings
 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;
 --enable_warnings
 
 #FIXME: change back to $engine_type for INNODB and MYISAM, but MEMORY doesn't support this
-eval CREATE TABLE res_t3_itisalongname_1381742_itsaverylongname_1381742(
-         middleinitial CHAR,
-         lastname VARCHAR(50),
-         age_averylongfieldname_averylongname_1234569 int,
-         COMMENT TEXT) ENGINE=$engine_type;
+--replace_result $engine_type <engine_to_be_tested>
+eval
+CREATE TABLE res_t3_itisalongname_1381742_itsaverylongname_1381742(
+   middleinitial CHAR, lastname VARCHAR(50),
+   age_averylongfieldname_averylongname_1234569 INT, COMMENT VARCHAR(100))
+ENGINE=$engine_type;
 
 INSERT INTO res_t3_itisalongname_1381742_itsaverylongname_1381742
-      VALUES('a', 'aaaaaaaaaabbbbbbbbc', 0, 'default');
+VALUES('a', 'aaaaaaaaaabbbbbbbbc', 0, 'default');
 
 delimiter //;
-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//
 delimiter ;//
 
diff -Nrup a/mysql-test/suite/funcs_1/t/is_engines.test b/mysql-test/suite/funcs_1/t/is_engines.test
--- a/mysql-test/suite/funcs_1/t/is_engines.test	2008-03-07 20:18:12 +01:00
+++ b/mysql-test/suite/funcs_1/t/is_engines.test	2008-04-01 13:18:29 +02:00
@@ -40,7 +40,7 @@ eval SHOW TABLES FROM information_schema
 # Ensure that the INFORMATION_SCHEMA.ENGINES table has the following columns,
 # in the following order:
 #
-# ENGINE 
+# ENGINE
 # SUPPORT
 # COMMENT
 # TRANSACTIONS
diff -Nrup a/mysql-test/suite/funcs_1/t/ndb_trig_03.test b/mysql-test/suite/funcs_1/t/ndb_trig_03.test
--- a/mysql-test/suite/funcs_1/t/ndb_trig_03.test	2008-03-12 12:56:05 +01:00
+++ b/mysql-test/suite/funcs_1/t/ndb_trig_03.test	2008-04-01 13:18:29 +02:00
@@ -10,7 +10,7 @@ let $engine_type= ndb;
 # Create some objects needed in many testcases
 USE test;
 --source suite/funcs_1/include/ndb_tb3.inc
-    
+
 --source suite/funcs_1/triggers/triggers_03.inc
 DROP TABLE test.tb3;
 
diff -Nrup a/mysql-test/suite/funcs_1/t/ndb_trig_08.test b/mysql-test/suite/funcs_1/t/ndb_trig_08.test
--- a/mysql-test/suite/funcs_1/t/ndb_trig_08.test	2008-03-12 12:56:05 +01:00
+++ b/mysql-test/suite/funcs_1/t/ndb_trig_08.test	2008-04-01 13:18:29 +02:00
@@ -10,7 +10,7 @@ let $engine_type= ndb;
 # Create some objects needed in many testcases
 USE test;
 --source suite/funcs_1/include/ndb_tb3.inc
-    
+
 --source suite/funcs_1/triggers/triggers_08.inc
 DROP TABLE test.tb3;
 
diff -Nrup a/mysql-test/suite/funcs_1/t/ndb_views.test b/mysql-test/suite/funcs_1/t/ndb_views.test
--- a/mysql-test/suite/funcs_1/t/ndb_views.test	2008-03-12 12:56:05 +01:00
+++ b/mysql-test/suite/funcs_1/t/ndb_views.test	2008-04-01 13:18:29 +02:00
@@ -17,7 +17,7 @@ CREATE DATABASE test1;
 USE test1;
 --source suite/funcs_1/include/ndb_tb2.inc
 USE test;
-    
+
 --source suite/funcs_1/views/views_master.inc
 DROP DATABASE test1;
 DROP TABLE test.tb2;
diff -Nrup a/mysql-test/suite/funcs_1/t/suite.opt b/mysql-test/suite/funcs_1/t/suite.opt
--- a/mysql-test/suite/funcs_1/t/suite.opt	2007-06-27 14:27:58 +02:00
+++ b/mysql-test/suite/funcs_1/t/suite.opt	2008-04-01 13:18:29 +02:00
@@ -1,2 +1,2 @@
---secure-file-priv=$MYSQL_TEST_DIR
+--secure-file-priv=$MYSQLTEST_VARDIR
 
diff -Nrup a/mysql-test/suite/funcs_1/triggers/trig_frkey.inc b/mysql-test/suite/funcs_1/triggers/trig_frkey.inc
--- a/mysql-test/suite/funcs_1/triggers/trig_frkey.inc	2007-07-27 12:59:07 +02:00
+++ b/mysql-test/suite/funcs_1/triggers/trig_frkey.inc	2008-04-01 13:18:29 +02:00
@@ -70,7 +70,7 @@ let $message= Testcase x.x.x.2:;
 	insert into t2 values (1,2,'Emp 1');
 	insert into t2 values (2,3,'Emp 2');
 
-	--error 1452
+	--error ER_NO_REFERENCED_ROW_2
 	insert into t2 values (3,4,'Emp 3');
 
 	create trigger tr_t2 before insert on t2 for each row
diff -Nrup a/mysql-test/suite/funcs_1/triggers/triggers_0102.inc b/mysql-test/suite/funcs_1/triggers/triggers_0102.inc
--- a/mysql-test/suite/funcs_1/triggers/triggers_0102.inc	2008-03-31 23:34:58 +02:00
+++ b/mysql-test/suite/funcs_1/triggers/triggers_0102.inc	2008-04-01 13:18:29 +02:00
@@ -215,9 +215,9 @@ let $message= Testcase 3.5.1.7: - need t
 	CREATE TRIGGER trg5_1 BEFORE INSERT on test.t1
 		for each row set new.f3 = '14';
 # In 5.0 names to long (more than 64 chars) were trimed without an error
-# In 5.1 an error is returned. So adding a call with the expected error 
+# In 5.1 an error is returned. So adding a call with the expected error
 # and one with a shorter name to validate proper execution
-	--error 1059
+	--error ER_TOO_LONG_IDENT
 	CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ
 		BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
 	CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX
@@ -234,7 +234,7 @@ let $message= Testcase 3.5.1.7: - need t
 	--error 0, ER_TRG_DOES_NOT_EXIST
 	drop trigger trg5_1;
 	# In 5.1 the long name should generate an error that is to long
-	--error 1059
+	--error ER_TOO_LONG_IDENT
 	drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ;
 	drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX;
 	drop table t1;
diff -Nrup a/mysql-test/suite/funcs_1/triggers/triggers_03.inc b/mysql-test/suite/funcs_1/triggers/triggers_03.inc
--- a/mysql-test/suite/funcs_1/triggers/triggers_03.inc	2008-03-31 23:36:39 +02:00
+++ b/mysql-test/suite/funcs_1/triggers/triggers_03.inc	2008-04-01 13:18:29 +02:00
@@ -64,8 +64,7 @@ let $message= Testcase 3.5.3.2:;
         select current_user;
 	use priv_db;
 
-# error 1227 is better, as it says, that not the privilege
-	--error 1142,1227
+	--error ER_TABLEACCESS_DENIED_ERROR
 	create trigger trg1_1 before INSERT on t1 for each row
 		set new.f1 = 'trig 3.5.3.2_1-no';
 
@@ -85,7 +84,7 @@ let $message= Testcase 3.5.3.2:;
         select current_user;
 	use priv_db;
 
-        --error 1143
+        --error ER_COLUMNACCESS_DENIED_ERROR
 	insert into t1 (f1) values ('insert 3.5.3.2-yes');
 	select f1 from t1 order by f1;
 
@@ -99,7 +98,7 @@ let $message= Testcase 3.5.3.6:;
 	connection no_privs;
 	use priv_db;
 
-	--error 1142,1227
+	--error ER_TABLEACCESS_DENIED_ERROR
 	drop trigger trg1_2;
 
 	connection default;
@@ -120,7 +119,7 @@ let $message= Testcase 3.5.3.6:;
 # Cleanup
 	--disable_warnings
 	connection default;
-	--error 0, 1360
+	--error 0, ER_TRG_DOES_NOT_EXIST
 	drop trigger trg1_2;
 	disconnect no_privs;
 	disconnect yes_privs;
@@ -131,8 +130,6 @@ let $message= Testcase 3.5.3.6:;
 # Test case: Ensure that use of the construct "SET NEW. <column name> = <value>"
 #            fails at CREATE TRIGGER time, if the current user does not have the
 #            UPDATE privilege on the column specified
-# Note: As a result of bug 8884 the triggers are actually created.
-#       Disabled because of bug 8884
 
 # --- 3.5.3.7a - Privs set on a global level
 let $message=Testcase 3.5.3.7a:;
diff -Nrup a/mysql-test/suite/funcs_1/triggers/triggers_03e_columns.inc b/mysql-test/suite/funcs_1/triggers/triggers_03e_columns.inc
--- a/mysql-test/suite/funcs_1/triggers/triggers_03e_columns.inc	2007-02-06 13:19:35 +01:00
+++ b/mysql-test/suite/funcs_1/triggers/triggers_03e_columns.inc	2008-04-01 13:18:29 +02:00
@@ -95,12 +95,12 @@ let $message= update only on column:;
 	use priv_db;
         update t1 set f1 = 'update2_no'
                 where f1 like '%insert%';
-	--error 1143
+	--error ER_COLUMNACCESS_DENIED_ERROR
         update t2 set f1 = 'update2_no'
                 where f1 like '%insert%';
         update t1 set f1 = 'update3_no'
                 where f1 like '%insert%';
-	--error 1143
+	--error ER_COLUMNACCESS_DENIED_ERROR
         update t2 set f1 = 'update3_no'
                 where f1 like '%insert%';
         select f1 from t1 order by f1;
@@ -148,12 +148,12 @@ let $message= check if access only on on
 
         update t1 set f1 = 'update6_no'
                 where f1 like '%insert%';
-        --error 1142
+        --error ER_TABLEACCESS_DENIED_ERROR
         update t2 set f1 = 'update6_no'
                 where f1 like '%insert%';
         update t1 set f1 = 'update7_no'
                 where f1 like '%insert%';
-        --error 1142
+        --error ER_TABLEACCESS_DENIED_ERROR
         update t2 set f1 = 'update7_no'
                 where f1 like '%insert%';
         select f1 from t1 order by f1;
@@ -173,7 +173,7 @@ let $message= check if rejected without 
 
         connection no_privs;
         select current_user;
-	--error 1142
+	--error ER_TABLEACCESS_DENIED_ERROR
         update t1 set   f1 = 'update8-no',
                         f2 = 'update8-no'
                 where f2 like '%yes';
@@ -188,7 +188,7 @@ let $message= check trigger, but not upd
         connection default;
         select current_user;
         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;
 
@@ -202,14 +202,14 @@ let $message= check trigger, but not upd
         connection no_privs;
         select current_user;
 	use priv_db;
-	--error 1143
+	--error ER_COLUMNACCESS_DENIED_ERROR
         update t1 set   f1 = 'update9-no',
                         f2 = 'update9-no'
                 where f2 like '%yes';
         select * from t1 order by f1,f2,f3;
 
 # trigger is involved (table privilege) ->fail
-	--error 1143
+	--error ER_COLUMNACCESS_DENIED_ERROR
 	update t1 set f3= f3+1;
 	select f3 from t1 order by f3;
 
@@ -224,13 +224,13 @@ let $message= check trigger, but not upd
         connection no_privs;
         select current_user;
         use priv_db;
-        --error 1142
+        --error ER_TABLEACCESS_DENIED_ERROR
         update t1 set f3= f3+1;
         select f3 from t1 order by f3;
 
 let $message= ##### trigger privilege on column level? #######;
 --source include/show_msg.inc
-	--error 1064
+	--error ER_PARSE_ERROR
 	grant TRIGGER(f1) on priv_db.t1 to test_yesprivs@localhost;
 
 # Cleanup table level
@@ -242,7 +242,7 @@ let $message= ##### trigger privilege on
         select current_user;
 
 
-# general Cleanup 
+# general Cleanup
 	drop database if exists priv_db;
 	drop user test_yesprivs@localhost;
 	drop user test_noprivs@localhost;
diff -Nrup a/mysql-test/suite/funcs_1/triggers/triggers_03e_db_level.inc b/mysql-test/suite/funcs_1/triggers/triggers_03e_db_level.inc
--- a/mysql-test/suite/funcs_1/triggers/triggers_03e_db_level.inc	2007-02-06 13:19:35 +01:00
+++ b/mysql-test/suite/funcs_1/triggers/triggers_03e_db_level.inc	2008-04-01 13:18:29 +02:00
@@ -42,7 +42,7 @@ let $message= Testcase for db level:;
 let $message= no trigger privilege on db level for create:;
 --source include/show_msg.inc
 	use priv_db;
-	--error 1142
+	--error ER_TABLEACCESS_DENIED_ERROR
 	create trigger trg1_1 before INSERT on t1 for each row
 		set new.f1 = 'trig 1_1-no';
 
@@ -101,7 +101,7 @@ let $message= no trigger privilege on db
 	connection yes_privs;
         select current_user;
 	use priv_db;
-	--error 1142
+	--error ER_TABLEACCESS_DENIED_ERROR
 	drop trigger trg1_2;
 
 	connection no_privs;
@@ -110,7 +110,7 @@ let $message= no trigger privilege on db
 # no trigger privilege at activation time:
 let $message= no trigger privilege at activation time:;
 --source include/show_msg.inc
-        --error 1142
+        --error ER_TABLEACCESS_DENIED_ERROR
         insert into t1 (f1) values ('insert-yes');
         select f1 from t1 order by f1;
 
@@ -132,7 +132,7 @@ let $message= trigger privilege on db le
 	connection yes_privs;
         select current_user;
         show grants for test_yesprivs@localhost;
-        --error 1142
+        --error ER_TABLEACCESS_DENIED_ERROR
  	drop trigger trg1_2;
 
 # succeed
@@ -161,14 +161,14 @@ let $message= use db with trigger privil
         connection yes_privs;
         select current_user;
         use no_priv_db;
-	--error 1142
+	--error ER_TABLEACCESS_DENIED_ERROR
         create trigger trg1_3 before INSERT  on t1 for each row
                 set new.f1 = 'trig 1_3-no';
         use priv_db;
         create trigger trg1_3 before INSERT  on t1 for each row
                 set new.f1 = 'trig 1_3-yes';
         use no_priv_db;
-        --error 1142
+        --error ER_TABLEACCESS_DENIED_ERROR
         create trigger trg1_4 before UPDATE  on t1 for each row
                 set new.f1 = 'trig 1_4-no';
         use priv_db;
@@ -190,12 +190,12 @@ let $message= use db with trigger privil
         connection yes_privs;
         select current_user;
         use no_priv_db;
-	--error 1360
+	--error ER_TRG_DOES_NOT_EXIST
         drop trigger trg1_3;
         use priv_db;
         drop trigger trg1_3;
         use no_priv_db;
-        --error 1360
+        --error ER_TRG_DOES_NOT_EXIST
         drop trigger trg1_4;
         use priv_db;
         drop trigger trg1_4;
@@ -211,7 +211,7 @@ let $message= use db with trigger privil
 	drop table no_priv_db.t1;
 	--enable_warnings
 
-# general Cleanup 
+# general Cleanup
 	--disable_warnings
 	drop database if exists priv_db;
         drop database if exists no_priv_db;
diff -Nrup a/mysql-test/suite/funcs_1/triggers/triggers_03e_db_table_mix.inc b/mysql-test/suite/funcs_1/triggers/triggers_03e_db_table_mix.inc
--- a/mysql-test/suite/funcs_1/triggers/triggers_03e_db_table_mix.inc	2007-02-06 13:19:35 +01:00
+++ b/mysql-test/suite/funcs_1/triggers/triggers_03e_db_table_mix.inc	2008-04-01 13:18:29 +02:00
@@ -60,7 +60,7 @@ let $message= trigger privilege on one d
         create trigger trg2_1 before INSERT  on t2 for each row
                 set new.f1 = 'trig 2_1-yes';
 	use priv2_db;
-	--error 1142
+	--error ER_TABLEACCESS_DENIED_ERROR
 	create trigger trg1_1 before INSERT  on t1 for each row
 		set new.f1 = 'trig1_1-yes';
 
@@ -80,7 +80,7 @@ let $message= trigger privilege on one d
         select f1 from priv1_db.t1 order by f1;
         insert into priv1_db.t2 (f1) values ('insert22-no');
         select f1 from priv1_db.t2 order by f1;
- 
+
 # revoke trigger priv on table level, that doesn't exists->fail
 
 let $message= revoke trigger privilege on table level (not existing);
@@ -88,7 +88,7 @@ let $message= revoke trigger privilege o
        	connection default;
         select current_user;
 	use priv1_db;
-	--error 1147
+	--error ER_NONEXISTING_TABLE_GRANT
         revoke TRIGGER on priv1_db.t1 from test_yesprivs@localhost;
         show grants for test_yesprivs@localhost;
 
@@ -100,7 +100,7 @@ let $message= revoke trigger privilege o
 	drop trigger trg1_1;
 	drop trigger trg2_1;
 
-# revoke the db level->create/drop/use trigger fail 
+# revoke the db level->create/drop/use trigger fail
 
         connection default;
 	select current_user;
@@ -116,7 +116,7 @@ let $message= no trigger privilege on ta
 	connection yes_privs;
         select current_user;
 	use priv1_db;
-	--error 1142
+	--error ER_TABLEACCESS_DENIED_ERROR
 	create trigger trg1_1 before INSERT on t1 for each row
 		set new.f1 = 'trig 1_1-no';
 
@@ -133,7 +133,7 @@ let $message= trigger privilege on table
 	show triggers;
 	create trigger trg1_2 before INSERT  on t1 for each row
 		set new.f1 = 'trig 1_2-yes';
-        --error 1142
+        --error ER_TABLEACCESS_DENIED_ERROR
         create trigger trg2_1 before INSERT  on t2 for each row
                 set new.f1 = 'trig 2_1-no';
 
@@ -157,7 +157,7 @@ let $message= trigger privilege on table
 
 	connection yes_privs;
         select current_user;
-	--error 1142
+	--error ER_TABLEACCESS_DENIED_ERROR
         create trigger trg2_1 before INSERT  on t2 for each row
                 set new.f1 = 'trig 2_1-yes';
 
@@ -196,7 +196,7 @@ let $message= trigger privilege on table
         select current_user;
 
 
-# general Cleanup 
+# general Cleanup
 	drop database if exists priv1_db;
 	drop database if exists priv2_db;
 	drop user test_yesprivs@localhost;
diff -Nrup a/mysql-test/suite/funcs_1/triggers/triggers_03e_definer.inc b/mysql-test/suite/funcs_1/triggers/triggers_03e_definer.inc
--- a/mysql-test/suite/funcs_1/triggers/triggers_03e_definer.inc	2007-02-06 13:19:35 +01:00
+++ b/mysql-test/suite/funcs_1/triggers/triggers_03e_definer.inc	2008-04-01 13:18:29 +02:00
@@ -38,7 +38,7 @@ let $message= #########      Testcase fo
                 before INSERT on t1 for each row
                 set new.f1 = 'trig 1_0-yes';
 	drop trigger trg1_0;
-# create trigger with definer test_yesprivs@localhost->succeed: 
+# create trigger with definer test_yesprivs@localhost->succeed:
         create definer=test_yesprivs@localhost trigger trg1_0
                 before INSERT on t1 for each row
                 set new.f1 = 'trig 1_0-yes';
@@ -49,13 +49,15 @@ let $message= #########      Testcase fo
 	select current_user;
 	use priv_db;
 # user hasn't trigger privilege->fail:
-	--error 1142
+	--error ER_TABLEACCESS_DENIED_ERROR
         insert into t1 (f1) values ('insert-no');
         select f1 from t1 order by f1;
-	--error 1142
+	--error ER_TABLEACCESS_DENIED_ERROR
         drop trigger trg1_0;
 
-        connection default;                                                             select current_user;                                                    	grant  select, insert, update ,trigger
+        connection default;
+        select current_user;
+        grant  select, insert, update ,trigger
 	        on priv_db.t1 to test_yesprivs@localhost;
 	show grants for test_yesprivs@localhost;
 
@@ -66,12 +68,12 @@ let $message= #########      Testcase fo
         select f1 from t1 order by f1;
         drop trigger trg1_0;
 # user has not super privilege->fail:
-	--error 1227
+	--error ER_SPECIFIC_ACCESS_DENIED_ERROR
         create definer=not_ex_user@localhost trigger trg1_0
                 before INSERT on t1 for each row
                 set new.f1 = 'trig 1_0-yes';
 # shall always succeed:
-	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');
@@ -92,7 +94,7 @@ let $message= #########      Testcase fo
         connection yes_privs;
 	select current_user;
 	show grants;
-	--error 1227
+	--error ER_SPECIFIC_ACCESS_DENIED_ERROR
         create definer=not_ex_user@localhost trigger trg1_3
                 after UPDATE on t1 for each row
                 set @var1 = 'trig 1_3-yes';
@@ -109,7 +111,7 @@ let $message= #########      Testcase fo
 	--enable_warnings
 
 
-# general Cleanup 
+# general Cleanup
 	--disable_warnings
 	drop database if exists priv_db;
 	drop user test_yesprivs@localhost;
diff -Nrup a/mysql-test/suite/funcs_1/triggers/triggers_03e_global_db_mix.inc b/mysql-test/suite/funcs_1/triggers/triggers_03e_global_db_mix.inc
--- a/mysql-test/suite/funcs_1/triggers/triggers_03e_global_db_mix.inc	2007-02-06 13:19:35 +01:00
+++ b/mysql-test/suite/funcs_1/triggers/triggers_03e_global_db_mix.inc	2008-04-01 13:18:29 +02:00
@@ -89,7 +89,7 @@ let $message= trigger privilege on user 
         use priv_db;
         show triggers;
 	select * from information_schema.triggers;
-	--error 1142
+	--error ER_TABLEACCESS_DENIED_ERROR
         drop trigger trg1_1;
 
         connection default;
@@ -106,7 +106,7 @@ let $message= no trigger privilege on db
 
 	connection yes_privs;
         select current_user;
-	--error 1142
+	--error ER_TABLEACCESS_DENIED_ERROR
 	create trigger trg1_1 before INSERT on t1 for each row
 		set new.f1 = 'trig 1_1-no';
 
@@ -131,12 +131,12 @@ let $message= trigger privilege on db le
 	use priv_db;
 	create trigger trg1_2 before INSERT  on t1 for each row
 		set new.f1 = 'trig 1_2-yes';
-        --error 1142
+        --error ER_TABLEACCESS_DENIED_ERROR
 	create trigger no_priv_db.trg1_9 before insert on no_priv_db.t1
 		for each row
 		set new.f1 = 'trig 1_9-yes';
         use no_priv_db;
-	--error 1142
+	--error ER_TABLEACCESS_DENIED_ERROR
         create trigger trg1_2 before INSERT  on t1 for each row
                 set new.f1 = 'trig 1_2-no';
         create trigger priv_db.trg1_9 before UPDATE on priv_db.t1
@@ -151,7 +151,7 @@ let $message= trigger privilege on db le
 	use no_priv_db;
         insert into t1 (f1) values ('insert-yes');
         select f1 from t1 order by f1;
-	--error 1142
+	--error ER_TABLEACCESS_DENIED_ERROR
 	drop trigger priv_db.trg1_9;
 
         connection default;
@@ -159,7 +159,7 @@ let $message= trigger privilege on db le
 	drop trigger priv_db.trg1_9;
  	revoke TRIGGER on priv_db.* from test_yesprivs@localhost;
 	use priv_db;
-	--error 1142
+	--error ER_TABLEACCESS_DENIED_ERROR
 	insert into t1 (f1) values ('insert-yes');
 	select f1 from t1 order by f1;
         grant TRIGGER on *.* to test_yesprivs@localhost;
@@ -168,7 +168,7 @@ let $message= trigger privilege on db le
 	connection yes_privs;
         select current_user;
 	use no_priv_db;
-	--error 1142
+	--error ER_TABLEACCESS_DENIED_ERROR
         create trigger trg1_2 before INSERT  on t1 for each row
                 set new.f1 = 'trig 1_2-no';
 
@@ -209,7 +209,7 @@ let $message= trigger privilege on db le
 	connection default;
         select current_user;
 
-# general Cleanup 
+# general Cleanup
 	drop database if exists priv_db;
 	drop database if exists no_priv_db;
         drop database if exists h1;
diff -Nrup a/mysql-test/suite/funcs_1/triggers/triggers_03e_prepare.inc b/mysql-test/suite/funcs_1/triggers/triggers_03e_prepare.inc
--- a/mysql-test/suite/funcs_1/triggers/triggers_03e_prepare.inc	2007-02-06 13:19:35 +01:00
+++ b/mysql-test/suite/funcs_1/triggers/triggers_03e_prepare.inc	2008-04-01 13:18:29 +02:00
@@ -39,7 +39,7 @@ let $message= #### Testcase for trigger 
         select current_user;
 	show triggers;
 	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;
@@ -71,7 +71,7 @@ let $message= #### Testcase for trigger 
 
         connection yes_privs;
         select current_user;
-	--error 1142
+	--error ER_TABLEACCESS_DENIED_ERROR
         execute ins1;
         select f1 from t1 order by f1;
         prepare ins1 from 'insert into t1 (f1) values (''insert4-no'')';
@@ -79,7 +79,7 @@ let $message= #### Testcase for trigger 
         connection use_privs;
         select current_user;
         prepare ins1 from 'insert into t1 (f1) values (''insert5-no'')';
-	--error 1142
+	--error ER_TABLEACCESS_DENIED_ERROR
         execute ins1;
         select f1 from t1 order by f1;
 
@@ -107,13 +107,13 @@ let $message= #### Testcase for trigger 
 
         connection yes_privs;
         select current_user;
-        --error 1142
+        --error ER_TABLEACCESS_DENIED_ERROR
         execute ins1;
         select f1 from t1 order by f1;
 
         connection use_privs;
         select current_user;
-        --error 1142
+        --error ER_TABLEACCESS_DENIED_ERROR
         execute ins1;
         select f1 from t1 order by f1;
 
@@ -170,7 +170,7 @@ let $message= #### Testcase for trigger 
 	--enable_warnings
 
 
-# general Cleanup 
+# general Cleanup
 	--disable_warnings
 	drop database if exists priv_db;
 	drop user test_yesprivs@localhost;
diff -Nrup a/mysql-test/suite/funcs_1/triggers/triggers_03e_table_level.inc b/mysql-test/suite/funcs_1/triggers/triggers_03e_table_level.inc
--- a/mysql-test/suite/funcs_1/triggers/triggers_03e_table_level.inc	2007-02-06 13:19:35 +01:00
+++ b/mysql-test/suite/funcs_1/triggers/triggers_03e_table_level.inc	2008-04-01 13:18:29 +02:00
@@ -57,7 +57,7 @@ let $message= no trigger privilege on ta
         select current_user;
 	use priv_db;
 	show tables;
-	--error 1142
+	--error ER_TABLEACCESS_DENIED_ERROR
 	create trigger trg1_1 before INSERT on t1 for each row
 		set new.f1 = 'trig 1_1-no';
 
@@ -109,7 +109,7 @@ let $message= no trigger privilege on ta
 	connection yes_privs;
         select current_user;
 
-	--error 1142 
+	--error ER_TABLEACCESS_DENIED_ERROR
 	drop trigger trg1_2;
 
 # no trigger priv at activation time->insert fails
@@ -118,7 +118,7 @@ let $message= no trigger privilege at ac
 --source include/show_msg.inc
 	connection no_privs;
 	select current_user;
-	--error 1142
+	--error ER_TABLEACCESS_DENIED_ERROR
 	insert into t1 (f1) values ('insert5-no');
 	select f1 from t1 order by f1;
 
@@ -155,7 +155,7 @@ let $message= trigger privilege on table
 	insert into t1 (f1) values ('insert8-yes');
 	select f1 from t1 order by f1;
 
-# trigger privilege must be keep when mixinf tables with and without 
+# trigger privilege must be keep when mixinf tables with and without
 # trigger privilege
 
 let $message= switch to table without having trigger priv for it:;
@@ -172,12 +172,12 @@ let $message= use table with trigger pri
 --source include/show_msg.inc
         connection yes_privs;
         select current_user;
-	--error 1142
+	--error ER_TABLEACCESS_DENIED_ERROR
         create trigger trg2_1 before INSERT  on t2 for each row
                 set new.f1 = 'trig 2_1-no';
         create trigger trg1_3 before INSERT  on t1 for each row
                 set new.f1 = 'trig 1_3-yes';
-        --error 1142
+        --error ER_TABLEACCESS_DENIED_ERROR
         create trigger trg2_2 before UPDATE  on t2 for each row
                 set new.f1 = 'trig 2_2-no';
         create trigger trg1_4 before UPDATE  on t1 for each row
@@ -193,10 +193,10 @@ let $message= use table with trigger pri
 
         connection yes_privs;
         select current_user;
-	--error 1360
+	--error ER_TRG_DOES_NOT_EXIST
         drop trigger trg2_1;
         drop trigger trg1_3;
-        --error 1360
+        --error ER_TRG_DOES_NOT_EXIST
         drop trigger trg2_2;
         drop trigger trg1_4;
 
@@ -210,7 +210,7 @@ let $message= use table with trigger pri
 	--enable_warnings
 
 
-# general Cleanup 
+# general Cleanup
 	--disable_warnings
 	drop database if exists priv_db;
 	drop user test_yesprivs@localhost;
diff -Nrup a/mysql-test/suite/funcs_1/triggers/triggers_03e_transaction.inc b/mysql-test/suite/funcs_1/triggers/triggers_03e_transaction.inc
--- a/mysql-test/suite/funcs_1/triggers/triggers_03e_transaction.inc	2007-02-06 13:19:35 +01:00
+++ b/mysql-test/suite/funcs_1/triggers/triggers_03e_transaction.inc	2008-04-01 13:18:29 +02:00
@@ -40,7 +40,7 @@ let $message= #########      Testcase fo
         select current_user;
 	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;
@@ -56,7 +56,7 @@ let $message= #########      Testcase fo
 	commit work;
 	drop trigger trg1_1;
 	rollback work;
-	--error 1360
+	--error ER_TRG_DOES_NOT_EXIST
 	drop trigger trg1_1;
 	drop trigger trg1_2;
 	commit work;
@@ -74,7 +74,7 @@ let $message= #########      Testcase fo
 	--enable_warnings
 
 
-# general Cleanup 
+# general Cleanup
 	--disable_warnings
 	drop database if exists priv_db;
 	drop user test_yesprivs@localhost;
diff -Nrup a/mysql-test/suite/funcs_1/triggers/triggers_0407.inc b/mysql-test/suite/funcs_1/triggers/triggers_0407.inc
--- a/mysql-test/suite/funcs_1/triggers/triggers_0407.inc	2008-03-31 23:36:41 +02:00
+++ b/mysql-test/suite/funcs_1/triggers/triggers_0407.inc	2008-04-01 13:18:30 +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)
 #======================================================================
 
 --disable_abort_on_error
@@ -46,7 +46,7 @@ let $message= Testcase 3.5.4.1:;
 	eval create table t1 (f1 char(30)) engine=$engine_type;
 	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';
 	connection con1_general;
 	Use db_drop;
@@ -61,17 +61,17 @@ let $message= Testcase 3.5.4.1:;
 	Select * from t1 order by f1;
 
 #Cleanup
-	--disable_warnings 
+	--disable_warnings
 	connection con1_super;
         --disable_warnings
-	--error 0,1360
-	drop trigger trg1; 
+	--error 0,ER_TRG_DOES_NOT_EXIST
+	drop trigger trg1;
 	drop database if exists db_drop;
 	revoke ALL PRIVILEGES, GRANT OPTION FROM 'test_general'@'localhost';
 	--enable_warnings
 
 #Section 3.5.4.2
-# Test case: Ensure that DROP TRIGGER <trigger name> fails, with an appropriate error 
+# Test case: Ensure that DROP TRIGGER <trigger name> fails, with an appropriate error
 #            message, if the trigger name does not exist.
 let $message= Testcase 3.5.4.2:;
 --source include/show_msg.inc
@@ -83,16 +83,16 @@ let $message= Testcase 3.5.4.2:;
 	drop table if exists t1_432 ;
 	--enable_warnings
 	eval create table t1_432 (f1 char (30)) engine=$engine_type;
-	--error 1360
+	--error ER_TRG_DOES_NOT_EXIST
 	Drop trigger tr_does_not_exit;
-#cleanup 
+#cleanup
 	--disable_warnings
 	drop table if exists t1_432 ;
 	drop database  if exists db_drop2;
 	--enable_warnings
 
 #Section 3.5.4.3
-# Test case: Ensure that DROP TRIGGER <trigger name> fails, with an appropriate 
+# Test case: Ensure that DROP TRIGGER <trigger name> fails, with an appropriate
 #            error message, if <trigger name> is not a qualified name.
 let $message= Testcase 3.5.4.3:;
 --source include/show_msg.inc
@@ -107,33 +107,33 @@ let $message= Testcase 3.5.4.3:;
 	eval create table t1_433 (f1 char (30)) engine=$engine_type;
 	eval create table t1_433a (f1a char (5)) engine=$engine_type;
 
-	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';
 
-# Using table 
-	--error 1064
+# Using table
+	--error ER_PARSE_ERROR
 	Drop trigger t1.433.trg3;
 
-# Using database.table 
-	--error 1064
+# Using database.table
+	--error ER_PARSE_ERROR
 	Drop trigger db_drop3.t1.433.trg3;
 
 # wrong database
-	--error 1360
+	--error ER_TRG_DOES_NOT_EXIST
 	Drop trigger mysql.trg3;
 
 # database does not exist
-	--error 1360
+	--error ER_TRG_DOES_NOT_EXIST
 	Drop trigger tbx.trg3;
 
-#cleanup 
+#cleanup
 	Drop trigger db_drop3.trg3;
 	drop table if exists t1_433;
 	drop table if exists t1_433a;
 	drop database if exists db_drop3;
 
 #Section 3.5.4.4
-# Test case: Ensure that when a database is dropped, all triggers created within 
+# Test case: Ensure that when a database is dropped, all triggers created within
 #            that database are also cleanly dropped.
 let $message= Testcase 3.5.4.4:;
 --source include/show_msg.inc
@@ -143,7 +143,7 @@ let $message= Testcase 3.5.4.4:;
 	Use db_drop4;
 	eval create table t1 (f1 char(30)) engine=$engine_type;
 	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';
 	connection con1_general;
 	Use db_drop4;
@@ -166,14 +166,14 @@ let $message= Testcase 3.5.4.4:;
 #Cleanup
 	connection con1_super;
         --disable_warnings
-	--error 1360
-	drop trigger trg4; 
+	--error ER_TRG_DOES_NOT_EXIST
+	drop trigger trg4;
 	drop database if exists db_drop4;
 	--enable_warnings
 	revoke ALL PRIVILEGES, GRANT OPTION FROM 'test_general'@'localhost';
 
 #Section 3.5.4.5
-# Test case: Ensure that when a table is dropped, all triggers for which it is the 
+# Test case: Ensure that when a table is dropped, all triggers for which it is the
 #            subject table are also cleanly dropped.
 let $message= Testcase 3.5.4.5:;
 --source include/show_msg.inc
@@ -183,7 +183,7 @@ let $message= Testcase 3.5.4.5:;
 	Use db_drop5;
 	eval create table t1 (f1 char(50)) engine=$engine_type;
 	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';
 	connection con1_general;
 	Use db_drop5;
@@ -204,8 +204,8 @@ let $message= Testcase 3.5.4.5:;
 #Cleanup
 	connection con1_super;
         --disable_warnings
-	--error 1360
-	drop trigger trg5; 
+	--error ER_TRG_DOES_NOT_EXIST
+	drop trigger trg5;
 	drop database if exists db_drop5;
 	--enable_warnings
 	revoke ALL PRIVILEGES, GRANT OPTION FROM 'test_general'@'localhost';
@@ -223,55 +223,55 @@ let $message= Testcase 3.5.5:;
 	use test;
 
 #Section 3.5.5.1
-# Test case: Ensure that, if CREATE TRIGGER is executed with a non-existent 
+# Test case: Ensure that, if CREATE TRIGGER is executed with a non-existent
 #            subject table, the statement fails with an appropriate error message.
 let $message= Testcase 3.5.5.1:;
 --source include/show_msg.inc
 
-	--error 1146
+	--error ER_NO_SUCH_TABLE
 	Create trigger trg1 before INSERT on t100 for each row set new.f2=1000;
 
 
 #Section 3.5.5.2
-# Test case: Ensure that, if CREATE TRIGGER is executed with a temporary table 
+# Test case: Ensure that, if CREATE TRIGGER is executed with a temporary table
 #           as the subject table, the statement fails with an appropriate error message.
 let $message= Testcase 3.5.5.2:;
 --source include/show_msg.inc
 	
 	Create temporary table t1_temp (f1 bigint signed, f2 bigint unsigned);
 	
-	--error 1361
-	Create trigger trg2 before INSERT 
+	--error ER_TRG_ON_VIEW_OR_TEMP_TABLE
+	Create trigger trg2 before INSERT
 		on t1_temp for each row set new.f2=9999;
 
 #Cleanup
-	--disable_warnings 
+	--disable_warnings
 	drop table t1_temp;
 	--enable_warnings
 
 
 #Section 3.5.5.3
-# Test case: Ensure that, if CREATE TRIGGER is executed with a view as the subject 
+# Test case: Ensure that, if CREATE TRIGGER is executed with a view as the subject
 #            table, the statement fails with an appropriate error message.
 let $message= Testcase 3.5.5.3:;
 --source include/show_msg.inc
 
 	Create view vw3 as select f118 from tb3;
 	
-# OBN Not sure why the server is returning error 1347
-	--error 1347
-	Create trigger trg3 before INSERT 
+# OBN Not sure why the server is returning error ER_WRONG_OBJECT
+	--error ER_WRONG_OBJECT
+	Create trigger trg3 before INSERT
 		on vw3 for each row set new.f118='s';
 
 #Cleanup
-	--disable_warnings 
+	--disable_warnings
 	drop view vw3;
 	--enable_warnings
 
 
 #Section 3.5.5.4
-# Test case: Ensure that, if CREATE TRIGGER is executed with a table that resides 
-#            in a different database than in which the trigger will reside, the 
+# Test case: Ensure that, if CREATE TRIGGER is executed with a table that resides
+#            in a different database than in which the trigger will reside, the
 #            statement fails with an appropriate error message; that is, ensure that
 #            the trigger and its subject table must reside in the same database.
 let $message= Testcase 3.5.5.4:;
@@ -283,7 +283,7 @@ let $message= Testcase 3.5.5.4:;
 	use dbtest_two;
 	eval create table t2 (f1 char(15)) engine=$engine_type;
 	use dbtest_one;
-	--error 1435
+	--error ER_TRG_IN_WRONG_SCHEMA
 	create trigger trg4 before INSERT
 		on dbtest_two.t2 for each row set new.f1='trig 3.5.5.4';
 	grant INSERT, SELECT on dbtest_two.t2 to test_general;
@@ -298,7 +298,7 @@ let $message= Testcase 3.5.5.4:;
 
 #Cleanup
 	connection con1_super;
-	--disable_warnings 
+	--disable_warnings
 	revoke ALL PRIVILEGES, GRANT OPTION FROM 'test_general'@'localhost';
 	DROP DATABASE if exists dbtest_one;
 	drop database if EXISTS dbtest_two;
@@ -316,7 +316,7 @@ let $message= Testcase 3.5.6:;
 	use test;
 
 #Section 3.5.6.1
-# Test case: Ensure that a trigger definition can specify a trigger action time of BEFORE. 
+# Test case: Ensure that a trigger definition can specify a trigger action time of BEFORE.
 # See section 3.5.1.1
 let $message= Testcase 3.5.6.1 (see Testcase 3.5.1.1);
 --source include/show_msg.inc
@@ -328,37 +328,37 @@ let $message= Testcase 3.5.6.2 (see Test
 --source include/show_msg.inc
 
 #Section 3.5.6.3
-# Test case: Ensure that a trigger definition that specifies a trigger action 
-#            time that is not either BEFORE or AFTER fails, with an appropriate 
+# Test case: Ensure that a trigger definition that specifies a trigger action
+#            time that is not either BEFORE or AFTER fails, with an appropriate
 #            error message, at CREATE TRIGGER time.
 let $message= Testcase 3.5.6.3:;
 --source include/show_msg.inc
 
-	--error 1064
+	--error ER_PARSE_ERROR
 	Create trigger trg3_1 DURING UPDATE on tb3 for each row set new.f132=25;
-	--error 1064
+	--error ER_PARSE_ERROR
 	Create trigger trg3_2 TIME INSERT on tb3 for each row set new.f132=15;
 
-#Cleanup 
+#Cleanup
 # OBN - Although none of the above should have been created we should do a cleanup
 #       since if they have been created, not dropping them will affect following
 #       tests.
 	--disable_warnings
-	--error 0, 1360
+	--error 0, ER_TRG_DOES_NOT_EXIST
 	drop trigger tb3.trg3_1;
-	--error 0, 1360
+	--error 0, ER_TRG_DOES_NOT_EXIST
 	drop trigger tb3.trg3_2;
 	--enable_warnings
 
 #Section 3.5.6.4
-# Test case: Ensure that a trigger defined with a trigger action time of BEFORE 
-#            always executes its triggered action immediately before the trigger event. 
+# Test case: Ensure that a trigger defined with a trigger action time of BEFORE
+#            always executes its triggered action immediately before the trigger event.
 # See section 3.5.1.1
 let $message= Testcase 3.5.6.4 (see Testcase 3.5.1.1);
 --source include/show_msg.inc
 
 #Section 3.5.6.5
-# Test case: Ensure that a trigger defined with a trigger action time of AFTER 
+# Test case: Ensure that a trigger defined with a trigger action time of AFTER
 #            always executes its triggered action immediately after the trigger event.
 let $message= Testcase 3.5.6.5 (see Testcase 3.5.1.1);
 --source include/show_msg.inc
@@ -384,40 +384,40 @@ let $message= Testcase 3.5.7.3 (see Test
 --source include/show_msg.inc
 
 #Section 3.5.7.4
-# Test case: Ensure that a trigger definition that specifies a trigger event that 
-#            is not either INSERT, UPDATE or DELETE fails, with an appropriate error 
+# Test case: Ensure that a trigger definition that specifies a trigger event that
+#            is not either INSERT, UPDATE or DELETE fails, with an appropriate error
 #            message, at CREATE TRIGGER time.
 let $message= Testcase 3.5.7.4:;
 --source include/show_msg.inc
 
-	--error 1064
+	--error ER_PARSE_ERROR
 	Create trigger trg4_1 BEFORE SELECT on tb3 for each row set new.f132=5;
-	--error 1064
+	--error ER_PARSE_ERROR
 	Create trigger trg4_2 AFTER VALUE on tb3 for each row set new.f132=1;
 
-#Cleanup 
+#Cleanup
 # OBN - Although none of the above should have been created we should do a cleanup
 #       since if they have been created, not dropping them will affect following
 #       tests.
 	--disable_warnings
-	--error 0, 1360
+	--error 0, ER_TRG_DOES_NOT_EXIST
 	drop trigger tb3.trg4_1;
-	--error 0, 1360
+	--error 0, ER_TRG_DOES_NOT_EXIST
 	drop trigger tb3.trg4_2;
 	--enable_warnings
 
-#Section 3.5.7.5 / 3.5.7.6 
-# Test case: Ensure that it is not possible to create multiple BEFORE INSERT triggers 
+#Section 3.5.7.5 / 3.5.7.6
+# Test case: Ensure that it is not possible to create multiple BEFORE INSERT triggers
 #            on the same table, even if the triggers have different names / different
 #            triggered actions.
 let $message= Testcase 3.5.7.5 / 3.5.7.6:;
 --source include/show_msg.inc
 
-	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';
 
-	--error ER_NOT_SUPPORTED_YET 
-	Create trigger trg5_2 BEFORE INSERT 
+	--error ER_NOT_SUPPORTED_YET
+	Create trigger trg5_2 BEFORE INSERT
 		on tb3 for each row set new.f122='Trigger2 3.5.7.5';
 
 	Insert into tb3 (f121,f122) values ('Test 3.5.7.5/6','Insert 3.5.7.5');
@@ -426,27 +426,27 @@ let $message= Testcase 3.5.7.5 / 3.5.7.6
 	Select f121,f122 from tb3 where f121='Test 3.5.7.5/6';
 
 #Cleanup
-	--disable_warnings 
+	--disable_warnings
 	drop trigger trg5_1;
-	--error 0, 1360
+	--error 0, ER_TRG_DOES_NOT_EXIST
 	drop trigger trg5_2;
 	delete from tb3 where f121='Test 3.5.7.5/6';
 	--enable_warnings
 
 
-#Section 3.5.7.7 / 3.5.7.8 
-# Test case: Ensure that it is not possible to create multiple AFTER INSERT triggers 
+#Section 3.5.7.7 / 3.5.7.8
+# Test case: Ensure that it is not possible to create multiple AFTER INSERT triggers
 #            on the same table, even if the triggers have different names / different
 #            triggered actions.
 let $message= Testcase 3.5.7.7 / 3.5.7.8:;
 --source include/show_msg.inc
 	
 	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';
 
-	--error ER_NOT_SUPPORTED_YET 
-	Create trigger trg6_2 AFTER INSERT 
+	--error ER_NOT_SUPPORTED_YET
+	Create trigger trg6_2 AFTER INSERT
 		on tb3 for each row set @test_var='Trigger2 3.5.7.7';
 
 	select @test_var;
@@ -458,26 +458,26 @@ let $message= Testcase 3.5.7.7 / 3.5.7.8
 	select @test_var;
 
 #Cleanup
-	--disable_warnings 
+	--disable_warnings
 	drop trigger trg6_1;
-	--error 0, 1360
+	--error 0, ER_TRG_DOES_NOT_EXIST
 	drop trigger trg6_2;
 	delete from tb3 where f121='Test 3.5.7.7/8';	
 	--enable_warnings
 
 
 #Section 3.5.7.9 / 3.5.7.10
-# Test case: Ensure that it is not possible to create multiple BEFORE UPDATE triggers 
-#            on the same table, even if the triggers have different names / different 
+# Test case: Ensure that it is not possible to create multiple BEFORE UPDATE triggers
+#            on the same table, even if the triggers have different names / different
 #            triggered actions.
 let $message= Testcase 3.5.7.9/10:;
 --source include/show_msg.inc
 
-	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';
 
-	--error ER_NOT_SUPPORTED_YET 
-	Create trigger trg7_2 BEFORE UPDATE 
+	--error ER_NOT_SUPPORTED_YET
+	Create trigger trg7_2 BEFORE UPDATE
 		on tb3 for each row set new.f122='Trigger2 3.5.7.9';
 
 	Insert into tb3 (f121,f122) values ('Test 3.5.7.9/10','Insert 3.5.7.9');
@@ -486,25 +486,25 @@ let $message= Testcase 3.5.7.9/10:;
 	Select f121,f122 from tb3 where f121='Test 3.5.7.9/10';
 
 #Cleanup
-	--disable_warnings 
+	--disable_warnings
 	drop trigger trg7_1;
-	--error 0, 1360
+	--error 0, ER_TRG_DOES_NOT_EXIST
 	drop trigger trg7_2;
 	delete from tb3 where f121='Test 3.5.7.9/10';	
 
 #Section 3.5.7.11 / 3.5.7.12
-# Test case: Ensure that it is not possible to create multiple AFTER UPDATE triggers 
+# Test case: Ensure that it is not possible to create multiple AFTER UPDATE triggers
 #            on the same table, even if the triggers have different names / different
-#            triggered actions. 
+#            triggered actions.
 let $message= Testcase 3.5.7.11/12:;
 --source include/show_msg.inc
 
 	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';
 
-	--error ER_NOT_SUPPORTED_YET 
-	Create trigger trg8_2 AFTER UPDATE 
+	--error ER_NOT_SUPPORTED_YET
+	Create trigger trg8_2 AFTER UPDATE
 		on tb3 for each row set @test_var='Trigger2 3.5.7.11';
 
 
@@ -518,25 +518,25 @@ let $message= Testcase 3.5.7.11/12:;
 	delete from tb3 where f121='Test 3.5.7.11/12';
 
 #Cleanup
-	--disable_warnings 
+	--disable_warnings
 	drop trigger trg8_1;
-	--error 0, 1360
+	--error 0, ER_TRG_DOES_NOT_EXIST
 	drop trigger trg8_2;
 	delete from tb3 where f121='Test 3.5.7.11/12';	
 
 #Section 3.5.7.13 / 3.5.7.14
-# Test case: Ensure that it is not possible to create multiple BEFORE DELETE triggers 
+# Test case: Ensure that it is not possible to create multiple BEFORE DELETE triggers
 #            on the same table, even if the triggers have different names / different
 #            triggered actions.
 let $message= Testcase 3.5.7.13/14:;
 --source include/show_msg.inc
 
 	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;
 
 	--error ER_NOT_SUPPORTED_YET
-	Create trigger trg9_2 BEFORE DELETE 
+	Create trigger trg9_2 BEFORE DELETE
 		on tb3 for each row set @test_var=@test_var+10;
 
 	select @test_var;
@@ -550,29 +550,29 @@ let $message= Testcase 3.5.7.13/14:;
 	select @test_var;
 
 #Cleanup
-	--disable_warnings 
+	--disable_warnings
 	drop trigger trg9_1;
-	--error 0, 1360
+	--error 0, ER_TRG_DOES_NOT_EXIST
 	drop trigger trg9_2;
 	delete from tb3 where f121='Test 3.5.7.13/14';	
 
 #Section 3.5.7.15 / 3.5.7.16
-# Test case: Ensure that it is not possible to create multiple AFTER DELETE triggers 
-#            on the same table, even if the triggers have different names / different 
+# Test case: Ensure that it is not possible to create multiple AFTER DELETE triggers
+#            on the same table, even if the triggers have different names / different
 #            triggered actions.
 let $message= Testcase 3.5.7.15/16:;
 --source include/show_msg.inc
 	
 	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;
 
-	--error ER_NOT_SUPPORTED_YET 
-	Create trigger trg_3_406010_2 AFTER DELETE 
+	--error ER_NOT_SUPPORTED_YET
+	Create trigger trg_3_406010_2 AFTER DELETE
 		on tb3 for each row set @test_var=@test_var+50;
 
-	--error 1359 
-	Create trigger trg_3_406010_1 AFTER INSERT 
+	--error ER_TRG_ALREADY_EXISTS
+	Create trigger trg_3_406010_1 AFTER INSERT
 		on tb3 for each row set @test_var=@test_var+1;
 
 	select @test_var;
@@ -586,18 +586,18 @@ let $message= Testcase 3.5.7.15/16:;
 	select @test_var;
 
 #Cleanup
-	--disable_warnings 
+	--disable_warnings
 	drop trigger trg_3_406010_1;
-	--error 0, 1360
+	--error 0, ER_TRG_DOES_NOT_EXIST
 	drop trigger trg_3_406010_2;
 	delete from tb3 where f121='Test 3.5.7.15/16';	
 	--enable_warnings
 
 
 #Section 3.5.7.17
-# Test case: Ensure that it is possible to have a BEFORE INSERT, an AFTER INSERT, 
-#            a BEFORE UPDATE, an AFTER UPDATE, a BEFORE DELETE, and an AFTER DELETE 
-#            trigger on the same table; that is, ensure that every persistent base 
+# Test case: Ensure that it is possible to have a BEFORE INSERT, an AFTER INSERT,
+#            a BEFORE UPDATE, an AFTER UPDATE, a BEFORE DELETE, and an AFTER DELETE
+#            trigger on the same table; that is, ensure that every persistent base
 #            table may be the subject table for exactly six triggers
 let $message= Testcase 3.5.7.17 (see Testcase 3.5.1.1);
 --source include/show_msg.inc
diff -Nrup a/mysql-test/suite/funcs_1/triggers/triggers_08.inc b/mysql-test/suite/funcs_1/triggers/triggers_08.inc
--- a/mysql-test/suite/funcs_1/triggers/triggers_08.inc	2008-03-31 23:36:43 +02:00
+++ b/mysql-test/suite/funcs_1/triggers/triggers_08.inc	2008-04-01 13:18:30 +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)
 #======================================================================
 # WL#4084: enable disabled parts, 2007-11-15 hhunger
 
@@ -30,20 +30,20 @@ let $message= Testcase: 3.5:;
 #################################
 
 #Section 3.5.8.1
-# Testcase: Ensure that the triggered action of every trigger always executes 
+# Testcase: Ensure that the triggered action of every trigger always executes
 #           correctly and the results in all expected changes made to the database
 let $message= Testcase 3.5.8.1: (implied in previous tests);
 --source include/show_msg.inc
 
 #Section 3.5.8.2
-# Testcase: Ensure that the triggered actions of every trigger never results 
+# Testcase: Ensure that the triggered actions of every trigger never results
 #           in an unexpected change made to the database.
 let $message= Testcase 3.5.8.2: (implied in previous tests);
 --source include/show_msg.inc
 
 
 #Section 3.5.8.3 / 3.5.8.4
-#Test case: Ensure that the triggered action can any valid SQL statement / set 
+#Test case: Ensure that the triggered action can any valid SQL statement / set
 #           of valid SQL statements, provided the statements are written within
Thread
bk commit into 5.1 tree (mleich:1.2584) BUG#35335mleich1 Apr