MySQL Lists are EOL. Please join:

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

ChangeSet@stripped, 2008-03-31 19:48:02+02:00, mleich@stripped +116 -0
  Fix for 
     Bug#35335 funcs_1: Some tests fail within load_file during
                        pushbuild runs
     Solution: 1. Move files with input data used in load_file, 
                  load data etc. 
                  from suite/funcs_1/<whatever>
                  to std_data
               2. Use for testsuite funcs_1 the server option
                  --secure-file-priv=<MYSQLTEST_VARDIR>
               3. Outfiles have to be stored under MYSQLTEST_VARDIR 
  + changes according to WL#4304 Cleanup in funcs_1 tests
    - backport of fixes/improvements made in 5.1 to 5.0
      The differences between scripts in 5.0 and 5.1 cause
      much additional and annoying work during any upmerge.
    - replace error numbers with names
    - improved comments
    - improved formatting
    - Unify storage engine names so that result files for
      storage engine variants do not differ (some tests)
    - remove a script no more used (tests are done in other scripts)

  BitKeeper/deleted/.del-triggers_master.test@stripped, 2008-03-31 16:26:14+02:00, mleich@stripped +0 -0
    Delete: mysql-test/suite/funcs_1/triggers/triggers_master.test

  mysql-test/Makefile.am@stripped, 2008-03-31 19:47:57+02:00, mleich@stripped +6 -2
    Introduce installation of funcs_1 files in std_data.

  mysql-test/mysql-test-run.pl@stripped, 2008-03-31 19:47:57+02:00, mleich@stripped +2 -2
    The tests within funcs_1 need a server started with
        --secure-file-priv=<MYSQLTEST_VARDIR>
    like the main regression tests.

  mysql-test/std_data/funcs_1/innodb_tb1.txt@stripped, 2008-03-31 16:34:26+02:00, mleich@stripped +0 -0
    Rename: mysql-test/suite/funcs_1/data/innodb_tb1.txt -> mysql-test/std_data/funcs_1/innodb_tb1.txt

  mysql-test/std_data/funcs_1/innodb_tb2.txt@stripped, 2008-03-31 16:34:26+02:00, mleich@stripped +0 -0
    Rename: mysql-test/suite/funcs_1/data/innodb_tb2.txt -> mysql-test/std_data/funcs_1/innodb_tb2.txt

  mysql-test/std_data/funcs_1/innodb_tb3.txt@stripped, 2008-03-31 16:34:26+02:00, mleich@stripped +0 -0
    Rename: mysql-test/suite/funcs_1/data/innodb_tb3.txt -> mysql-test/std_data/funcs_1/innodb_tb3.txt

  mysql-test/std_data/funcs_1/innodb_tb4.txt@stripped, 2008-03-31 16:34:26+02:00, mleich@stripped +0 -0
    Rename: mysql-test/suite/funcs_1/data/innodb_tb4.txt -> mysql-test/std_data/funcs_1/innodb_tb4.txt

  mysql-test/std_data/funcs_1/load_file.txt@stripped, 2008-03-31 19:48:00+02:00, mleich@stripped +1 -0
    New BitKeeper file ``mysql-test/std_data/funcs_1/load_file.txt''

  mysql-test/std_data/funcs_1/load_file.txt@stripped, 2008-03-31 19:48:00+02:00, mleich@stripped +0 -0

  mysql-test/std_data/funcs_1/memory_tb1.txt@stripped, 2008-03-31 16:34:58+02:00, mleich@stripped +0 -0
    Rename: mysql-test/suite/funcs_1/data/memory_tb1.txt -> mysql-test/std_data/funcs_1/memory_tb1.txt

  mysql-test/std_data/funcs_1/memory_tb2.txt@stripped, 2008-03-31 16:34:58+02:00, mleich@stripped +0 -0
    Rename: mysql-test/suite/funcs_1/data/memory_tb2.txt -> mysql-test/std_data/funcs_1/memory_tb2.txt

  mysql-test/std_data/funcs_1/memory_tb3.txt@stripped, 2008-03-31 16:34:58+02:00, mleich@stripped +0 -0
    Rename: mysql-test/suite/funcs_1/data/memory_tb3.txt -> mysql-test/std_data/funcs_1/memory_tb3.txt

  mysql-test/std_data/funcs_1/memory_tb4.txt@stripped, 2008-03-31 16:34:58+02:00, mleich@stripped +0 -0
    Rename: mysql-test/suite/funcs_1/data/memory_tb4.txt -> mysql-test/std_data/funcs_1/memory_tb4.txt

  mysql-test/std_data/funcs_1/myisam_tb1.txt@stripped, 2008-03-31 16:35:07+02:00, mleich@stripped +0 -0
    Rename: mysql-test/suite/funcs_1/data/myisam_tb1.txt -> mysql-test/std_data/funcs_1/myisam_tb1.txt

  mysql-test/std_data/funcs_1/myisam_tb2.txt@stripped, 2008-03-31 16:35:07+02:00, mleich@stripped +0 -0
    Rename: mysql-test/suite/funcs_1/data/myisam_tb2.txt -> mysql-test/std_data/funcs_1/myisam_tb2.txt

  mysql-test/std_data/funcs_1/myisam_tb3.txt@stripped, 2008-03-31 16:35:07+02:00, mleich@stripped +0 -0
    Rename: mysql-test/suite/funcs_1/data/myisam_tb3.txt -> mysql-test/std_data/funcs_1/myisam_tb3.txt

  mysql-test/std_data/funcs_1/myisam_tb4.txt@stripped, 2008-03-31 16:35:07+02:00, mleich@stripped +0 -0
    Rename: mysql-test/suite/funcs_1/data/myisam_tb4.txt -> mysql-test/std_data/funcs_1/myisam_tb4.txt

  mysql-test/std_data/funcs_1/t3.txt@stripped, 2008-03-31 16:36:04+02:00, mleich@stripped +0 -0
    Rename: mysql-test/suite/funcs_1/data/t3.txt -> mysql-test/std_data/funcs_1/t3.txt

  mysql-test/std_data/funcs_1/t4.txt@stripped, 2008-03-31 16:36:04+02:00, mleich@stripped +0 -0
    Rename: mysql-test/suite/funcs_1/data/t4.txt -> mysql-test/std_data/funcs_1/t4.txt

  mysql-test/std_data/funcs_1/t7.txt@stripped, 2008-03-31 16:36:04+02:00, mleich@stripped +0 -0
    Rename: mysql-test/suite/funcs_1/data/t7.txt -> mysql-test/std_data/funcs_1/t7.txt

  mysql-test/std_data/funcs_1/t9.txt@stripped, 2008-03-31 16:36:04+02:00, mleich@stripped +0 -0
    Rename: mysql-test/suite/funcs_1/data/t9.txt -> mysql-test/std_data/funcs_1/t9.txt

  mysql-test/suite/funcs_1/README.txt@stripped, 2008-03-31 19:47:57+02:00, mleich@stripped +9 -1
    Extended description

  mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc@stripped, 2008-03-31 19:47:57+02:00, mleich@stripped +6 -6
    Cleanup

  mysql-test/suite/funcs_1/datadict/datadict_load.inc@stripped, 2008-03-31 19:47:57+02:00, mleich@stripped +8 -8
    Cleanup

  mysql-test/suite/funcs_1/include/innodb_tb1.inc@stripped, 2008-03-31 19:47:57+02:00, mleich@stripped +60 -59
    Adjustment to new storage place of infile.

  mysql-test/suite/funcs_1/include/innodb_tb2.inc@stripped, 2008-03-31 19:47:57+02:00, mleich@stripped +54 -52
    Adjustment to new storage place of infile.

  mysql-test/suite/funcs_1/include/innodb_tb3.inc@stripped, 2008-03-31 19:47:57+02:00, mleich@stripped +62 -60
    Adjustment to new storage place of infile.

  mysql-test/suite/funcs_1/include/innodb_tb4.inc@stripped, 2008-03-31 19:47:57+02:00, mleich@stripped +54 -52
    Adjustment to new storage place of infile.

  mysql-test/suite/funcs_1/include/memory_tb1.inc@stripped, 2008-03-31 19:47:57+02:00, mleich@stripped +53 -51
    Adjustment to new storage place of infile.

  mysql-test/suite/funcs_1/include/memory_tb2.inc@stripped, 2008-03-31 19:47:57+02:00, mleich@stripped +54 -52
    Adjustment to new storage place of infile.

  mysql-test/suite/funcs_1/include/memory_tb3.inc@stripped, 2008-03-31 19:47:57+02:00, mleich@stripped +56 -55
    Adjustment to new storage place of infile.

  mysql-test/suite/funcs_1/include/memory_tb4.inc@stripped, 2008-03-31 19:47:57+02:00, mleich@stripped +54 -52
    Adjustment to new storage place of infile.

  mysql-test/suite/funcs_1/include/myisam_tb1.inc@stripped, 2008-03-31 19:47:57+02:00, mleich@stripped +60 -58
    Adjustment to new storage place of infile.

  mysql-test/suite/funcs_1/include/myisam_tb2.inc@stripped, 2008-03-31 19:47:57+02:00, mleich@stripped +70 -68
    Adjustment to new storage place of infile.

  mysql-test/suite/funcs_1/include/myisam_tb3.inc@stripped, 2008-03-31 19:47:57+02:00, mleich@stripped +62 -60
    Adjustment to new storage place of infile.

  mysql-test/suite/funcs_1/include/myisam_tb4.inc@stripped, 2008-03-31 19:47:57+02:00, mleich@stripped +69 -67
    Adjustment to new storage place of infile.

  mysql-test/suite/funcs_1/include/sp_tb.inc@stripped, 2008-03-31 19:47:57+02:00, mleich@stripped +54 -29
    Adjustment to new storage place of infile.

  mysql-test/suite/funcs_1/r/innodb_func_view.result@stripped, 2008-03-31 19:47:57+02:00, mleich@stripped +4600 -4374
    Updated results

  mysql-test/suite/funcs_1/r/innodb_storedproc_02.result@stripped, 2008-03-31 19:47:58+02:00, mleich@stripped +46 -33
    Updated results

  mysql-test/suite/funcs_1/r/innodb_storedproc_03.result@stripped, 2008-03-31 19:47:58+02:00, mleich@stripped +28 -20
    Updated results

  mysql-test/suite/funcs_1/r/innodb_storedproc_06.result@stripped, 2008-03-31 19:47:58+02:00, mleich@stripped +31 -20
    Updated results

  mysql-test/suite/funcs_1/r/innodb_storedproc_07.result@stripped, 2008-03-31 19:47:58+02:00, mleich@stripped +28 -20
    Updated results

  mysql-test/suite/funcs_1/r/innodb_storedproc_08.result@stripped, 2008-03-31 19:47:58+02:00, mleich@stripped +28 -20
    Updated results

  mysql-test/suite/funcs_1/r/innodb_storedproc_10.result@stripped, 2008-03-31 19:47:58+02:00, mleich@stripped +121 -36
    Updated results

  mysql-test/suite/funcs_1/r/innodb_trig_0102.result@stripped, 2008-03-31 19:47:58+02:00, mleich@stripped +93 -92
    Updated results

  mysql-test/suite/funcs_1/r/innodb_trig_03.result@stripped, 2008-03-31 19:47:58+02:00, mleich@stripped +133 -182
    Updated results

  mysql-test/suite/funcs_1/r/innodb_trig_0407.result@stripped, 2008-03-31 19:47:58+02:00, mleich@stripped +84 -83
    Updated results

  mysql-test/suite/funcs_1/r/innodb_trig_08.result@stripped, 2008-03-31 19:47:58+02:00, mleich@stripped +180 -142
    Updated results

  mysql-test/suite/funcs_1/r/innodb_trig_09.result@stripped, 2008-03-31 19:47:58+02:00, mleich@stripped +81 -79
    Updated results

  mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result@stripped, 2008-03-31 19:47:58+02:00, mleich@stripped +75 -74
    Updated results

  mysql-test/suite/funcs_1/r/innodb_trig_frkey.result@stripped, 2008-03-31 19:47:58+02:00, mleich@stripped +60 -59
    Updated results

  mysql-test/suite/funcs_1/r/innodb_views.result@stripped, 2008-03-31 19:47:58+02:00, mleich@stripped +104 -102
    Updated results

  mysql-test/suite/funcs_1/r/is_columns_innodb.result@stripped, 2008-03-31 19:47:58+02:00, mleich@stripped +298 -287
    Updated results

  mysql-test/suite/funcs_1/r/is_columns_memory.result@stripped, 2008-03-31 19:47:58+02:00, mleich@stripped +285 -274
    Updated results

  mysql-test/suite/funcs_1/r/is_columns_myisam.result@stripped, 2008-03-31 19:47:58+02:00, mleich@stripped +322 -311
    Updated results

  mysql-test/suite/funcs_1/r/is_columns_ndb.result@stripped, 2008-03-31 19:47:58+02:00, mleich@stripped +24 -18
    Updated results

  mysql-test/suite/funcs_1/r/is_tables_innodb.result@stripped, 2008-03-31 19:47:58+02:00, mleich@stripped +298 -287
    Updated results

  mysql-test/suite/funcs_1/r/is_tables_memory.result@stripped, 2008-03-31 19:47:58+02:00, mleich@stripped +285 -274
    Updated results

  mysql-test/suite/funcs_1/r/is_tables_myisam.result@stripped, 2008-03-31 19:47:58+02:00, mleich@stripped +322 -311
    Updated results

  mysql-test/suite/funcs_1/r/is_tables_ndb.result@stripped, 2008-03-31 19:47:58+02:00, mleich@stripped +24 -18
    Updated results

  mysql-test/suite/funcs_1/r/memory_func_view.result@stripped, 2008-03-31 19:47:58+02:00, mleich@stripped +4600 -4374
    Updated results

  mysql-test/suite/funcs_1/r/memory_storedproc_02.result@stripped, 2008-03-31 19:47:58+02:00, mleich@stripped +46 -33
    Updated results

  mysql-test/suite/funcs_1/r/memory_storedproc_03.result@stripped, 2008-03-31 19:47:58+02:00, mleich@stripped +28 -20
    Updated results

  mysql-test/suite/funcs_1/r/memory_storedproc_06.result@stripped, 2008-03-31 19:47:58+02:00, mleich@stripped +31 -20
    Updated results

  mysql-test/suite/funcs_1/r/memory_storedproc_07.result@stripped, 2008-03-31 19:47:58+02:00, mleich@stripped +28 -20
    Updated results

  mysql-test/suite/funcs_1/r/memory_storedproc_08.result@stripped, 2008-03-31 19:47:58+02:00, mleich@stripped +28 -20
    Updated results

  mysql-test/suite/funcs_1/r/memory_storedproc_10.result@stripped, 2008-03-31 19:47:58+02:00, mleich@stripped +121 -36
    Updated results

  mysql-test/suite/funcs_1/r/memory_trig_0102.result@stripped, 2008-03-31 19:47:58+02:00, mleich@stripped +87 -86
    Updated results

  mysql-test/suite/funcs_1/r/memory_trig_03.result@stripped, 2008-03-31 19:47:59+02:00, mleich@stripped +127 -176
    Updated results

  mysql-test/suite/funcs_1/r/memory_trig_0407.result@stripped, 2008-03-31 19:47:59+02:00, mleich@stripped +78 -77
    Updated results

  mysql-test/suite/funcs_1/r/memory_trig_08.result@stripped, 2008-03-31 19:47:59+02:00, mleich@stripped +174 -136
    Updated results

  mysql-test/suite/funcs_1/r/memory_trig_09.result@stripped, 2008-03-31 19:47:59+02:00, mleich@stripped +75 -73
    Updated results

  mysql-test/suite/funcs_1/r/memory_trig_1011ext.result@stripped, 2008-03-31 19:47:59+02:00, mleich@stripped +69 -68
    Updated results

  mysql-test/suite/funcs_1/r/memory_views.result@stripped, 2008-03-31 19:47:59+02:00, mleich@stripped +104 -102
    Updated results

  mysql-test/suite/funcs_1/r/myisam_func_view.result@stripped, 2008-03-31 19:47:59+02:00, mleich@stripped +4600 -4374
    Updated results

  mysql-test/suite/funcs_1/r/myisam_storedproc_02.result@stripped, 2008-03-31 19:47:59+02:00, mleich@stripped +46 -33
    Updated results

  mysql-test/suite/funcs_1/r/myisam_storedproc_03.result@stripped, 2008-03-31 19:47:59+02:00, mleich@stripped +28 -20
    Updated results

  mysql-test/suite/funcs_1/r/myisam_storedproc_06.result@stripped, 2008-03-31 19:47:59+02:00, mleich@stripped +31 -20
    Updated results

  mysql-test/suite/funcs_1/r/myisam_storedproc_07.result@stripped, 2008-03-31 19:47:59+02:00, mleich@stripped +28 -20
    Updated results

  mysql-test/suite/funcs_1/r/myisam_storedproc_08.result@stripped, 2008-03-31 19:47:59+02:00, mleich@stripped +28 -20
    Updated results

  mysql-test/suite/funcs_1/r/myisam_storedproc_10.result@stripped, 2008-03-31 19:47:59+02:00, mleich@stripped +121 -36
    Updated results

  mysql-test/suite/funcs_1/r/myisam_trig_0102.result@stripped, 2008-03-31 19:47:59+02:00, mleich@stripped +93 -92
    Updated results

  mysql-test/suite/funcs_1/r/myisam_trig_03.result@stripped, 2008-03-31 19:47:59+02:00, mleich@stripped +133 -182
    Updated results

  mysql-test/suite/funcs_1/r/myisam_trig_0407.result@stripped, 2008-03-31 19:47:59+02:00, mleich@stripped +84 -83
    Updated results

  mysql-test/suite/funcs_1/r/myisam_trig_08.result@stripped, 2008-03-31 19:47:59+02:00, mleich@stripped +180 -142
    Updated results

  mysql-test/suite/funcs_1/r/myisam_trig_09.result@stripped, 2008-03-31 19:47:59+02:00, mleich@stripped +81 -79
    Updated results

  mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result@stripped, 2008-03-31 19:47:59+02:00, mleich@stripped +75 -74
    Updated results

  mysql-test/suite/funcs_1/r/myisam_views.result@stripped, 2008-03-31 19:47:59+02:00, mleich@stripped +11403 -11406
    Updated results

  mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc@stripped, 2008-03-31 19:48:00+02:00, mleich@stripped +3 -2
    "--echo" instead of SQL command.

  mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc@stripped, 2008-03-31 19:48:00+02:00, mleich@stripped +80 -41
    Adjustment to new storage place of infile
    + correct formatting.

  mysql-test/suite/funcs_1/storedproc/storedproc_02.inc@stripped, 2008-03-31 19:48:00+02:00, mleich@stripped +236 -112
    Backport from 5.1 + correct formatting.

  mysql-test/suite/funcs_1/storedproc/storedproc_03.inc@stripped, 2008-03-31 19:48:00+02:00, mleich@stripped +59 -27
    Minor improvements + correct formatting.

  mysql-test/suite/funcs_1/storedproc/storedproc_06.inc@stripped, 2008-03-31 19:48:00+02:00, mleich@stripped +41 -28
    Backport from 5.1 + correct formatting

  mysql-test/suite/funcs_1/storedproc/storedproc_10.inc@stripped, 2008-03-31 19:48:00+02:00, mleich@stripped +76 -33
    Backport from 5.1. + correct formatting

  mysql-test/suite/funcs_1/t/innodb_trig_0407.test@stripped, 2008-03-31 19:48:00+02:00, mleich@stripped +1 -1
    Cleanup

  mysql-test/suite/funcs_1/t/is_basics_mixed.test@stripped, 2008-03-31 19:48:00+02:00, mleich@stripped +1 -1
    Adjustment to new storage place of outfile.

  mysql-test/suite/funcs_1/t/memory_storedproc_02.test@stripped, 2008-03-31 19:48:00+02:00, mleich@stripped +2 -2
    Cleanup

  mysql-test/suite/funcs_1/t/memory_storedproc_03.test@stripped, 2008-03-31 19:48:00+02:00, mleich@stripped +2 -2
    Cleanup

  mysql-test/suite/funcs_1/t/memory_storedproc_06.test@stripped, 2008-03-31 19:48:00+02:00, mleich@stripped +2 -2
    Cleanup

  mysql-test/suite/funcs_1/t/memory_storedproc_07.test@stripped, 2008-03-31 19:48:00+02:00, mleich@stripped +2 -2
    Cleanup

  mysql-test/suite/funcs_1/t/memory_storedproc_08.test@stripped, 2008-03-31 19:48:00+02:00, mleich@stripped +2 -2
    Cleanup

  mysql-test/suite/funcs_1/t/memory_storedproc_10.test@stripped, 2008-03-31 19:48:00+02:00, mleich@stripped +2 -2
    Cleanup

  mysql-test/suite/funcs_1/t/myisam_storedproc_02.test@stripped, 2008-03-31 19:48:00+02:00, mleich@stripped +2 -2
    Cleanup

  mysql-test/suite/funcs_1/t/myisam_storedproc_03.test@stripped, 2008-03-31 19:48:00+02:00, mleich@stripped +2 -2
    Cleanup

  mysql-test/suite/funcs_1/t/myisam_storedproc_06.test@stripped, 2008-03-31 19:48:00+02:00, mleich@stripped +2 -2
    Cleanup

  mysql-test/suite/funcs_1/t/myisam_storedproc_07.test@stripped, 2008-03-31 19:48:00+02:00, mleich@stripped +2 -2
    Cleanup

  mysql-test/suite/funcs_1/t/myisam_storedproc_08.test@stripped, 2008-03-31 19:48:00+02:00, mleich@stripped +2 -2
    Cleanup

  mysql-test/suite/funcs_1/t/myisam_storedproc_10.test@stripped, 2008-03-31 19:48:00+02:00, mleich@stripped +2 -2
    Cleanup

  mysql-test/suite/funcs_1/triggers/trig_frkey2.inc@stripped, 2008-03-31 19:48:00+02:00, mleich@stripped +51 -51
    Cleanup

  mysql-test/suite/funcs_1/triggers/triggers_0102.inc@stripped, 2008-03-31 19:48:00+02:00, mleich@stripped +114 -114
    Cleanup

  mysql-test/suite/funcs_1/triggers/triggers_03.inc@stripped, 2008-03-31 19:48:00+02:00, mleich@stripped +49 -126
    Backport from 5.1

  mysql-test/suite/funcs_1/triggers/triggers_0407.inc@stripped, 2008-03-31 19:48:00+02:00, mleich@stripped +109 -109
    Backport from 5.1

  mysql-test/suite/funcs_1/triggers/triggers_08.inc@stripped, 2008-03-31 19:48:00+02:00, mleich@stripped +150 -129
    Backport from 5.1

  mysql-test/suite/funcs_1/triggers/triggers_09.inc@stripped, 2008-03-31 19:48:00+02:00, mleich@stripped +76 -78
    Backport from 5.1

  mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc@stripped, 2008-03-31 19:48:00+02:00, mleich@stripped +21 -21
    Backport from 5.1

  mysql-test/suite/funcs_1/views/func_view.inc@stripped, 2008-03-31 19:48:00+02:00, mleich@stripped +111 -163
    Backport from 5.1

  mysql-test/suite/funcs_1/views/views_master.inc@stripped, 2008-03-31 19:48:00+02:00, mleich@stripped +3 -3
    Cleanup

diff -Nrup a/mysql-test/Makefile.am b/mysql-test/Makefile.am
--- a/mysql-test/Makefile.am	2007-09-24 11:33:23 +02:00
+++ b/mysql-test/Makefile.am	2008-03-31 19:47:57 +02:00
@@ -45,7 +45,8 @@ dist-hook:
 	mkdir -p $(distdir)/t $(distdir)/r $(distdir)/include \
 		$(distdir)/std_data \
 		$(distdir)/std_data/ndb_backup50_data_be $(distdir)/std_data/ndb_backup50_data_le \
-		$(distdir)/lib
+		$(distdir)/lib \
+		$(distdir)/funcs_1
 	-$(INSTALL_DATA) $(srcdir)/t/*.def $(distdir)/t
 	$(INSTALL_DATA) $(srcdir)/t/*.test $(distdir)/t
 	-$(INSTALL_DATA) $(srcdir)/t/*.imtest $(distdir)/t
@@ -66,6 +67,7 @@ dist-hook:
 	$(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(distdir)/std_data
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup50_data_be/BACKUP* $(distdir)/std_data/ndb_backup50_data_be
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup50_data_le/BACKUP* $(distdir)/std_data/ndb_backup50_data_le
+	$(INSTALL_DATA) $(srcdir)/std_data/funcs_1/* $(distdir)/std_data/funcs_1
 	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(distdir)/lib
 	-rm -rf `find $(distdir)/suite -type d -name SCCS`
 
@@ -77,7 +79,8 @@ install-data-local:
 		$(DESTDIR)$(testdir)/std_data \
 		$(DESTDIR)$(testdir)/std_data/ndb_backup50_data_be \
 		$(DESTDIR)$(testdir)/std_data/ndb_backup50_data_le \
-		$(DESTDIR)$(testdir)/lib
+		$(DESTDIR)$(testdir)/lib \
+		$(DESTDIR)$(testdir)/funcs_1
 	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir)
 	-$(INSTALL_DATA) $(srcdir)/t/*.def $(DESTDIR)$(testdir)/t
 	$(INSTALL_DATA) $(srcdir)/t/*.test $(DESTDIR)$(testdir)/t
@@ -103,6 +106,7 @@ install-data-local:
 	$(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(DESTDIR)$(testdir)/std_data
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup50_data_be/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup50_data_be
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup50_data_le/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup50_data_le
+	$(INSTALL_DATA) $(srcdir)/std_data/funcs_1/* $(distdir)/std_data/funcs_1
 	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(DESTDIR)$(testdir)/lib
 	for f in `(cd $(srcdir); find suite -type f | grep -v SCCS)`; \
 	do \
diff -Nrup a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
--- a/mysql-test/mysql-test-run.pl	2008-02-06 07:16:51 +01:00
+++ b/mysql-test/mysql-test-run.pl	2008-03-31 19:47:57 +02:00
@@ -3739,9 +3739,9 @@ sub mysqld_arguments ($$$$) {
   {
     # By default, prevent the started mysqld to access files outside of vardir
     my $secure_file_dir= $opt_vardir;
-    if ( $opt_suite ne "main" )
+    if ( $opt_suite ne "main" and $opt_suite ne "funcs_1" )
     {
-      # When running a suite other than default allow the mysqld
+      # When running a suite other than default or funcs_1 allow the mysqld
       # access to subdirs of mysql-test/ in order to make it possible
       # to "load data" from the suites data/ directory.
       $secure_file_dir= $glob_mysql_test_dir;
diff -Nrup a/mysql-test/std_data/funcs_1/innodb_tb1.txt b/mysql-test/std_data/funcs_1/innodb_tb1.txt
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/std_data/funcs_1/innodb_tb1.txt	2008-03-31 16:34:26 +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/innodb_tb2.txt b/mysql-test/std_data/funcs_1/innodb_tb2.txt
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/std_data/funcs_1/innodb_tb2.txt	2008-03-31 16:34:26 +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/innodb_tb3.txt b/mysql-test/std_data/funcs_1/innodb_tb3.txt
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/std_data/funcs_1/innodb_tb3.txt	2008-03-31 16:34:26 +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/innodb_tb4.txt b/mysql-test/std_data/funcs_1/innodb_tb4.txt
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/std_data/funcs_1/innodb_tb4.txt	2008-03-31 16:34:26 +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/std_data/funcs_1/load_file.txt b/mysql-test/std_data/funcs_1/load_file.txt
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/std_data/funcs_1/load_file.txt	2008-03-31 19:48:00 +02:00
@@ -0,0 +1 @@
+Here is content from load_file
diff -Nrup a/mysql-test/std_data/funcs_1/memory_tb1.txt b/mysql-test/std_data/funcs_1/memory_tb1.txt
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/std_data/funcs_1/memory_tb1.txt	2008-03-31 16:34:58 +02:00
@@ -0,0 +1,10 @@
+!	!	!	!	125	69	107	223	9324	34526	518	41335	-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
+@	@	@	@	33	206	121	215	9380	15833	14975	52816	-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
+#	#	#	#	117	5	25	30	21071	22894	7157	52356	-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
+$	$	$	$	2	19	61	214	1220	9289	14636	719	-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
+%	%	%	%	102	185	122	228	21359	20663	7136	60130	-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
+^	^	^	^	24	48	102	248	30907	13155	26008	11892	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
+&	&	&	&	68	95	123	253	26999	2063	7957	49062	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
+*	*	*	*	114	116	86	237	16008	64728	29018	63686	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
+(	(	(	(	102	120	12	166	7011	231	28948	43386	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
+)	)	)	)	14	162	113	166	15432	23427	9909	55743	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/memory_tb2.txt b/mysql-test/std_data/funcs_1/memory_tb2.txt
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/std_data/funcs_1/memory_tb2.txt	2008-03-31 16:34:58 +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/memory_tb3.txt b/mysql-test/std_data/funcs_1/memory_tb3.txt
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/std_data/funcs_1/memory_tb3.txt	2008-03-31 16:34:58 +02:00
@@ -0,0 +1,10 @@
+!	!	!	!	!	!	87	241	57	173	18446	49170	16642	30337	-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
+@	@	@	@	@	@	46	98	15	87	28328	27957	22906	13894	-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
+#	#	#	#	#	#	47	178	99	1	14395	33016	14488	19286	-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
+$	$	$	$	$	$	112	214	125	95	17700	64850	18337	21044	-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
+%	%	%	%	%	%	11	122	24	177	25939	55312	20230	23055	-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
+^	^	^	^	^	^	89	228	33	168	29230	35722	26178	18372	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
+&	&	&	&	&	&	71	225	98	132	15603	29021	29242	62542	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
+*	*	*	*	*	*	54	204	86	76	12146	41911	27986	4744	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
+(	(	(	(	(	(	7	93	3	194	18817	25083	8657	49740	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
+)	)	)	)	)	)	15	241	27	18	9788	64993	245	39300	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/memory_tb4.txt b/mysql-test/std_data/funcs_1/memory_tb4.txt
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/std_data/funcs_1/memory_tb4.txt	2008-03-31 16:34:58 +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/std_data/funcs_1/myisam_tb1.txt b/mysql-test/std_data/funcs_1/myisam_tb1.txt
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/std_data/funcs_1/myisam_tb1.txt	2008-03-31 16:35:07 +02:00
@@ -0,0 +1,10 @@
+!	!	!	a`0	a`0	0`	0`	a`0	a`0	0`	0`	!	20	96	13	158	11496	12640	26882	22184	-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	@	68	67	107	152	1647	41491	10631	40729	-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	#	0	54	39	182	28122	30607	623	40601	-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	$	40	53	33	204	8927	17582	6931	6231	-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	%	27	126	101	76	8412	64647	24531	7195	-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	^	48	168	35	166	25531	41269	21741	46926	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	&	31	148	93	146	8540	31876	22500	8553	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	*	95	51	63	48	5445	40770	2704	28590	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	(	17	203	60	176	2330	41952	4228	46680	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	)	43	137	116	109	17630	47511	18723	24472	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/myisam_tb2.txt b/mysql-test/std_data/funcs_1/myisam_tb2.txt
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/std_data/funcs_1/myisam_tb2.txt	2008-03-31 16:35:07 +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\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0
 \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\
 0\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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\04@\0\0\0\0\0\04@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\
 0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0@
+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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0>@\0\0\0\0\0\0>@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\04@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\
 0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\04@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\04@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0@
+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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0D@\0\0\0\0\0\0D@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\
 0\0\0\0@\0\0\0\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0"@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0"@	\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0*@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\N
+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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0I@\0\0\0\0\0\0I@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\
 0\0\0\0@\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0$@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0$@	\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0"@
+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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @	\0\0\0\0\0\0\0\0\0\0\0\0\09@\0\0\0\0\0\0.@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0Q@\0\0\0\0\0\0@\0\0\0\0\0Q@\0\0\0\0\0Q@\0\0\0\0\0\0@\0\0\0\0\0Q@\0\0\0\0\0\0@\0\0\0\0\0\0@
 \0\0\0\0\0\0\0\0\0&@\0\0\0\0\0\0&@\0\0\0\0\0\0*@\0\0\0\0\0\0&@\0\0\0\0\0\0*@\0\0\0\0\0\0*@\0\0\0\0\0\0&@\0\0\0\0\0\0*@\0\0\0\0\0\0&@\0\0\0\0\0\0&@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0Q@\0\0\0\0\0\0@\0\0\0\0\0Q@\0\0\0\0\0Q@\0\0\0\0\0\0@\0\0\0\0\0Q@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0&@\0\0\0\0\0\0&@\0\0\0\0\0\0*@\0\0\0\0\0\0&@\0\0\0\0\0\0*@\0\0\0\0\0\0*@\0\0\0\0\0\0&@\0\0\0\0\0\0*@\0\0\0\0\0\0&@\0\0\0\0\0\0&@	\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0$@
+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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0
 \0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\
 0\0@\0\0\0\0\0\0@
+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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\04@\0\0\0\0\0\04@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0
 \0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0@
+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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0>@\0\0\0\0\0\0>@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\04@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0
 \0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\04@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\04@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0@
+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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0D@\0\0\0\0\0\0D@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\
 0@\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0"@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0"@	\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0*@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\N
diff -Nrup a/mysql-test/std_data/funcs_1/myisam_tb3.txt b/mysql-test/std_data/funcs_1/myisam_tb3.txt
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/std_data/funcs_1/myisam_tb3.txt	2008-03-31 16:35:07 +02:00
@@ -0,0 +1,10 @@
+!	!	!	a`0	a`0	0`	0`	a`0	a`0	0`	0`	!	109	139	69	7	18139	13696	27218	8005	-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	@	84	140	42	19	17074	20551	20585	53745	-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	#	59	235	74	53	11119	50568	6317	28587	-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	$	111	15	124	208	1523	44126	32488	35195	-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	%	39	74	95	55	9343	13013	30820	52027	-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	^	0	189	119	57	27291	29348	7618	17041	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	&	95	202	104	100	25978	36845	25435	57697	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	*	32	31	47	219	22189	56957	23389	18316	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	(	35	5	13	119	23453	2681	10787	47642	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	)	20	177	13	18	23752	18809	22353	4155	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/myisam_tb4.txt b/mysql-test/std_data/funcs_1/myisam_tb4.txt
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/std_data/funcs_1/myisam_tb4.txt	2008-03-31 16:35:07 +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\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0
 \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\
 0\0\0\0\0\0@	0	0!	0		0	0!	0!	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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\04@\0\0\0\0\0\04@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\
 0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0@	1@	1@#	1@		
 1@	1@#	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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0>@\0\0\0\0\0\0>@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\04@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\
 0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\04@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\04@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0@	2#$	2#$%	2#$		2#$
 	2#$%	2#$%	4
+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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0D@\0\0\0\0\0\0D@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\
 0\0\0\0@\0\0\0\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0"@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0"@	\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0*@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\N	3$%^	3$%^&	3$%^		3$%^	3$%^&	3$%^&	5
+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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0I@\0\0\0\0\0\0I@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\
 0\0\0\0@\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0$@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0$@	\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0"@	4%^&*	4%^&*(	4%^&*		4%^&*	4%^&*(	4%^&*(	6
+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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @	\0\0\0\0\0\0\0\0\0\0\0\0\09@\0\0\0\0\0\0.@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0Q@\0\0\0\0\0\0@\0\0\0\0\0Q@\0\0\0\0\0Q@\0\0\0\0\0\0@\0\0\0\0\0Q@\0\0\0\0\0\0@\0\0\0\0\0\0@
 \0\0\0\0\0\0\0\0\0&@\0\0\0\0\0\0&@\0\0\0\0\0\0*@\0\0\0\0\0\0&@\0\0\0\0\0\0*@\0\0\0\0\0\0*@\0\0\0\0\0\0&@\0\0\0\0\0\0*@\0\0\0\0\0\0&@\0\0\0\0\0\0&@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0Q@\0\0\0\0\0\0@\0\0\0\0\0Q@\0\0\0\0\0Q@\0\0\0\0\0\0@\0\0\0\0\0Q@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0&@\0\0\0\0\0\0&@\0\0\0\0\0\0*@\0\0\0\0\0\0&@\0\0\0\0\0\0*@\0\0\0\0\0\0*@\0\0\0\0\0\0&@\0\0\0\0\0\0*@\0\0\0\0\0\0&@\0\0\0\0\0\0&@	\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0$@	5^&*()	5^&*()_	5^&*()		5^&*()	5^&*()_	5^&*()_	7
+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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0
 \0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\
 0\0@\0\0\0\0\0\0@	6&*()_+	6&*()_+=	6&*()_+		6&*()_+	6&*()_+=	6&*()_+=	8
+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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\04@\0\0\0\0\0\04@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0
 \0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0@	7*()_+=-	7*(
 )_+=-|	7*()_+=-		7*()_+=-	7*()_+=-|	7*()_+=-|	9
+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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0>@\0\0\0\0\0\0>@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\04@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0
 \0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\04@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\04@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0@	8()_+=-|{	8()_+=-|{}	8()_+=-|{		8()_+=-
 |{	8()_+=-|{}	8()_+=-|{}	10
+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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0D@\0\0\0\0\0\0D@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\
 0@\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0"@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0"@	\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0*@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\N	9)_+=-|{}[	9)_+=-|{}[]	9)_+=-|{}[		9)_+=-|{}[	9)_+=-|{}[]	9)_+=-|{}[]	11
diff -Nrup a/mysql-test/std_data/funcs_1/t3.txt b/mysql-test/std_data/funcs_1/t3.txt
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/std_data/funcs_1/t3.txt	2008-03-31 16:36:04 +02:00
@@ -0,0 +1,10 @@
+a`	a`	-5000
+aaa	aaa	-4999
+abaa	abaa	-4998
+acaaa	acaaa	-4997
+adaaaa	adaaaa	-4996
+aeaaaaa	aeaaaaa	-4995
+afaaaaaa	afaaaaaa	-4994
+agaaaaaaa	agaaaaaaa	-4993
+a^aaaaaaaa	a^aaaaaaaa	-4992
+a_aaaaaaaaa	a_aaaaaaaaa	-4991
diff -Nrup a/mysql-test/std_data/funcs_1/t4.txt b/mysql-test/std_data/funcs_1/t4.txt
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/std_data/funcs_1/t4.txt	2008-03-31 16:36:04 +02:00
@@ -0,0 +1,10 @@
+a`	a`	1000-01-1	-5000	a`	-5000
+aaa	aaa	1000-01-2	-4999	aaa	-4999
+abaa	abaa	1000-01-3	-4998	abaa	-4998
+acaaa	acaaa	1000-01-4	-4997	acaaa	-4997
+adaaaa	adaaaa	1000-01-5	-4996	adaaaa	-4996
+aeaaaaa	aeaaaaa	1000-01-6	-4995	aeaaaaa	-4995
+afaaaaaa	afaaaaaa	1000-01-7	-4994	afaaaaaa	-4994
+agaaaaaaa	agaaaaaaa	1000-01-8	-4993	agaaaaaaa	-4993
+a^aaaaaaaa	a^aaaaaaaa	1000-01-9	-4992	a^aaaaaaaa	-4992
+a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
diff -Nrup a/mysql-test/std_data/funcs_1/t7.txt b/mysql-test/std_data/funcs_1/t7.txt
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/std_data/funcs_1/t7.txt	2008-03-31 16:36:04 +02:00
@@ -0,0 +1,10 @@
+a`	a`		-5000
+aaa	aaa		-4999
+abaa	abaa		-4998
+acaaa	acaaa		-4997
+adaaaa	adaaaa		-4996
+aeaaaaa	aeaaaaa		-4995
+afaaaaaa	afaaaaaa		-4994
+agaaaaaaa	agaaaaaaa		-4993
+a^aaaaaaaa	a^aaaaaaaa		-4992
+a_aaaaaaaaa	a_aaaaaaaaa		-4991
diff -Nrup a/mysql-test/std_data/funcs_1/t9.txt b/mysql-test/std_data/funcs_1/t9.txt
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/std_data/funcs_1/t9.txt	2008-03-31 16:36:04 +02:00
@@ -0,0 +1,10 @@
+-5000	a`	-5000
+-4999	aaa	-4999
+-4998	abaa	-4998
+-4997	acaaa	-4997
+-4996	adaaaa	-4996
+-4995	aeaaaaa	-4995
+-4994	afaaaaaa	-4994
+-4993	agaaaaaaa	-4993
+-4992	a^aaaaaaaa	-4992
+-4991	a_aaaaaaaaa	-4991
diff -Nrup a/mysql-test/suite/funcs_1/README.txt b/mysql-test/suite/funcs_1/README.txt
--- a/mysql-test/suite/funcs_1/README.txt	2008-03-07 17:33:00 +01:00
+++ b/mysql-test/suite/funcs_1/README.txt	2008-03-31 19:47:57 +02:00
@@ -25,7 +25,7 @@
    SESSION_STATUS
    SESSION_VARIABLES
 
-3. Some hints:
+3. Some hints for maintainers of this suite:
    - SHOW TABLES ... LIKE '<pattern>'
      does a case sensitive comparison between the tablename and
      the pattern.
@@ -43,4 +43,12 @@
      ERROR 42000: Access denied for user ... to database 'information_schema'
      DROP DATABASE INFORMATION_SCHEMA;
      ERROR 42000: Access denied for user ... to database 'INFORMATION_SCHEMA'
+   - Try to unify results by
+     --replace_result $engine_type <engine_to_be_tested>
+     if we could expect that the results for storage engine variants of a
+     test differ only in the engine names.
+     This makes future maintenance easier.
+   - Avoid the use of include/show_msg*.inc.
+     They produce "SQL" noise which annoys during server debugging and can be
+     easy replaced by "--echo ...".
 
diff -Nrup a/mysql-test/suite/funcs_1/data/innodb_tb1.txt b/mysql-test/suite/funcs_1/data/innodb_tb1.txt
--- a/mysql-test/suite/funcs_1/data/innodb_tb1.txt	2007-02-06 18:54:34 +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/innodb_tb2.txt b/mysql-test/suite/funcs_1/data/innodb_tb2.txt
--- a/mysql-test/suite/funcs_1/data/innodb_tb2.txt	2007-02-06 18:54:34 +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/innodb_tb3.txt b/mysql-test/suite/funcs_1/data/innodb_tb3.txt
--- a/mysql-test/suite/funcs_1/data/innodb_tb3.txt	2007-02-06 18:54:34 +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/innodb_tb4.txt b/mysql-test/suite/funcs_1/data/innodb_tb4.txt
--- a/mysql-test/suite/funcs_1/data/innodb_tb4.txt	2007-02-06 18:54:34 +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/data/memory_tb1.txt b/mysql-test/suite/funcs_1/data/memory_tb1.txt
--- a/mysql-test/suite/funcs_1/data/memory_tb1.txt	2007-02-06 18:54:34 +01:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1,10 +0,0 @@
-!	!	!	!	125	69	107	223	9324	34526	518	41335	-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
-@	@	@	@	33	206	121	215	9380	15833	14975	52816	-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
-#	#	#	#	117	5	25	30	21071	22894	7157	52356	-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
-$	$	$	$	2	19	61	214	1220	9289	14636	719	-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
-%	%	%	%	102	185	122	228	21359	20663	7136	60130	-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
-^	^	^	^	24	48	102	248	30907	13155	26008	11892	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
-&	&	&	&	68	95	123	253	26999	2063	7957	49062	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
-*	*	*	*	114	116	86	237	16008	64728	29018	63686	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
-(	(	(	(	102	120	12	166	7011	231	28948	43386	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
-)	)	)	)	14	162	113	166	15432	23427	9909	55743	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/memory_tb2.txt b/mysql-test/suite/funcs_1/data/memory_tb2.txt
--- a/mysql-test/suite/funcs_1/data/memory_tb2.txt	2007-02-06 18:54:34 +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/memory_tb3.txt b/mysql-test/suite/funcs_1/data/memory_tb3.txt
--- a/mysql-test/suite/funcs_1/data/memory_tb3.txt	2007-02-06 18:54:34 +01:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1,10 +0,0 @@
-!	!	!	!	!	!	87	241	57	173	18446	49170	16642	30337	-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
-@	@	@	@	@	@	46	98	15	87	28328	27957	22906	13894	-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
-#	#	#	#	#	#	47	178	99	1	14395	33016	14488	19286	-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
-$	$	$	$	$	$	112	214	125	95	17700	64850	18337	21044	-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
-%	%	%	%	%	%	11	122	24	177	25939	55312	20230	23055	-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
-^	^	^	^	^	^	89	228	33	168	29230	35722	26178	18372	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
-&	&	&	&	&	&	71	225	98	132	15603	29021	29242	62542	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
-*	*	*	*	*	*	54	204	86	76	12146	41911	27986	4744	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
-(	(	(	(	(	(	7	93	3	194	18817	25083	8657	49740	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
-)	)	)	)	)	)	15	241	27	18	9788	64993	245	39300	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/memory_tb4.txt b/mysql-test/suite/funcs_1/data/memory_tb4.txt
--- a/mysql-test/suite/funcs_1/data/memory_tb4.txt	2007-02-06 18:54:34 +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/data/myisam_tb1.txt b/mysql-test/suite/funcs_1/data/myisam_tb1.txt
--- a/mysql-test/suite/funcs_1/data/myisam_tb1.txt	2007-02-06 18:54:34 +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`	!	20	96	13	158	11496	12640	26882	22184	-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	@	68	67	107	152	1647	41491	10631	40729	-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	#	0	54	39	182	28122	30607	623	40601	-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	$	40	53	33	204	8927	17582	6931	6231	-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	%	27	126	101	76	8412	64647	24531	7195	-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	^	48	168	35	166	25531	41269	21741	46926	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	&	31	148	93	146	8540	31876	22500	8553	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	*	95	51	63	48	5445	40770	2704	28590	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	(	17	203	60	176	2330	41952	4228	46680	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	)	43	137	116	109	17630	47511	18723	24472	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/myisam_tb2.txt b/mysql-test/suite/funcs_1/data/myisam_tb2.txt
--- a/mysql-test/suite/funcs_1/data/myisam_tb2.txt	2007-02-06 18:54:34 +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\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0
 \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\
 0\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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\04@\0\0\0\0\0\04@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\
 0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0@
-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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0>@\0\0\0\0\0\0>@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\04@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\
 0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\04@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\04@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0@
-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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0D@\0\0\0\0\0\0D@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\
 0\0\0\0@\0\0\0\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0"@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0"@	\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0*@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\N
-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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0I@\0\0\0\0\0\0I@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\
 0\0\0\0@\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0$@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0$@	\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0"@
-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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @	\0\0\0\0\0\0\0\0\0\0\0\0\09@\0\0\0\0\0\0.@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0Q@\0\0\0\0\0\0@\0\0\0\0\0Q@\0\0\0\0\0Q@\0\0\0\0\0\0@\0\0\0\0\0Q@\0\0\0\0\0\0@\0\0\0\0\0\0@
 \0\0\0\0\0\0\0\0\0&@\0\0\0\0\0\0&@\0\0\0\0\0\0*@\0\0\0\0\0\0&@\0\0\0\0\0\0*@\0\0\0\0\0\0*@\0\0\0\0\0\0&@\0\0\0\0\0\0*@\0\0\0\0\0\0&@\0\0\0\0\0\0&@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0Q@\0\0\0\0\0\0@\0\0\0\0\0Q@\0\0\0\0\0Q@\0\0\0\0\0\0@\0\0\0\0\0Q@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0&@\0\0\0\0\0\0&@\0\0\0\0\0\0*@\0\0\0\0\0\0&@\0\0\0\0\0\0*@\0\0\0\0\0\0*@\0\0\0\0\0\0&@\0\0\0\0\0\0*@\0\0\0\0\0\0&@\0\0\0\0\0\0&@	\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0$@
-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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0
 \0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\
 0\0@\0\0\0\0\0\0@
-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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\04@\0\0\0\0\0\04@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0
 \0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0@
-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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0>@\0\0\0\0\0\0>@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\04@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0
 \0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\04@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\04@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0@
-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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0D@\0\0\0\0\0\0D@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\
 0@\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0"@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0"@	\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0*@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\N
diff -Nrup a/mysql-test/suite/funcs_1/data/myisam_tb3.txt b/mysql-test/suite/funcs_1/data/myisam_tb3.txt
--- a/mysql-test/suite/funcs_1/data/myisam_tb3.txt	2007-02-06 18:54:34 +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`	!	109	139	69	7	18139	13696	27218	8005	-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	@	84	140	42	19	17074	20551	20585	53745	-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	#	59	235	74	53	11119	50568	6317	28587	-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	$	111	15	124	208	1523	44126	32488	35195	-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	%	39	74	95	55	9343	13013	30820	52027	-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	^	0	189	119	57	27291	29348	7618	17041	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	&	95	202	104	100	25978	36845	25435	57697	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	*	32	31	47	219	22189	56957	23389	18316	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	(	35	5	13	119	23453	2681	10787	47642	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	)	20	177	13	18	23752	18809	22353	4155	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/myisam_tb4.txt b/mysql-test/suite/funcs_1/data/myisam_tb4.txt
--- a/mysql-test/suite/funcs_1/data/myisam_tb4.txt	2007-02-06 18:54:34 +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\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0
 \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\
 0\0\0\0\0\0@	0	0!	0		0	0!	0!	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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\04@\0\0\0\0\0\04@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\
 0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0@	1@	1@#	1@		
 1@	1@#	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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0>@\0\0\0\0\0\0>@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\04@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\
 0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\04@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\04@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0@	2#$	2#$%	2#$		2#$
 	2#$%	2#$%	4
-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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0D@\0\0\0\0\0\0D@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\
 0\0\0\0@\0\0\0\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0"@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0"@	\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0*@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\N	3$%^	3$%^&	3$%^		3$%^	3$%^&	3$%^&	5
-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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0I@\0\0\0\0\0\0I@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\
 0\0\0\0@\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0$@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0$@	\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0"@	4%^&*	4%^&*(	4%^&*		4%^&*	4%^&*(	4%^&*(	6
-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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @	\0\0\0\0\0\0\0\0\0\0\0\0\09@\0\0\0\0\0\0.@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0Q@\0\0\0\0\0\0@\0\0\0\0\0Q@\0\0\0\0\0Q@\0\0\0\0\0\0@\0\0\0\0\0Q@\0\0\0\0\0\0@\0\0\0\0\0\0@
 \0\0\0\0\0\0\0\0\0&@\0\0\0\0\0\0&@\0\0\0\0\0\0*@\0\0\0\0\0\0&@\0\0\0\0\0\0*@\0\0\0\0\0\0*@\0\0\0\0\0\0&@\0\0\0\0\0\0*@\0\0\0\0\0\0&@\0\0\0\0\0\0&@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0Q@\0\0\0\0\0\0@\0\0\0\0\0Q@\0\0\0\0\0Q@\0\0\0\0\0\0@\0\0\0\0\0Q@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0&@\0\0\0\0\0\0&@\0\0\0\0\0\0*@\0\0\0\0\0\0&@\0\0\0\0\0\0*@\0\0\0\0\0\0*@\0\0\0\0\0\0&@\0\0\0\0\0\0*@\0\0\0\0\0\0&@\0\0\0\0\0\0&@	\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\0\0\0\0N@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0(@\0\0\0\0\0\0$@\0\0\0\0\0\0$@	5^&*()	5^&*()_	5^&*()		5^&*()	5^&*()_	5^&*()_	7
-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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0
 \0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0$@\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\
 0\0@\0\0\0\0\0\0@	6&*()_+	6&*()_+=	6&*()_+		6&*()_+	6&*()_+=	6&*()_+=	8
-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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\04@\0\0\0\0\0\04@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0
 \0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\04@\0\0\0\0\0\0�\0\0\0\0\0\0�\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0@	7*()_+=-	7*(
 )_+=-|	7*()_+=-		7*()_+=-	7*()_+=-|	7*()_+=-|	9
-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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0>@\0\0\0\0\0\0>@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\04@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0
 \0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\04@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\04@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0>@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0"@\0\0\0\0\0\0@\0\0\0\0\0\0@	8()_+=-|{	8()_+=-|{}	8()_+=-|{		8()_+=-
 |{	8()_+=-|{}	8()_+=-|{}	10
-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	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0D@\0\0\0\0\0\0D@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\
 0@\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0"@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0I@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0\0\0\0"@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0&@\0\0\0\0\0\0"@\0\0\0\0\0\0"@	\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0*@	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@	\N	9)_+=-|{}[	9)_+=-|{}[]	9)_+=-|{}[		9)_+=-|{}[	9)_+=-|{}[]	9)_+=-|{}[]	11
diff -Nrup a/mysql-test/suite/funcs_1/data/t3.txt b/mysql-test/suite/funcs_1/data/t3.txt
--- a/mysql-test/suite/funcs_1/data/t3.txt	2007-02-06 18:54:34 +01:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1,10 +0,0 @@
-a`	a`	-5000
-aaa	aaa	-4999
-abaa	abaa	-4998
-acaaa	acaaa	-4997
-adaaaa	adaaaa	-4996
-aeaaaaa	aeaaaaa	-4995
-afaaaaaa	afaaaaaa	-4994
-agaaaaaaa	agaaaaaaa	-4993
-a^aaaaaaaa	a^aaaaaaaa	-4992
-a_aaaaaaaaa	a_aaaaaaaaa	-4991
diff -Nrup a/mysql-test/suite/funcs_1/data/t4.txt b/mysql-test/suite/funcs_1/data/t4.txt
--- a/mysql-test/suite/funcs_1/data/t4.txt	2007-02-06 18:54:34 +01:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1,10 +0,0 @@
-a`	a`	1000-01-1	-5000	a`	-5000
-aaa	aaa	1000-01-2	-4999	aaa	-4999
-abaa	abaa	1000-01-3	-4998	abaa	-4998
-acaaa	acaaa	1000-01-4	-4997	acaaa	-4997
-adaaaa	adaaaa	1000-01-5	-4996	adaaaa	-4996
-aeaaaaa	aeaaaaa	1000-01-6	-4995	aeaaaaa	-4995
-afaaaaaa	afaaaaaa	1000-01-7	-4994	afaaaaaa	-4994
-agaaaaaaa	agaaaaaaa	1000-01-8	-4993	agaaaaaaa	-4993
-a^aaaaaaaa	a^aaaaaaaa	1000-01-9	-4992	a^aaaaaaaa	-4992
-a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
diff -Nrup a/mysql-test/suite/funcs_1/data/t7.txt b/mysql-test/suite/funcs_1/data/t7.txt
--- a/mysql-test/suite/funcs_1/data/t7.txt	2007-02-06 18:54:34 +01:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1,10 +0,0 @@
-a`	a`		-5000
-aaa	aaa		-4999
-abaa	abaa		-4998
-acaaa	acaaa		-4997
-adaaaa	adaaaa		-4996
-aeaaaaa	aeaaaaa		-4995
-afaaaaaa	afaaaaaa		-4994
-agaaaaaaa	agaaaaaaa		-4993
-a^aaaaaaaa	a^aaaaaaaa		-4992
-a_aaaaaaaaa	a_aaaaaaaaa		-4991
diff -Nrup a/mysql-test/suite/funcs_1/data/t9.txt b/mysql-test/suite/funcs_1/data/t9.txt
--- a/mysql-test/suite/funcs_1/data/t9.txt	2007-02-06 18:54:34 +01:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1,10 +0,0 @@
--5000	a`	-5000
--4999	aaa	-4999
--4998	abaa	-4998
--4997	acaaa	-4997
--4996	adaaaa	-4996
--4995	aeaaaaa	-4995
--4994	afaaaaaa	-4994
--4993	agaaaaaaa	-4993
--4992	a^aaaaaaaa	-4992
--4991	a_aaaaaaaaa	-4991
diff -Nrup a/mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc b/mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc
--- a/mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc	2007-02-06 18:54:35 +01:00
+++ b/mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc	2008-03-31 19:47:57 +02:00
@@ -2,7 +2,7 @@
 #
 
 # columns in INFORMATION_SCHEMA with VARCHAR(4096) on Linux and Intel or AMD
-# processor are shown as VARCHAR(512) on Windows, VARCHAR(1023) on AIX and HPUX, 
+# processor are shown as VARCHAR(512) on Windows, VARCHAR(1023) on AIX and HPUX,
 # VARCHAR(1024) on Solaris10, ... see below and in bug #12777 for details.
 # So we need to replace the output for these systems. There may be other still
 # not tested / detected systems.
@@ -10,10 +10,10 @@
 # Setting the variables used below has been moved to the beginning of the datadict
 # tests to "suite/funcs_1/datadict/datadict_load.inc".
 #
-# SELECT character_maximum_length INTO @CML 
-#   FROM information_schema.columns 
-#  WHERE table_schema = 'information_schema' 
-#    AND table_name   = 'columns' 
+# SELECT character_maximum_length INTO @CML
+#   FROM information_schema.columns
+#  WHERE table_schema = 'information_schema'
+#    AND table_name   = 'columns'
 #    AND column_name  = 'table_catalog';
 
 # this enables the --replace_result only if needed, using this we never replace
@@ -31,7 +31,7 @@ if ($bug_12777_0512)
    --replace_result 512 4096  1536 12288
 }
 
-# aix52, aix52-64bit, hp3750, hp3750-64bit, hpux11, hpux11-64bit, 
+# aix52, aix52-64bit, hp3750, hp3750-64bit, hpux11, hpux11-64bit,
 if ($bug_12777_1023)
 {
    #                nnnn       3*n
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-11 19:54:33 +01:00
+++ b/mysql-test/suite/funcs_1/datadict/datadict_load.inc	2008-03-31 19:47:57 +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 3 files $<engine>_datadict.test, but it has been moved 
+#  this was part of the 3 files $<engine>_datadict.test, but it has been moved
 #  here to have only one place where all preparation for the test is done.
 #
 ################################################################################
diff -Nrup a/mysql-test/suite/funcs_1/include/innodb_tb1.inc b/mysql-test/suite/funcs_1/include/innodb_tb1.inc
--- a/mysql-test/suite/funcs_1/include/innodb_tb1.inc	2007-02-06 18:54:35 +01:00
+++ b/mysql-test/suite/funcs_1/include/innodb_tb1.inc	2008-03-31 19:47:57 +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 = innodb;
 
-
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb1.txt' into table tb1 ;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/innodb_tb1.txt'
+into table tb1;
diff -Nrup a/mysql-test/suite/funcs_1/include/innodb_tb2.inc b/mysql-test/suite/funcs_1/include/innodb_tb2.inc
--- a/mysql-test/suite/funcs_1/include/innodb_tb2.inc	2007-02-06 18:54:35 +01:00
+++ b/mysql-test/suite/funcs_1/include/innodb_tb2.inc	2008-03-31 19:47:57 +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 = innodb;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb2.txt' into table tb2 ;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/innodb_tb2.txt'
+into table tb2;
diff -Nrup a/mysql-test/suite/funcs_1/include/innodb_tb3.inc b/mysql-test/suite/funcs_1/include/innodb_tb3.inc
--- a/mysql-test/suite/funcs_1/include/innodb_tb3.inc	2007-02-06 18:54:35 +01:00
+++ b/mysql-test/suite/funcs_1/include/innodb_tb3.inc	2008-03-31 19:47:57 +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 = innodb;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb3.txt' into table tb3 ;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/innodb_tb3.txt'
+into table tb3;
diff -Nrup a/mysql-test/suite/funcs_1/include/innodb_tb4.inc b/mysql-test/suite/funcs_1/include/innodb_tb4.inc
--- a/mysql-test/suite/funcs_1/include/innodb_tb4.inc	2007-02-06 18:54:35 +01:00
+++ b/mysql-test/suite/funcs_1/include/innodb_tb4.inc	2008-03-31 19:47:57 +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 = innodb;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb4.txt' into table tb4 ;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/innodb_tb4.txt'
+into table tb4;
diff -Nrup a/mysql-test/suite/funcs_1/include/memory_tb1.inc b/mysql-test/suite/funcs_1/include/memory_tb1.inc
--- a/mysql-test/suite/funcs_1/include/memory_tb1.inc	2008-03-07 17:33:00 +01:00
+++ b/mysql-test/suite/funcs_1/include/memory_tb1.inc	2008-03-31 19:47:57 +02:00
@@ -4,57 +4,59 @@
 drop table if exists tb1 ;
 --enable_warnings
 create table tb1 (
-f1 char, 
-f2 char binary, 
-f3 char ascii, 
-f12 binary, 
-f13 tinyint, 
-f14 tinyint unsigned, 
-f15 tinyint zerofill, 
-f16 tinyint unsigned zerofill, 
-f17 smallint, 
-f18 smallint unsigned,  
-f19 smallint zerofill, 
-f20 smallint unsigned zerofill, 
-f21 mediumint, 
-f22 mediumint unsigned, 
-f23 mediumint zerofill, 
-f24 mediumint unsigned zerofill, 
-f25 int, 
-f26 int unsigned, 
-f27 int zerofill, 
-f28 int unsigned zerofill, 
-f29 bigint, 
-f30 bigint unsigned, 
-f31 bigint zerofill, 
-f32 bigint unsigned zerofill, 
-f33 decimal not null DEFAULT 9.9, 
-f34 decimal unsigned not null DEFAULT 9.9, 
-f35 decimal zerofill not null DEFAULT 9.9, 
-f36 decimal unsigned zerofill not null DEFAULT 9.9, 
-f37 decimal (0) not null DEFAULT 9.9, 
-f38 decimal (64) not null DEFAULT 9.9, 
-f39 decimal (0) unsigned not null DEFAULT 9.9, 
-f40 decimal (64) unsigned not null DEFAULT 9.9, 
-f41 decimal (0) zerofill not null DEFAULT 9.9, 
-f42 decimal (64) zerofill not null DEFAULT 9.9, 
-f43 decimal (0) unsigned zerofill not null DEFAULT 9.9, 
-f44 decimal (64) unsigned zerofill not null DEFAULT 9.9, 
-f45 decimal (0,0) not null DEFAULT 9.9, 
-f46 decimal (63,30) not null DEFAULT 9.9, 
-f47 decimal (0,0) unsigned not null DEFAULT 9.9, 
-f48 decimal (63,30) unsigned not null DEFAULT 9.9, 
-f49 decimal (0,0) zerofill not null DEFAULT 9.9, 
-f50 decimal (63,30) zerofill not null DEFAULT 9.9, 
-f51 decimal (0,0) unsigned zerofill not null DEFAULT 9.9, 
-f52 decimal (63,30) unsigned zerofill not null DEFAULT 9.9, 
-f53 numeric not null DEFAULT 99, 
-f54 numeric unsigned not null DEFAULT 99, 
-f55 numeric zerofill not null DEFAULT 99, 
-f56 numeric unsigned zerofill not null DEFAULT 99, 
-f57 numeric (0) not null DEFAULT 99, 
+f1 char,
+f2 char binary,
+f3 char ascii,
+f12 binary,
+f13 tinyint,
+f14 tinyint unsigned,
+f15 tinyint zerofill,
+f16 tinyint unsigned zerofill,
+f17 smallint,
+f18 smallint unsigned,
+f19 smallint zerofill,
+f20 smallint unsigned zerofill,
+f21 mediumint,
+f22 mediumint unsigned,
+f23 mediumint zerofill,
+f24 mediumint unsigned zerofill,
+f25 int,
+f26 int unsigned,
+f27 int zerofill,
+f28 int unsigned zerofill,
+f29 bigint,
+f30 bigint unsigned,
+f31 bigint zerofill,
+f32 bigint unsigned zerofill,
+f33 decimal not null DEFAULT 9.9,
+f34 decimal unsigned not null DEFAULT 9.9,
+f35 decimal zerofill not null DEFAULT 9.9,
+f36 decimal unsigned zerofill not null DEFAULT 9.9,
+f37 decimal (0) not null DEFAULT 9.9,
+f38 decimal (64) not null DEFAULT 9.9,
+f39 decimal (0) unsigned not null DEFAULT 9.9,
+f40 decimal (64) unsigned not null DEFAULT 9.9,
+f41 decimal (0) zerofill not null DEFAULT 9.9,
+f42 decimal (64) zerofill not null DEFAULT 9.9,
+f43 decimal (0) unsigned zerofill not null DEFAULT 9.9,
+f44 decimal (64) unsigned zerofill not null DEFAULT 9.9,
+f45 decimal (0,0) not null DEFAULT 9.9,
+f46 decimal (63,30) not null DEFAULT 9.9,
+f47 decimal (0,0) unsigned not null DEFAULT 9.9,
+f48 decimal (63,30) unsigned not null DEFAULT 9.9,
+f49 decimal (0,0) zerofill not null DEFAULT 9.9,
+f50 decimal (63,30) zerofill not null DEFAULT 9.9,
+f51 decimal (0,0) unsigned zerofill not null DEFAULT 9.9,
+f52 decimal (63,30) unsigned zerofill not null DEFAULT 9.9,
+f53 numeric not null DEFAULT 99,
+f54 numeric unsigned not null DEFAULT 99,
+f55 numeric zerofill not null DEFAULT 99,
+f56 numeric unsigned zerofill not null DEFAULT 99,
+f57 numeric (0) not null DEFAULT 99,
 f58 numeric (64) not null DEFAULT 99
 ) engine = memory;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb1.txt' into table tb1 ;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/memory_tb1.txt'
+into table tb1;
diff -Nrup a/mysql-test/suite/funcs_1/include/memory_tb2.inc b/mysql-test/suite/funcs_1/include/memory_tb2.inc
--- a/mysql-test/suite/funcs_1/include/memory_tb2.inc	2008-03-07 17:33:00 +01:00
+++ b/mysql-test/suite/funcs_1/include/memory_tb2.inc	2008-03-31 19:47:57 +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 = memory;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb2.txt' into table tb2 ;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/memory_tb2.txt'
+into table tb2 ;
diff -Nrup a/mysql-test/suite/funcs_1/include/memory_tb3.inc b/mysql-test/suite/funcs_1/include/memory_tb3.inc
--- a/mysql-test/suite/funcs_1/include/memory_tb3.inc	2008-03-07 17:33:00 +01:00
+++ b/mysql-test/suite/funcs_1/include/memory_tb3.inc	2008-03-31 19:47:57 +02:00
@@ -4,60 +4,61 @@
 drop table if exists tb3;
 --enable_warnings
 create table tb3 (
-f118 char not null DEFAULT 'a', 
-f119 char binary not null DEFAULT b'101', 
-f120 char ascii not null DEFAULT b'101', 
-f121 char(50), 
-f122 char(50), 
-f129 binary not null DEFAULT b'101', 
-f130 tinyint not null DEFAULT 99, 
-f131 tinyint unsigned not null DEFAULT 99, 
-f132 tinyint zerofill not null DEFAULT 99, 
-f133 tinyint unsigned zerofill not null DEFAULT 99, 
-f134 smallint not null DEFAULT 999, 
-f135 smallint unsigned not null DEFAULT 999, 
-f136 smallint zerofill not null DEFAULT 999,  
-f137 smallint unsigned zerofill not null DEFAULT 999, 
-f138 mediumint not null DEFAULT 9999, 
-f139 mediumint unsigned not null DEFAULT 9999, 
-f140 mediumint zerofill not null DEFAULT 9999, 
-f141 mediumint unsigned zerofill not null DEFAULT 9999, 
-f142 int not null DEFAULT 99999, 
-f143 int unsigned not null DEFAULT 99999, 
-f144 int zerofill not null DEFAULT 99999, 
-f145 int unsigned zerofill not null DEFAULT 99999, 
-f146 bigint not null DEFAULT 999999, 
-f147 bigint unsigned not null DEFAULT 999999, 
-f148 bigint zerofill not null DEFAULT 999999, 
-f149 bigint unsigned zerofill not null DEFAULT 999999, 
-f150 decimal not null DEFAULT 999.999, 
-f151 decimal unsigned not null DEFAULT 999.17, 
-f152 decimal zerofill not null DEFAULT 999.999, 
-f153 decimal unsigned zerofill, 
-f154 decimal (0), 
-f155 decimal (64), 
-f156 decimal (0) unsigned, 
-f157 decimal (64) unsigned, 
-f158 decimal (0) zerofill, 
-f159 decimal (64) zerofill, 
-f160 decimal (0) unsigned zerofill, 
-f161 decimal (64) unsigned zerofill, 
-f162 decimal (0,0), 
-f163 decimal (63,30), 
-f164 decimal (0,0) unsigned, 
-f165 decimal (63,30) unsigned, 
-f166 decimal (0,0) zerofill, 
-f167 decimal (63,30) zerofill, 
-f168 decimal (0,0) unsigned zerofill, 
-f169 decimal (63,30) unsigned zerofill, 
-f170 numeric, 
-f171 numeric unsigned, 
-f172 numeric zerofill, 
-f173 numeric unsigned zerofill, 
-f174 numeric (0), 
-f175 numeric (64) 
+f118 char not null DEFAULT 'a',
+f119 char binary not null DEFAULT b'101',
+f120 char ascii not null DEFAULT b'101',
+f121 char(50),
+f122 char(50),
+f129 binary not null DEFAULT b'101',
+f130 tinyint not null DEFAULT 99,
+f131 tinyint unsigned not null DEFAULT 99,
+f132 tinyint zerofill not null DEFAULT 99,
+f133 tinyint unsigned zerofill not null DEFAULT 99,
+f134 smallint not null DEFAULT 999,
+f135 smallint unsigned not null DEFAULT 999,
+f136 smallint zerofill not null DEFAULT 999,
+f137 smallint unsigned zerofill not null DEFAULT 999,
+f138 mediumint not null DEFAULT 9999,
+f139 mediumint unsigned not null DEFAULT 9999,
+f140 mediumint zerofill not null DEFAULT 9999,
+f141 mediumint unsigned zerofill not null DEFAULT 9999,
+f142 int not null DEFAULT 99999,
+f143 int unsigned not null DEFAULT 99999,
+f144 int zerofill not null DEFAULT 99999,
+f145 int unsigned zerofill not null DEFAULT 99999,
+f146 bigint not null DEFAULT 999999,
+f147 bigint unsigned not null DEFAULT 999999,
+f148 bigint zerofill not null DEFAULT 999999,
+f149 bigint unsigned zerofill not null DEFAULT 999999,
+f150 decimal not null DEFAULT 999.999,
+f151 decimal unsigned not null DEFAULT 999.17,
+f152 decimal zerofill not null DEFAULT 999.999,
+f153 decimal unsigned zerofill,
+f154 decimal (0),
+f155 decimal (64),
+f156 decimal (0) unsigned,
+f157 decimal (64) unsigned,
+f158 decimal (0) zerofill,
+f159 decimal (64) zerofill,
+f160 decimal (0) unsigned zerofill,
+f161 decimal (64) unsigned zerofill,
+f162 decimal (0,0),
+f163 decimal (63,30),
+f164 decimal (0,0) unsigned,
+f165 decimal (63,30) unsigned,
+f166 decimal (0,0) zerofill,
+f167 decimal (63,30) zerofill,
+f168 decimal (0,0) unsigned zerofill,
+f169 decimal (63,30) unsigned zerofill,
+f170 numeric,
+f171 numeric unsigned,
+f172 numeric zerofill,
+f173 numeric unsigned zerofill,
+f174 numeric (0),
+f175 numeric (64)
 ) engine = memory;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb3.txt' into table tb3 ;
-
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/memory_tb3.txt'
+into table tb3;
diff -Nrup a/mysql-test/suite/funcs_1/include/memory_tb4.inc b/mysql-test/suite/funcs_1/include/memory_tb4.inc
--- a/mysql-test/suite/funcs_1/include/memory_tb4.inc	2008-03-07 17:33:00 +01:00
+++ b/mysql-test/suite/funcs_1/include/memory_tb4.inc	2008-03-31 19:47:57 +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"),
 f236 char(95) unicode,
 f241 char(255) unicode,
@@ -63,5 +63,7 @@ f239 varbinary(0),
 f240 varchar(1200) unicode
 ) engine = memory;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/memory_tb4.txt' into table tb4 ;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/memory_tb4.txt'
+into table tb4;
diff -Nrup a/mysql-test/suite/funcs_1/include/myisam_tb1.inc b/mysql-test/suite/funcs_1/include/myisam_tb1.inc
--- a/mysql-test/suite/funcs_1/include/myisam_tb1.inc	2007-02-06 18:54:35 +01:00
+++ b/mysql-test/suite/funcs_1/include/myisam_tb1.inc	2008-03-31 19:47:57 +02:00
@@ -4,65 +4,67 @@
 drop table if exists tb1 ;
 --enable_warnings
 create table tb1 (
-f1 char, 
-f2 char binary, 
-f3 char ascii, 
-f4 tinytext unicode, 
-f5 text, 
-f6 mediumtext, 
-f7 longtext, 
-f8 tinyblob, 
+f1 char,
+f2 char binary,
+f3 char ascii,
+f4 tinytext unicode,
+f5 text,
+f6 mediumtext,
+f7 longtext,
+f8 tinyblob,
 f9 blob,
-f10 mediumblob, 
-f11 longblob, 
-f12 binary, 
-f13 tinyint, 
-f14 tinyint unsigned, 
-f15 tinyint zerofill, 
-f16 tinyint unsigned zerofill, 
-f17 smallint, 
-f18 smallint unsigned,  
-f19 smallint zerofill, 
-f20 smallint unsigned zerofill, 
-f21 mediumint, 
-f22 mediumint unsigned, 
-f23 mediumint zerofill, 
-f24 mediumint unsigned zerofill, 
-f25 int, 
-f26 int unsigned, 
-f27 int zerofill, 
-f28 int unsigned zerofill, 
-f29 bigint, 
-f30 bigint unsigned, 
-f31 bigint zerofill, 
-f32 bigint unsigned zerofill, 
-f33 decimal not null DEFAULT 9.9, 
-f34 decimal unsigned not null DEFAULT 9.9, 
-f35 decimal zerofill not null DEFAULT 9.9, 
-f36 decimal unsigned zerofill not null DEFAULT 9.9, 
-f37 decimal (0) not null DEFAULT 9.9, 
-f38 decimal (64) not null DEFAULT 9.9, 
-f39 decimal (0) unsigned not null DEFAULT 9.9, 
-f40 decimal (64) unsigned not null DEFAULT 9.9, 
-f41 decimal (0) zerofill not null DEFAULT 9.9, 
-f42 decimal (64) zerofill not null DEFAULT 9.9, 
-f43 decimal (0) unsigned zerofill not null DEFAULT 9.9, 
-f44 decimal (64) unsigned zerofill not null DEFAULT 9.9, 
-f45 decimal (0,0) not null DEFAULT 9.9, 
-f46 decimal (63,30) not null DEFAULT 9.9, 
-f47 decimal (0,0) unsigned not null DEFAULT 9.9, 
-f48 decimal (63,30) unsigned not null DEFAULT 9.9, 
-f49 decimal (0,0) zerofill not null DEFAULT 9.9, 
-f50 decimal (63,30) zerofill not null DEFAULT 9.9, 
-f51 decimal (0,0) unsigned zerofill not null DEFAULT 9.9, 
-f52 decimal (63,30) unsigned zerofill not null DEFAULT 9.9, 
-f53 numeric not null DEFAULT 99, 
-f54 numeric unsigned not null DEFAULT 99, 
-f55 numeric zerofill not null DEFAULT 99, 
-f56 numeric unsigned zerofill not null DEFAULT 99, 
-f57 numeric (0) not null DEFAULT 99, 
+f10 mediumblob,
+f11 longblob,
+f12 binary,
+f13 tinyint,
+f14 tinyint unsigned,
+f15 tinyint zerofill,
+f16 tinyint unsigned zerofill,
+f17 smallint,
+f18 smallint unsigned,
+f19 smallint zerofill,
+f20 smallint unsigned zerofill,
+f21 mediumint,
+f22 mediumint unsigned,
+f23 mediumint zerofill,
+f24 mediumint unsigned zerofill,
+f25 int,
+f26 int unsigned,
+f27 int zerofill,
+f28 int unsigned zerofill,
+f29 bigint,
+f30 bigint unsigned,
+f31 bigint zerofill,
+f32 bigint unsigned zerofill,
+f33 decimal not null DEFAULT 9.9,
+f34 decimal unsigned not null DEFAULT 9.9,
+f35 decimal zerofill not null DEFAULT 9.9,
+f36 decimal unsigned zerofill not null DEFAULT 9.9,
+f37 decimal (0) not null DEFAULT 9.9,
+f38 decimal (64) not null DEFAULT 9.9,
+f39 decimal (0) unsigned not null DEFAULT 9.9,
+f40 decimal (64) unsigned not null DEFAULT 9.9,
+f41 decimal (0) zerofill not null DEFAULT 9.9,
+f42 decimal (64) zerofill not null DEFAULT 9.9,
+f43 decimal (0) unsigned zerofill not null DEFAULT 9.9,
+f44 decimal (64) unsigned zerofill not null DEFAULT 9.9,
+f45 decimal (0,0) not null DEFAULT 9.9,
+f46 decimal (63,30) not null DEFAULT 9.9,
+f47 decimal (0,0) unsigned not null DEFAULT 9.9,
+f48 decimal (63,30) unsigned not null DEFAULT 9.9,
+f49 decimal (0,0) zerofill not null DEFAULT 9.9,
+f50 decimal (63,30) zerofill not null DEFAULT 9.9,
+f51 decimal (0,0) unsigned zerofill not null DEFAULT 9.9,
+f52 decimal (63,30) unsigned zerofill not null DEFAULT 9.9,
+f53 numeric not null DEFAULT 99,
+f54 numeric unsigned not null DEFAULT 99,
+f55 numeric zerofill not null DEFAULT 99,
+f56 numeric unsigned zerofill not null DEFAULT 99,
+f57 numeric (0) not null DEFAULT 99,
 f58 numeric (64) not null DEFAULT 99
 ) engine = myisam;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb1.txt' into table tb1 ;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/myisam_tb1.txt'
+into table tb1;
diff -Nrup a/mysql-test/suite/funcs_1/include/myisam_tb2.inc b/mysql-test/suite/funcs_1/include/myisam_tb2.inc
--- a/mysql-test/suite/funcs_1/include/myisam_tb2.inc	2007-02-06 18:54:35 +01:00
+++ b/mysql-test/suite/funcs_1/include/myisam_tb2.inc	2008-03-31 19:47:57 +02:00
@@ -4,77 +4,79 @@
 drop table if exists tb2 ;
 --enable_warnings
 create table tb2 (
-f59 numeric (0) unsigned, 
-f60 numeric (64) unsigned, 
-f61 numeric (0) zerofill, 
-f62 numeric (64) zerofill, 
-f63 numeric (0) unsigned zerofill, 
-f64 numeric (64) unsigned zerofill, 
-f65 numeric (0,0), 
-f66 numeric (63,30), 
-f67 numeric (0,0) unsigned, 
-f68 numeric (63,30) unsigned, 
-f69 numeric (0,0) zerofill, 
-f70 numeric (63,30) zerofill, 
-f71 numeric (0,0) unsigned zerofill, 
-f72 numeric (63,30) unsigned zerofill, 
-f73 real, 
-f74 real unsigned, 
-f75 real zerofill, 
-f76 real unsigned zerofill, 
-f77 double default 7.7, 
-f78 double unsigned default 7.7, 
-f79 double zerofill default 7.7, 
-f80 double unsigned zerofill default 8.8, 
-f81 float not null default 8.8, 
-f82 float unsigned not null default 8.8, 
-f83 float zerofill not null default 8.8, 
-f84 float unsigned zerofill not null default 8.8, 
-f85 float(0) not null default 8.8, 
-f86 float(23) not null default 8.8, 
-f87 float(0) unsigned not null default 8.8, 
-f88 float(23) unsigned not null default 8.8, 
-f89 float(0) zerofill not null default 8.8, 
-f90 float(23) zerofill not null default 8.8, 
-f91 float(0) unsigned zerofill not null default 8.8, 
-f92 float(23) unsigned zerofill not null default 8.8, 
-f93 float(24) not null default 8.8, 
-f94 float(53) not null default 8.8, 
-f95 float(24) unsigned not null default 8.8, 
-f96 float(53) unsigned not null default 8.8, 
-f97 float(24) zerofill not null default 8.8, 
-f98 float(53) zerofill not null default 8.8, 
-f99 float(24) unsigned zerofill not null default 8.8, 
-f100 float(53) unsigned zerofill not null default 8.8, 
-f101 date not null default '2000-01-01', 
-f102 time not null default 20, 
-f103 datetime not null default '2/2/2', 
-f104 timestamp not null default 20001231235959, 
-f105 year not null default 2000, 
-f106 year(3) not null default 2000, 
-f107 year(4) not null default 2000, 
-f108 enum("1enum","2enum") not null default "1enum", 
+f59 numeric (0) unsigned,
+f60 numeric (64) unsigned,
+f61 numeric (0) zerofill,
+f62 numeric (64) zerofill,
+f63 numeric (0) unsigned zerofill,
+f64 numeric (64) unsigned zerofill,
+f65 numeric (0,0),
+f66 numeric (63,30),
+f67 numeric (0,0) unsigned,
+f68 numeric (63,30) unsigned,
+f69 numeric (0,0) zerofill,
+f70 numeric (63,30) zerofill,
+f71 numeric (0,0) unsigned zerofill,
+f72 numeric (63,30) unsigned zerofill,
+f73 real,
+f74 real unsigned,
+f75 real zerofill,
+f76 real unsigned zerofill,
+f77 double default 7.7,
+f78 double unsigned default 7.7,
+f79 double zerofill default 7.7,
+f80 double unsigned zerofill default 8.8,
+f81 float not null default 8.8,
+f82 float unsigned not null default 8.8,
+f83 float zerofill not null default 8.8,
+f84 float unsigned zerofill not null default 8.8,
+f85 float(0) not null default 8.8,
+f86 float(23) not null default 8.8,
+f87 float(0) unsigned not null default 8.8,
+f88 float(23) unsigned not null default 8.8,
+f89 float(0) zerofill not null default 8.8,
+f90 float(23) zerofill not null default 8.8,
+f91 float(0) unsigned zerofill not null default 8.8,
+f92 float(23) unsigned zerofill not null default 8.8,
+f93 float(24) not null default 8.8,
+f94 float(53) not null default 8.8,
+f95 float(24) unsigned not null default 8.8,
+f96 float(53) unsigned not null default 8.8,
+f97 float(24) zerofill not null default 8.8,
+f98 float(53) zerofill not null default 8.8,
+f99 float(24) unsigned zerofill not null default 8.8,
+f100 float(53) unsigned zerofill not null default 8.8,
+f101 date not null default '2000-01-01',
+f102 time not null default 20,
+f103 datetime not null default '2/2/2',
+f104 timestamp not null default 20001231235959,
+f105 year not null default 2000,
+f106 year(3) not null default 2000,
+f107 year(4) not null default 2000,
+f108 enum("1enum","2enum") not null default "1enum",
 f109 set("1set","2set") not null default "1set",
-f110 VARBINARY(64) null, 
-f111 VARBINARY(27) null , 
-f112 VARBINARY(64) null , 
-f113 VARBINARY(192) null , 
-f114 VARBINARY(192) , 
-f115 VARBINARY(27) null , 
-f116 VARBINARY(64) null, 
-f117 VARBINARY(192) null 
+f110 VARBINARY(64) null,
+f111 VARBINARY(27) null ,
+f112 VARBINARY(64) null ,
+f113 VARBINARY(192) null ,
+f114 VARBINARY(192) ,
+f115 VARBINARY(27) null ,
+f116 VARBINARY(64) null,
+f117 VARBINARY(192) null
 ) engine = myisam;
 
 # The original columns. They are replaced by varbinary, because the funcs_1 tests should
 # not depend on the optional availability of the geometry feature.
-# f110 geometry null, 
-# f111 point null , 
-# f112 linestring null , 
-# f113 polygon null , 
-# f114 geometrycollection , 
-# f115 multipoint null , 
-# f116 multilinestring null, 
-# f117 multipolygon null 
+# f110 geometry null,
+# f111 point null ,
+# f112 linestring null ,
+# f113 polygon null ,
+# f114 geometrycollection ,
+# f115 multipoint null ,
+# f116 multilinestring null,
+# f117 multipolygon null
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb2.txt' into table tb2 ;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/myisam_tb2.txt'
+into table tb2;
diff -Nrup a/mysql-test/suite/funcs_1/include/myisam_tb3.inc b/mysql-test/suite/funcs_1/include/myisam_tb3.inc
--- a/mysql-test/suite/funcs_1/include/myisam_tb3.inc	2007-02-06 18:54:35 +01:00
+++ b/mysql-test/suite/funcs_1/include/myisam_tb3.inc	2008-03-31 19:47:57 +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 = myisam;
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb3.txt' into table tb3 ;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/myisam_tb3.txt'
+into table tb3;
diff -Nrup a/mysql-test/suite/funcs_1/include/myisam_tb4.inc b/mysql-test/suite/funcs_1/include/myisam_tb4.inc
--- a/mysql-test/suite/funcs_1/include/myisam_tb4.inc	2007-02-06 18:54:35 +01:00
+++ b/mysql-test/suite/funcs_1/include/myisam_tb4.inc	2008-03-31 19:47:57 +02:00
@@ -4,64 +4,64 @@
 drop table if exists tb4 ;
 --enable_warnings
 create table tb4 (
-f176 numeric (0) unsigned not null DEFAULT 9, 
-f177 numeric (64) unsigned not null DEFAULT 9, 
-f178 numeric (0) zerofill not null DEFAULT 9, 
-f179 numeric (64) zerofill not null DEFAULT 9, 
-f180 numeric (0) unsigned zerofill not null DEFAULT 9, 
-f181 numeric (64) unsigned zerofill not null DEFAULT 9, 
-f182 numeric (0,0) not null DEFAULT 9, 
-f183 numeric (63,30) not null DEFAULT 9, 
-f184 numeric (0,0) unsigned not null DEFAULT 9, 
-f185 numeric (63,30) unsigned not null DEFAULT 9, 
-f186 numeric (0,0) zerofill not null DEFAULT 9, 
-f187 numeric (63,30) zerofill not null DEFAULT 9, 
-f188 numeric (0,0) unsigned zerofill not null DEFAULT 9, 
-f189 numeric (63,30) unsigned zerofill not null DEFAULT 9, 
-f190 real not null DEFAULT 88.8, 
-f191 real unsigned not null DEFAULT 88.8, 
-f192 real zerofill not null DEFAULT 88.8, 
-f193 real unsigned zerofill not null DEFAULT 88.8, 
-f194 double not null DEFAULT 55.5, 
-f195 double unsigned not null DEFAULT 55.5, 
-f196 double zerofill not null DEFAULT 55.5, 
-f197 double unsigned zerofill not null DEFAULT 55.5, 
-f198 float, 
-f199 float unsigned, 
-f200 float zerofill, 
-f201 float unsigned zerofill, 
-f202 float(0), 
-f203 float(23), 
-f204 float(0) unsigned, 
-f205 float(23) unsigned, 
-f206 float(0) zerofill, 
-f207 float(23) zerofill, 
-f208 float(0) unsigned zerofill, 
-f209 float(23) unsigned zerofill, 
-f210 float(24), 
-f211 float(53), 
-f212 float(24) unsigned, 
-f213 float(53) unsigned, 
-f214 float(24) zerofill, 
-f215 float(53) zerofill, 
-f216 float(24) unsigned zerofill, 
-f217 float(53) unsigned zerofill, 
-f218 date, 
-f219 time, 
-f220 datetime, 
-f221 timestamp, 
-f222 year, 
-f223 year(3), 
-f224 year(4), 
-f225 enum("1enum","2enum"), 
-f226 set("1set","2set"), 
-f227 VARBINARY(64), 
-f228 VARBINARY(27), 
-f229 VARBINARY(64), 
-f230 VARBINARY(192), 
-f231 VARBINARY(192), 
-f232 VARBINARY(27), 
-f233 VARBINARY(64), 
+f176 numeric (0) unsigned not null DEFAULT 9,
+f177 numeric (64) unsigned not null DEFAULT 9,
+f178 numeric (0) zerofill not null DEFAULT 9,
+f179 numeric (64) zerofill not null DEFAULT 9,
+f180 numeric (0) unsigned zerofill not null DEFAULT 9,
+f181 numeric (64) unsigned zerofill not null DEFAULT 9,
+f182 numeric (0,0) not null DEFAULT 9,
+f183 numeric (63,30) not null DEFAULT 9,
+f184 numeric (0,0) unsigned not null DEFAULT 9,
+f185 numeric (63,30) unsigned not null DEFAULT 9,
+f186 numeric (0,0) zerofill not null DEFAULT 9,
+f187 numeric (63,30) zerofill not null DEFAULT 9,
+f188 numeric (0,0) unsigned zerofill not null DEFAULT 9,
+f189 numeric (63,30) unsigned zerofill not null DEFAULT 9,
+f190 real not null DEFAULT 88.8,
+f191 real unsigned not null DEFAULT 88.8,
+f192 real zerofill not null DEFAULT 88.8,
+f193 real unsigned zerofill not null DEFAULT 88.8,
+f194 double not null DEFAULT 55.5,
+f195 double unsigned not null DEFAULT 55.5,
+f196 double zerofill not null DEFAULT 55.5,
+f197 double unsigned zerofill not null DEFAULT 55.5,
+f198 float,
+f199 float unsigned,
+f200 float zerofill,
+f201 float unsigned zerofill,
+f202 float(0),
+f203 float(23),
+f204 float(0) unsigned,
+f205 float(23) unsigned,
+f206 float(0) zerofill,
+f207 float(23) zerofill,
+f208 float(0) unsigned zerofill,
+f209 float(23) unsigned zerofill,
+f210 float(24),
+f211 float(53),
+f212 float(24) unsigned,
+f213 float(53) unsigned,
+f214 float(24) zerofill,
+f215 float(53) zerofill,
+f216 float(24) unsigned zerofill,
+f217 float(53) unsigned zerofill,
+f218 date,
+f219 time,
+f220 datetime,
+f221 timestamp,
+f222 year,
+f223 year(3),
+f224 year(4),
+f225 enum("1enum","2enum"),
+f226 set("1set","2set"),
+f227 VARBINARY(64),
+f228 VARBINARY(27),
+f229 VARBINARY(64),
+f230 VARBINARY(192),
+f231 VARBINARY(192),
+f232 VARBINARY(27),
+f233 VARBINARY(64),
 f234 VARBINARY(192),
 f235 char(255) unicode,
 f236 char(60) ascii,
@@ -75,14 +75,16 @@ f242 bit(30)
 
 # The original columns. They are replaced by varbinary, because the funcs_1 tests should
 # not depend on the optional availability of the geometry feature.
-# f227 geometry, 
-# f228 point, 
-# f229 linestring, 
-# f230 polygon, 
-# f231 geometrycollection, 
-# f232 multipoint, 
-# f233 multilinestring, 
+# f227 geometry,
+# f228 point,
+# f229 linestring,
+# f230 polygon,
+# f231 geometrycollection,
+# f232 multipoint,
+# f233 multilinestring,
 # f234 multipolygon,
 
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/myisam_tb4.txt' into table tb4 ;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/myisam_tb4.txt'
+into table tb4;
diff -Nrup a/mysql-test/suite/funcs_1/include/sp_tb.inc b/mysql-test/suite/funcs_1/include/sp_tb.inc
--- a/mysql-test/suite/funcs_1/include/sp_tb.inc	2008-03-07 17:33:00 +01:00
+++ b/mysql-test/suite/funcs_1/include/sp_tb.inc	2008-03-31 19:47:57 +02:00
@@ -5,29 +5,46 @@ USE test;
 --disable_warnings
 DROP TABLE IF EXISTS t1, t2, t4, t10, t11;
 --enable_warnings
-eval CREATE TABLE t1  (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = $engine_type;
-eval CREATE TABLE t2  (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = $engine_type;
-eval CREATE TABLE t4  (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = $engine_type;
-eval CREATE TABLE t10 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = $engine_type;
-eval CREATE TABLE t11 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = $engine_type;
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t1;
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t2;
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t4;
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t10;
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t11;
+eval
+CREATE TABLE t1  (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+ENGINE = $engine_type;
+eval
+CREATE TABLE t2  (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+ENGINE = $engine_type;
+eval
+CREATE TABLE t4  (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+ENGINE = $engine_type;
+eval
+CREATE TABLE t10 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+ENGINE = $engine_type;
+eval
+CREATE TABLE t11 (f1 char(20),f2 char(25),f3 date,f4 int,f5 char(25),f6 int)
+ENGINE = $engine_type;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/t4.txt' INTO TABLE t1;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/t4.txt' INTO TABLE t2;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/t4.txt' INTO TABLE t4;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/t4.txt' INTO TABLE t10;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/t4.txt' INTO TABLE t11;
 
 
 --disable_warnings
 drop TABLE if exists t3;
 --enable_warnings
-eval CREATE TABLE t3 (f1 char(20), f2 char(20), f3 integer) ENGINE = $engine_type;
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t3.txt' INTO TABLE t3;
+eval
+CREATE TABLE t3 (f1 char(20), f2 char(20), f3 integer) ENGINE = $engine_type;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/t3.txt' INTO TABLE t3;
 
 #---------------------------
 
@@ -37,9 +54,12 @@ drop database if exists test4;
 CREATE database test4;
 use test4;
 
-eval CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int) ENGINE = $engine_type;
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' INTO TABLE t6;
+eval
+CREATE TABLE t6 (f1 char(20), f2 char(25), f3 date, f4 int, f5 char(25), f6 int)
+ENGINE = $engine_type;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/t4.txt' INTO TABLE t6;
 #---------------------------
 
 use test;
@@ -47,18 +67,23 @@ use test;
 --disable_warnings
 drop TABLE if exists t7, t8;
 --enable_warnings
-eval CREATE TABLE t7 (f1 char(20), f2 char(25), f3 date, f4 int) ENGINE = $engine_type;
-eval CREATE TABLE t8 (f1 char(20), f2 char(25), f3 date, f4 int) ENGINE = $engine_type;
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t7;
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t7.txt' INTO TABLE t8;
+eval
+CREATE TABLE t7 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = $engine_type;
+eval
+CREATE TABLE t8 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = $engine_type;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/t7.txt' INTO TABLE t7;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/t7.txt' INTO TABLE t8;
 
 
 --disable_warnings
 drop TABLE if exists t9;
 --enable_warnings
 eval CREATE TABLE t9 (f1 int, f2 char(25), f3 int) ENGINE = $engine_type;
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval LOAD DATA INFILE '$MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' INTO TABLE t9;
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval
+LOAD DATA INFILE '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/t9.txt' INTO TABLE t9;
 
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	2007-07-25 06:31:21 +02:00
+++ b/mysql-test/suite/funcs_1/r/innodb_func_view.result	2008-03-31 19:47:57 +02:00
@@ -1,7 +1,3 @@
-
-! Attention: The file with the expected results suffers from
-Bug#10713: mysqldump includes database in create view and referenced tables
---------------------------------------------------------------------------------
 DROP TABLE IF EXISTS t1_selects, t1_modes, t1_values;
 DROP VIEW  IF EXISTS v1;
 CREATE TABLE t1_values
@@ -9,7 +5,7 @@ CREATE TABLE t1_values
 id BIGINT AUTO_INCREMENT,
 select_id BIGINT,
 PRIMARY KEY(id)
-) ENGINE = 'InnoDB' ;
+) ENGINE = <engine_to_be_tested>;
 ALTER TABLE t1_values ADD my_char_30        CHAR(30);
 ALTER TABLE t1_values ADD my_varchar_1000   VARCHAR(1000);
 ALTER TABLE t1_values ADD my_binary_30      BINARY(30);
@@ -39,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',
@@ -54,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',
@@ -89,6 +85,9 @@ INSERT INTO t1_values SET select_id = @s
 my_bigint = 4;
 INSERT INTO t1_values SET select_id = @select_id,
 my_bigint = -25;
+##### 1.1.1. CAST --> BINARY
+##### 1.1.2. CAST --> CHAR
+##### 1.1.3. CAST --> DATE
 INSERT INTO t1_values SET select_id = @select_id,
 my_char_30 = '2005-06-27';
 INSERT INTO t1_values SET select_id = @select_id,
@@ -101,6 +100,7 @@ INSERT INTO t1_values SET select_id = @s
 my_bigint = 20050627;
 INSERT INTO t1_values SET select_id = @select_id,
 my_double = +20.050627E+6;
+##### 1.1.4. CAST --> DATETIME
 INSERT INTO t1_values SET select_id = @select_id,
 my_char_30 = '2005-06-27 17:58';
 INSERT INTO t1_values SET select_id = @select_id,
@@ -113,6 +113,7 @@ INSERT INTO t1_values SET select_id = @s
 my_bigint = 200506271758;
 INSERT INTO t1_values SET select_id = @select_id,
 my_double = +0.0200506271758E+13;
+##### 1.1.5. CAST --> TIME
 INSERT INTO t1_values SET select_id = @select_id,
 my_char_30 = '1 17:58';
 INSERT INTO t1_values SET select_id = @select_id,
@@ -123,10 +124,9 @@ INSERT INTO t1_values SET select_id = @s
 my_varbinary_1000 = '1 17:58';
 INSERT INTO t1_values SET select_id = @select_id,
 my_bigint = 1758;
-
-some statements disabled because of
-Bug#12440: CAST(data type DOUBLE AS TIME) strange results
---------------------------------------------------------------------------------
+INSERT INTO t1_values SET select_id = @select_id,
+my_double = +1.758E+3;
+##### 1.1.6. CAST --> DECIMAL
 INSERT INTO t1_values SET select_id = @select_id,
 my_char_30 = '-3333.3333';
 INSERT INTO t1_values SET select_id = @select_id,
@@ -135,51 +135,39 @@ INSERT INTO t1_values SET select_id = @s
 my_binary_30 = '-3333.3333';
 INSERT INTO t1_values SET select_id = @select_id,
 my_varbinary_1000 = '-3333.3333';
-
-some statements disabled because of
-Bug#13349: CAST(1.0E+300 TO DECIMAL) returns wrong result + diff little/big endian
---------------------------------------------------------------------------------
+INSERT INTO t1_values SET select_id = @select_id,
+my_double = -0.33333333E+4;
+##### 1.1.7. CAST --> SIGNED INTEGER
 
 "Attention: CAST --> SIGNED INTEGER
-            The file with expected results suffers from
-            Bug#5083 Big integer values are inserted as negative into 
-                     decimal/string columns
             Bug#5913 Traditional mode: BIGINT range not correctly delimited
-            Both have the status: To be fixed later"
---------------------------------------------------------------------------------
-
-some statements disabled because of
-Bug #13344: CAST(1E+300 TO signed int) on little endian CPU, wrong result
+            Status: To be fixed later"
 --------------------------------------------------------------------------------
+##### 1.1.8. CAST --> UNSIGNED INTEGER
 
 "Attention: CAST --> UNSIGNED INTEGER
-            The file with expected results suffers from Bug 5083 5913 9809"
+            The file with expected results suffers from Bug 5913"
 --------------------------------------------------------------------------------
 
 some statements disabled because of
-Bugs#8663: cant use bgint unsigned as input to cast
+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';
-
-"Attention: IF(my_year IS NULL, ...
-            The file with expected results suffers from 
-            Bug#11689. successful CREATE VIEW but SELECT on view fails."
---------------------------------------------------------------------------------
 SET @my_select = 'SELECT BIT_LENGTH(my_char_30),
 my_char_30, id FROM t1_values';
 SET @my_select = 'SELECT BIT_LENGTH(my_varchar_1000),
@@ -192,22 +180,20 @@ 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';
-
-"Attention: LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', <numeric column>)
-            The file with expected results suffers from Bug 10963 11728"
-            and the testcases with length = BIGINT or DOUBLE column are deactivated,
-because there are 32/64 Bit differences
---------------------------------------------------------------------------------
+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';
+SET @my_select =
+'SELECT LEFT(''AaBbCcDdEeFfGgHhIiJjÄäÜüÖö'', my_double), my_double, id FROM t1_values';
 SET @my_select = 'SELECT LENGTH(my_char_30),
 my_char_30, id FROM t1_values';
 SET @my_select = 'SELECT LENGTH(my_varchar_1000),
@@ -216,8 +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';
-SET @my_select = 
-'SELECT LOAD_FILE(''../log/current_test''), 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),
@@ -299,19 +287,19 @@ SET sql_mode = '';
 --------------------------------------------------------------------------------
 CREATE VIEW v1 AS SELECT my_char_30, id FROM t1_values;
 SELECT my_char_30, id FROM t1_values
-WHERE select_id = 187 OR select_id IS NULL;
+WHERE select_id = 193 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 187 OR select_id IS NULL);
+WHERE select_id = 193 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
 CREATE VIEW v1 AS SELECT CONCAT('A',my_char_30), my_char_30, id FROM t1_values;
 SELECT CONCAT('A',my_char_30), my_char_30, id FROM t1_values
-WHERE select_id = 186 OR select_id IS NULL;
+WHERE select_id = 192 OR select_id IS NULL order by id;
 CONCAT('A',my_char_30)	my_char_30	id
 NULL	NULL	1
 A		2
@@ -323,7 +311,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select concat(_latin1'A',`t1_values`.`my_char_30`) AS `CONCAT('A',my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 186 OR select_id IS NULL);
+WHERE select_id = 192 OR select_id IS NULL) order by id;
 CONCAT('A',my_char_30)	my_char_30	id
 NULL	NULL	1
 A		2
@@ -337,13 +325,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_varbin
 my_varbinary_1000, id FROM t1_values;
 SELECT LTRIM(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 185 OR select_id IS NULL;
+WHERE select_id = 191 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_varbinary_1000`) AS `LTRIM(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 185 OR select_id IS NULL);
+WHERE select_id = 191 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -351,13 +339,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_binary
 my_binary_30, id FROM t1_values;
 SELECT LTRIM(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 184 OR select_id IS NULL;
+WHERE select_id = 190 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_binary_30`) AS `LTRIM(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 184 OR select_id IS NULL);
+WHERE select_id = 190 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -365,13 +353,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_varcha
 my_varchar_1000, id FROM t1_values;
 SELECT LTRIM(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 183 OR select_id IS NULL;
+WHERE select_id = 189 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_varchar_1000`) AS `LTRIM(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 183 OR select_id IS NULL);
+WHERE select_id = 189 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -379,13 +367,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_char_3
 my_char_30, id FROM t1_values;
 SELECT LTRIM(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 182 OR select_id IS NULL;
+WHERE select_id = 188 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_char_30`) AS `LTRIM(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 182 OR select_id IS NULL);
+WHERE select_id = 188 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -393,13 +381,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_varbin
 my_varbinary_1000, id FROM t1_values;
 SELECT LOWER(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 181 OR select_id IS NULL;
+WHERE select_id = 187 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_varbinary_1000`) AS `LOWER(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 181 OR select_id IS NULL);
+WHERE select_id = 187 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -407,13 +395,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_binary
 my_binary_30, id FROM t1_values;
 SELECT LOWER(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 180 OR select_id IS NULL;
+WHERE select_id = 186 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_binary_30`) AS `LOWER(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 180 OR select_id IS NULL);
+WHERE select_id = 186 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -421,13 +409,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_varcha
 my_varchar_1000, id FROM t1_values;
 SELECT LOWER(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 179 OR select_id IS NULL;
+WHERE select_id = 185 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_varchar_1000`) AS `LOWER(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 179 OR select_id IS NULL);
+WHERE select_id = 185 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -435,13 +423,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_char_3
 my_char_30, id FROM t1_values;
 SELECT LOWER(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 178 OR select_id IS NULL;
+WHERE select_id = 184 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_char_30`) AS `LOWER(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 178 OR select_id IS NULL);
+WHERE select_id = 184 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -449,13 +437,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', ' -
 my_decimal, id FROM t1_values;
 SELECT LOCATE('-', ' - -ABC', my_decimal),
 my_decimal, id FROM t1_values
-WHERE select_id = 177 OR select_id IS NULL;
+WHERE select_id = 183 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',_latin1' - -ABC',`t1_values`.`my_decimal`) AS `LOCATE('-', ' - -ABC', my_decimal)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 177 OR select_id IS NULL);
+WHERE select_id = 183 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -463,13 +451,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', ' -
 my_double, id FROM t1_values;
 SELECT LOCATE('-', ' - -ABC', my_double),
 my_double, id FROM t1_values
-WHERE select_id = 176 OR select_id IS NULL;
+WHERE select_id = 182 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',_latin1' - -ABC',`t1_values`.`my_double`) AS `LOCATE('-', ' - -ABC', my_double)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 176 OR select_id IS NULL);
+WHERE select_id = 182 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -477,13 +465,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', ' -
 my_bigint, id FROM t1_values;
 SELECT LOCATE('-', ' - -ABC', my_bigint),
 my_bigint, id FROM t1_values
-WHERE select_id = 175 OR select_id IS NULL;
+WHERE select_id = 181 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',_latin1' - -ABC',`t1_values`.`my_bigint`) AS `LOCATE('-', ' - -ABC', my_bigint)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 175 OR select_id IS NULL);
+WHERE select_id = 181 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -491,13 +479,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_
 my_varbinary_1000, id FROM t1_values;
 SELECT LOCATE('-', my_varbinary_1000, 3),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 174 OR select_id IS NULL;
+WHERE select_id = 180 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_varbinary_1000`,3) AS `LOCATE('-', my_varbinary_1000, 3)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 174 OR select_id IS NULL);
+WHERE select_id = 180 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -505,13 +493,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_
 my_binary_30, id FROM t1_values;
 SELECT LOCATE('-', my_binary_30, 3),
 my_binary_30, id FROM t1_values
-WHERE select_id = 173 OR select_id IS NULL;
+WHERE select_id = 179 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_binary_30`,3) AS `LOCATE('-', my_binary_30, 3)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 173 OR select_id IS NULL);
+WHERE select_id = 179 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -519,13 +507,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_
 my_varchar_1000, id FROM t1_values;
 SELECT LOCATE('-', my_varchar_1000, 3),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 172 OR select_id IS NULL;
+WHERE select_id = 178 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_varchar_1000`,3) AS `LOCATE('-', my_varchar_1000, 3)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 172 OR select_id IS NULL);
+WHERE select_id = 178 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -533,13 +521,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_
 my_char_30, id FROM t1_values;
 SELECT LOCATE('-', my_char_30, 3),
 my_char_30, id FROM t1_values
-WHERE select_id = 171 OR select_id IS NULL;
+WHERE select_id = 177 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_char_30`,3) AS `LOCATE('-', my_char_30, 3)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 171 OR select_id IS NULL);
+WHERE select_id = 177 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -547,13 +535,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbi
 my_varbinary_1000, my_binary_30 id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_binary_30 ),
 my_varbinary_1000, my_binary_30 id FROM t1_values
-WHERE select_id = 170 OR select_id IS NULL;
+WHERE select_id = 176 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_binary_30`) AS `LOCATE(my_varbinary_1000, my_binary_30 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`my_binary_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 170 OR select_id IS NULL);
+WHERE select_id = 176 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -561,13 +549,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbi
 my_varbinary_1000, my_varchar_1000 id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_varchar_1000 ),
 my_varbinary_1000, my_varchar_1000 id FROM t1_values
-WHERE select_id = 169 OR select_id IS NULL;
+WHERE select_id = 175 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_varbinary_1000, my_varchar_1000 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`my_varchar_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 169 OR select_id IS NULL);
+WHERE select_id = 175 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -575,13 +563,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbi
 my_varbinary_1000, my_char_30 id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_char_30 ),
 my_varbinary_1000, my_char_30 id FROM t1_values
-WHERE select_id = 168 OR select_id IS NULL;
+WHERE select_id = 174 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_char_30`) AS `LOCATE(my_varbinary_1000, my_char_30 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`my_char_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 168 OR select_id IS NULL);
+WHERE select_id = 174 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -589,13 +577,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbi
 my_varbinary_1000, id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_varbinary_1000 ),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 167 OR select_id IS NULL;
+WHERE select_id = 173 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_varbinary_1000, my_varbinary_1000 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 167 OR select_id IS NULL);
+WHERE select_id = 173 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -603,13 +591,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binar
 my_binary_30, my_varbinary_1000 id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_varbinary_1000 ),
 my_binary_30, my_varbinary_1000 id FROM t1_values
-WHERE select_id = 166 OR select_id IS NULL;
+WHERE select_id = 172 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_binary_30, my_varbinary_1000 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`my_varbinary_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 166 OR select_id IS NULL);
+WHERE select_id = 172 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -617,13 +605,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binar
 my_binary_30, my_varchar_1000 id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_varchar_1000 ),
 my_binary_30, my_varchar_1000 id FROM t1_values
-WHERE select_id = 165 OR select_id IS NULL;
+WHERE select_id = 171 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_binary_30, my_varchar_1000 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`my_varchar_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 165 OR select_id IS NULL);
+WHERE select_id = 171 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -631,13 +619,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binar
 my_binary_30, my_char_30 id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_char_30 ),
 my_binary_30, my_char_30 id FROM t1_values
-WHERE select_id = 164 OR select_id IS NULL;
+WHERE select_id = 170 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_char_30`) AS `LOCATE(my_binary_30, my_char_30 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`my_char_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 164 OR select_id IS NULL);
+WHERE select_id = 170 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -645,13 +633,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binar
 my_binary_30, id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_binary_30 ),
 my_binary_30, id FROM t1_values
-WHERE select_id = 163 OR select_id IS NULL;
+WHERE select_id = 169 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_binary_30`) AS `LOCATE(my_binary_30, my_binary_30 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 163 OR select_id IS NULL);
+WHERE select_id = 169 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -659,13 +647,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varch
 my_varchar_1000, my_varbinary_1000 id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_varbinary_1000 ),
 my_varchar_1000, my_varbinary_1000 id FROM t1_values
-WHERE select_id = 162 OR select_id IS NULL;
+WHERE select_id = 168 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_varchar_1000, my_varbinary_1000 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`my_varbinary_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 162 OR select_id IS NULL);
+WHERE select_id = 168 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -673,13 +661,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varch
 my_varchar_1000, my_binary_30 id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_binary_30 ),
 my_varchar_1000, my_binary_30 id FROM t1_values
-WHERE select_id = 161 OR select_id IS NULL;
+WHERE select_id = 167 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_binary_30`) AS `LOCATE(my_varchar_1000, my_binary_30 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`my_binary_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 161 OR select_id IS NULL);
+WHERE select_id = 167 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -687,13 +675,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varch
 my_varchar_1000, my_char_30 id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_char_30 ),
 my_varchar_1000, my_char_30 id FROM t1_values
-WHERE select_id = 160 OR select_id IS NULL;
+WHERE select_id = 166 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_char_30`) AS `LOCATE(my_varchar_1000, my_char_30 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`my_char_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 160 OR select_id IS NULL);
+WHERE select_id = 166 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -701,13 +689,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varch
 my_varchar_1000, id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_varchar_1000 ),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 159 OR select_id IS NULL;
+WHERE select_id = 165 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_varchar_1000, my_varchar_1000 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 159 OR select_id IS NULL);
+WHERE select_id = 165 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -715,13 +703,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_
 my_char_30, my_varbinary_1000 id FROM t1_values;
 SELECT LOCATE(my_char_30, my_varbinary_1000 ),
 my_char_30, my_varbinary_1000 id FROM t1_values
-WHERE select_id = 158 OR select_id IS NULL;
+WHERE select_id = 164 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_char_30, my_varbinary_1000 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`my_varbinary_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 158 OR select_id IS NULL);
+WHERE select_id = 164 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -729,13 +717,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_
 my_char_30, my_binary_30 id FROM t1_values;
 SELECT LOCATE(my_char_30, my_binary_30 ),
 my_char_30, my_binary_30 id FROM t1_values
-WHERE select_id = 157 OR select_id IS NULL;
+WHERE select_id = 163 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_binary_30`) AS `LOCATE(my_char_30, my_binary_30 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`my_binary_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 157 OR select_id IS NULL);
+WHERE select_id = 163 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -743,13 +731,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_
 my_char_30, my_varchar_1000 id FROM t1_values;
 SELECT LOCATE(my_char_30, my_varchar_1000 ),
 my_char_30, my_varchar_1000 id FROM t1_values
-WHERE select_id = 156 OR select_id IS NULL;
+WHERE select_id = 162 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_char_30, my_varchar_1000 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`my_varchar_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 156 OR select_id IS NULL);
+WHERE select_id = 162 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -757,13 +745,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_
 my_char_30, id FROM t1_values;
 SELECT LOCATE(my_char_30, my_char_30 ),
 my_char_30, id FROM t1_values
-WHERE select_id = 155 OR select_id IS NULL;
+WHERE select_id = 161 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_char_30`) AS `LOCATE(my_char_30, my_char_30 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 155 OR select_id IS NULL);
+WHERE select_id = 161 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -771,13 +759,13 @@ CREATE VIEW v1 AS SELECT LOCATE('char', 
 my_varbinary_1000, id FROM t1_values;
 SELECT LOCATE('char', my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 154 OR select_id IS NULL;
+WHERE select_id = 160 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_varbinary_1000`) AS `LOCATE('char', my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 154 OR select_id IS NULL);
+WHERE select_id = 160 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -785,13 +773,13 @@ CREATE VIEW v1 AS SELECT LOCATE('char', 
 my_binary_30, id FROM t1_values;
 SELECT LOCATE('char', my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 153 OR select_id IS NULL;
+WHERE select_id = 159 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_binary_30`) AS `LOCATE('char', my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 153 OR select_id IS NULL);
+WHERE select_id = 159 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -799,13 +787,13 @@ CREATE VIEW v1 AS SELECT LOCATE('char', 
 my_varchar_1000, id FROM t1_values;
 SELECT LOCATE('char', my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 152 OR select_id IS NULL;
+WHERE select_id = 158 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_varchar_1000`) AS `LOCATE('char', my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 152 OR select_id IS NULL);
+WHERE select_id = 158 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -813,46 +801,50 @@ CREATE VIEW v1 AS SELECT LOCATE('char', 
 my_char_30, id FROM t1_values;
 SELECT LOCATE('char', my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 151 OR select_id IS NULL;
+WHERE select_id = 157 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_char_30`) AS `LOCATE('char', my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 151 OR select_id IS NULL);
+WHERE select_id = 157 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT LOAD_FILE('../log/current_test'), id FROM t1_values;
-SELECT LOAD_FILE('../log/current_test'), id FROM t1_values
-WHERE select_id = 150 OR select_id IS NULL;
-LOAD_FILE('../log/current_test')	id
-CURRENT_TEST: innodb_func_view
+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;
+my_col	id
+Here is content from load_file
 	1
-CURRENT_TEST: innodb_func_view
+Here is content from load_file
 	2
-CURRENT_TEST: innodb_func_view
+Here is content from load_file
 	3
-CURRENT_TEST: innodb_func_view
+Here is content from load_file
 	4
-CURRENT_TEST: innodb_func_view
+Here is content from load_file
 	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file(_latin1'../log/current_test') AS `LOAD_FILE('../log/current_test')`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file(_latin1'<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/load_file.txt') AS `my_col`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 150 OR select_id IS NULL);
-LOAD_FILE('../log/current_test')	id
-CURRENT_TEST: innodb_func_view
+WHERE select_id = 156 OR select_id IS NULL) order by id;
+my_col	id
+Here is content from load_file
 	1
-CURRENT_TEST: innodb_func_view
+Here is content from load_file
 	2
-CURRENT_TEST: innodb_func_view
+Here is content from load_file
 	3
-CURRENT_TEST: innodb_func_view
+Here is content from load_file
 	4
-CURRENT_TEST: innodb_func_view
+Here is content from load_file
 	5
 DROP VIEW v1;
 
@@ -861,13 +853,13 @@ CREATE VIEW v1 AS SELECT LENGTH(my_varbi
 my_varbinary_1000, id FROM t1_values;
 SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 149 OR select_id IS NULL;
+WHERE select_id = 155 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_varbinary_1000`) AS `LENGTH(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 149 OR select_id IS NULL);
+WHERE select_id = 155 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -875,13 +867,13 @@ CREATE VIEW v1 AS SELECT LENGTH(my_binar
 my_binary_30, id FROM t1_values;
 SELECT LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 148 OR select_id IS NULL;
+WHERE select_id = 154 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_binary_30`) AS `LENGTH(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 148 OR select_id IS NULL);
+WHERE select_id = 154 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -889,13 +881,13 @@ CREATE VIEW v1 AS SELECT LENGTH(my_varch
 my_varchar_1000, id FROM t1_values;
 SELECT LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 147 OR select_id IS NULL;
+WHERE select_id = 153 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_varchar_1000`) AS `LENGTH(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 147 OR select_id IS NULL);
+WHERE select_id = 153 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -903,19 +895,49 @@ CREATE VIEW v1 AS SELECT LENGTH(my_char_
 my_char_30, id FROM t1_values;
 SELECT LENGTH(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 146 OR select_id IS NULL;
+WHERE select_id = 152 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_char_30`) AS `LENGTH(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 146 OR select_id IS NULL);
+WHERE select_id = 152 OR select_id IS NULL) order by id;
+DROP VIEW v1;
+
+
+CREATE VIEW v1 AS SELECT LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_double), my_double, id FROM t1_values;
+SELECT LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_double), my_double, id FROM t1_values
+WHERE select_id = 151 OR select_id IS NULL order by id;
+LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_double)	my_double	id
+NULL	NULL	1
+	-1.7976931348623e+308	2
+AaBbCcDdEeFfGgHhIiJjÄäÜüÖö	1.7976931348623e+308	3
+	0	4
+	-1	5
+Warnings:
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+SHOW CREATE VIEW v1;
+View	Create View
+SELECT v1.* FROM v1
+WHERE v1.id IN (SELECT id FROM t1_values
+WHERE select_id = 151 OR select_id IS NULL) order by id;
+LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_double)	my_double	id
+NULL	NULL	1
+	-1.7976931348623e+308	2
+AaBbCcDdEeFfGgHhIiJjÄäÜüÖö	1.7976931348623e+308	3
+	0	4
+	-1	5
+Warnings:
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
 DROP VIEW v1;
 
 
 CREATE VIEW v1 AS SELECT LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal), my_decimal, id FROM t1_values;
 SELECT LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal), my_decimal, id FROM t1_values
-WHERE select_id = 145 OR select_id IS NULL;
+WHERE select_id = 150 OR select_id IS NULL order by id;
 LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)	my_decimal	id
 NULL	NULL	1
 	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -930,7 +952,7 @@ View	Create View
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 145 OR select_id IS NULL);
+WHERE select_id = 150 OR select_id IS NULL) order by id;
 LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)	my_decimal	id
 NULL	NULL	1
 	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -943,9 +965,33 @@ Error	1292	Truncated incorrect DECIMAL v
 DROP VIEW v1;
 
 
+CREATE VIEW v1 AS SELECT LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_bigint), my_bigint, id FROM t1_values;
+SELECT LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_bigint), my_bigint, id FROM t1_values
+WHERE select_id = 149 OR select_id IS NULL order by id;
+LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_bigint)	my_bigint	id
+NULL	NULL	1
+	-9223372036854775808	2
+AaBbCcDdEeFfGgHhIiJjÄäÜüÖö	9223372036854775807	3
+	0	4
+	-1	5
+SHOW CREATE VIEW v1;
+View	Create View
+SELECT v1.* FROM v1
+WHERE v1.id IN (SELECT id FROM t1_values
+WHERE select_id = 149 OR select_id IS NULL) order by id;
+LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_bigint)	my_bigint	id
+NULL	NULL	1
+	-9223372036854775808	2
+AaBbCcDdEeFfGgHhIiJjÄäÜüÖö	9223372036854775807	3
+	0	4
+	-1	5
+DROP VIEW v1;
+
+
 CREATE VIEW v1 AS SELECT LEFT(my_varbinary_1000, 2), my_varbinary_1000, id FROM t1_values;
 SELECT LEFT(my_varbinary_1000, 2), my_varbinary_1000, id FROM t1_values
-WHERE select_id = 144 OR select_id IS NULL;
+WHERE select_id = 148 OR select_id IS NULL order by id;
 LEFT(my_varbinary_1000, 2)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -957,7 +1003,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_varbinary_1000`,2) AS `LEFT(my_varbinary_1000, 2)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 144 OR select_id IS NULL);
+WHERE select_id = 148 OR select_id IS NULL) order by id;
 LEFT(my_varbinary_1000, 2)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -969,19 +1015,19 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_binary_30, 2), my_binary_30, id FROM t1_values;
 SELECT LEFT(my_binary_30, 2), my_binary_30, id FROM t1_values
-WHERE select_id = 143 OR select_id IS NULL;
+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
 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`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 143 OR select_id IS NULL);
+WHERE select_id = 147 OR select_id IS NULL) order by id;
 LEFT(my_binary_30, 2)	my_binary_30	id
 NULL	NULL	1
 @@ -993,7 +1039,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_varchar_1000, 2), my_varchar_1000, id FROM t1_values;
 SELECT LEFT(my_varchar_1000, 2), my_varchar_1000, id FROM t1_values
-WHERE select_id = 142 OR select_id IS NULL;
+WHERE select_id = 146 OR select_id IS NULL order by id;
 LEFT(my_varchar_1000, 2)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -1005,7 +1051,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_varchar_1000`,2) AS `LEFT(my_varchar_1000, 2)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 142 OR select_id IS NULL);
+WHERE select_id = 146 OR select_id IS NULL) order by id;
 LEFT(my_varchar_1000, 2)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -1017,7 +1063,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_char_30, 2), my_char_30, id FROM t1_values;
 SELECT LEFT(my_char_30, 2), my_char_30, id FROM t1_values
-WHERE select_id = 141 OR select_id IS NULL;
+WHERE select_id = 145 OR select_id IS NULL order by id;
 LEFT(my_char_30, 2)	my_char_30	id
 NULL	NULL	1
 		2
@@ -1029,7 +1075,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_char_30`,2) AS `LEFT(my_char_30, 2)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 141 OR select_id IS NULL);
+WHERE select_id = 145 OR select_id IS NULL) order by id;
 LEFT(my_char_30, 2)	my_char_30	id
 NULL	NULL	1
 		2
@@ -1043,13 +1089,13 @@ CREATE VIEW v1 AS SELECT LCASE(my_varcha
 my_varchar_1000, id FROM t1_values;
 SELECT LCASE(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 140 OR select_id IS NULL;
+WHERE select_id = 144 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_varchar_1000`) AS `LCASE(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 140 OR select_id IS NULL);
+WHERE select_id = 144 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -1057,13 +1103,13 @@ CREATE VIEW v1 AS SELECT INSTR(my_char_3
 my_char_30, id FROM t1_values;
 SELECT INSTR(my_char_30, 'char'),
 my_char_30, id FROM t1_values
-WHERE select_id = 139 OR select_id IS NULL;
+WHERE select_id = 143 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_char_30`) AS `INSTR(my_char_30, 'char')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 139 OR select_id IS NULL);
+WHERE select_id = 143 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -1071,7 +1117,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_v
 my_varbinary_1000, id FROM t1_values;
 SELECT BIT_LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 138 OR select_id IS NULL;
+WHERE select_id = 142 OR select_id IS NULL order by id;
 BIT_LENGTH(my_varbinary_1000)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -1083,7 +1129,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_varbinary_1000`) AS `BIT_LENGTH(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 138 OR select_id IS NULL);
+WHERE select_id = 142 OR select_id IS NULL) order by id;
 BIT_LENGTH(my_varbinary_1000)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -1097,19 +1143,19 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_b
 my_binary_30, id FROM t1_values;
 SELECT BIT_LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 137 OR select_id IS NULL;
+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
 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`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 137 OR select_id IS NULL);
+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	@@ -1123,7 +1169,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_v
 my_varchar_1000, id FROM t1_values;
 SELECT BIT_LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 136 OR select_id IS NULL;
+WHERE select_id = 140 OR select_id IS NULL order by id;
 BIT_LENGTH(my_varchar_1000)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -1135,7 +1181,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_varchar_1000`) AS `BIT_LENGTH(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 136 OR select_id IS NULL);
+WHERE select_id = 140 OR select_id IS NULL) order by id;
 BIT_LENGTH(my_varchar_1000)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -1149,7 +1195,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_c
 my_char_30, id FROM t1_values;
 SELECT BIT_LENGTH(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 135 OR select_id IS NULL;
+WHERE select_id = 139 OR select_id IS NULL order by id;
 BIT_LENGTH(my_char_30)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -1161,7 +1207,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_char_30`) AS `BIT_LENGTH(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 135 OR select_id IS NULL);
+WHERE select_id = 139 OR select_id IS NULL) order by id;
 BIT_LENGTH(my_char_30)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -1175,7 +1221,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_year,
 my_year, id FROM t1_values;
 SELECT IFNULL(my_year,'IS_NULL'),
 my_year, id FROM t1_values
-WHERE select_id = 134 OR select_id IS NULL;
+WHERE select_id = 138 OR select_id IS NULL order by id;
 IFNULL(my_year,'IS_NULL')	my_year	id
 IS_NULL	NULL	1
 1901	1901	2
@@ -1187,7 +1233,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_year`,_latin1'IS_NULL') AS `IFNULL(my_year,'IS_NULL')`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 134 OR select_id IS NULL);
+WHERE select_id = 138 OR select_id IS NULL) order by id;
 IFNULL(my_year,'IS_NULL')	my_year	id
 IS_NULL	NULL	1
 1901	1901	2
@@ -1201,7 +1247,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_time,
 my_time, id FROM t1_values;
 SELECT IFNULL(my_time,'IS_NULL'),
 my_time, id FROM t1_values
-WHERE select_id = 133 OR select_id IS NULL;
+WHERE select_id = 137 OR select_id IS NULL order by id;
 IFNULL(my_time,'IS_NULL')	my_time	id
 IS_NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -1213,7 +1259,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_time`,_latin1'IS_NULL') AS `IFNULL(my_time,'IS_NULL')`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 133 OR select_id IS NULL);
+WHERE select_id = 137 OR select_id IS NULL) order by id;
 IFNULL(my_time,'IS_NULL')	my_time	id
 IS_NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -1227,7 +1273,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_times
 my_timestamp, id FROM t1_values;
 SELECT IFNULL(my_timestamp,'IS_NULL'),
 my_timestamp, id FROM t1_values
-WHERE select_id = 132 OR select_id IS NULL;
+WHERE select_id = 136 OR select_id IS NULL order by id;
 IFNULL(my_timestamp,'IS_NULL')	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -1239,7 +1285,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_timestamp`,_latin1'IS_NULL') AS `IFNULL(my_timestamp,'IS_NULL')`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 132 OR select_id IS NULL);
+WHERE select_id = 136 OR select_id IS NULL) order by id;
 IFNULL(my_timestamp,'IS_NULL')	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -1253,7 +1299,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_date,
 my_date, id FROM t1_values;
 SELECT IFNULL(my_date,'IS_NULL'),
 my_date, id FROM t1_values
-WHERE select_id = 131 OR select_id IS NULL;
+WHERE select_id = 135 OR select_id IS NULL order by id;
 IFNULL(my_date,'IS_NULL')	my_date	id
 IS_NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -1265,7 +1311,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_date`,_latin1'IS_NULL') AS `IFNULL(my_date,'IS_NULL')`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 131 OR select_id IS NULL);
+WHERE select_id = 135 OR select_id IS NULL) order by id;
 IFNULL(my_date,'IS_NULL')	my_date	id
 IS_NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -1279,7 +1325,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_datet
 my_datetime, id FROM t1_values;
 SELECT IFNULL(my_datetime,'IS_NULL'),
 my_datetime, id FROM t1_values
-WHERE select_id = 130 OR select_id IS NULL;
+WHERE select_id = 134 OR select_id IS NULL order by id;
 IFNULL(my_datetime,'IS_NULL')	my_datetime	id
 IS_NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -1291,7 +1337,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_datetime`,_latin1'IS_NULL') AS `IFNULL(my_datetime,'IS_NULL')`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 130 OR select_id IS NULL);
+WHERE select_id = 134 OR select_id IS NULL) order by id;
 IFNULL(my_datetime,'IS_NULL')	my_datetime	id
 IS_NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -1305,7 +1351,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_doubl
 my_double, id FROM t1_values;
 SELECT IFNULL(my_double,'IS_NULL'),
 my_double, id FROM t1_values
-WHERE select_id = 129 OR select_id IS NULL;
+WHERE select_id = 133 OR select_id IS NULL order by id;
 IFNULL(my_double,'IS_NULL')	my_double	id
 IS_NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -1317,7 +1363,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_double`,_latin1'IS_NULL') AS `IFNULL(my_double,'IS_NULL')`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 129 OR select_id IS NULL);
+WHERE select_id = 133 OR select_id IS NULL) order by id;
 IFNULL(my_double,'IS_NULL')	my_double	id
 IS_NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -1331,7 +1377,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_decim
 my_decimal, id FROM t1_values;
 SELECT IFNULL(my_decimal,'IS_NULL'),
 my_decimal, id FROM t1_values
-WHERE select_id = 128 OR select_id IS NULL;
+WHERE select_id = 132 OR select_id IS NULL order by id;
 IFNULL(my_decimal,'IS_NULL')	my_decimal	id
 IS_NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -1343,7 +1389,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_decimal`,_latin1'IS_NULL') AS `IFNULL(my_decimal,'IS_NULL')`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 128 OR select_id IS NULL);
+WHERE select_id = 132 OR select_id IS NULL) order by id;
 IFNULL(my_decimal,'IS_NULL')	my_decimal	id
 IS_NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -1357,7 +1403,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_bigin
 my_bigint, id FROM t1_values;
 SELECT IFNULL(my_bigint,'IS_NULL'),
 my_bigint, id FROM t1_values
-WHERE select_id = 127 OR select_id IS NULL;
+WHERE select_id = 131 OR select_id IS NULL order by id;
 IFNULL(my_bigint,'IS_NULL')	my_bigint	id
 IS_NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -1369,7 +1415,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_bigint`,_latin1'IS_NULL') AS `IFNULL(my_bigint,'IS_NULL')`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 127 OR select_id IS NULL);
+WHERE select_id = 131 OR select_id IS NULL) order by id;
 IFNULL(my_bigint,'IS_NULL')	my_bigint	id
 IS_NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -1383,7 +1429,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_varbi
 my_varbinary_1000, id FROM t1_values;
 SELECT IFNULL(my_varbinary_1000,'IS_NULL'),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 126 OR select_id IS NULL;
+WHERE select_id = 130 OR select_id IS NULL order by id;
 IFNULL(my_varbinary_1000,'IS_NULL')	my_varbinary_1000	id
 IS_NULL	NULL	1
 		2
@@ -1395,7 +1441,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_varbinary_1000`,_latin1'IS_NULL') AS `IFNULL(my_varbinary_1000,'IS_NULL')`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 126 OR select_id IS NULL);
+WHERE select_id = 130 OR select_id IS NULL) order by id;
 IFNULL(my_varbinary_1000,'IS_NULL')	my_varbinary_1000	id
 IS_NULL	NULL	1
 		2
@@ -1409,19 +1455,19 @@ CREATE VIEW v1 AS SELECT IFNULL(my_binar
 my_binary_30, id FROM t1_values;
 SELECT IFNULL(my_binary_30,'IS_NULL'),
 my_binary_30, id FROM t1_values
-WHERE select_id = 125 OR select_id IS NULL;
+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
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_binary_30`,_latin1'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`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 125 OR select_id IS NULL);
+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
 @@ -1435,7 +1481,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_varch
 my_varchar_1000, id FROM t1_values;
 SELECT IFNULL(my_varchar_1000,'IS_NULL'),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 124 OR select_id IS NULL;
+WHERE select_id = 128 OR select_id IS NULL order by id;
 IFNULL(my_varchar_1000,'IS_NULL')	my_varchar_1000	id
 IS_NULL	NULL	1
 		2
@@ -1447,7 +1493,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_varchar_1000`,_latin1'IS_NULL') AS `IFNULL(my_varchar_1000,'IS_NULL')`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 124 OR select_id IS NULL);
+WHERE select_id = 128 OR select_id IS NULL) order by id;
 IFNULL(my_varchar_1000,'IS_NULL')	my_varchar_1000	id
 IS_NULL	NULL	1
 		2
@@ -1461,7 +1507,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_char_
 my_char_30, id FROM t1_values;
 SELECT IFNULL(my_char_30,'IS_NULL'),
 my_char_30, id FROM t1_values
-WHERE select_id = 123 OR select_id IS NULL;
+WHERE select_id = 127 OR select_id IS NULL order by id;
 IFNULL(my_char_30,'IS_NULL')	my_char_30	id
 IS_NULL	NULL	1
 		2
@@ -1473,7 +1519,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_char_30`,_latin1'IS_NULL') AS `IFNULL(my_char_30,'IS_NULL')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 123 OR select_id IS NULL);
+WHERE select_id = 127 OR select_id IS NULL) order by id;
 IFNULL(my_char_30,'IS_NULL')	my_char_30	id
 IS_NULL	NULL	1
 		2
@@ -1487,7 +1533,7 @@ CREATE VIEW v1 AS SELECT IF(my_year IS N
 'IS NOT NULL'), my_year, id FROM t1_values;
 SELECT IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_year, id FROM t1_values
-WHERE select_id = 122 OR select_id IS NULL;
+WHERE select_id = 126 OR select_id IS NULL order by id;
 IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_year	id
 IS     NULL	NULL	1
@@ -1501,7 +1547,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`r
 'IS NOT NULL')`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 122 OR select_id IS NULL);
+WHERE select_id = 126 OR select_id IS NULL) order by id;
 IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_year	id
 IS     NULL	NULL	1
@@ -1516,7 +1562,7 @@ CREATE VIEW v1 AS SELECT IF(my_time IS N
 'IS NOT NULL'), my_time, id FROM t1_values;
 SELECT IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_time, id FROM t1_values
-WHERE select_id = 121 OR select_id IS NULL;
+WHERE select_id = 125 OR select_id IS NULL order by id;
 IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_time	id
 IS     NULL	NULL	1
@@ -1530,7 +1576,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`r
 'IS NOT NULL')`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 121 OR select_id IS NULL);
+WHERE select_id = 125 OR select_id IS NULL) order by id;
 IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_time	id
 IS     NULL	NULL	1
@@ -1545,7 +1591,7 @@ CREATE VIEW v1 AS SELECT IF(my_timestamp
 'IS NOT NULL'), my_timestamp, id FROM t1_values;
 SELECT IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_timestamp, id FROM t1_values
-WHERE select_id = 120 OR select_id IS NULL;
+WHERE select_id = 124 OR select_id IS NULL order by id;
 IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_timestamp	id
 IS NOT NULL	0000-00-00 00:00:00	1
@@ -1559,7 +1605,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`r
 'IS NOT NULL')`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 120 OR select_id IS NULL);
+WHERE select_id = 124 OR select_id IS NULL) order by id;
 IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_timestamp	id
 IS NOT NULL	0000-00-00 00:00:00	1
@@ -1574,7 +1620,7 @@ CREATE VIEW v1 AS SELECT IF(my_date IS N
 'IS NOT NULL'), my_date, id FROM t1_values;
 SELECT IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_date, id FROM t1_values
-WHERE select_id = 119 OR select_id IS NULL;
+WHERE select_id = 123 OR select_id IS NULL order by id;
 IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_date	id
 IS     NULL	NULL	1
@@ -1588,7 +1634,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`r
 'IS NOT NULL')`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 119 OR select_id IS NULL);
+WHERE select_id = 123 OR select_id IS NULL) order by id;
 IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_date	id
 IS     NULL	NULL	1
@@ -1603,7 +1649,7 @@ CREATE VIEW v1 AS SELECT IF(my_datetime 
 'IS NOT NULL'), my_datetime, id FROM t1_values;
 SELECT IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_datetime, id FROM t1_values
-WHERE select_id = 118 OR select_id IS NULL;
+WHERE select_id = 122 OR select_id IS NULL order by id;
 IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_datetime	id
 IS     NULL	NULL	1
@@ -1617,7 +1663,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`r
 'IS NOT NULL')`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 118 OR select_id IS NULL);
+WHERE select_id = 122 OR select_id IS NULL) order by id;
 IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_datetime	id
 IS     NULL	NULL	1
@@ -1632,7 +1678,7 @@ CREATE VIEW v1 AS SELECT IF(my_double IS
 'IS NOT NULL'), my_double, id FROM t1_values;
 SELECT IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_double, id FROM t1_values
-WHERE select_id = 117 OR select_id IS NULL;
+WHERE select_id = 121 OR select_id IS NULL order by id;
 IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_double	id
 IS     NULL	NULL	1
@@ -1646,7 +1692,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`r
 'IS NOT NULL')`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 117 OR select_id IS NULL);
+WHERE select_id = 121 OR select_id IS NULL) order by id;
 IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_double	id
 IS     NULL	NULL	1
@@ -1661,7 +1707,7 @@ CREATE VIEW v1 AS SELECT IF(my_decimal I
 'IS NOT NULL'), my_decimal, id FROM t1_values;
 SELECT IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_decimal, id FROM t1_values
-WHERE select_id = 116 OR select_id IS NULL;
+WHERE select_id = 120 OR select_id IS NULL order by id;
 IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_decimal	id
 IS     NULL	NULL	1
@@ -1675,7 +1721,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`r
 'IS NOT NULL')`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 116 OR select_id IS NULL);
+WHERE select_id = 120 OR select_id IS NULL) order by id;
 IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_decimal	id
 IS     NULL	NULL	1
@@ -1690,7 +1736,7 @@ CREATE VIEW v1 AS SELECT IF(my_bigint IS
 'IS NOT NULL'), my_bigint, id FROM t1_values;
 SELECT IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_bigint, id FROM t1_values
-WHERE select_id = 115 OR select_id IS NULL;
+WHERE select_id = 119 OR select_id IS NULL order by id;
 IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_bigint	id
 IS     NULL	NULL	1
@@ -1704,7 +1750,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`r
 'IS NOT NULL')`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 115 OR select_id IS NULL);
+WHERE select_id = 119 OR select_id IS NULL) order by id;
 IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_bigint	id
 IS     NULL	NULL	1
@@ -1719,7 +1765,7 @@ CREATE VIEW v1 AS SELECT IF(my_varbinary
 'IS NOT NULL'), my_varbinary_1000, id FROM t1_values;
 SELECT IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varbinary_1000, id FROM t1_values
-WHERE select_id = 114 OR select_id IS NULL;
+WHERE select_id = 118 OR select_id IS NULL order by id;
 IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varbinary_1000	id
 IS     NULL	NULL	1
@@ -1733,7 +1779,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`r
 'IS NOT NULL')`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 114 OR select_id IS NULL);
+WHERE select_id = 118 OR select_id IS NULL) order by id;
 IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varbinary_1000	id
 IS     NULL	NULL	1
@@ -1748,21 +1794,21 @@ CREATE VIEW v1 AS SELECT IF(my_binary_30
 'IS NOT NULL'), my_binary_30, id FROM t1_values;
 SELECT IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_binary_30, id FROM t1_values
-WHERE select_id = 113 OR select_id IS NULL;
+WHERE select_id = 117 OR select_id IS NULL order by id;
 IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_binary_30	id
 IS     NULL	NULL	1
-IS NOT NULL	+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
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(isnull(`t1_values`.`my_binary_30`),_latin1'IS     NULL',_latin1'IS NOT NULL') AS `IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 113 OR select_id IS NULL);
+WHERE select_id = 117 OR select_id IS NULL) order by id;
 IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_binary_30	id
 IS     NULL	NULL	1
@@ -1777,7 +1823,7 @@ CREATE VIEW v1 AS SELECT IF(my_varchar_1
 'IS NOT NULL'), my_varchar_1000, id FROM t1_values;
 SELECT IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varchar_1000, id FROM t1_values
-WHERE select_id = 112 OR select_id IS NULL;
+WHERE select_id = 116 OR select_id IS NULL order by id;
 IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varchar_1000	id
 IS     NULL	NULL	1
@@ -1791,7 +1837,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`r
 'IS NOT NULL')`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 112 OR select_id IS NULL);
+WHERE select_id = 116 OR select_id IS NULL) order by id;
 IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varchar_1000	id
 IS     NULL	NULL	1
@@ -1806,7 +1852,7 @@ CREATE VIEW v1 AS SELECT IF(my_char_30 I
 'IS NOT NULL'), my_char_30, id FROM t1_values;
 SELECT IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_char_30, id FROM t1_values
-WHERE select_id = 111 OR select_id IS NULL;
+WHERE select_id = 115 OR select_id IS NULL order by id;
 IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_char_30	id
 IS     NULL	NULL	1
@@ -1820,7 +1866,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`r
 'IS NOT NULL')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 111 OR select_id IS NULL);
+WHERE select_id = 115 OR select_id IS NULL) order by id;
 IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_char_30	id
 IS     NULL	NULL	1
@@ -1835,7 +1881,7 @@ CREATE VIEW v1 AS SELECT IF(my_year, 'IS
 my_year, id FROM t1_values;
 SELECT IF(my_year, 'IS     TRUE', 'IS NOT TRUE'),
 my_year, id FROM t1_values
-WHERE select_id = 110 OR select_id IS NULL;
+WHERE select_id = 114 OR select_id IS NULL order by id;
 IF(my_year, 'IS     TRUE', 'IS NOT TRUE')	my_year	id
 IS NOT TRUE	NULL	1
 IS     TRUE	1901	2
@@ -1847,7 +1893,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_year`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_year, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 110 OR select_id IS NULL);
+WHERE select_id = 114 OR select_id IS NULL) order by id;
 IF(my_year, 'IS     TRUE', 'IS NOT TRUE')	my_year	id
 IS NOT TRUE	NULL	1
 IS     TRUE	1901	2
@@ -1861,7 +1907,7 @@ CREATE VIEW v1 AS SELECT IF(my_time, 'IS
 my_time, id FROM t1_values;
 SELECT IF(my_time, 'IS     TRUE', 'IS NOT TRUE'),
 my_time, id FROM t1_values
-WHERE select_id = 109 OR select_id IS NULL;
+WHERE select_id = 113 OR select_id IS NULL order by id;
 IF(my_time, 'IS     TRUE', 'IS NOT TRUE')	my_time	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-838:59:59	2
@@ -1873,7 +1919,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_time`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_time, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 109 OR select_id IS NULL);
+WHERE select_id = 113 OR select_id IS NULL) order by id;
 IF(my_time, 'IS     TRUE', 'IS NOT TRUE')	my_time	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-838:59:59	2
@@ -1887,7 +1933,7 @@ CREATE VIEW v1 AS SELECT IF(my_timestamp
 my_timestamp, id FROM t1_values;
 SELECT IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE'),
 my_timestamp, id FROM t1_values
-WHERE select_id = 108 OR select_id IS NULL;
+WHERE select_id = 112 OR select_id IS NULL order by id;
 IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE')	my_timestamp	id
 IS NOT TRUE	0000-00-00 00:00:00	1
 IS     TRUE	1970-01-01 03:00:01	2
@@ -1899,7 +1945,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_timestamp`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 108 OR select_id IS NULL);
+WHERE select_id = 112 OR select_id IS NULL) order by id;
 IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE')	my_timestamp	id
 IS NOT TRUE	0000-00-00 00:00:00	1
 IS     TRUE	1970-01-01 03:00:01	2
@@ -1913,7 +1959,7 @@ CREATE VIEW v1 AS SELECT IF(my_date, 'IS
 my_date, id FROM t1_values;
 SELECT IF(my_date, 'IS     TRUE', 'IS NOT TRUE'),
 my_date, id FROM t1_values
-WHERE select_id = 107 OR select_id IS NULL;
+WHERE select_id = 111 OR select_id IS NULL order by id;
 IF(my_date, 'IS     TRUE', 'IS NOT TRUE')	my_date	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01	2
@@ -1925,7 +1971,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_date`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_date, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 107 OR select_id IS NULL);
+WHERE select_id = 111 OR select_id IS NULL) order by id;
 IF(my_date, 'IS     TRUE', 'IS NOT TRUE')	my_date	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01	2
@@ -1939,7 +1985,7 @@ CREATE VIEW v1 AS SELECT IF(my_datetime,
 my_datetime, id FROM t1_values;
 SELECT IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE'),
 my_datetime, id FROM t1_values
-WHERE select_id = 106 OR select_id IS NULL;
+WHERE select_id = 110 OR select_id IS NULL order by id;
 IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE')	my_datetime	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01 00:00:00	2
@@ -1951,7 +1997,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_datetime`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 106 OR select_id IS NULL);
+WHERE select_id = 110 OR select_id IS NULL) order by id;
 IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE')	my_datetime	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01 00:00:00	2
@@ -1965,7 +2011,7 @@ CREATE VIEW v1 AS SELECT IF(my_double, '
 my_double, id FROM t1_values;
 SELECT IF(my_double, 'IS     TRUE', 'IS NOT TRUE'),
 my_double, id FROM t1_values
-WHERE select_id = 105 OR select_id IS NULL;
+WHERE select_id = 109 OR select_id IS NULL order by id;
 IF(my_double, 'IS     TRUE', 'IS NOT TRUE')	my_double	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-1.7976931348623e+308	2
@@ -1977,7 +2023,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_double`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_double, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 105 OR select_id IS NULL);
+WHERE select_id = 109 OR select_id IS NULL) order by id;
 IF(my_double, 'IS     TRUE', 'IS NOT TRUE')	my_double	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-1.7976931348623e+308	2
@@ -1991,7 +2037,7 @@ CREATE VIEW v1 AS SELECT IF(my_decimal, 
 my_decimal, id FROM t1_values;
 SELECT IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE'),
 my_decimal, id FROM t1_values
-WHERE select_id = 104 OR select_id IS NULL;
+WHERE select_id = 108 OR select_id IS NULL order by id;
 IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE')	my_decimal	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2003,7 +2049,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_decimal`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 104 OR select_id IS NULL);
+WHERE select_id = 108 OR select_id IS NULL) order by id;
 IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE')	my_decimal	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2017,7 +2063,7 @@ CREATE VIEW v1 AS SELECT IF(my_bigint, '
 my_bigint, id FROM t1_values;
 SELECT IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE'),
 my_bigint, id FROM t1_values
-WHERE select_id = 103 OR select_id IS NULL;
+WHERE select_id = 107 OR select_id IS NULL order by id;
 IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE')	my_bigint	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9223372036854775808	2
@@ -2029,7 +2075,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_bigint`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 103 OR select_id IS NULL);
+WHERE select_id = 107 OR select_id IS NULL) order by id;
 IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE')	my_bigint	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9223372036854775808	2
@@ -2043,7 +2089,7 @@ CREATE VIEW v1 AS SELECT IF(my_varbinary
 my_varbinary_1000, id FROM t1_values;
 SELECT IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 102 OR select_id IS NULL;
+WHERE select_id = 106 OR select_id IS NULL order by id;
 IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varbinary_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2055,7 +2101,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_varbinary_1000`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 102 OR select_id IS NULL);
+WHERE select_id = 106 OR select_id IS NULL) order by id;
 IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varbinary_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2069,13 +2115,13 @@ CREATE VIEW v1 AS SELECT IF(my_binary_30
 my_binary_30, id FROM t1_values;
 SELECT IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_binary_30, id FROM t1_values
-WHERE select_id = 101 OR select_id IS NULL;
+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------->'
@@ -2086,7 +2132,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_binary_30`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 101 OR select_id IS NULL);
+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	@@ -2105,7 +2151,7 @@ CREATE VIEW v1 AS SELECT IF(my_varchar_1
 my_varchar_1000, id FROM t1_values;
 SELECT IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 100 OR select_id IS NULL;
+WHERE select_id = 104 OR select_id IS NULL order by id;
 IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varchar_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2117,7 +2163,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_varchar_1000`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 100 OR select_id IS NULL);
+WHERE select_id = 104 OR select_id IS NULL) order by id;
 IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varchar_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2131,7 +2177,7 @@ CREATE VIEW v1 AS SELECT IF(my_char_30, 
 my_char_30, id FROM t1_values;
 SELECT IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_char_30, id FROM t1_values
-WHERE select_id = 99 OR select_id IS NULL;
+WHERE select_id = 103 OR select_id IS NULL order by id;
 IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE')	my_char_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2146,7 +2192,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_char_30`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 99 OR select_id IS NULL);
+WHERE select_id = 103 OR select_id IS NULL) order by id;
 IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE')	my_char_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2159,11 +2205,11 @@ 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 = 98 OR select_id IS NULL;
+WHERE select_id = 102 OR select_id IS NULL order by id;
 CONVERT(my_varbinary_1000 USING koi8r)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2175,7 +2221,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varbinary_1000` using koi8r) AS `CONVERT(my_varbinary_1000 USING koi8r)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 98 OR select_id IS NULL);
+WHERE select_id = 102 OR select_id IS NULL) order by id;
 CONVERT(my_varbinary_1000 USING koi8r)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2185,23 +2231,23 @@ 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 = 97 OR select_id IS NULL;
+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
 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`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 97 OR select_id IS NULL);
+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
 @@ -2211,11 +2257,11 @@ 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 = 96 OR select_id IS NULL;
+WHERE select_id = 100 OR select_id IS NULL order by id;
 CONVERT(my_varchar_1000 USING koi8r)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2227,7 +2273,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varchar_1000` using koi8r) AS `CONVERT(my_varchar_1000 USING koi8r)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 96 OR select_id IS NULL);
+WHERE select_id = 100 OR select_id IS NULL) order by id;
 CONVERT(my_varchar_1000 USING koi8r)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2237,11 +2283,11 @@ 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 = 95 OR select_id IS NULL;
+WHERE select_id = 99 OR select_id IS NULL order by id;
 CONVERT(my_char_30 USING koi8r)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2253,7 +2299,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_char_30` using koi8r) AS `CONVERT(my_char_30 USING koi8r)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 95 OR select_id IS NULL);
+WHERE select_id = 99 OR select_id IS NULL) order by id;
 CONVERT(my_char_30 USING koi8r)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2263,11 +2309,11 @@ 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 = 94 OR select_id IS NULL;
+WHERE select_id = 98 OR select_id IS NULL order by id;
 CONVERT(my_varbinary_1000 USING utf8)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2279,7 +2325,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varbinary_1000` using utf8) AS `CONVERT(my_varbinary_1000 USING utf8)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 94 OR select_id IS NULL);
+WHERE select_id = 98 OR select_id IS NULL) order by id;
 CONVERT(my_varbinary_1000 USING utf8)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2289,23 +2335,23 @@ 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 = 93 OR select_id IS NULL;
+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
 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`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 93 OR select_id IS NULL);
+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
 @@ -2315,11 +2361,11 @@ 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 = 92 OR select_id IS NULL;
+WHERE select_id = 96 OR select_id IS NULL order by id;
 CONVERT(my_varchar_1000 USING utf8)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2331,7 +2377,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varchar_1000` using utf8) AS `CONVERT(my_varchar_1000 USING utf8)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 92 OR select_id IS NULL);
+WHERE select_id = 96 OR select_id IS NULL) order by id;
 CONVERT(my_varchar_1000 USING utf8)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2341,11 +2387,11 @@ 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 = 91 OR select_id IS NULL;
+WHERE select_id = 95 OR select_id IS NULL order by id;
 CONVERT(my_char_30 USING utf8)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2357,7 +2403,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_char_30` using utf8) AS `CONVERT(my_char_30 USING utf8)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 91 OR select_id IS NULL);
+WHERE select_id = 95 OR select_id IS NULL) order by id;
 CONVERT(my_char_30 USING utf8)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2371,7 +2417,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS UNSIGNED INTEGER),
 my_year, id FROM t1_values
-WHERE select_id = 90 OR select_id IS NULL;
+WHERE select_id = 94 OR select_id IS NULL order by id;
 CAST(my_year AS UNSIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2383,7 +2429,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as unsigned) AS `CAST(my_year AS UNSIGNED INTEGER)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 90 OR select_id IS NULL);
+WHERE select_id = 94 OR select_id IS NULL) order by id;
 CAST(my_year AS UNSIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2397,7 +2443,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS UNSIGNED INTEGER),
 my_time, id FROM t1_values
-WHERE select_id = 89 OR select_id IS NULL;
+WHERE select_id = 93 OR select_id IS NULL order by id;
 CAST(my_time AS UNSIGNED INTEGER)	my_time	id
 NULL	NULL	1
 18446744073701165657	-838:59:59	2
@@ -2409,7 +2455,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as unsigned) AS `CAST(my_time AS UNSIGNED INTEGER)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 89 OR select_id IS NULL);
+WHERE select_id = 93 OR select_id IS NULL) order by id;
 CAST(my_time AS UNSIGNED INTEGER)	my_time	id
 NULL	NULL	1
 18446744073701165657	-838:59:59	2
@@ -2423,7 +2469,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timesta
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS UNSIGNED INTEGER),
 my_timestamp, id FROM t1_values
-WHERE select_id = 88 OR select_id IS NULL;
+WHERE select_id = 92 OR select_id IS NULL order by id;
 CAST(my_timestamp AS UNSIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 19700101030001	1970-01-01 03:00:01	2
@@ -2435,7 +2481,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as unsigned) AS `CAST(my_timestamp AS UNSIGNED INTEGER)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 88 OR select_id IS NULL);
+WHERE select_id = 92 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS UNSIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 19700101030001	1970-01-01 03:00:01	2
@@ -2449,7 +2495,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS UNSIGNED INTEGER),
 my_date, id FROM t1_values
-WHERE select_id = 87 OR select_id IS NULL;
+WHERE select_id = 91 OR select_id IS NULL order by id;
 CAST(my_date AS UNSIGNED INTEGER)	my_date	id
 NULL	NULL	1
 10101	0001-01-01	2
@@ -2461,7 +2507,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as unsigned) AS `CAST(my_date AS UNSIGNED INTEGER)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 87 OR select_id IS NULL);
+WHERE select_id = 91 OR select_id IS NULL) order by id;
 CAST(my_date AS UNSIGNED INTEGER)	my_date	id
 NULL	NULL	1
 10101	0001-01-01	2
@@ -2475,7 +2521,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetim
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS UNSIGNED INTEGER),
 my_datetime, id FROM t1_values
-WHERE select_id = 86 OR select_id IS NULL;
+WHERE select_id = 90 OR select_id IS NULL order by id;
 CAST(my_datetime AS UNSIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 10101000000	0001-01-01 00:00:00	2
@@ -2487,7 +2533,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as unsigned) AS `CAST(my_datetime AS UNSIGNED INTEGER)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 86 OR select_id IS NULL);
+WHERE select_id = 90 OR select_id IS NULL) order by id;
 CAST(my_datetime AS UNSIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 10101000000	0001-01-01 00:00:00	2
@@ -2497,11 +2543,43 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
+CREATE VIEW v1 AS SELECT CAST(my_double AS UNSIGNED INTEGER),
+my_double, id FROM t1_values;
+SELECT CAST(my_double AS UNSIGNED INTEGER),
+my_double, id FROM t1_values
+WHERE select_id = 89 OR select_id IS NULL order by id;
+CAST(my_double AS UNSIGNED INTEGER)	my_double	id
+NULL	NULL	1
+9223372036854775808	-1.7976931348623e+308	2
+9223372036854775807	1.7976931348623e+308	3
+0	0	4
+18446744073709551615	-1	5
+Warnings:
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+SHOW CREATE VIEW v1;
+View	Create View
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as unsigned) AS `CAST(my_double AS UNSIGNED INTEGER)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
+SELECT v1.* FROM v1
+WHERE v1.id IN (SELECT id FROM t1_values
+WHERE select_id = 89 OR select_id IS NULL) order by id;
+CAST(my_double AS UNSIGNED INTEGER)	my_double	id
+NULL	NULL	1
+9223372036854775808	-1.7976931348623e+308	2
+9223372036854775807	1.7976931348623e+308	3
+0	0	4
+18446744073709551615	-1	5
+Warnings:
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+DROP VIEW v1;
+
+
 CREATE VIEW v1 AS SELECT CAST(my_decimal AS UNSIGNED INTEGER),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS UNSIGNED INTEGER),
 my_decimal, id FROM t1_values
-WHERE select_id = 85 OR select_id IS NULL;
+WHERE select_id = 88 OR select_id IS NULL order by id;
 CAST(my_decimal AS UNSIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 0	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2517,7 +2595,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as unsigned) AS `CAST(my_decimal AS UNSIGNED INTEGER)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 85 OR select_id IS NULL);
+WHERE select_id = 88 OR select_id IS NULL) order by id;
 CAST(my_decimal AS UNSIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 0	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2535,7 +2613,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint 
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS UNSIGNED INTEGER),
 my_bigint, id FROM t1_values
-WHERE select_id = 84 OR select_id IS NULL;
+WHERE select_id = 87 OR select_id IS NULL order by id;
 CAST(my_bigint AS UNSIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 9223372036854775808	-9223372036854775808	2
@@ -2547,7 +2625,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as unsigned) AS `CAST(my_bigint AS UNSIGNED INTEGER)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 84 OR select_id IS NULL);
+WHERE select_id = 87 OR select_id IS NULL) order by id;
 CAST(my_bigint AS UNSIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 9223372036854775808	-9223372036854775808	2
@@ -2561,7 +2639,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbina
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS UNSIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 83 OR select_id IS NULL;
+WHERE select_id = 86 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS UNSIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -2578,7 +2656,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as unsigned) AS `CAST(my_varbinary_1000 AS UNSIGNED INTEGER)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 83 OR select_id IS NULL);
+WHERE select_id = 86 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS UNSIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -2597,13 +2675,13 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS UNSIGNED INTEGER),
 my_binary_30, id FROM t1_values
-WHERE select_id = 82 OR select_id IS NULL;
+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------->'
@@ -2615,7 +2693,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as unsigned) AS `CAST(my_binary_30 AS UNSIGNED INTEGER)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 82 OR select_id IS NULL);
+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	@@ -2635,7 +2713,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS UNSIGNED INTEGER),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 81 OR select_id IS NULL;
+WHERE select_id = 84 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS UNSIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -2652,7 +2730,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as unsigned) AS `CAST(my_varchar_1000 AS UNSIGNED INTEGER)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 81 OR select_id IS NULL);
+WHERE select_id = 84 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS UNSIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -2671,7 +2749,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS UNSIGNED INTEGER),
 my_char_30, id FROM t1_values
-WHERE select_id = 80 OR select_id IS NULL;
+WHERE select_id = 83 OR select_id IS NULL order by id;
 CAST(my_char_30 AS UNSIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -2688,7 +2766,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as unsigned) AS `CAST(my_char_30 AS UNSIGNED INTEGER)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 80 OR select_id IS NULL);
+WHERE select_id = 83 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS UNSIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -2707,7 +2785,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS SIGNED INTEGER),
 my_year, id FROM t1_values
-WHERE select_id = 79 OR select_id IS NULL;
+WHERE select_id = 82 OR select_id IS NULL order by id;
 CAST(my_year AS SIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2719,7 +2797,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as signed) AS `CAST(my_year AS SIGNED INTEGER)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 79 OR select_id IS NULL);
+WHERE select_id = 82 OR select_id IS NULL) order by id;
 CAST(my_year AS SIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2733,7 +2811,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS SIGNED INTEGER),
 my_time, id FROM t1_values
-WHERE select_id = 78 OR select_id IS NULL;
+WHERE select_id = 81 OR select_id IS NULL order by id;
 CAST(my_time AS SIGNED INTEGER)	my_time	id
 NULL	NULL	1
 -8385959	-838:59:59	2
@@ -2745,7 +2823,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as signed) AS `CAST(my_time AS SIGNED INTEGER)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 78 OR select_id IS NULL);
+WHERE select_id = 81 OR select_id IS NULL) order by id;
 CAST(my_time AS SIGNED INTEGER)	my_time	id
 NULL	NULL	1
 -8385959	-838:59:59	2
@@ -2759,7 +2837,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timesta
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS SIGNED INTEGER),
 my_timestamp, id FROM t1_values
-WHERE select_id = 77 OR select_id IS NULL;
+WHERE select_id = 80 OR select_id IS NULL order by id;
 CAST(my_timestamp AS SIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 19700101030001	1970-01-01 03:00:01	2
@@ -2771,7 +2849,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as signed) AS `CAST(my_timestamp AS SIGNED INTEGER)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 77 OR select_id IS NULL);
+WHERE select_id = 80 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS SIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 19700101030001	1970-01-01 03:00:01	2
@@ -2785,7 +2863,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS SIGNED INTEGER),
 my_date, id FROM t1_values
-WHERE select_id = 76 OR select_id IS NULL;
+WHERE select_id = 79 OR select_id IS NULL order by id;
 CAST(my_date AS SIGNED INTEGER)	my_date	id
 NULL	NULL	1
 10101	0001-01-01	2
@@ -2797,7 +2875,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as signed) AS `CAST(my_date AS SIGNED INTEGER)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 76 OR select_id IS NULL);
+WHERE select_id = 79 OR select_id IS NULL) order by id;
 CAST(my_date AS SIGNED INTEGER)	my_date	id
 NULL	NULL	1
 10101	0001-01-01	2
@@ -2811,7 +2889,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetim
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS SIGNED INTEGER),
 my_datetime, id FROM t1_values
-WHERE select_id = 75 OR select_id IS NULL;
+WHERE select_id = 78 OR select_id IS NULL order by id;
 CAST(my_datetime AS SIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 10101000000	0001-01-01 00:00:00	2
@@ -2823,7 +2901,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as signed) AS `CAST(my_datetime AS SIGNED INTEGER)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 75 OR select_id IS NULL);
+WHERE select_id = 78 OR select_id IS NULL) order by id;
 CAST(my_datetime AS SIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 10101000000	0001-01-01 00:00:00	2
@@ -2833,11 +2911,43 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
+CREATE VIEW v1 AS SELECT CAST(my_double AS SIGNED INTEGER),
+my_double, id FROM t1_values;
+SELECT CAST(my_double AS SIGNED INTEGER),
+my_double, id FROM t1_values
+WHERE select_id = 77 OR select_id IS NULL order by id;
+CAST(my_double AS SIGNED INTEGER)	my_double	id
+NULL	NULL	1
+-9223372036854775808	-1.7976931348623e+308	2
+9223372036854775807	1.7976931348623e+308	3
+0	0	4
+-1	-1	5
+Warnings:
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+SHOW CREATE VIEW v1;
+View	Create View
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as signed) AS `CAST(my_double AS SIGNED INTEGER)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
+SELECT v1.* FROM v1
+WHERE v1.id IN (SELECT id FROM t1_values
+WHERE select_id = 77 OR select_id IS NULL) order by id;
+CAST(my_double AS SIGNED INTEGER)	my_double	id
+NULL	NULL	1
+-9223372036854775808	-1.7976931348623e+308	2
+9223372036854775807	1.7976931348623e+308	3
+0	0	4
+-1	-1	5
+Warnings:
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+DROP VIEW v1;
+
+
 CREATE VIEW v1 AS SELECT CAST(my_decimal AS SIGNED INTEGER),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS SIGNED INTEGER),
 my_decimal, id FROM t1_values
-WHERE select_id = 74 OR select_id IS NULL;
+WHERE select_id = 76 OR select_id IS NULL order by id;
 CAST(my_decimal AS SIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 -9223372036854775808	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2852,7 +2962,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as signed) AS `CAST(my_decimal AS SIGNED INTEGER)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 74 OR select_id IS NULL);
+WHERE select_id = 76 OR select_id IS NULL) order by id;
 CAST(my_decimal AS SIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 -9223372036854775808	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2869,7 +2979,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint 
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS SIGNED INTEGER),
 my_bigint, id FROM t1_values
-WHERE select_id = 73 OR select_id IS NULL;
+WHERE select_id = 75 OR select_id IS NULL order by id;
 CAST(my_bigint AS SIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -2881,7 +2991,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as signed) AS `CAST(my_bigint AS SIGNED INTEGER)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 73 OR select_id IS NULL);
+WHERE select_id = 75 OR select_id IS NULL) order by id;
 CAST(my_bigint AS SIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -2895,7 +3005,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbina
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS SIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 72 OR select_id IS NULL;
+WHERE select_id = 74 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS SIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -2911,7 +3021,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as signed) AS `CAST(my_varbinary_1000 AS SIGNED INTEGER)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 72 OR select_id IS NULL);
+WHERE select_id = 74 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS SIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -2929,13 +3039,13 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS SIGNED INTEGER),
 my_binary_30, id FROM t1_values
-WHERE select_id = 71 OR select_id IS NULL;
+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------->'
@@ -2946,7 +3056,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as signed) AS `CAST(my_binary_30 AS SIGNED INTEGER)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 71 OR select_id IS NULL);
+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	@@ -2965,7 +3075,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS SIGNED INTEGER),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 70 OR select_id IS NULL;
+WHERE select_id = 72 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS SIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -2981,7 +3091,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as signed) AS `CAST(my_varchar_1000 AS SIGNED INTEGER)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 70 OR select_id IS NULL);
+WHERE select_id = 72 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS SIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -2999,7 +3109,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS SIGNED INTEGER),
 my_char_30, id FROM t1_values
-WHERE select_id = 69 OR select_id IS NULL;
+WHERE select_id = 71 OR select_id IS NULL order by id;
 CAST(my_char_30 AS SIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -3015,7 +3125,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as signed) AS `CAST(my_char_30 AS SIGNED INTEGER)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 69 OR select_id IS NULL);
+WHERE select_id = 71 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS SIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -3033,7 +3143,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS DECIMAL(37,2)),
 my_year, id FROM t1_values
-WHERE select_id = 68 OR select_id IS NULL;
+WHERE select_id = 70 OR select_id IS NULL order by id;
 CAST(my_year AS DECIMAL(37,2))	my_year	id
 NULL	NULL	1
 1901.00	1901	2
@@ -3045,7 +3155,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as decimal(37,2)) AS `CAST(my_year AS DECIMAL(37,2))`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 68 OR select_id IS NULL);
+WHERE select_id = 70 OR select_id IS NULL) order by id;
 CAST(my_year AS DECIMAL(37,2))	my_year	id
 NULL	NULL	1
 1901.00	1901	2
@@ -3059,7 +3169,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS DECIMAL(37,2)),
 my_time, id FROM t1_values
-WHERE select_id = 67 OR select_id IS NULL;
+WHERE select_id = 69 OR select_id IS NULL order by id;
 CAST(my_time AS DECIMAL(37,2))	my_time	id
 NULL	NULL	1
 -8385959.00	-838:59:59	2
@@ -3071,7 +3181,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as decimal(37,2)) AS `CAST(my_time AS DECIMAL(37,2))`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 67 OR select_id IS NULL);
+WHERE select_id = 69 OR select_id IS NULL) order by id;
 CAST(my_time AS DECIMAL(37,2))	my_time	id
 NULL	NULL	1
 -8385959.00	-838:59:59	2
@@ -3085,7 +3195,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timesta
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS DECIMAL(37,2)),
 my_timestamp, id FROM t1_values
-WHERE select_id = 66 OR select_id IS NULL;
+WHERE select_id = 68 OR select_id IS NULL order by id;
 CAST(my_timestamp AS DECIMAL(37,2))	my_timestamp	id
 0.00	0000-00-00 00:00:00	1
 19700101030001.00	1970-01-01 03:00:01	2
@@ -3097,7 +3207,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as decimal(37,2)) AS `CAST(my_timestamp AS DECIMAL(37,2))`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 66 OR select_id IS NULL);
+WHERE select_id = 68 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS DECIMAL(37,2))	my_timestamp	id
 0.00	0000-00-00 00:00:00	1
 19700101030001.00	1970-01-01 03:00:01	2
@@ -3111,7 +3221,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS DECIMAL(37,2)),
 my_date, id FROM t1_values
-WHERE select_id = 65 OR select_id IS NULL;
+WHERE select_id = 67 OR select_id IS NULL order by id;
 CAST(my_date AS DECIMAL(37,2))	my_date	id
 NULL	NULL	1
 10101.00	0001-01-01	2
@@ -3123,7 +3233,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as decimal(37,2)) AS `CAST(my_date AS DECIMAL(37,2))`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 65 OR select_id IS NULL);
+WHERE select_id = 67 OR select_id IS NULL) order by id;
 CAST(my_date AS DECIMAL(37,2))	my_date	id
 NULL	NULL	1
 10101.00	0001-01-01	2
@@ -3137,7 +3247,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetim
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS DECIMAL(37,2)),
 my_datetime, id FROM t1_values
-WHERE select_id = 64 OR select_id IS NULL;
+WHERE select_id = 66 OR select_id IS NULL order by id;
 CAST(my_datetime AS DECIMAL(37,2))	my_datetime	id
 NULL	NULL	1
 10101000000.00	0001-01-01 00:00:00	2
@@ -3149,7 +3259,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as decimal(37,2)) AS `CAST(my_datetime AS DECIMAL(37,2))`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 64 OR select_id IS NULL);
+WHERE select_id = 66 OR select_id IS NULL) order by id;
 CAST(my_datetime AS DECIMAL(37,2))	my_datetime	id
 NULL	NULL	1
 10101000000.00	0001-01-01 00:00:00	2
@@ -3159,11 +3269,49 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
+CREATE VIEW v1 AS SELECT CAST(my_double AS DECIMAL(37,2)),
+my_double, id FROM t1_values;
+SELECT CAST(my_double AS DECIMAL(37,2)),
+my_double, id FROM t1_values
+WHERE select_id = 65 OR select_id IS NULL order by id;
+CAST(my_double AS DECIMAL(37,2))	my_double	id
+NULL	NULL	1
+-99999999999999999999999999999999999.99	-1.7976931348623e+308	2
+99999999999999999999999999999999999.99	1.7976931348623e+308	3
+0.00	0	4
+-1.00	-1	5
+-3333.33	-3333.3333	30
+Warnings:
+Error	1292	Truncated incorrect DECIMAL value: ''
+Error	1264	Out of range value adjusted for column 'CAST(my_double AS DECIMAL(37,2))' at row 1
+Error	1292	Truncated incorrect DECIMAL value: ''
+Error	1264	Out of range value adjusted for column 'CAST(my_double AS DECIMAL(37,2))' at row 1
+SHOW CREATE VIEW v1;
+View	Create View
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as decimal(37,2)) AS `CAST(my_double AS DECIMAL(37,2))`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
+SELECT v1.* FROM v1
+WHERE v1.id IN (SELECT id FROM t1_values
+WHERE select_id = 65 OR select_id IS NULL) order by id;
+CAST(my_double AS DECIMAL(37,2))	my_double	id
+NULL	NULL	1
+-99999999999999999999999999999999999.99	-1.7976931348623e+308	2
+99999999999999999999999999999999999.99	1.7976931348623e+308	3
+0.00	0	4
+-1.00	-1	5
+-3333.33	-3333.3333	30
+Warnings:
+Error	1292	Truncated incorrect DECIMAL value: ''
+Error	1264	Out of range value adjusted for column 'CAST(my_double AS DECIMAL(37,2))' at row 1
+Error	1292	Truncated incorrect DECIMAL value: ''
+Error	1264	Out of range value adjusted for column 'CAST(my_double AS DECIMAL(37,2))' at row 1
+DROP VIEW v1;
+
+
 CREATE VIEW v1 AS SELECT CAST(my_decimal AS DECIMAL(37,2)),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS DECIMAL(37,2)),
 my_decimal, id FROM t1_values
-WHERE select_id = 63 OR select_id IS NULL;
+WHERE select_id = 64 OR select_id IS NULL order by id;
 CAST(my_decimal AS DECIMAL(37,2))	my_decimal	id
 NULL	NULL	1
 -10000000000000000000000000000000000.00	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -3175,7 +3323,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as decimal(37,2)) AS `CAST(my_decimal AS DECIMAL(37,2))`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 63 OR select_id IS NULL);
+WHERE select_id = 64 OR select_id IS NULL) order by id;
 CAST(my_decimal AS DECIMAL(37,2))	my_decimal	id
 NULL	NULL	1
 -10000000000000000000000000000000000.00	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -3189,7 +3337,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint 
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS DECIMAL(37,2)),
 my_bigint, id FROM t1_values
-WHERE select_id = 62 OR select_id IS NULL;
+WHERE select_id = 63 OR select_id IS NULL order by id;
 CAST(my_bigint AS DECIMAL(37,2))	my_bigint	id
 NULL	NULL	1
 -9223372036854775808.00	-9223372036854775808	2
@@ -3201,7 +3349,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as decimal(37,2)) AS `CAST(my_bigint AS DECIMAL(37,2))`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 62 OR select_id IS NULL);
+WHERE select_id = 63 OR select_id IS NULL) order by id;
 CAST(my_bigint AS DECIMAL(37,2))	my_bigint	id
 NULL	NULL	1
 -9223372036854775808.00	-9223372036854775808	2
@@ -3215,14 +3363,14 @@ CREATE VIEW v1 AS SELECT CAST(my_varbina
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS DECIMAL(37,2)),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 61 OR select_id IS NULL;
+WHERE select_id = 62 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS DECIMAL(37,2))	my_varbinary_1000	id
 NULL	NULL	1
 0.00		2
 0.00	<---------1000 characters-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 --------------->	3
 0.00	 ---äÖüß@µ*$-- 	4
 -1.00	-1	5
--3333.33	-3333.3333	28
+-3333.33	-3333.3333	29
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3232,14 +3380,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as decimal(37,2)) AS `CAST(my_varbinary_1000 AS DECIMAL(37,2))`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 61 OR select_id IS NULL);
+WHERE select_id = 62 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS DECIMAL(37,2))	my_varbinary_1000	id
 NULL	NULL	1
 0.00		2
 0.00	<---------1000 characters-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 --------------->	3
 0.00	 ---äÖüß@µ*$-- 	4
 -1.00	-1	5
--3333.33	-3333.3333	28
+-3333.33	-3333.3333	29
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3251,14 +3399,14 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS DECIMAL(37,2)),
 my_binary_30, id FROM t1_values
-WHERE select_id = 60 OR select_id IS NULL;
+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: ''
@@ -3273,14 +3421,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as decimal(37,2)) AS `CAST(my_binary_30 AS DECIMAL(37,2))`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 60 OR select_id IS NULL);
+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	<--------30 characters------->	3
 0.00	 ---äÖüß@µ*$--  -1.00	-1--3333.33	-3333.3333+-3333.33	-3333.3333 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: ''
@@ -3297,14 +3445,14 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS DECIMAL(37,2)),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 59 OR select_id IS NULL;
+WHERE select_id = 60 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS DECIMAL(37,2))	my_varchar_1000	id
 NULL	NULL	1
 0.00		2
 0.00	<---------1000 characters-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 --------------->	3
 0.00	 ---äÖüß@µ*$-- 	4
 -1.00	-1	5
--3333.33	-3333.3333	26
+-3333.33	-3333.3333	27
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3314,14 +3462,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as decimal(37,2)) AS `CAST(my_varchar_1000 AS DECIMAL(37,2))`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 59 OR select_id IS NULL);
+WHERE select_id = 60 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS DECIMAL(37,2))	my_varchar_1000	id
 NULL	NULL	1
 0.00		2
 0.00	<---------1000 characters-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 --------------->	3
 0.00	 ---äÖüß@µ*$-- 	4
 -1.00	-1	5
--3333.33	-3333.3333	26
+-3333.33	-3333.3333	27
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3333,14 +3481,14 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS DECIMAL(37,2)),
 my_char_30, id FROM t1_values
-WHERE select_id = 58 OR select_id IS NULL;
+WHERE select_id = 59 OR select_id IS NULL order by id;
 CAST(my_char_30 AS DECIMAL(37,2))	my_char_30	id
 NULL	NULL	1
 0.00		2
 0.00	<--------30 characters------->	3
 0.00	 ---äÖüß@µ*$--	4
 -1.00	-1	5
--3333.33	-3333.3333	25
+-3333.33	-3333.3333	26
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: '                              '
@@ -3353,14 +3501,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as decimal(37,2)) AS `CAST(my_char_30 AS DECIMAL(37,2))`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 58 OR select_id IS NULL);
+WHERE select_id = 59 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS DECIMAL(37,2))	my_char_30	id
 NULL	NULL	1
 0.00		2
 0.00	<--------30 characters------->	3
 0.00	 ---äÖüß@µ*$--	4
 -1.00	-1	5
--3333.33	-3333.3333	25
+-3333.33	-3333.3333	26
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: '                              '
@@ -3375,7 +3523,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS TIME),
 my_year, id FROM t1_values
-WHERE select_id = 57 OR select_id IS NULL;
+WHERE select_id = 58 OR select_id IS NULL order by id;
 CAST(my_year AS TIME)	my_year	id
 NULL	NULL	1
 00:19:01	1901	2
@@ -3387,7 +3535,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as time) AS `CAST(my_year AS TIME)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 57 OR select_id IS NULL);
+WHERE select_id = 58 OR select_id IS NULL) order by id;
 CAST(my_year AS TIME)	my_year	id
 NULL	NULL	1
 00:19:01	1901	2
@@ -3401,7 +3549,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS TIME),
 my_time, id FROM t1_values
-WHERE select_id = 56 OR select_id IS NULL;
+WHERE select_id = 57 OR select_id IS NULL order by id;
 CAST(my_time AS TIME)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -3413,7 +3561,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as time) AS `CAST(my_time AS TIME)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 56 OR select_id IS NULL);
+WHERE select_id = 57 OR select_id IS NULL) order by id;
 CAST(my_time AS TIME)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -3427,7 +3575,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timesta
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS TIME),
 my_timestamp, id FROM t1_values
-WHERE select_id = 55 OR select_id IS NULL;
+WHERE select_id = 56 OR select_id IS NULL order by id;
 CAST(my_timestamp AS TIME)	my_timestamp	id
 00:00:00	0000-00-00 00:00:00	1
 03:00:01	1970-01-01 03:00:01	2
@@ -3439,7 +3587,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as time) AS `CAST(my_timestamp AS TIME)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 55 OR select_id IS NULL);
+WHERE select_id = 56 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS TIME)	my_timestamp	id
 00:00:00	0000-00-00 00:00:00	1
 03:00:01	1970-01-01 03:00:01	2
@@ -3453,7 +3601,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS TIME),
 my_date, id FROM t1_values
-WHERE select_id = 54 OR select_id IS NULL;
+WHERE select_id = 55 OR select_id IS NULL order by id;
 CAST(my_date AS TIME)	my_date	id
 NULL	NULL	1
 00:00:00	0001-01-01	2
@@ -3465,7 +3613,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as time) AS `CAST(my_date AS TIME)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 54 OR select_id IS NULL);
+WHERE select_id = 55 OR select_id IS NULL) order by id;
 CAST(my_date AS TIME)	my_date	id
 NULL	NULL	1
 00:00:00	0001-01-01	2
@@ -3479,7 +3627,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetim
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS TIME),
 my_datetime, id FROM t1_values
-WHERE select_id = 53 OR select_id IS NULL;
+WHERE select_id = 54 OR select_id IS NULL order by id;
 CAST(my_datetime AS TIME)	my_datetime	id
 NULL	NULL	1
 00:00:00	0001-01-01 00:00:00	2
@@ -3491,7 +3639,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as time) AS `CAST(my_datetime AS TIME)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 53 OR select_id IS NULL);
+WHERE select_id = 54 OR select_id IS NULL) order by id;
 CAST(my_datetime AS TIME)	my_datetime	id
 NULL	NULL	1
 00:00:00	0001-01-01 00:00:00	2
@@ -3501,11 +3649,45 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
+CREATE VIEW v1 AS SELECT CAST(my_double AS TIME),
+my_double, id FROM t1_values;
+SELECT CAST(my_double AS TIME),
+my_double, id FROM t1_values
+WHERE select_id = 53 OR select_id IS NULL order by id;
+CAST(my_double AS TIME)	my_double	id
+NULL	NULL	1
+NULL	-1.7976931348623e+308	2
+NULL	1.7976931348623e+308	3
+00:00:00	0	4
+-00:00:01	-1	5
+00:17:58	1758	25
+Warnings:
+Warning	1292	Truncated incorrect time value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect time value: '1.7976931348623e+308'
+SHOW CREATE VIEW v1;
+View	Create View
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as time) AS `CAST(my_double AS TIME)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
+SELECT v1.* FROM v1
+WHERE v1.id IN (SELECT id FROM t1_values
+WHERE select_id = 53 OR select_id IS NULL) order by id;
+CAST(my_double AS TIME)	my_double	id
+NULL	NULL	1
+NULL	-1.7976931348623e+308	2
+NULL	1.7976931348623e+308	3
+00:00:00	0	4
+-00:00:01	-1	5
+00:17:58	1758	25
+Warnings:
+Warning	1292	Truncated incorrect time value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect time value: '1.7976931348623e+308'
+DROP VIEW v1;
+
+
 CREATE VIEW v1 AS SELECT CAST(my_bigint AS TIME),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS TIME),
 my_bigint, id FROM t1_values
-WHERE select_id = 52 OR select_id IS NULL;
+WHERE select_id = 52 OR select_id IS NULL order by id;
 CAST(my_bigint AS TIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -3521,7 +3703,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as time) AS `CAST(my_bigint AS TIME)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 52 OR select_id IS NULL);
+WHERE select_id = 52 OR select_id IS NULL) order by id;
 CAST(my_bigint AS TIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -3539,7 +3721,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbina
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS TIME),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 51 OR select_id IS NULL;
+WHERE select_id = 51 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS TIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -3556,7 +3738,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as time) AS `CAST(my_varbinary_1000 AS TIME)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 51 OR select_id IS NULL);
+WHERE select_id = 51 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS TIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -3575,14 +3757,14 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS TIME),
 my_binary_30, id FROM t1_values
-WHERE select_id = 50 OR select_id IS NULL;
+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------->'
@@ -3594,7 +3776,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as time) AS `CAST(my_binary_30 AS TIME)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 50 OR select_id IS NULL);
+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	@@ -3615,7 +3797,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS TIME),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 49 OR select_id IS NULL;
+WHERE select_id = 49 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS TIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -3632,7 +3814,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as time) AS `CAST(my_varchar_1000 AS TIME)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 49 OR select_id IS NULL);
+WHERE select_id = 49 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS TIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -3651,7 +3833,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS TIME),
 my_char_30, id FROM t1_values
-WHERE select_id = 48 OR select_id IS NULL;
+WHERE select_id = 48 OR select_id IS NULL order by id;
 CAST(my_char_30 AS TIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -3668,7 +3850,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as time) AS `CAST(my_char_30 AS TIME)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 48 OR select_id IS NULL);
+WHERE select_id = 48 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS TIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -3687,7 +3869,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS DATETIME),
 my_year, id FROM t1_values
-WHERE select_id = 47 OR select_id IS NULL;
+WHERE select_id = 47 OR select_id IS NULL order by id;
 CAST(my_year AS DATETIME)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -3704,7 +3886,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as datetime) AS `CAST(my_year AS DATETIME)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 47 OR select_id IS NULL);
+WHERE select_id = 47 OR select_id IS NULL) order by id;
 CAST(my_year AS DATETIME)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -3723,7 +3905,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS DATETIME),
 my_time, id FROM t1_values
-WHERE select_id = 46 OR select_id IS NULL;
+WHERE select_id = 46 OR select_id IS NULL order by id;
 CAST(my_time AS DATETIME)	my_time	id
 NULL	NULL	1
 0000-00-00 00:00:00	-838:59:59	2
@@ -3738,7 +3920,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as datetime) AS `CAST(my_time AS DATETIME)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 46 OR select_id IS NULL);
+WHERE select_id = 46 OR select_id IS NULL) order by id;
 CAST(my_time AS DATETIME)	my_time	id
 NULL	NULL	1
 0000-00-00 00:00:00	-838:59:59	2
@@ -3755,7 +3937,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timesta
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS DATETIME),
 my_timestamp, id FROM t1_values
-WHERE select_id = 45 OR select_id IS NULL;
+WHERE select_id = 45 OR select_id IS NULL order by id;
 CAST(my_timestamp AS DATETIME)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -3767,7 +3949,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as datetime) AS `CAST(my_timestamp AS DATETIME)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 45 OR select_id IS NULL);
+WHERE select_id = 45 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS DATETIME)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -3781,7 +3963,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS DATETIME),
 my_date, id FROM t1_values
-WHERE select_id = 44 OR select_id IS NULL;
+WHERE select_id = 44 OR select_id IS NULL order by id;
 CAST(my_date AS DATETIME)	my_date	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01	2
@@ -3793,7 +3975,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as datetime) AS `CAST(my_date AS DATETIME)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 44 OR select_id IS NULL);
+WHERE select_id = 44 OR select_id IS NULL) order by id;
 CAST(my_date AS DATETIME)	my_date	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01	2
@@ -3807,7 +3989,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetim
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS DATETIME),
 my_datetime, id FROM t1_values
-WHERE select_id = 43 OR select_id IS NULL;
+WHERE select_id = 43 OR select_id IS NULL order by id;
 CAST(my_datetime AS DATETIME)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -3819,7 +4001,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as datetime) AS `CAST(my_datetime AS DATETIME)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 43 OR select_id IS NULL);
+WHERE select_id = 43 OR select_id IS NULL) order by id;
 CAST(my_datetime AS DATETIME)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -3833,7 +4015,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double 
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS DATETIME),
 my_double, id FROM t1_values
-WHERE select_id = 42 OR select_id IS NULL;
+WHERE select_id = 42 OR select_id IS NULL order by id;
 CAST(my_double AS DATETIME)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -3852,7 +4034,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as datetime) AS `CAST(my_double AS DATETIME)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 42 OR select_id IS NULL);
+WHERE select_id = 42 OR select_id IS NULL) order by id;
 CAST(my_double AS DATETIME)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -3873,7 +4055,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint 
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS DATETIME),
 my_bigint, id FROM t1_values
-WHERE select_id = 41 OR select_id IS NULL;
+WHERE select_id = 41 OR select_id IS NULL order by id;
 CAST(my_bigint AS DATETIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -3892,7 +4074,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as datetime) AS `CAST(my_bigint AS DATETIME)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 41 OR select_id IS NULL);
+WHERE select_id = 41 OR select_id IS NULL) order by id;
 CAST(my_bigint AS DATETIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -3913,7 +4095,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbina
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS DATETIME),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 40 OR select_id IS NULL;
+WHERE select_id = 40 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS DATETIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -3931,7 +4113,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as datetime) AS `CAST(my_varbinary_1000 AS DATETIME)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 40 OR select_id IS NULL);
+WHERE select_id = 40 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS DATETIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -3951,14 +4133,14 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS DATETIME),
 my_binary_30, id FROM t1_values
-WHERE select_id = 39 OR select_id IS NULL;
+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	Truncated incorrect datetime value: ''
 Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
@@ -3970,7 +4152,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as datetime) AS `CAST(my_binary_30 AS DATETIME)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 39 OR select_id IS NULL);
+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	@@ -3991,7 +4173,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS DATETIME),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 38 OR select_id IS NULL;
+WHERE select_id = 38 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS DATETIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4009,7 +4191,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as datetime) AS `CAST(my_varchar_1000 AS DATETIME)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 38 OR select_id IS NULL);
+WHERE select_id = 38 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS DATETIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4029,7 +4211,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS DATETIME),
 my_char_30, id FROM t1_values
-WHERE select_id = 37 OR select_id IS NULL;
+WHERE select_id = 37 OR select_id IS NULL order by id;
 CAST(my_char_30 AS DATETIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4047,7 +4229,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as datetime) AS `CAST(my_char_30 AS DATETIME)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 37 OR select_id IS NULL);
+WHERE select_id = 37 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS DATETIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4067,7 +4249,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS DATE),
 my_year, id FROM t1_values
-WHERE select_id = 36 OR select_id IS NULL;
+WHERE select_id = 36 OR select_id IS NULL order by id;
 CAST(my_year AS DATE)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -4084,7 +4266,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as date) AS `CAST(my_year AS DATE)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 36 OR select_id IS NULL);
+WHERE select_id = 36 OR select_id IS NULL) order by id;
 CAST(my_year AS DATE)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -4103,7 +4285,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS DATE),
 my_time, id FROM t1_values
-WHERE select_id = 35 OR select_id IS NULL;
+WHERE select_id = 35 OR select_id IS NULL order by id;
 CAST(my_time AS DATE)	my_time	id
 NULL	NULL	1
 0000-00-00	-838:59:59	2
@@ -4115,7 +4297,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as date) AS `CAST(my_time AS DATE)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 35 OR select_id IS NULL);
+WHERE select_id = 35 OR select_id IS NULL) order by id;
 CAST(my_time AS DATE)	my_time	id
 NULL	NULL	1
 0000-00-00	-838:59:59	2
@@ -4129,7 +4311,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timesta
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS DATE),
 my_timestamp, id FROM t1_values
-WHERE select_id = 34 OR select_id IS NULL;
+WHERE select_id = 34 OR select_id IS NULL order by id;
 CAST(my_timestamp AS DATE)	my_timestamp	id
 0000-00-00	0000-00-00 00:00:00	1
 1970-01-01	1970-01-01 03:00:01	2
@@ -4141,7 +4323,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as date) AS `CAST(my_timestamp AS DATE)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 34 OR select_id IS NULL);
+WHERE select_id = 34 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS DATE)	my_timestamp	id
 0000-00-00	0000-00-00 00:00:00	1
 1970-01-01	1970-01-01 03:00:01	2
@@ -4155,7 +4337,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS DATE),
 my_date, id FROM t1_values
-WHERE select_id = 33 OR select_id IS NULL;
+WHERE select_id = 33 OR select_id IS NULL order by id;
 CAST(my_date AS DATE)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4167,7 +4349,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as date) AS `CAST(my_date AS DATE)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 33 OR select_id IS NULL);
+WHERE select_id = 33 OR select_id IS NULL) order by id;
 CAST(my_date AS DATE)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4181,7 +4363,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetim
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS DATE),
 my_datetime, id FROM t1_values
-WHERE select_id = 32 OR select_id IS NULL;
+WHERE select_id = 32 OR select_id IS NULL order by id;
 CAST(my_datetime AS DATE)	my_datetime	id
 NULL	NULL	1
 0001-01-01	0001-01-01 00:00:00	2
@@ -4193,7 +4375,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as date) AS `CAST(my_datetime AS DATE)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 32 OR select_id IS NULL);
+WHERE select_id = 32 OR select_id IS NULL) order by id;
 CAST(my_datetime AS DATE)	my_datetime	id
 NULL	NULL	1
 0001-01-01	0001-01-01 00:00:00	2
@@ -4207,7 +4389,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double 
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS DATE),
 my_double, id FROM t1_values
-WHERE select_id = 31 OR select_id IS NULL;
+WHERE select_id = 31 OR select_id IS NULL order by id;
 CAST(my_double AS DATE)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -4225,7 +4407,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as date) AS `CAST(my_double AS DATE)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 31 OR select_id IS NULL);
+WHERE select_id = 31 OR select_id IS NULL) order by id;
 CAST(my_double AS DATE)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -4245,7 +4427,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint 
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS DATE),
 my_bigint, id FROM t1_values
-WHERE select_id = 30 OR select_id IS NULL;
+WHERE select_id = 30 OR select_id IS NULL order by id;
 CAST(my_bigint AS DATE)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -4263,7 +4445,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as date) AS `CAST(my_bigint AS DATE)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 30 OR select_id IS NULL);
+WHERE select_id = 30 OR select_id IS NULL) order by id;
 CAST(my_bigint AS DATE)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -4283,7 +4465,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbina
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS DATE),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 29 OR select_id IS NULL;
+WHERE select_id = 29 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS DATE)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4301,7 +4483,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as date) AS `CAST(my_varbinary_1000 AS DATE)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 29 OR select_id IS NULL);
+WHERE select_id = 29 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS DATE)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4321,14 +4503,14 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS DATE),
 my_binary_30, id FROM t1_values
-WHERE select_id = 28 OR select_id IS NULL;
+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	Truncated incorrect datetime value: ''
 Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
@@ -4340,7 +4522,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as date) AS `CAST(my_binary_30 AS DATE)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 28 OR select_id IS NULL);
+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	@@ -4361,7 +4543,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS DATE),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 27 OR select_id IS NULL;
+WHERE select_id = 27 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS DATE)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4379,7 +4561,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as date) AS `CAST(my_varchar_1000 AS DATE)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 27 OR select_id IS NULL);
+WHERE select_id = 27 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS DATE)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4399,7 +4581,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS DATE),
 my_char_30, id FROM t1_values
-WHERE select_id = 26 OR select_id IS NULL;
+WHERE select_id = 26 OR select_id IS NULL order by id;
 CAST(my_char_30 AS DATE)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4417,7 +4599,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as date) AS `CAST(my_char_30 AS DATE)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 26 OR select_id IS NULL);
+WHERE select_id = 26 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS DATE)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4437,7 +4619,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS CHAR),
 my_year, id FROM t1_values
-WHERE select_id = 25 OR select_id IS NULL;
+WHERE select_id = 25 OR select_id IS NULL order by id;
 CAST(my_year AS CHAR)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4449,7 +4631,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as char charset latin1) AS `CAST(my_year AS CHAR)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 25 OR select_id IS NULL);
+WHERE select_id = 25 OR select_id IS NULL) order by id;
 CAST(my_year AS CHAR)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4463,7 +4645,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS CHAR),
 my_time, id FROM t1_values
-WHERE select_id = 24 OR select_id IS NULL;
+WHERE select_id = 24 OR select_id IS NULL order by id;
 CAST(my_time AS CHAR)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4475,7 +4657,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as char charset latin1) AS `CAST(my_time AS CHAR)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 24 OR select_id IS NULL);
+WHERE select_id = 24 OR select_id IS NULL) order by id;
 CAST(my_time AS CHAR)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4489,7 +4671,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timesta
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS CHAR),
 my_timestamp, id FROM t1_values
-WHERE select_id = 23 OR select_id IS NULL;
+WHERE select_id = 23 OR select_id IS NULL order by id;
 CAST(my_timestamp AS CHAR)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -4501,7 +4683,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as char charset latin1) AS `CAST(my_timestamp AS CHAR)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 23 OR select_id IS NULL);
+WHERE select_id = 23 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS CHAR)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -4515,7 +4697,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS CHAR),
 my_date, id FROM t1_values
-WHERE select_id = 22 OR select_id IS NULL;
+WHERE select_id = 22 OR select_id IS NULL order by id;
 CAST(my_date AS CHAR)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4527,7 +4709,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as char charset latin1) AS `CAST(my_date AS CHAR)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 22 OR select_id IS NULL);
+WHERE select_id = 22 OR select_id IS NULL) order by id;
 CAST(my_date AS CHAR)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4541,7 +4723,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetim
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS CHAR),
 my_datetime, id FROM t1_values
-WHERE select_id = 21 OR select_id IS NULL;
+WHERE select_id = 21 OR select_id IS NULL order by id;
 CAST(my_datetime AS CHAR)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4553,7 +4735,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as char charset latin1) AS `CAST(my_datetime AS CHAR)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 21 OR select_id IS NULL);
+WHERE select_id = 21 OR select_id IS NULL) order by id;
 CAST(my_datetime AS CHAR)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4567,7 +4749,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double 
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS CHAR),
 my_double, id FROM t1_values
-WHERE select_id = 20 OR select_id IS NULL;
+WHERE select_id = 20 OR select_id IS NULL order by id;
 CAST(my_double AS CHAR)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -4579,7 +4761,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as char charset latin1) AS `CAST(my_double AS CHAR)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 20 OR select_id IS NULL);
+WHERE select_id = 20 OR select_id IS NULL) order by id;
 CAST(my_double AS CHAR)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -4593,7 +4775,7 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS CHAR),
 my_decimal, id FROM t1_values
-WHERE select_id = 19 OR select_id IS NULL;
+WHERE select_id = 19 OR select_id IS NULL order by id;
 CAST(my_decimal AS CHAR)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -4605,7 +4787,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as char charset latin1) AS `CAST(my_decimal AS CHAR)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 19 OR select_id IS NULL);
+WHERE select_id = 19 OR select_id IS NULL) order by id;
 CAST(my_decimal AS CHAR)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -4619,7 +4801,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint 
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS CHAR),
 my_bigint, id FROM t1_values
-WHERE select_id = 18 OR select_id IS NULL;
+WHERE select_id = 18 OR select_id IS NULL order by id;
 CAST(my_bigint AS CHAR)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -4631,7 +4813,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as char charset latin1) AS `CAST(my_bigint AS CHAR)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 18 OR select_id IS NULL);
+WHERE select_id = 18 OR select_id IS NULL) order by id;
 CAST(my_bigint AS CHAR)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -4645,7 +4827,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbina
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS CHAR),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 17 OR select_id IS NULL;
+WHERE select_id = 17 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS CHAR)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -4657,7 +4839,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as char charset latin1) AS `CAST(my_varbinary_1000 AS CHAR)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 17 OR select_id IS NULL);
+WHERE select_id = 17 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS CHAR)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -4671,19 +4853,19 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS CHAR),
 my_binary_30, id FROM t1_values
-WHERE select_id = 16 OR select_id IS NULL;
+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
 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`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 16 OR select_id IS NULL);
+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
 @@ -4697,7 +4879,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS CHAR),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 15 OR select_id IS NULL;
+WHERE select_id = 15 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS CHAR)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -4709,7 +4891,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as char charset latin1) AS `CAST(my_varchar_1000 AS CHAR)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 15 OR select_id IS NULL);
+WHERE select_id = 15 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS CHAR)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -4723,7 +4905,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS CHAR),
 my_char_30, id FROM t1_values
-WHERE select_id = 14 OR select_id IS NULL;
+WHERE select_id = 14 OR select_id IS NULL order by id;
 CAST(my_char_30 AS CHAR)	my_char_30	id
 NULL	NULL	1
 		2
@@ -4735,7 +4917,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as char charset latin1) AS `CAST(my_char_30 AS CHAR)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 14 OR select_id IS NULL);
+WHERE select_id = 14 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS CHAR)	my_char_30	id
 NULL	NULL	1
 		2
@@ -4749,7 +4931,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS BINARY),
 my_year, id FROM t1_values
-WHERE select_id = 13 OR select_id IS NULL;
+WHERE select_id = 13 OR select_id IS NULL order by id;
 CAST(my_year AS BINARY)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4761,7 +4943,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as char charset binary) AS `CAST(my_year AS BINARY)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 13 OR select_id IS NULL);
+WHERE select_id = 13 OR select_id IS NULL) order by id;
 CAST(my_year AS BINARY)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4775,7 +4957,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS BINARY),
 my_time, id FROM t1_values
-WHERE select_id = 12 OR select_id IS NULL;
+WHERE select_id = 12 OR select_id IS NULL order by id;
 CAST(my_time AS BINARY)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4787,7 +4969,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as char charset binary) AS `CAST(my_time AS BINARY)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 12 OR select_id IS NULL);
+WHERE select_id = 12 OR select_id IS NULL) order by id;
 CAST(my_time AS BINARY)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4801,7 +4983,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timesta
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS BINARY),
 my_timestamp, id FROM t1_values
-WHERE select_id = 11 OR select_id IS NULL;
+WHERE select_id = 11 OR select_id IS NULL order by id;
 CAST(my_timestamp AS BINARY)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -4813,7 +4995,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as char charset binary) AS `CAST(my_timestamp AS BINARY)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 11 OR select_id IS NULL);
+WHERE select_id = 11 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS BINARY)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -4827,7 +5009,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS BINARY),
 my_date, id FROM t1_values
-WHERE select_id = 10 OR select_id IS NULL;
+WHERE select_id = 10 OR select_id IS NULL order by id;
 CAST(my_date AS BINARY)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4839,7 +5021,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as char charset binary) AS `CAST(my_date AS BINARY)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 10 OR select_id IS NULL);
+WHERE select_id = 10 OR select_id IS NULL) order by id;
 CAST(my_date AS BINARY)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4853,7 +5035,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetim
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS BINARY),
 my_datetime, id FROM t1_values
-WHERE select_id = 9 OR select_id IS NULL;
+WHERE select_id = 9 OR select_id IS NULL order by id;
 CAST(my_datetime AS BINARY)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4865,7 +5047,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as char charset binary) AS `CAST(my_datetime AS BINARY)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 9 OR select_id IS NULL);
+WHERE select_id = 9 OR select_id IS NULL) order by id;
 CAST(my_datetime AS BINARY)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4879,7 +5061,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double 
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS BINARY),
 my_double, id FROM t1_values
-WHERE select_id = 8 OR select_id IS NULL;
+WHERE select_id = 8 OR select_id IS NULL order by id;
 CAST(my_double AS BINARY)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -4891,7 +5073,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as char charset binary) AS `CAST(my_double AS BINARY)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 8 OR select_id IS NULL);
+WHERE select_id = 8 OR select_id IS NULL) order by id;
 CAST(my_double AS BINARY)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -4905,7 +5087,7 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS BINARY),
 my_decimal, id FROM t1_values
-WHERE select_id = 7 OR select_id IS NULL;
+WHERE select_id = 7 OR select_id IS NULL order by id;
 CAST(my_decimal AS BINARY)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -4917,7 +5099,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as char charset binary) AS `CAST(my_decimal AS BINARY)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 7 OR select_id IS NULL);
+WHERE select_id = 7 OR select_id IS NULL) order by id;
 CAST(my_decimal AS BINARY)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -4931,7 +5113,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint 
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS BINARY),
 my_bigint, id FROM t1_values
-WHERE select_id = 6 OR select_id IS NULL;
+WHERE select_id = 6 OR select_id IS NULL order by id;
 CAST(my_bigint AS BINARY)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -4943,7 +5125,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as char charset binary) AS `CAST(my_bigint AS BINARY)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 6 OR select_id IS NULL);
+WHERE select_id = 6 OR select_id IS NULL) order by id;
 CAST(my_bigint AS BINARY)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -4957,7 +5139,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbina
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS BINARY),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 5 OR select_id IS NULL;
+WHERE select_id = 5 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS BINARY)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -4969,7 +5151,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as char charset binary) AS `CAST(my_varbinary_1000 AS BINARY)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 5 OR select_id IS NULL);
+WHERE select_id = 5 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS BINARY)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -4983,19 +5165,19 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS BINARY),
 my_binary_30, id FROM t1_values
-WHERE select_id = 4 OR select_id IS NULL;
+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
 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`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 4 OR select_id IS NULL);
+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
 @@ -5009,7 +5191,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS BINARY),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 3 OR select_id IS NULL;
+WHERE select_id = 3 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS BINARY)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -5021,7 +5203,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as char charset binary) AS `CAST(my_varchar_1000 AS BINARY)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 3 OR select_id IS NULL);
+WHERE select_id = 3 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS BINARY)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -5035,7 +5217,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS BINARY),
 my_char_30, id FROM t1_values
-WHERE select_id = 2 OR select_id IS NULL;
+WHERE select_id = 2 OR select_id IS NULL order by id;
 CAST(my_char_30 AS BINARY)	my_char_30	id
 NULL	NULL	1
 		2
@@ -5047,7 +5229,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as char charset binary) AS `CAST(my_char_30 AS BINARY)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 2 OR select_id IS NULL);
+WHERE select_id = 2 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS BINARY)	my_char_30	id
 NULL	NULL	1
 		2
@@ -5059,7 +5241,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT sqrt(my_bigint), my_bigint, id FROM t1_values;
 SELECT sqrt(my_bigint), my_bigint, id FROM t1_values
-WHERE select_id = 1 OR select_id IS NULL;
+WHERE select_id = 1 OR select_id IS NULL order by id;
 sqrt(my_bigint)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -5073,7 +5255,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select sqrt(`t1_values`.`my_bigint`) AS `sqrt(my_bigint)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 1 OR select_id IS NULL);
+WHERE select_id = 1 OR select_id IS NULL) order by id;
 sqrt(my_bigint)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
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-11 19:53:16 +01:00
+++ b/mysql-test/suite/funcs_1/r/innodb_storedproc_02.result	2008-03-31 19:47:58 +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.2 - Syntax checks for the stored procedure-specific
 programming statements BEGIN/END, DECLARE, SET, SELECT/INTO, OPEN, FETCH, CLOSE:
@@ -164,7 +172,7 @@ declare y integer default 1;
 set @x = x;
 set @y = y;
 set @z = 234;
-SELECT f1, f2 into @x, @y from t2 limit 1;
+SELECT f1, f2 into @x, @y from t2 where f1='a`' and f2='a`' limit 1;
 SELECT @x, @y, @z, invar;
 BEGIN
 set @x = 2;
@@ -207,7 +215,7 @@ BEGIN
 declare x integer; declare y integer;
 set @x=x;
 set @y=y;
-SELECT f4, f3 into @x, @y from t2 limit 1;
+SELECT f4, f3 into @x, @y from t2 where f4=-5000 and f3='1000-01-01' limit 1;
 SELECT @x, @y;
 END//
 CALL sp1();
@@ -695,7 +703,7 @@ Testcase 3.1.2.54:
 ------------------
 
 Ensure that a handler with a condition defined with an SQLSTATE that begins with
+“01“ is always exactly equivalent in action to a handler with an SQLWARNING
 condition.
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp0;
@@ -794,7 +802,7 @@ Testcase 3.1.2.56:
 ------------------
 
 Ensure that a handler with a condition defined with an SQLSTATE that begins with
+“02“ is always exactly equivalent in action to a handler with a NOT FOUND
 condition.
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp0;
@@ -902,7 +910,7 @@ Testcase 3.1.2.58:
 ------------------
 
 Ensure that a handler with a condition defined with an SQLSTATE that begins with
+anything other that “01“ or “02“ is always exactly equivalent in action to a
 handler with an SQLEXCEPTION condition.
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp0;
@@ -1082,7 +1090,8 @@ declare f2_value char(20);
 declare f5_value char(20);
 declare f4_value integer;
 declare f6_value integer;
-declare cur1 cursor for SELECT f1, f2, f4, f5, f6 from t2 limit 3;
+declare cur1 cursor for SELECT f1, f2, f4, f5, f6 from t2
+where f4 >=-5000 order by f4 limit 3;
 open cur1;
 while proceed do
 SELECT count AS 'loop';
@@ -1165,7 +1174,7 @@ of a compound statement ends.
 DROP TABLE IF EXISTS temp1;
 DROP PROCEDURE IF EXISTS sp1;
 create table temp1( f0 char(20), f1 char(20), f2 char(20), f3 int, f4 char(20) );
-SELECT f1, f2, f4, f5 from t2;
+SELECT f1, f2, f4, f5 from t2 order by f4;
 f1	f2	f4	f5
 a`	a`	-5000	a`
 aaa	aaa	-4999	aaa
@@ -1185,8 +1194,8 @@ declare newf1 char(20);
 declare newf2 char(20);
 declare newf5 char(20);
 declare newf4 integer;
-declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 limit 5;
-declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 limit 5;
+declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by f4 limit 5;
+declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by f4 limit 5;
 open cur1;
 open cur2;
 BEGIN
@@ -1268,8 +1277,10 @@ declare i_newf11 char(20);
 declare i_newf12 char(20);
 declare i_newf13 date;
 declare i_newf14 integer;
-declare cur1 cursor for SELECT f1, f2, f3, f4 from t2 limit 4;
-declare cur2 cursor for SELECT f1, f2, f3, f4 from t2 limit 3;
+declare cur1 cursor for SELECT f1, f2, f3, f4 from t2
+where f4>=-5000 order by f4 limit 4;
+declare cur2 cursor for SELECT f1, f2, f3, f4 from t2
+where f4>=-5000 order by f4 limit 3;
 declare continue handler for sqlstate '02000' set proceed=0;
 open cur1;
 open cur2;
@@ -1300,8 +1311,10 @@ DECLARE o_newf11 CHAR(20);
 DECLARE o_newf12 CHAR(20);
 DECLARE o_newf13 DATE;
 DECLARE o_newf14 INTEGER;
-DECLARE cur1 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2 LIMIT 5;
-DECLARE cur2 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2 LIMIT 5;
+DECLARE cur1 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2
+WHERE f4>=-5000 ORDER BY f4 LIMIT 5;
+DECLARE cur2 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2
+WHERE f4>=-5000 ORDER BY f4 LIMIT 5;
 DECLARE CONTINUE HANDLER FOR SQLSTATE '02000' SET proceed=0;
 OPEN cur1;
 OPEN cur2;
diff -Nrup a/mysql-test/suite/funcs_1/r/innodb_storedproc_03.result b/mysql-test/suite/funcs_1/r/innodb_storedproc_03.result
--- a/mysql-test/suite/funcs_1/r/innodb_storedproc_03.result	2008-03-11 19:53:16 +01:00
+++ b/mysql-test/suite/funcs_1/r/innodb_storedproc_03.result	2008-03-31 19:47:58 +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.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/innodb_storedproc_06.result b/mysql-test/suite/funcs_1/r/innodb_storedproc_06.result
--- a/mysql-test/suite/funcs_1/r/innodb_storedproc_06.result	2008-03-07 17:33:00 +01:00
+++ b/mysql-test/suite/funcs_1/r/innodb_storedproc_06.result	2008-03-31 19:47:58 +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.6 - Privilege Checks:
 --------------------------------------------------------------------------------
@@ -79,6 +87,7 @@ BEGIN
 SELECT * from db_storedproc_1.t6 where t6.f2= 'xyz';
 END//
 ERROR 42000: Access denied for user 'user_1'@'localhost' to database 'db_storedproc_1'
+USE db_storedproc_1;
 	
 root@localhost	db_storedproc_1
 GRANT CREATE ROUTINE ON db_storedproc_1.* TO 'user_1'@'localhost';
@@ -90,6 +99,7 @@ CREATE PROCEDURE sp1(v1 char(20))
 BEGIN
 SELECT * from db_storedproc_1.t6 where t6.f2= 'xyz';
 END//
+USE db_storedproc_1;
 	
 root@localhost	db_storedproc_1
 DROP USER 'user_1'@'localhost';
@@ -115,6 +125,7 @@ CREATE FUNCTION fn1(v1 int) returns int
 BEGIN
 return v1;
 END//
+USE db_storedproc_1;
 	
 root@localhost	db_storedproc_1
 drop user 'user_1'@'localhost';
diff -Nrup a/mysql-test/suite/funcs_1/r/innodb_storedproc_07.result b/mysql-test/suite/funcs_1/r/innodb_storedproc_07.result
--- a/mysql-test/suite/funcs_1/r/innodb_storedproc_07.result	2008-03-11 19:53:16 +01:00
+++ b/mysql-test/suite/funcs_1/r/innodb_storedproc_07.result	2008-03-31 19:47:58 +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.7 - SQL mode checks:
 --------------------------------------------------------------------------------
diff -Nrup a/mysql-test/suite/funcs_1/r/innodb_storedproc_08.result b/mysql-test/suite/funcs_1/r/innodb_storedproc_08.result
--- a/mysql-test/suite/funcs_1/r/innodb_storedproc_08.result	2008-03-11 19:53:16 +01:00
+++ b/mysql-test/suite/funcs_1/r/innodb_storedproc_08.result	2008-03-31 19:47:58 +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.8 - SHOW statement checks:
 --------------------------------------------------------------------------------
diff -Nrup a/mysql-test/suite/funcs_1/r/innodb_storedproc_10.result b/mysql-test/suite/funcs_1/r/innodb_storedproc_10.result
--- a/mysql-test/suite/funcs_1/r/innodb_storedproc_10.result	2008-03-11 19:53:16 +01:00
+++ b/mysql-test/suite/funcs_1/r/innodb_storedproc_10.result	2008-03-31 19:47:58 +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.10 - CALL checks:
 --------------------------------------------------------------------------------
@@ -78,7 +86,7 @@ connect(localhost,user_1,,db_storedproc,
 user_1@localhost	db_storedproc
 CREATE PROCEDURE sp31102 () SQL SECURITY INVOKER
 BEGIN
-SELECT * FROM db_storedproc.t1 LIMIT 1;
+SELECT * FROM db_storedproc.t1 WHERE f4=-5000 LIMIT 1;
 END//
 CREATE FUNCTION fn31105(n INT) RETURNS INT
 BEGIN
@@ -93,6 +101,8 @@ CALL sp31102();
 ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.sp31102'
 SELECT fn31105( 9 );
 ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.fn31105'
+connection default;
+USE db_storedproc;
 	
 root@localhost	db_storedproc
 CALL sp31102();
@@ -112,6 +122,8 @@ a`	a`	1000-01-01	-5000	a`	-5000
 SELECT fn31105( 9 );
 fn31105( 9 )
 81
+connection default;
+USE db_storedproc;
 	
 root@localhost	db_storedproc
 REVOKE EXECUTE ON db_storedproc.* FROM 'user_2'@'localhost';
@@ -129,6 +141,7 @@ CALL sp31102();
 ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.sp31102'
 SELECT fn31105( 9 );
 ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.fn31105'
+USE db_storedproc;
 	
 root@localhost	db_storedproc
 DROP PROCEDURE sp31102;
@@ -176,6 +189,8 @@ DROP PROCEDURE IF EXISTS sp_ins_1;
 DROP PROCEDURE IF EXISTS sp_ins_3;
 DROP PROCEDURE IF EXISTS sp_upd;
 DROP PROCEDURE IF EXISTS sp_ins_upd;
+DROP PROCEDURE IF EXISTS sp_del;
+DROP PROCEDURE IF EXISTS sp_with_rowcount;
 CREATE TABLE temp(f1 CHAR(20),f2 CHAR(25),f3 DATE,f4 INT,f5 CHAR(25),f6 INT);
 INSERT INTO temp SELECT * FROM t10;
 CREATE PROCEDURE sp_ins_1()
@@ -203,49 +218,72 @@ END;
 SELECT COUNT( f1 ), f1 FROM temp GROUP BY f1;
 UPDATE temp SET temp.f1 = 'updated_2' WHERE temp.f1 ='qwe' AND temp.f2 = 'abc';
 END//
+CREATE PROCEDURE sp_del()
+BEGIN
+DELETE FROM temp WHERE temp.f1 ='qwe' OR temp.f1 = 'updated_2';
+END//
+CREATE PROCEDURE sp_with_rowcount()
+BEGIN
+BEGIN
+INSERT INTO temp VALUES  ('qwe', 'abc', '1989-11-09', 100, 'uvw', 1000),
+('qwe', 'xyz', '1998-03-26', 100, 'uvw', 1000),
+('qwe', 'abc', '2000-11-09', 100, 'uvw', 1000),
+('qwe', 'xyz', '2005-11-07', 100, 'uvw', 1000);
+END;
+SELECT row_count() AS 'row_count() after insert';
+SELECT row_count() AS 'row_count() after select row_count()';
+SELECT f1,f2,f3 FROM temp ORDER BY f1,f2,f3;
+UPDATE temp SET temp.f1 = 'updated_2' WHERE temp.f2 = 'abc';
+SELECT row_count() AS 'row_count() after update';
+SELECT f1,f2,f3 FROM temp ORDER BY f1,f2,f3;
+DELETE FROM temp WHERE temp.f1 = 'updated_2';
+SELECT row_count() AS 'row_count() after delete';
+END//
 CALL sp_ins_1();
 SELECT row_count();
 row_count()
 1
 SELECT * FROM temp;
 f1	f2	f3	f4	f5	f6
+a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
+a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
 abaa	abaa	1000-01-03	-4998	abaa	-4998
+abc	abc	2005-10-03	100	uvw	1000
 acaaa	acaaa	1000-01-04	-4997	acaaa	-4997
 adaaaa	adaaaa	1000-01-05	-4996	adaaaa	-4996
 aeaaaaa	aeaaaaa	1000-01-06	-4995	aeaaaaa	-4995
 afaaaaaa	afaaaaaa	1000-01-07	-4994	afaaaaaa	-4994
 agaaaaaaa	agaaaaaaa	1000-01-08	-4993	agaaaaaaa	-4993
-a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
-a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
-abc	abc	2005-10-03	100	uvw	1000
 CALL sp_ins_3();
 SELECT row_count();
 row_count()
 1
 SELECT * FROM temp;
 f1	f2	f3	f4	f5	f6
+a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
+a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
 abaa	abaa	1000-01-03	-4998	abaa	-4998
+abc	abc	2005-10-03	100	uvw	1000
+abc	xyz	1949-05-23	100	uvw	1000
+abc	xyz	1989-11-09	100	uvw	1000
+abc	xyz	2005-10-24	100	uvw	1000
 acaaa	acaaa	1000-01-04	-4997	acaaa	-4997
 adaaaa	adaaaa	1000-01-05	-4996	adaaaa	-4996
 aeaaaaa	aeaaaaa	1000-01-06	-4995	aeaaaaa	-4995
 afaaaaaa	afaaaaaa	1000-01-07	-4994	afaaaaaa	-4994
 agaaaaaaa	agaaaaaaa	1000-01-08	-4993	agaaaaaaa	-4993
-a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
-a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
-abc	abc	2005-10-03	100	uvw	1000
-abc	xyz	1949-05-23	100	uvw	1000
-abc	xyz	1989-11-09	100	uvw	1000
-abc	xyz	2005-10-24	100	uvw	1000
 CALL sp_upd();
 SELECT row_count();
 row_count()
 4
 SELECT * FROM temp;
 f1	f2	f3	f4	f5	f6
+a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
+a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
 abaa	abaa	1000-01-03	-4998	abaa	-4998
@@ -254,8 +292,6 @@ adaaaa	adaaaa	1000-01-05	-4996	adaaaa	-4
 aeaaaaa	aeaaaaa	1000-01-06	-4995	aeaaaaa	-4995
 afaaaaaa	afaaaaaa	1000-01-07	-4994	afaaaaaa	-4994
 agaaaaaaa	agaaaaaaa	1000-01-08	-4993	agaaaaaaa	-4993
-a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
-a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
 updated	abc	2005-10-03	100	uvw	1000
 updated	xyz	1949-05-23	100	uvw	1000
 updated	xyz	1989-11-09	100	uvw	1000
@@ -279,6 +315,8 @@ row_count()
 3
 SELECT * FROM temp;
 f1	f2	f3	f4	f5	f6
+a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
+a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
 abaa	abaa	1000-01-03	-4998	abaa	-4998
@@ -287,26 +325,73 @@ adaaaa	adaaaa	1000-01-05	-4996	adaaaa	-4
 aeaaaaa	aeaaaaa	1000-01-06	-4995	aeaaaaa	-4995
 afaaaaaa	afaaaaaa	1000-01-07	-4994	afaaaaaa	-4994
 agaaaaaaa	agaaaaaaa	1000-01-08	-4993	agaaaaaaa	-4993
-a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
-a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
+qwe	xyz	1998-03-26	100	uvw	1000
 updated	abc	2005-10-03	100	uvw	1000
 updated	xyz	1949-05-23	100	uvw	1000
 updated	xyz	1989-11-09	100	uvw	1000
 updated	xyz	2005-10-24	100	uvw	1000
 updated_2	abc	1989-11-09	100	uvw	1000
-qwe	xyz	1998-03-26	100	uvw	1000
 updated_2	abc	2000-11-09	100	uvw	1000
 updated_2	abc	2005-11-07	100	uvw	1000
+CALL sp_del();
+SELECT row_count();
+row_count()
+4
+SELECT * FROM temp;
+f1	f2	f3	f4	f5	f6
+a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
+a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
+a`	a`	1000-01-01	-5000	a`	-5000
+aaa	aaa	1000-01-02	-4999	aaa	-4999
+abaa	abaa	1000-01-03	-4998	abaa	-4998
+acaaa	acaaa	1000-01-04	-4997	acaaa	-4997
+adaaaa	adaaaa	1000-01-05	-4996	adaaaa	-4996
+aeaaaaa	aeaaaaa	1000-01-06	-4995	aeaaaaa	-4995
+afaaaaaa	afaaaaaa	1000-01-07	-4994	afaaaaaa	-4994
+agaaaaaaa	agaaaaaaa	1000-01-08	-4993	agaaaaaaa	-4993
+updated	abc	2005-10-03	100	uvw	1000
+updated	xyz	1949-05-23	100	uvw	1000
+updated	xyz	1989-11-09	100	uvw	1000
+updated	xyz	2005-10-24	100	uvw	1000
+DELETE FROM temp;
+CALL sp_with_rowcount();
+row_count() after insert
+4
+row_count() after select row_count()
+-1
+f1	f2	f3
+qwe	abc	1989-11-09
+qwe	abc	2000-11-09
+qwe	xyz	1998-03-26
+qwe	xyz	2005-11-07
+row_count() after update
+2
+f1	f2	f3
+qwe	xyz	1998-03-26
+qwe	xyz	2005-11-07
+updated_2	abc	1989-11-09
+updated_2	abc	2000-11-09
+row_count() after delete
+2
+SELECT row_count();
+row_count()
+-1
+SELECT * FROM temp;
+f1	f2	f3	f4	f5	f6
+qwe	xyz	1998-03-26	100	uvw	1000
+qwe	xyz	2005-11-07	100	uvw	1000
 DROP PROCEDURE sp_ins_1;
 DROP PROCEDURE sp_ins_3;
 DROP PROCEDURE sp_upd;
 DROP PROCEDURE sp_ins_upd;
+DROP PROCEDURE sp_del;
+DROP PROCEDURE sp_with_rowcount;
 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/innodb_trig_0102.result b/mysql-test/suite/funcs_1/r/innodb_trig_0102.result
--- a/mysql-test/suite/funcs_1/r/innodb_trig_0102.result	2008-03-07 17:33:00 +01:00
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_0102.result	2008-03-31 19:47:58 +02:00
@@ -1,96 +1,97 @@
 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.1.1:
 ------------------
 use test;
-Create trigger trg1_1 BEFORE INSERT 
+Create trigger trg1_1 BEFORE INSERT
 on tb3 for each row set @test_before = 2, new.f142 = @test_before;
-Create trigger trg1_2 AFTER INSERT 
+Create trigger trg1_2 AFTER INSERT
 on tb3 for each row set @test_after = 6;
-Create trigger trg1_4 BEFORE UPDATE 
-on tb3 for each row set @test_before = 27, 
-new.f142 = @test_before, 
+Create trigger trg1_4 BEFORE UPDATE
+on tb3 for each row set @test_before = 27,
+new.f142 = @test_before,
 new.f122 = 'Before Update Trigger';
-Create trigger trg1_3 AFTER UPDATE 
+Create trigger trg1_3 AFTER UPDATE
 on tb3 for each row set @test_after = '15';
-Create trigger trg1_5 BEFORE DELETE on tb3 for each row  
-select count(*) into @test_before from tb3 as tr_tb3 
+Create trigger trg1_5 BEFORE DELETE on tb3 for each row
+select count(*) into @test_before from tb3 as tr_tb3
 where f121 = 'Test 3.5.1.1';
-Create trigger trg1_6 AFTER DELETE on tb3 for each row  
-select count(*) into @test_after from tb3 as tr_tb3 
+Create trigger trg1_6 AFTER DELETE on tb3 for each row
+select count(*) into @test_after from tb3 as tr_tb3
 where f121 = 'Test 3.5.1.1';
 set @test_before = 1;
 set @test_after = 5;
 select @test_before, @test_after;
 @test_before	@test_after
 1	5
-Insert into tb3 (f121, f122, f142, f144, f134) 
+Insert into tb3 (f121, f122, f142, f144, f134)
 values ('Test 3.5.1.1', 'First Row', @test_before, @test_after, 1);
 select f121, f122, f142, f144, f134 from tb3 where f121 = 'Test 3.5.1.1';
 f121	f122	f142	f144	f134
@@ -103,9 +104,9 @@ set @test_after = 8;
 select @test_before, @test_after;
 @test_before	@test_after
 18	8
-Update tb3 set  tb3.f122 = 'Update', 
-tb3.f142 = @test_before, 
-tb3.f144 = @test_after 
+Update tb3 set  tb3.f122 = 'Update',
+tb3.f142 = @test_before,
+tb3.f144 = @test_after
 where tb3.f121 = 'Test 3.5.1.1';
 select f121, f122, f142, f144, f134 from tb3 where f121 = 'Test 3.5.1.1';
 f121	f122	f142	f144	f134
@@ -113,7 +114,7 @@ Test 3.5.1.1	Before Update Trigger	27	00
 select @test_before, @test_after;
 @test_before	@test_after
 27	15
-Insert into tb3 (f121, f122, f142, f144, f134) 
+Insert into tb3 (f121, f122, f142, f144, f134)
 values ('Test 3.5.1.1', 'Second Row', 5, 6, 2);
 set @test_before = 0;
 set @test_after = 0;
@@ -141,7 +142,7 @@ delete from tb3 where f121='Test 3.5.1.1
 
 Testcase: 3.5.1.2:
 ------------------
-Create trigger trg_1 after insert 
+Create trigger trg_1 after insert
 on tb3 for each statement set @x= 1;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'statement set @x= 1' at line 2
 drop trigger trg_1;
@@ -194,7 +195,7 @@ drop table if exists t1;
 Warnings:
 Note	1051	Unknown table 't1'
 create table t1 (f1 int, f2 char(25),f3 int) engine=innodb;
-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';
@@ -206,7 +207,7 @@ update t1 set f2='update 3.5.1.7';
 select * from t1;
 f1	f2	f3
 NULL	update 3.5.1.7	42
-select trigger_name from information_schema.triggers;
+select trigger_name from information_schema.triggers order by trigger_name;
 trigger_name
 trg5_1
 trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX
@@ -226,7 +227,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;
@@ -234,11 +235,11 @@ create database trig_db;
 use trig_db;
 create table t1 (f1 integer) engine = innodb;
 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;
@@ -262,9 +263,9 @@ drop table if exists t1;
 drop table if exists t2;
 create table t1 (f1 char(50), f2 integer) engine = innodb;
 create table t2 (f1 char(50), f2 integer) engine = innodb;
-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);
@@ -294,15 +295,15 @@ create database trig_db2;
 create database trig_db3;
 use trig_db1;
 create table t1 (f1 char(50), f2 integer) engine = innodb;
-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 = innodb;
-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 = innodb;
-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;
@@ -313,7 +314,7 @@ insert into trig_db3.t1 (f1,f2) values (
 select @test_var1, @test_var2, @test_var3;
 @test_var1	@test_var2	@test_var3
 trig1	trig2	trig3
-select * from t1;
+select * from t1 order by f2;
 f1	f2
 trig1	1
 trig1	2
@@ -323,7 +324,7 @@ trig2	3
 select * from trig_db3.t1;
 f1	f2
 trig3	4
-select * from t1;
+select * from t1 order by f2;
 f1	f2
 trig1	1
 trig1	2
@@ -341,17 +342,17 @@ create database trig_db2;
 use trig_db1;
 create table t1 (f1 char(50), f2 integer) engine = innodb;
 create table trig_db2.t1 (f1 char(50), f2 integer) engine = innodb;
-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;
+from information_schema.triggers order by trigger_name;
 trigger_schema	trigger_name	event_object_table
-trig_db1	trig1_b	t1
 trig_db1	trig1_a	t1
+trig_db1	trig1_b	t1
 trig_db2	trig2	t1
 set @test_var1= '', @test_var2= '', @test_var3= '';
 insert into t1 (f1,f2) values ('insert to db1 t1 from db1',352);
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-07 17:33:00 +01:00
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_03.result	2008-03-31 19:47:58 +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:
 ---------------
@@ -106,7 +107,7 @@ set new.f1 = 'trig 3.5.3.2_1-no';
 ERROR 42000: Access denied; you need the SUPER privilege for this operation
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.2-no');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 select current_user;
@@ -121,15 +122,12 @@ root@localhost
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.2-yes');
 ERROR 42000: UPDATE command denied to user 'test_yesprivs'@'localhost' for column 'f1' in table 't1'
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
-
-note: once 15166 is fixed a similar case for SELECT needs to be added
----------------------------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.2-yes');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 trig 3.5.3.2_2-yes
@@ -141,7 +139,7 @@ drop trigger trg1_2;
 ERROR 42000: Access denied; you need the SUPER privilege for this operation
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.6-yes');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 trig 3.5.3.2_2-yes
@@ -150,12 +148,12 @@ use priv_db;
 drop trigger trg1_2;
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.6-no');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
+insert 3.5.3.6-no
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
-insert 3.5.3.6-no
 drop trigger trg1_2;
 
 Testcase 3.5.3.7a:
@@ -180,23 +178,22 @@ use priv_db;
 show grants;
 Grants for test_noprivs@localhost
 GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
+insert 3.5.3.6-no
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
-insert 3.5.3.6-no
-
-Trigger create disabled - should fail - Bug 8884
-------------------------------------------------
+create trigger trg4a_1 before INSERT on t1 for each row
+set new.f1 = 'trig 3.5.3.7-1a';
 insert into t1 (f1) values ('insert 3.5.3.7-1a');
-select f1 from t1;
+ERROR 42000: UPDATE command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
+insert 3.5.3.6-no
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
-insert 3.5.3.6-no
-insert 3.5.3.7-1a
 drop trigger trg4a_1;
 use priv_db;
 select current_user;
@@ -207,18 +204,13 @@ Grants for test_yesprivs@localhost
 GRANT UPDATE, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 create trigger trg4a_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2a';
-
-SELECT priv added to bypass bug 15166
--------------------------------------
-grant SELECT on *.* to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2b');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
+insert 3.5.3.6-no
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
-insert 3.5.3.6-no
-insert 3.5.3.7-1a
 trig 3.5.3.7-2a
 drop trigger trg4a_2;
 
@@ -245,30 +237,29 @@ Grants for test_noprivs@localhost
 GRANT USAGE ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE ON `priv_db`.* TO 'test_noprivs'@'localhost'
 use priv_db;
-
-Trigger create disabled - should fail - Bug 8884
-------------------------------------------------
+create trigger trg4b_1 before UPDATE on t1 for each row
+set new.f1 = 'trig 3.5.3.7-1b';
+ERROR 42000: Access denied; you need the SUPER privilege for this operation
 insert into t1 (f1) values ('insert 3.5.3.7-1b');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
+insert 3.5.3.6-no
+insert 3.5.3.7-1b
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
-insert 3.5.3.6-no
-insert 3.5.3.7-1a
 trig 3.5.3.7-2a
-insert 3.5.3.7-1b
 update t1 set  f1 = 'update 3.5.3.7-1b' where f1 = 'insert 3.5.3.7-1b';
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
+insert 3.5.3.6-no
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
-insert 3.5.3.6-no
-insert 3.5.3.7-1a
 trig 3.5.3.7-2a
 update 3.5.3.7-1b
 drop trigger trg4b_1;
+ERROR HY000: Trigger does not exist
 show grants;
 Grants for test_yesprivs@localhost
 GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
@@ -276,32 +267,26 @@ GRANT UPDATE ON `priv_db`.* TO 'test_yes
 use priv_db;
 create trigger trg4b_2 before UPDATE  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2b';
-
-SELECT priv added to bypass bug 15166
--------------------------------------
-grant SELECT on priv_db.* to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2b');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
+insert 3.5.3.6-no
+insert 3.5.3.7-2b
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
-insert 3.5.3.6-no
-insert 3.5.3.7-1a
 trig 3.5.3.7-2a
 update 3.5.3.7-1b
-insert 3.5.3.7-2b
 update t1 set  f1 = 'update 3.5.3.7-2b' where f1 = 'insert 3.5.3.7-2b';
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
+insert 3.5.3.6-no
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
-insert 3.5.3.6-no
-insert 3.5.3.7-1a
 trig 3.5.3.7-2a
-update 3.5.3.7-1b
 trig 3.5.3.7-2b
+update 3.5.3.7-1b
 drop trigger trg4b_2;
 
 Testcase 3.5.3.7c
@@ -327,21 +312,19 @@ Grants for test_noprivs@localhost
 GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
-
-Trigger create disabled - should fail - Bug 8884
-------------------------------------------------
+create trigger trg4c_1 before INSERT on t1 for each row
+set new.f1 = 'trig 3.5.3.7-1c';
 insert into t1 (f1) values ('insert 3.5.3.7-1c');
-select f1 from t1;
+ERROR 42000: UPDATE command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
+insert 3.5.3.6-no
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
-insert 3.5.3.6-no
-insert 3.5.3.7-1a
 trig 3.5.3.7-2a
-update 3.5.3.7-1b
 trig 3.5.3.7-2b
-insert 3.5.3.7-1c
+update 3.5.3.7-1b
 drop trigger trg4c_1;
 show grants;
 Grants for test_yesprivs@localhost
@@ -350,23 +333,17 @@ GRANT UPDATE ON `priv_db`.`t1` TO 'test_
 use priv_db;
 create trigger trg4c_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2c';
-
-SELECT priv added to bypass bug 15166
--------------------------------------
-grant SELECT on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2c');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
+insert 3.5.3.6-no
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
-insert 3.5.3.6-no
-insert 3.5.3.7-1a
 trig 3.5.3.7-2a
-update 3.5.3.7-1b
 trig 3.5.3.7-2b
-insert 3.5.3.7-1c
 trig 3.5.3.7-2c
+update 3.5.3.7-1b
 drop trigger trg4c_2;
 
 Testcase 3.5.3.7d:
@@ -390,23 +367,20 @@ Grants for test_noprivs@localhost
 GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT (f1), INSERT (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
-
-Trigger create disabled - should fail - Bug 8884
-------------------------------------------------
+create trigger trg4d_1 before INSERT on t1 for each row
+set new.f1 = 'trig 3.5.3.7-1d';
 insert into t1 (f1) values ('insert 3.5.3.7-1d');
-select f1 from t1;
+ERROR 42000: UPDATE command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
+insert 3.5.3.6-no
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
-insert 3.5.3.6-no
-insert 3.5.3.7-1a
 trig 3.5.3.7-2a
-update 3.5.3.7-1b
 trig 3.5.3.7-2b
-insert 3.5.3.7-1c
 trig 3.5.3.7-2c
-insert 3.5.3.7-1d
+update 3.5.3.7-1b
 drop trigger trg4d_1;
 show grants;
 Grants for test_yesprivs@localhost
@@ -415,25 +389,18 @@ GRANT UPDATE (f1) ON `priv_db`.`t1` TO '
 use priv_db;
 create trigger trg4d_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2d';
-
-SELECT priv added to bypass bug 15166
--------------------------------------
-grant SELECT (f1) on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2d');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
+insert 3.5.3.6-no
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
-insert 3.5.3.6-no
-insert 3.5.3.7-1a
 trig 3.5.3.7-2a
-update 3.5.3.7-1b
 trig 3.5.3.7-2b
-insert 3.5.3.7-1c
 trig 3.5.3.7-2c
-insert 3.5.3.7-1d
 trig 3.5.3.7-2d
+update 3.5.3.7-1b
 drop trigger trg4d_2;
 
 Testcase 3.5.3.8a:
@@ -458,14 +425,14 @@ use priv_db;
 show grants;
 Grants for test_noprivs@localhost
 GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-
-Trigger create disabled - should fail - Bug 8887
-------------------------------------------------
+create trigger trg5a_1 before INSERT on t1 for each row
+set @test_var = new.f1;
 set @test_var = 'before trig 3.5.3.8-1a';
 select @test_var;
 @test_var
 before trig 3.5.3.8-1a
 insert into t1 (f1) values ('insert 3.5.3.8-1a');
+ERROR 42000: SELECT command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select @test_var;
 @test_var
 before trig 3.5.3.8-1a
@@ -483,10 +450,6 @@ set @test_var= 'before trig 3.5.3.8-2a';
 select @test_var;
 @test_var
 before trig 3.5.3.8-2a
-
-UPDATE priv added to bypass bug 15166
--------------------------------------
-grant UPDATE on *.* to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.8-2a');
 select @test_var;
 @test_var
@@ -517,15 +480,15 @@ Grants for test_noprivs@localhost
 GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE ON `priv_db`.* TO 'test_noprivs'@'localhost'
 use priv_db;
-
-Trigger create disabled - should fail - Bug 8887
-------------------------------------------------
+create trigger trg5b_1 before UPDATE on t1 for each row
+set @test_var= new.f1;
 set @test_var= 'before trig 3.5.3.8-1b';
 insert into t1 (f1) values ('insert 3.5.3.8-1b');
 select @test_var;
 @test_var
 before trig 3.5.3.8-1b
 update t1 set  f1= 'update 3.5.3.8-1b' where f1 = 'insert 3.5.3.8-1b';
+ERROR 42000: SELECT command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select @test_var;
 @test_var
 before trig 3.5.3.8-1b
@@ -542,10 +505,6 @@ insert into t1 (f1) values ('insert 3.5.
 select @test_var;
 @test_var
 before trig 3.5.3.8-2b
-
-UPDATE priv added to bypass bug 15166
--------------------------------------
-grant UPDATE on priv_db.* to test_yesprivs@localhost;
 update t1 set  f1= 'update 3.5.3.8-2b' where f1 = 'insert 3.5.3.8-2b';
 select @test_var;
 @test_var
@@ -576,11 +535,11 @@ Grants for test_noprivs@localhost
 GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
-
-Trigger create disabled - should fail - Bug 8887
-------------------------------------------------
+create trigger trg5c_1 before INSERT on t1 for each row
+set @test_var= new.f1;
 set @test_var= 'before trig 3.5.3.8-1c';
 insert into t1 (f1) values ('insert 3.5.3.8-1c');
+ERROR 42000: SELECT command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select @test_var;
 @test_var
 before trig 3.5.3.8-1c
@@ -593,10 +552,6 @@ use priv_db;
 create trigger trg5c_2 before INSERT  on t1 for each row
 set @test_var= new.f1;
 set @test_var='before trig 3.5.3.8-2c';
-
-UPDATE priv added to bypass bug 15166
--------------------------------------
-grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.8-2c');
 select @test_var;
 @test_var
@@ -626,11 +581,11 @@ Grants for test_noprivs@localhost
 GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
-
-Trigger create disabled - should fail - Bug 8887
-------------------------------------------------
+create trigger trg5d_1 before INSERT on t1 for each row
+set @test_var= new.f1;
 set @test_var='before trig 3.5.3.8-1d';
 insert into t1 (f1) values ('insert 3.5.3.8-1d');
+ERROR 42000: SELECT command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select @test_var;
 @test_var
 before trig 3.5.3.8-1d
@@ -643,10 +598,6 @@ use priv_db;
 create trigger trg5d_2 before INSERT  on t1 for each row
 set @test_var= new.f1;
 set @test_var='before trig 3.5.3.8-2d';
-
-UPDATE priv added to bypass bug 15166
--------------------------------------
-grant UPDATE (f1) on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.8-2d');
 select @test_var;
 @test_var
@@ -682,10 +633,10 @@ ERROR 42000: INSERT command denied to us
 revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
 grant INSERT on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (4);
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 4
-select f2 from t2;
+select f2 from t2 order by f2;
 f2
 4
 use priv_db;
@@ -698,11 +649,11 @@ ERROR 42000: UPDATE command denied to us
 revoke INSERT on priv_db.t2 from test_yesprivs@localhost;
 grant UPDATE on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (2);
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
-4
 2
-select f2 from t2;
+4
+select f2 from t2 order by f2;
 f2
 1
 use priv_db;
@@ -715,12 +666,12 @@ ERROR 42000: SELECT command denied to us
 revoke UPDATE on priv_db.t2 from test_yesprivs@localhost;
 grant SELECT on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (1);
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
-4
-2
 1
-select f2 from t2;
+2
+4
+select f2 from t2 order by f2;
 f2
 1
 select @aaa;
@@ -736,13 +687,13 @@ ERROR 42000: DELETE command denied to us
 revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
 grant DELETE on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (1);
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
-4
-2
 1
 1
-select f2 from t2;
+2
+4
+select f2 from t2 order by f2;
 f2
 drop database if exists priv_db;
 drop user test_yesprivs@localhost;
diff -Nrup a/mysql-test/suite/funcs_1/r/innodb_trig_0407.result b/mysql-test/suite/funcs_1/r/innodb_trig_0407.result
--- a/mysql-test/suite/funcs_1/r/innodb_trig_0407.result	2008-03-07 17:33:00 +01:00
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_0407.result	2008-03-31 19:47:58 +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:
 --------------
@@ -88,22 +89,22 @@ Use db_drop;
 create table t1 (f1 char(30)) engine=innodb;
 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');
-Select * from t1;
+Select * from t1 order by f1;
 f1
 Trigger 3.5.4.1
 drop trigger trg1;
 select trigger_schema, trigger_name, event_object_table
-from information_schema.triggers;
+from information_schema.triggers order by trigger_name;
 trigger_schema	trigger_name	event_object_table
 Insert into t1 values ('Insert no trigger 3.5.4.1');
-Select * from t1;
+Select * from t1 order by f1;
 f1
-Trigger 3.5.4.1
 Insert no trigger 3.5.4.1
+Trigger 3.5.4.1
 drop trigger trg1;
 drop database if exists db_drop;
 revoke ALL PRIVILEGES, GRANT OPTION FROM 'test_general'@'localhost';
@@ -127,7 +128,7 @@ drop table if exists t1_433 ;
 drop table if exists t1_433a ;
 create table t1_433 (f1 char (30)) engine=innodb;
 create table t1_433a (f1a char (5)) engine=innodb;
-CREATE TRIGGER trg3 BEFORE INSERT on t1_433 for each row 
+CREATE TRIGGER trg3 BEFORE INSERT on t1_433 for each row
 set new.f1 = 'Trigger 3.5.4.3';
 Drop trigger t1.433.trg3;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.trg3' at line 1
@@ -148,7 +149,7 @@ create database db_drop4;
 Use db_drop4;
 create table t1 (f1 char(30)) engine=innodb;
 grant INSERT, SELECT on db_drop4.t1 to test_general;
-Create trigger trg4 BEFORE INSERT on t1 
+Create trigger trg4 BEFORE INSERT on t1
 for each row set new.f1='Trigger 3.5.4.4';
 Use db_drop4;
 Insert into t1 values ('Insert 3.5.4.4');
@@ -184,7 +185,7 @@ create database db_drop5;
 Use db_drop5;
 create table t1 (f1 char(50)) engine=innodb;
 grant INSERT, SELECT on t1 to test_general;
-Create trigger trg5 BEFORE INSERT on t1 
+Create trigger trg5 BEFORE INSERT on t1
 for each row set new.f1='Trigger 3.5.4.5';
 Use db_drop5;
 Insert into t1 values ('Insert 3.5.4.5');
@@ -221,7 +222,7 @@ ERROR 42S02: Table 'test.t100' doesn't e
 Testcase 3.5.5.2:
 -----------------
 Create temporary table t1_temp (f1 bigint signed, f2 bigint unsigned);
-Create trigger trg2 before INSERT 
+Create trigger trg2 before INSERT
 on t1_temp for each row set new.f2=9999;
 ERROR HY000: Trigger's 't1_temp' is view or temporary table
 drop table t1_temp;
@@ -229,7 +230,7 @@ drop table t1_temp;
 Testcase 3.5.5.3:
 -----------------
 Create view vw3 as select f118 from tb3;
-Create trigger trg3 before INSERT 
+Create trigger trg3 before INSERT
 on vw3 for each row set new.f118='s';
 ERROR HY000: 'test.vw3' is not BASE TABLE
 drop view vw3;
@@ -257,7 +258,7 @@ use dbtest_one;
 Insert into dbtest_two.t2 values ('2nd Insert 3.5.5.4');
 Warnings:
 Warning	1265	Data truncated for column 'f1' at row 1
-Select * from dbtest_two.t2;
+Select * from dbtest_two.t2 order by f1;
 f1
 1st Insert 3.5.
 2nd Insert 3.5.
@@ -310,9 +311,9 @@ drop trigger tb3.trg4_2;
 
 Testcase 3.5.7.5 / 3.5.7.6:
 ---------------------------
-Create trigger trg5_1 BEFORE INSERT 
+Create trigger trg5_1 BEFORE INSERT
 on tb3 for each row set new.f122='Trigger1 3.5.7.5/6';
-Create trigger trg5_2 BEFORE INSERT 
+Create trigger trg5_2 BEFORE INSERT
 on tb3 for each row set new.f122='Trigger2 3.5.7.5';
 ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table'
 Insert into tb3 (f121,f122) values ('Test 3.5.7.5/6','Insert 3.5.7.5');
@@ -330,9 +331,9 @@ delete from tb3 where f121='Test 3.5.7.5
 Testcase 3.5.7.7 / 3.5.7.8:
 ---------------------------
 set @test_var='Before trig 3.5.7.7';
-Create trigger trg6_1 AFTER INSERT 
+Create trigger trg6_1 AFTER INSERT
 on tb3 for each row set @test_var='Trigger1 3.5.7.7/8';
-Create trigger trg6_2 AFTER INSERT 
+Create trigger trg6_2 AFTER INSERT
 on tb3 for each row set @test_var='Trigger2 3.5.7.7';
 ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table'
 select @test_var;
@@ -358,9 +359,9 @@ delete from tb3 where f121='Test 3.5.7.7
 
 Testcase 3.5.7.9/10:
 --------------------
-Create trigger trg7_1 BEFORE UPDATE 
+Create trigger trg7_1 BEFORE UPDATE
 on tb3 for each row set new.f122='Trigger1 3.5.7.9/10';
-Create trigger trg7_2 BEFORE UPDATE 
+Create trigger trg7_2 BEFORE UPDATE
 on tb3 for each row set new.f122='Trigger2 3.5.7.9';
 ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table'
 Insert into tb3 (f121,f122) values ('Test 3.5.7.9/10','Insert 3.5.7.9');
@@ -378,9 +379,9 @@ delete from tb3 where f121='Test 3.5.7.9
 Testcase 3.5.7.11/12:
 ---------------------
 set @test_var='Before trig 3.5.7.11';
-Create trigger trg8_1 AFTER UPDATE 
+Create trigger trg8_1 AFTER UPDATE
 on tb3 for each row set @test_var='Trigger 3.5.7.11/12';
-Create trigger trg8_2 AFTER UPDATE 
+Create trigger trg8_2 AFTER UPDATE
 on tb3 for each row set @test_var='Trigger2 3.5.7.11';
 ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table'
 select @test_var;
@@ -408,9 +409,9 @@ delete from tb3 where f121='Test 3.5.7.1
 Testcase 3.5.7.13/14:
 ---------------------
 set @test_var=1;
-Create trigger trg9_1 BEFORE DELETE 
+Create trigger trg9_1 BEFORE DELETE
 on tb3 for each row set @test_var=@test_var+1;
-Create trigger trg9_2 BEFORE DELETE 
+Create trigger trg9_2 BEFORE DELETE
 on tb3 for each row set @test_var=@test_var+10;
 ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table'
 select @test_var;
@@ -440,12 +441,12 @@ delete from tb3 where f121='Test 3.5.7.1
 Testcase 3.5.7.15/16:
 ---------------------
 set @test_var=1;
-Create trigger trg_3_406010_1 AFTER DELETE 
+Create trigger trg_3_406010_1 AFTER DELETE
 on tb3 for each row set @test_var=@test_var+5;
-Create trigger trg_3_406010_2 AFTER DELETE 
+Create trigger trg_3_406010_2 AFTER DELETE
 on tb3 for each row set @test_var=@test_var+50;
 ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table'
-Create trigger trg_3_406010_1 AFTER INSERT 
+Create trigger trg_3_406010_1 AFTER INSERT
 on tb3 for each row set @test_var=@test_var+1;
 ERROR HY000: Trigger already exists
 select @test_var;
diff -Nrup a/mysql-test/suite/funcs_1/r/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-07 17:33:00 +01:00
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_08.result	2008-03-31 19:47:58 +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
@@ -161,14 +162,22 @@ select @test_var;
 3.5.8.4 - single SQL - insert
 -----------------------------
 Create trigger trg2 BEFORE UPDATE on tb3 for each row
-insert into db_test.t1_i 
+BEGIN
+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%';
+f120	f122	f136	f144	f163
+1	Test 3.5.8.4	00222	0000023456	1.050000000000000000000000000000
+select * from db_test.t1_i order by i120;
+i120	i136	i144	i163
+1	00222	0000023456	1.050000000000000000000000000000
 update tb3 set f120='I', f122='Test 3.5.8.4-Single Insert'
 		 where f122='Test 3.5.8.4';
 Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
 f120	f122	f136	f144	f163
 I	Test 3.5.8.4-Single Insert	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_i;
+select * from db_test.t1_i order by i120;
 i120	i136	i144	i163
 1	00222	0000023456	1.050000000000000000000000000000
 I	00222	0000023456	1.050000000000000000000000000000
@@ -177,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'
@@ -185,27 +194,27 @@ update tb3 set f120='U', f122='Test 3.5.
 Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
 f120	f122	f136	f144	f163
 U	Test 3.5.8.4-Single Update	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_u;
+select * from db_test.t1_u order by u120;
 u120	u136	u144	u163
 a	00111	0000099999	999.990000000000000000000000000000
-U	00222	0000023456	1.050000000000000000000000000000
 c	00333	0000099999	999.990000000000000000000000000000
+f	00333	0000099999	999.990000000000000000000000000000
+U	00222	0000023456	1.050000000000000000000000000000
 U	00222	0000023456	1.050000000000000000000000000000
 U	00222	0000023456	1.050000000000000000000000000000
-f	00333	0000099999	999.990000000000000000000000000000
 
 3.5.8.3/4 - single SQL - delete
 -------------------------------
 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%';
 f120	f122	f136	f144	f163
 D	Test 3.5.8.4-Single Delete	00444	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_d;
+select * from db_test.t1_d order by d120;
 d120	d136	d144	d163
 a	00111	0000099999	999.990000000000000000000000000000
 c	00333	0000099999	999.990000000000000000000000000000
@@ -214,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%';
@@ -245,36 +254,36 @@ 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 
-from tb3 where f122 = 'Test 3.5.8.5-if';
+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 
-from tb3 where f122 = 'Test 3.5.8.5-if';
+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 
-from tb3 where f122 = 'Test 3.5.8.5-if';
+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
-d	Test 3.5.8.5-if	00010	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 
-from tb3 where f122 = 'Test 3.5.8.5-if';
+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
 D	Test 3.5.8.5-if	00101	three	2nd else
 D	Test 3.5.8.5-if	00102	three	2nd else
-d	Test 3.5.8.5-if	00010	three	2nd else
 D	Test 3.5.8.5-if	00103	three	2nd else
 create trigger trg3 before update on tb3 for each row
 BEGIN
@@ -289,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
@@ -331,60 +340,60 @@ 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 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+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 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+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 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+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 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+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
-1	Test 3.5.8.5-case	00152	0000099999	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 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+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
+1	Test 3.5.8.5-case	00200	0000000008	1=eight
 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
-1	Test 3.5.8.5-case	00152	0000099999	1=eight
-1	Test 3.5.8.5-case	00200	0000000008	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 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+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
+1	Test 3.5.8.5-case	00200	0000000008	1=eight
 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
-1	Test 3.5.8.5-case	00152	0000099999	1=eight
-1	Test 3.5.8.5-case	00200	0000000008	1=eight
 create trigger trg3a before update on tb3 for each row
 BEGIN
 CASE
@@ -398,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;
@@ -441,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;
@@ -466,33 +475,62 @@ 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;
 
 Testcase 3.5.8.6: (requirement void)
 ------------------------------------
-
-Testcase 3.5.8.7: (Disabled as a result of bug _____)
------------------------------------------------------
+CREATE PROCEDURE sp_01 () BEGIN set @v1=1; END//
+CREATE TRIGGER trg8_1 BEFORE UPDATE ON tb3 FOR EACH ROW
+BEGIN
+CALL sp_01 ();
+END//
+Insert into tb3 (f120, f122, f136) values ('6', 'Test 3.5.8.6-insert', 101);
+update tb3 set f120='S', f136=111,
+f122='Test 3.5.8.6-tr8_1'
+	       where f122='Test 3.5.8.6-insert';
+select f120, f122
+from tb3 where f122  like 'Test 3.5.8.6%' order by f120;
+f120	f122
+S	Test 3.5.8.6-tr8_1
+DROP TRIGGER trg8_1;
+DROP PROCEDURE sp_01;
+
+Testcase 3.5.8.7
+----------------
+Create trigger trg9_1 before update on tb3 for each row
+BEGIN
+Start transaction;
+Set new.f120='U';
+Commit;
+END//
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+Create trigger trg9_2 before delete on tb3 for each row
+BEGIN
+Start transaction;
+Set @var2=old.f120;
+Rollback;
+END//
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
 drop user test_general@localhost;
 drop user test_general;
 drop user test_super@localhost;
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-07 17:33:00 +01:00
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_09.result	2008-03-31 19:47:58 +02:00
@@ -1,74 +1,75 @@
 USE test;
 drop table if exists tb3 ;
 create table tb3 (
-f118 char not null DEFAULT 'a', 
-f119 char binary not null DEFAULT b'101', 
-f120 char ascii not null DEFAULT b'101', 
-f121 tinytext, 
-f122 text, 
-f123 mediumtext, 
-f124 longtext unicode, 
-f125 tinyblob, 
-f126 blob, 
-f127 mediumblob, 
-f128 longblob, 
-f129 binary not null DEFAULT b'101', 
-f130 tinyint not null DEFAULT 99, 
-f131 tinyint unsigned not null DEFAULT 99, 
-f132 tinyint zerofill not null DEFAULT 99, 
-f133 tinyint unsigned zerofill not null DEFAULT 99, 
-f134 smallint not null DEFAULT 999, 
-f135 smallint unsigned not null DEFAULT 999, 
-f136 smallint zerofill not null DEFAULT 999,  
-f137 smallint unsigned zerofill not null DEFAULT 999, 
-f138 mediumint not null DEFAULT 9999, 
-f139 mediumint unsigned not null DEFAULT 9999, 
-f140 mediumint zerofill not null DEFAULT 9999, 
-f141 mediumint unsigned zerofill not null DEFAULT 9999, 
-f142 int not null DEFAULT 99999, 
-f143 int unsigned not null DEFAULT 99999, 
-f144 int zerofill not null DEFAULT 99999, 
-f145 int unsigned zerofill not null DEFAULT 99999, 
-f146 bigint not null DEFAULT 999999, 
-f147 bigint unsigned not null DEFAULT 999999, 
-f148 bigint zerofill not null DEFAULT 999999, 
-f149 bigint unsigned zerofill not null DEFAULT 999999, 
-f150 decimal not null DEFAULT 999.999, 
-f151 decimal unsigned not null DEFAULT 999.17, 
-f152 decimal zerofill not null DEFAULT 999.999, 
-f153 decimal unsigned zerofill, 
-f154 decimal (0), 
-f155 decimal (64), 
-f156 decimal (0) unsigned, 
-f157 decimal (64) unsigned, 
-f158 decimal (0) zerofill, 
-f159 decimal (64) zerofill, 
-f160 decimal (0) unsigned zerofill, 
-f161 decimal (64) unsigned zerofill, 
-f162 decimal (0,0), 
-f163 decimal (63,30), 
-f164 decimal (0,0) unsigned, 
-f165 decimal (63,30) unsigned, 
-f166 decimal (0,0) zerofill, 
-f167 decimal (63,30) zerofill, 
-f168 decimal (0,0) unsigned zerofill, 
-f169 decimal (63,30) unsigned zerofill, 
-f170 numeric, 
-f171 numeric unsigned, 
-f172 numeric zerofill, 
-f173 numeric unsigned zerofill, 
-f174 numeric (0), 
-f175 numeric (64) 
+f118 char not null DEFAULT 'a',
+f119 char binary not null DEFAULT b'101',
+f120 char ascii not null DEFAULT b'101',
+f121 tinytext,
+f122 text,
+f123 mediumtext,
+f124 longtext unicode,
+f125 tinyblob,
+f126 blob,
+f127 mediumblob,
+f128 longblob,
+f129 binary not null DEFAULT b'101',
+f130 tinyint not null DEFAULT 99,
+f131 tinyint unsigned not null DEFAULT 99,
+f132 tinyint zerofill not null DEFAULT 99,
+f133 tinyint unsigned zerofill not null DEFAULT 99,
+f134 smallint not null DEFAULT 999,
+f135 smallint unsigned not null DEFAULT 999,
+f136 smallint zerofill not null DEFAULT 999,
+f137 smallint unsigned zerofill not null DEFAULT 999,
+f138 mediumint not null DEFAULT 9999,
+f139 mediumint unsigned not null DEFAULT 9999,
+f140 mediumint zerofill not null DEFAULT 9999,
+f141 mediumint unsigned zerofill not null DEFAULT 9999,
+f142 int not null DEFAULT 99999,
+f143 int unsigned not null DEFAULT 99999,
+f144 int zerofill not null DEFAULT 99999,
+f145 int unsigned zerofill not null DEFAULT 99999,
+f146 bigint not null DEFAULT 999999,
+f147 bigint unsigned not null DEFAULT 999999,
+f148 bigint zerofill not null DEFAULT 999999,
+f149 bigint unsigned zerofill not null DEFAULT 999999,
+f150 decimal not null DEFAULT 999.999,
+f151 decimal unsigned not null DEFAULT 999.17,
+f152 decimal zerofill not null DEFAULT 999.999,
+f153 decimal unsigned zerofill,
+f154 decimal (0),
+f155 decimal (64),
+f156 decimal (0) unsigned,
+f157 decimal (64) unsigned,
+f158 decimal (0) zerofill,
+f159 decimal (64) zerofill,
+f160 decimal (0) unsigned zerofill,
+f161 decimal (64) unsigned zerofill,
+f162 decimal (0,0),
+f163 decimal (63,30),
+f164 decimal (0,0) unsigned,
+f165 decimal (63,30) unsigned,
+f166 decimal (0,0) zerofill,
+f167 decimal (63,30) zerofill,
+f168 decimal (0,0) unsigned zerofill,
+f169 decimal (63,30) unsigned zerofill,
+f170 numeric,
+f171 numeric unsigned,
+f172 numeric zerofill,
+f173 numeric unsigned zerofill,
+f174 numeric (0),
+f175 numeric (64)
 ) engine = 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';
+select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136;
 f118	f121	f122	f136	f163
 a	NULL	Test 3.5.9.3	00008	123.170000000000000000000000000000
-select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
+select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122,
 @tr_var_b4_136, @tr_var_b4_163;
 @tr_var_b4_118	@tr_var_b4_121	@tr_var_b4_122	@tr_var_b4_136	@tr_var_b4_163
 a	NULL	Test 3.5.9.3	7	123.170000000000000000000000000000
-select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122, 
+select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122,
 @tr_var_af_136, @tr_var_af_163;
 @tr_var_af_118	@tr_var_af_121	@tr_var_af_122	@tr_var_af_136	@tr_var_af_163
 a	NULL	Test 3.5.9.3	7	123.170000000000000000000000000000
@@ -135,13 +136,13 @@ a	NULL	Test 3.5.9.3	7	123.17000000000000
 @tr_var_af_118	@tr_var_af_121	@tr_var_af_122	@tr_var_af_136	@tr_var_af_163
 0	0	0	0	0
 delete from tb3 where f122='Test 3.5.9.3';
-select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3';
+select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136;
 f118	f121	f122	f136	f163
-select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
+select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122,
 @tr_var_b4_136, @tr_var_b4_163;
 @tr_var_b4_118	@tr_var_b4_121	@tr_var_b4_122	@tr_var_b4_136	@tr_var_b4_163
 a	NULL	Test 3.5.9.3	8	123.170000000000000000000000000000
-select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122, 
+select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122,
 @tr_var_af_136, @tr_var_af_163;
 @tr_var_af_118	@tr_var_af_121	@tr_var_af_122	@tr_var_af_136	@tr_var_af_163
 a	NULL	Test 3.5.9.3	8	123.170000000000000000000000000000
@@ -172,17 +173,17 @@ set @tr_var_af_118=new.f118, @tr_var_af_
 0	0	0	0	0	0
 @tr_var_af_118	@tr_var_af_121	@tr_var_af_122	@tr_var_af_136	@tr_var_af_151	@tr_var_af_163
 0	0	0	0	0	0
-Insert into tb3 (f122, f136, f151, f163) 
+Insert into tb3 (f122, f136, f151, f163)
 values ('Test 3.5.9.4', 7, DEFAULT, 995.24);
-select f118, f121, f122, f136, f151, f163 from tb3 
-where f122 like 'Test 3.5.9.4%';
+select f118, f121, f122, f136, f151, f163 from tb3
+where f122 like 'Test 3.5.9.4%' order by f163;
 f118	f121	f122	f136	f151	f163
 a	NULL	Test 3.5.9.4	00007	999	995.240000000000000000000000000000
-select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
+select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122,
 @tr_var_b4_136, @tr_var_b4_151, @tr_var_b4_163;
 @tr_var_b4_118	@tr_var_b4_121	@tr_var_b4_122	@tr_var_b4_136	@tr_var_b4_151	@tr_var_b4_163
 a	NULL	Test 3.5.9.4	7	999	995.240000000000000000000000000000
-select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122, 
+select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122,
 @tr_var_af_136, @tr_var_af_151, @tr_var_af_163;
 @tr_var_af_118	@tr_var_af_121	@tr_var_af_122	@tr_var_af_136	@tr_var_af_151	@tr_var_af_163
 a	NULL	Test 3.5.9.4	7	999	995.240000000000000000000000000000
@@ -194,15 +195,15 @@ Update tb3 Set f122='Test 3.5.9.4-trig',
 where f122='Test 3.5.9.4';
 Warnings:
 Warning	1048	Column 'f136' cannot be null
-select f118, f121, f122, f136, f151, f163 from tb3 
-where f122 like 'Test 3.5.9.4-trig';
+select f118, f121, f122, f136, f151, f163 from tb3
+where f122 like 'Test 3.5.9.4-trig' order by f163;
 f118	f121	f122	f136	f151	f163
 a	NULL	Test 3.5.9.4-trig	00000	999	NULL
-select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
+select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122,
 @tr_var_b4_136, @tr_var_b4_151, @tr_var_b4_163;
 @tr_var_b4_118	@tr_var_b4_121	@tr_var_b4_122	@tr_var_b4_136	@tr_var_b4_151	@tr_var_b4_163
 a	NULL	Test 3.5.9.4-trig	0	999	NULL
-select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122, 
+select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122,
 @tr_var_af_136, @tr_var_af_151, @tr_var_af_163;
 @tr_var_af_118	@tr_var_af_121	@tr_var_af_122	@tr_var_af_136	@tr_var_af_151	@tr_var_af_163
 a	NULL	Test 3.5.9.4-trig	0	999	NULL
@@ -240,6 +241,7 @@ ERROR HY000: There is no NEW row in on 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/innodb_trig_1011ext.result b/mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result
--- a/mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result	2008-03-07 17:33:00 +01:00
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result	2008-03-31 19:47:58 +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.10.1/2/3:
 ----------------------
@@ -86,7 +87,7 @@ Insert into vw11 (f122, f151) values ('T
 Insert into vw11 (f122, f151) values ('Test 3.5.10.1/2/3', 2);
 Insert into vw11 (f122, f151) values ('Not in View', 3);
 select f121, f122, f151, f163
-from tb3 where f122 like 'Test 3.5.10.1/2/3%';
+from tb3 where f122 like 'Test 3.5.10.1/2/3%' order by f151;
 f121	f122	f151	f163
 NULL	Test 3.5.10.1/2/3	1	111.110000000000000000000000000000
 NULL	Test 3.5.10.1/2/3	2	111.110000000000000000000000000000
@@ -100,7 +101,7 @@ f121	f122	f151	f163
 NULL	Not in View	3	111.110000000000000000000000000000
 Update vw11 set f163=1;
 select f121, f122, f151, f163 from tb3
-where f122 like 'Test 3.5.10.1/2/3%';
+where f122 like 'Test 3.5.10.1/2/3%' order by f151;
 f121	f122	f151	f163
 Y	Test 3.5.10.1/2/3-Update	1	1.000000000000000000000000000000
 Y	Test 3.5.10.1/2/3-Update	2	1.000000000000000000000000000000
@@ -114,7 +115,7 @@ before delete
 0
 delete from vw11 where f151=1;
 select f121, f122, f151, f163 from tb3
-where f122 like 'Test 3.5.10.1/2/3%';
+where f122 like 'Test 3.5.10.1/2/3%' order by f151;
 f121	f122	f151	f163
 Y	Test 3.5.10.1/2/3-Update	2	1.000000000000000000000000000000
 select f121, f122, f151, f163 from vw11;
@@ -141,11 +142,11 @@ set @counter= 0;
 select @counter as 'Rows Loaded Before';
 Rows Loaded Before
 0
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table tb_load;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/t9.txt' into table tb_load;
 select @counter as 'Rows Loaded After';
 Rows Loaded After
 10
-Select * from tb_load limit 10;
+Select * from tb_load order by f1 limit 10;
 f1	f2	f3
 -5000	a`	1000
 -4999	aaa	999
@@ -240,7 +241,7 @@ insert into t3 (f1) values (new.f1+1000)
 create trigger tr2_4 after insert on t2_4 for each row
 insert into t3 (f1) values (new.f1+10000);
 insert into t1 values (1);
-select * from t3;
+select * from t3 order by f1;
 f1
 12
 102
@@ -275,14 +276,14 @@ create trigger tr4 after insert on t4
 for each row insert into t1 (f1) values (new.f4+1);
 insert into t1 values (1);
 ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
-select * from t1;
+select * from t1 order by f1;
 f1
 0
-select * from t2;
+select * from t2 order by f2;
 f2
-select * from t3;
+select * from t3 order by f3;
 f3
-select * from t4;
+select * from t4 order by f4;
 f4
 drop trigger tr1;
 drop trigger tr2;
@@ -293,8 +294,8 @@ drop table t2;
 drop table t3;
 drop table t4;
 
-Testcase y.y.y.4: Recursive trigger/SP references (disabled bug 11889)
-----------------------------------------------------------------------
+Testcase y.y.y.4: Recursive trigger/SP references
+-------------------------------------------------
 set @sql_mode='traditional';
 create table t1_sp (
 count integer,
@@ -382,12 +383,12 @@ start transaction;
 insert into t1 values (1);
 ERROR 22003: Out of range value adjusted for column 'f4' at row 1
 commit;
-select * from t1;
+select * from t1 order by f1;
 f1
 1
-select * from t2;
+select * from t2 order by f2;
 f2
-select * from t3;
+select * from t3 order by f3;
 f3
 drop trigger tr1;
 drop trigger tr2;
diff -Nrup a/mysql-test/suite/funcs_1/r/innodb_trig_frkey.result b/mysql-test/suite/funcs_1/r/innodb_trig_frkey.result
--- a/mysql-test/suite/funcs_1/r/innodb_trig_frkey.result	2008-03-07 17:33:00 +01:00
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_frkey.result	2008-03-31 19:47:58 +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 x.x.x.1:
 -----------------
diff -Nrup a/mysql-test/suite/funcs_1/r/innodb_views.result b/mysql-test/suite/funcs_1/r/innodb_views.result
--- a/mysql-test/suite/funcs_1/r/innodb_views.result	2008-03-11 19:54:33 +01:00
+++ b/mysql-test/suite/funcs_1/r/innodb_views.result	2008-03-31 19:47:58 +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 = innodb;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb2.txt' into table tb2 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb2.txt'
+into table tb2;
 DROP DATABASE IF EXISTS test1;
 CREATE DATABASE test1;
 USE test1;
 drop table if exists tb2 ;
 create table tb2 (
-f59 numeric (0) unsigned, 
-f60 numeric (64) unsigned, 
-f61 numeric (0) zerofill, 
-f62 numeric (64) zerofill, 
-f63 numeric (0) unsigned zerofill, 
-f64 numeric (64) unsigned zerofill, 
-f65 numeric (0,0), 
-f66 numeric (63,30), 
-f67 numeric (0,0) unsigned, 
-f68 numeric (63,30) unsigned, 
-f69 numeric (0,0) zerofill, 
-f70 numeric (63,30) zerofill, 
-f71 numeric (0,0) unsigned zerofill, 
-f72 numeric (63,30) unsigned zerofill, 
-f73 real, 
-f74 real unsigned, 
-f75 real zerofill, 
-f76 real unsigned zerofill, 
-f77 double default 7.7, 
-f78 double unsigned default 7.7, 
-f79 double zerofill default 7.7, 
-f80 double unsigned zerofill default 8.8, 
-f81 float not null default 8.8, 
-f82 float unsigned not null default 8.8, 
-f83 float zerofill not null default 8.8, 
-f84 float unsigned zerofill not null default 8.8, 
-f85 float(0) not null default 8.8, 
-f86 float(23) not null default 8.8, 
-f87 float(0) unsigned not null default 8.8, 
-f88 float(23) unsigned not null default 8.8, 
-f89 float(0) zerofill not null default 8.8, 
-f90 float(23) zerofill not null default 8.8, 
-f91 float(0) unsigned zerofill not null default 8.8, 
-f92 float(23) unsigned zerofill not null default 8.8, 
-f93 float(24) not null default 8.8, 
-f94 float(53) not null default 8.8, 
-f95 float(24) unsigned not null default 8.8, 
-f96 float(53) unsigned not null default 8.8, 
-f97 float(24) zerofill not null default 8.8, 
-f98 float(53) zerofill not null default 8.8, 
-f99 float(24) unsigned zerofill not null default 8.8, 
-f100 float(53) unsigned zerofill not null default 8.8, 
-f101 date not null default '2000-01-01', 
-f102 time not null default 20, 
-f103 datetime not null default '2/2/2', 
-f104 timestamp not null default 20001231235959, 
-f105 year not null default 2000, 
-f106 year(3) not null default 2000, 
-f107 year(4) not null default 2000, 
-f108 enum("1enum","2enum") not null default "1enum", 
+f59 numeric (0) unsigned,
+f60 numeric (64) unsigned,
+f61 numeric (0) zerofill,
+f62 numeric (64) zerofill,
+f63 numeric (0) unsigned zerofill,
+f64 numeric (64) unsigned zerofill,
+f65 numeric (0,0),
+f66 numeric (63,30),
+f67 numeric (0,0) unsigned,
+f68 numeric (63,30) unsigned,
+f69 numeric (0,0) zerofill,
+f70 numeric (63,30) zerofill,
+f71 numeric (0,0) unsigned zerofill,
+f72 numeric (63,30) unsigned zerofill,
+f73 real,
+f74 real unsigned,
+f75 real zerofill,
+f76 real unsigned zerofill,
+f77 double default 7.7,
+f78 double unsigned default 7.7,
+f79 double zerofill default 7.7,
+f80 double unsigned zerofill default 8.8,
+f81 float not null default 8.8,
+f82 float unsigned not null default 8.8,
+f83 float zerofill not null default 8.8,
+f84 float unsigned zerofill not null default 8.8,
+f85 float(0) not null default 8.8,
+f86 float(23) not null default 8.8,
+f87 float(0) unsigned not null default 8.8,
+f88 float(23) unsigned not null default 8.8,
+f89 float(0) zerofill not null default 8.8,
+f90 float(23) zerofill not null default 8.8,
+f91 float(0) unsigned zerofill not null default 8.8,
+f92 float(23) unsigned zerofill not null default 8.8,
+f93 float(24) not null default 8.8,
+f94 float(53) not null default 8.8,
+f95 float(24) unsigned not null default 8.8,
+f96 float(53) unsigned not null default 8.8,
+f97 float(24) zerofill not null default 8.8,
+f98 float(53) zerofill not null default 8.8,
+f99 float(24) unsigned zerofill not null default 8.8,
+f100 float(53) unsigned zerofill not null default 8.8,
+f101 date not null default '2000-01-01',
+f102 time not null default 20,
+f103 datetime not null default '2/2/2',
+f104 timestamp not null default 20001231235959,
+f105 year not null default 2000,
+f106 year(3) not null default 2000,
+f107 year(4) not null default 2000,
+f108 enum("1enum","2enum") not null default "1enum",
 f109 set("1set","2set") not null default "1set"
 ) engine = innodb;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/innodb_tb2.txt' into table tb2 ;
+load data infile '<MYSQLTEST_VARDIR>/std_data_ln/funcs_1/innodb_tb2.txt'
+into table tb2;
 USE test;
 
 ! Attention: The file with the expected results is not
diff -Nrup a/mysql-test/suite/funcs_1/r/is_columns_innodb.result b/mysql-test/suite/funcs_1/r/is_columns_innodb.result
--- a/mysql-test/suite/funcs_1/r/is_columns_innodb.result	2008-03-11 19:54:33 +01:00
+++ b/mysql-test/suite/funcs_1/r/is_columns_innodb.result	2008-03-31 19:47:58 +02:00
@@ -3,63 +3,63 @@ CREATE DATABASE test1;
 USE test;
 drop table if exists tb1 ;
 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, 
Thread
bk commit into 5.0 tree (mleich:1.2598) BUG#35335mleich31 Mar