List:Commits« Previous MessageNext Message »
From:horst Date:November 27 2007 4:40pm
Subject:bk commit into 5.1 tree (hhunger:1.2617)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of hhunger. When hhunger 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, 2007-11-27 17:40:18+01:00, hhunger@stripped +130 -0
  WL#4084: enable all disabled test cases.

  BitKeeper/etc/ignore@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +1 -0
    Added mysql-test/funcs_1.log to the ignore list

  mysql-test/suite/funcs_1/datadict/datadict_master.inc@stripped, 2007-11-27 17:40:04+01:00, hhunger@stripped +67 -117
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc@stripped, 2007-11-27 17:40:04+01:00, hhunger@stripped +1 -2
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/datadict/datadict_tables.inc@stripped, 2007-11-27 17:40:04+01:00, hhunger@stripped +2 -2
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/csv_subquery2.result@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +314 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/csv_subquery2.result@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/r/csv_subquery3.result@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +127 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/csv_subquery3.result@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/r/csv_subquery4.result@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +151 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/csv_subquery4.result@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/r/innodb__datadict.result@stripped, 2007-11-27 17:40:04+01:00, hhunger@stripped +191 -208
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/innodb_func_view.result@stripped, 2007-11-27 17:40:04+01:00, hhunger@stripped +5013 -4927
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/innodb_storedproc.result@stripped, 2007-11-27 17:40:06+01:00, hhunger@stripped +18280 -17123
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/innodb_storedproc_10.result@stripped, 2007-11-27 17:40:06+01:00, hhunger@stripped +28 -22
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/innodb_subquery2.result@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +329 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/innodb_subquery2.result@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/r/innodb_subquery3.result@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +127 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/innodb_subquery3.result@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/r/innodb_subquery4.result@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +151 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/innodb_subquery4.result@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/r/innodb_trig_03.result@stripped, 2007-11-27 17:40:06+01:00, hhunger@stripped +31 -47
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/innodb_trig_08.result@stripped, 2007-11-27 17:40:06+01:00, hhunger@stripped +37 -8
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result@stripped, 2007-11-27 17:40:06+01:00, hhunger@stripped +2 -2
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/innodb_views.result@stripped, 2007-11-27 17:40:06+01:00, hhunger@stripped +11594 -212
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/memory__datadict.result@stripped, 2007-11-27 17:40:06+01:00, hhunger@stripped +191 -208
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/memory_func_view.result@stripped, 2007-11-27 17:40:06+01:00, hhunger@stripped +5013 -4927
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/memory_storedproc.result@stripped, 2007-11-27 17:40:08+01:00, hhunger@stripped +18259 -17136
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/memory_storedproc_10.result@stripped, 2007-11-27 17:40:08+01:00, hhunger@stripped +28 -22
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/memory_subquery2.result@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +329 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/memory_subquery2.result@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/r/memory_subquery3.result@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +127 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/memory_subquery3.result@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/r/memory_subquery4.result@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +151 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/memory_subquery4.result@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/r/memory_trig_03.result@stripped, 2007-11-27 17:40:08+01:00, hhunger@stripped +31 -47
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/memory_trig_08.result@stripped, 2007-11-27 17:40:08+01:00, hhunger@stripped +37 -8
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/memory_trig_1011ext.result@stripped, 2007-11-27 17:40:08+01:00, hhunger@stripped +2 -2
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/memory_views.result@stripped, 2007-11-27 17:40:08+01:00, hhunger@stripped +11594 -212
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/myisam__datadict.result@stripped, 2007-11-27 17:40:08+01:00, hhunger@stripped +191 -208
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/myisam_func_view.result@stripped, 2007-11-27 17:40:08+01:00, hhunger@stripped +5013 -4927
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/myisam_storedproc.result@stripped, 2007-11-27 17:40:10+01:00, hhunger@stripped +18280 -17123
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/myisam_storedproc_10.result@stripped, 2007-11-27 17:40:10+01:00, hhunger@stripped +28 -22
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/myisam_subquery1.result@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +310 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/myisam_subquery1.result@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/r/myisam_subquery2.result@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +329 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/myisam_subquery2.result@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/r/myisam_subquery3.result@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +127 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/myisam_subquery3.result@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/r/myisam_subquery4.result@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +151 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/myisam_subquery4.result@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/r/myisam_trig_03.result@stripped, 2007-11-27 17:40:10+01:00, hhunger@stripped +31 -47
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/myisam_trig_08.result@stripped, 2007-11-27 17:40:10+01:00, hhunger@stripped +37 -8
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result@stripped, 2007-11-27 17:40:10+01:00, hhunger@stripped +2 -2
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/myisam_views.result@stripped, 2007-11-27 17:40:10+01:00, hhunger@stripped +11725 -9778
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/ndb__datadict.result@stripped, 2007-11-27 17:40:11+01:00, hhunger@stripped +344 -263
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/ndb_func_view.result@stripped, 2007-11-27 17:40:11+01:00, hhunger@stripped +5013 -4927
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/ndb_storedproc.result@stripped, 2007-11-27 17:40:12+01:00, hhunger@stripped +18105 -16946
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/ndb_storedproc_10.result@stripped, 2007-11-27 17:40:12+01:00, hhunger@stripped +32 -26
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/ndb_subquery2.result@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +329 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/ndb_subquery2.result@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/r/ndb_subquery3.result@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +129 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/ndb_subquery3.result@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/r/ndb_subquery4.result@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +151 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/ndb_subquery4.result@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/r/ndb_trig_03.result@stripped, 2007-11-27 17:40:12+01:00, hhunger@stripped +31 -47
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/ndb_trig_08.result@stripped, 2007-11-27 17:40:12+01:00, hhunger@stripped +37 -8
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result@stripped, 2007-11-27 17:40:12+01:00, hhunger@stripped +2 -2
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/r/ndb_views.result@stripped, 2007-11-27 17:40:12+01:00, hhunger@stripped +11594 -212
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/storedproc/storedproc_10.inc@stripped, 2007-11-27 17:40:12+01:00, hhunger@stripped +12 -23
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/storedproc/storedproc_master.inc@stripped, 2007-11-27 17:40:12+01:00, hhunger@stripped +2455 -2387
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/subquery/subquery1.inc@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +65 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/subquery/subquery1.inc@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/subquery/subquery2.inc@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +317 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/subquery/subquery2.inc@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/subquery/subquery3.inc@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +166 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/subquery/subquery3.inc@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/subquery/subquery4.inc@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +166 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/subquery/subquery4.inc@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/t/csv_subquery2.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +17 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/csv_subquery2.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/t/csv_subquery3.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +16 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/csv_subquery3.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/t/csv_subquery4.test@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +17 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/csv_subquery4.test@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/t/disabled.def@stripped, 2007-11-27 17:40:12+01:00, hhunger@stripped +0 -4
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/innodb__load.test@stripped, 2007-11-27 17:40:12+01:00, hhunger@stripped +1 -5
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/innodb_bitdata.test@stripped, 2007-11-27 17:40:12+01:00, hhunger@stripped +1 -5
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/innodb_cursors.test@stripped, 2007-11-27 17:40:12+01:00, hhunger@stripped +1 -5
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/innodb_storedproc.test@stripped, 2007-11-27 17:40:12+01:00, hhunger@stripped +3 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/innodb_subquery2.test@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +17 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/innodb_subquery2.test@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/t/innodb_subquery3.test@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +16 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/innodb_subquery3.test@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/t/innodb_subquery4.test@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +17 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/innodb_subquery4.test@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/t/innodb_trig_0102.test@stripped, 2007-11-27 17:40:12+01:00, hhunger@stripped +1 -5
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/innodb_trig_03.test@stripped, 2007-11-27 17:40:12+01:00, hhunger@stripped +1 -5
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/innodb_trig_03e.test@stripped, 2007-11-27 17:40:12+01:00, hhunger@stripped +1 -4
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/innodb_trig_0407.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +1 -5
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/innodb_trig_08.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +1 -5
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/innodb_trig_09.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +1 -5
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +1 -5
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/innodb_trig_frkey.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +1 -5
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/innodb_views.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +0 -2
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/memory__load.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +1 -5
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/memory_bitdata.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +1 -5
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/memory_cursors.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +1 -5
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/memory_storedproc.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +2 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/memory_subquery2.test@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +16 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/memory_subquery2.test@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/t/memory_subquery3.test@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +15 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/memory_subquery3.test@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/t/memory_subquery4.test@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +16 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/memory_subquery4.test@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/t/memory_trig_0102.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +1 -5
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/memory_trig_03.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +1 -5
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/memory_trig_03e.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +1 -4
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/memory_trig_0407.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +1 -5
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/memory_trig_08.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +1 -5
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/memory_trig_09.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +1 -5
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/memory_trig_1011ext.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +1 -5
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/memory_views.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +0 -2
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/myisam__load.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +1 -5
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/myisam_bitdata.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +2 -5
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/myisam_cursors.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +1 -2
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/myisam_storedproc.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +2 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/myisam_subquery2.test@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +16 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/myisam_subquery2.test@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/t/myisam_subquery3.test@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +15 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/myisam_subquery3.test@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/t/myisam_subquery4.test@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +16 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/myisam_subquery4.test@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/t/myisam_trig_0102.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +1 -5
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/myisam_trig_03.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +2 -5
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/myisam_trig_03e.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +1 -4
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/myisam_trig_0407.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +2 -5
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/myisam_trig_08.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +2 -5
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/myisam_trig_09.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +2 -5
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +2 -5
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/myisam_views.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +1 -2
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/ndb__load.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +1 -5
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/ndb_bitdata.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +2 -6
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/ndb_cursors.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +2 -6
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/ndb_storedproc.test@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +9 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/ndb_storedproc.test@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/t/ndb_subquery2.test@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +17 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/ndb_subquery2.test@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/t/ndb_subquery3.test@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +16 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/ndb_subquery3.test@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/t/ndb_subquery4.test@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +17 -0
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/ndb_subquery4.test@stripped, 2007-11-27 17:40:14+01:00, hhunger@stripped +0 -0

  mysql-test/suite/funcs_1/t/ndb_trig_0102.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +1 -5
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/ndb_trig_03.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +2 -6
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/ndb_trig_03e.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +2 -5
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/ndb_trig_0407.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +1 -5
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/ndb_trig_08.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +1 -5
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/ndb_trig_09.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +1 -5
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +1 -5
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/t/ndb_views.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +0 -2
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/triggers/triggers_03.inc@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +26 -50
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/triggers/triggers_03e_db_level.inc@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +1 -1
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/triggers/triggers_08.inc@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +42 -30
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +1 -2
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/triggers/triggers_master.test@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +29 -53
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/views/func_view.inc@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +17 -48
    WL#4084: enable all disabled test cases.

  mysql-test/suite/funcs_1/views/views_master.inc@stripped, 2007-11-27 17:40:13+01:00, hhunger@stripped +98 -82
    WL#4084: enable all disabled test cases.

diff -Nrup a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore
--- a/BitKeeper/etc/ignore	2007-11-26 22:18:50 +01:00
+++ b/BitKeeper/etc/ignore	2007-11-27 17:40:14 +01:00
@@ -3011,3 +3011,4 @@ win/vs71cache.txt
 win/vs8cache.txt
 zlib/*.ds?
 zlib/*.vcproj
+mysql-test/funcs_1.log
diff -Nrup a/mysql-test/suite/funcs_1/datadict/datadict_master.inc b/mysql-test/suite/funcs_1/datadict/datadict_master.inc
--- a/mysql-test/suite/funcs_1/datadict/datadict_master.inc	2007-11-21 15:06:34 +01:00
+++ b/mysql-test/suite/funcs_1/datadict/datadict_master.inc	2007-11-27 17:40:04 +01:00
@@ -1,7 +1,6 @@
 #### suite/funcs_1/datadict/datadict_master.inc
 #
 # Checks of INFORMATION_SCHEMA table properties and content.
-# (mostly only the features introduced with MySQL 5.1)
 #
 # Please set the variable $OTHER_ENGINE_TYPE before sourcing this script.
 # $OTHER_ENGINE_TYPE must be
@@ -17,6 +16,8 @@
 #                   #30420 "datadict" tests (all engines) fail:
 #                          Release build has help tables loaded
 #
+# 2007-11-15 hhunger WL#4084: Review and fix all disabled tests ... 
+#
 
 --disable_abort_on_error
 let $message=
@@ -31,10 +32,6 @@ let $message=
 . *__datadict.test are started. This can be a result of showing e.g. maximum
 . values of the number of rows of tables.
 .
-. This .result file has been checked OK with Linux 5.0.48,
-. build tree ChangeSet@stripped, 2007-07-30
-. except that the not fixed Bug#30020 causes a difference.
-.;
 --source include/show_msg80.inc
 
 ################################################################################
@@ -44,38 +41,27 @@ let $message=
    #set variable(s) here to be able to switch crashing sub tests with ONE change HERE.
    #change the variable(s) to enable / disable the crashing parts.
 
+   # Though bug#12777 is not a bug I let the implementation as it is (hhunger).
    # different 'logics' are used because sometimes codelines needs to be switched off
    # and otherwise some extra statements needs to be executed as long as the bug is not
    # fixed:
-   let $have_bug_11589= 1;
-   let $have_bug_30689= 1;
-
-   #seems not to work: --vertical_results
-   eval SELECT $have_bug_11589 AS "have_bug_11589";
-   eval SELECT $have_bug_30689 AS "have_bug_30689";
-   #seems not to work: --horizontal_results
-
-   # As long as
-   # Bug#11589: mysqltest, --ps-protocol, strange output, float/double/real with zerofill
-   # is not fixed, we must switch the ps-protocol for some statements off.
+   # Bug#32285: mysqltest, --ps-protocol, strange output, float/double/real with zerofill
+   # is not fixed, we must switch the ps-protocol for some statements off (formerly bug#11589).
    # If this bug is fixed, please
    # 1. set the following variable to 0
    # 2. check, if the test passes
    # 3. remove the workarounds
-   if ($have_bug_11589)
+   let $have_bug_32285= 1;
+
+   #seems not to work: --vertical_results
+   eval SELECT $have_bug_32285 AS "have_bug_32285";
+   #seems not to work: --horizontal_results
+
+   if ($have_bug_32285)
    {
       let $message= There are some statements where the ps-protocol is switched off.
                     This may come from the bug listed below, ir from other problems.
-                    Bug#11589: mysqltest, --ps-protocol, strange output, float/double/real with zerofill;
-      --source include/show_msg80.inc
-   }
-   if ($have_bug_30689)
-   {
-      let $message= Selects on INFORMATION_SCHEMA.VIEWS present incomplete
-                    content for the column VIEW_DEFINITION in cases where
-                    the view selects(=is based) on an INFORMATION_SCHEMA table.
-                    ---> VIEWS vu and vu1
-                    Bug#30689 Wrong content in I_S.VIEWS.VIEW_DEFINITION if VIEW is based on I_S;
+                    Bug#32285: mysqltest, --ps-protocol, strange output, float/double/real with zerofill;
       --source include/show_msg80.inc
    }
 #
@@ -154,17 +140,11 @@ SHOW tables;
 
 select * from schemata ORDER BY 2 DESC, 1 ASC;
 
-if ($have_bug_11589)
+if ($have_bug_32285)
 {
 --disable_ps_protocol
 }
 --vertical_results
-#SELECT * FROM tables;
-#
-#FIXME 3.2.1.1: we split the "SELECT * FROM tables" in two parts until
-#FIXME 3.2.1.1: Bug #12397: wrong values shown in column CREATE_OPTIONS of
-#FIXME 3.2.1.1: INFORMATION_SCHEMA.TABLES is solved, one with 'more' and one
-#FIXME 3.2.1.1: with 'less' replace
 #  9 AVG_ROW_LENGTH
 # 10 DATA_LENGTH
 # 11 MAX_DATA_LENGTH
@@ -185,7 +165,8 @@ SELECT * FROM tables
 # 15 CREATE_TIME
 # 16 UPDATE_TIME
 # 17 CHECK_TIME
---replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"
+# 20 CREATE_OPTIONS
+--replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"  20 "#CO#"
 SELECT * FROM tables
 WHERE NOT( table_schema = 'information_schema')
   AND NOT (table_schema = 'mysql' AND table_name LIKE 'help_%');
@@ -199,12 +180,21 @@ select s.catalog_name, s.schema_name, s.
 --source suite/funcs_1/datadict/datadict_bug_12777.inc
 select * from columns;
 select * from character_sets;
-select sum(id) from collations where collation_name <> 'utf8_general_cs';
+select sum(id) from collations;
 select collation_name, character_set_name into @x,@y
   from collation_character_set_applicability limit 1;
   select @x, @y;
 
---replace_column 16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"
+#  9 AVG_ROW_LENGTH
+# 10 DATA_LENGTH
+# 11 MAX_DATA_LENGTH
+# 12 INDEX_LENGTH
+# 13 DATA_FREE
+# 15 CREATE_TIME
+# 16 UPDATE_TIME
+# 17 CHECK_TIME
+# 20 CREATE_OPTIONS
+--replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"  20 "#CO#"
 select * from routines;
 
 select count(*) from routines;
@@ -321,10 +311,11 @@ select * from information_schema.schemat
 
 #SELECT * FROM information_schema.tables;
 #
-#FIXME 3.2.1.1: we split the "SELECT * FROM tables" in two parts until
-#FIXME 3.2.1.1: Bug #12397: wrong values shown in column CREATE_OPTIONS of
-#FIXME 3.2.1.1: INFORMATION_SCHEMA.TABLES is solved, one with 'more' and one
-#FIXME 3.2.1.1: with 'less' replace
+if ($have_bug_32285)
+{
+--disable_ps_protocol
+}
+--vertical_results
 #  9 AVG_ROW_LENGTH
 # 10 DATA_LENGTH
 # 11 MAX_DATA_LENGTH
@@ -332,14 +323,9 @@ select * from information_schema.schemat
 # 13 DATA_FREE
 # 15 CREATE_TIME
 # 16 UPDATE_TIME
-# 17 CHRCK_TIME
+# 17 CHECK_TIME
 # 20 CREATE_OPTIONS
-if ($have_bug_11589)
-{
---disable_ps_protocol
-}
---vertical_results
---replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss" 20 "#CO#"
+--replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"  20 "#CO#"
 SELECT * FROM information_schema.tables
  WHERE table_schema = 'information_schema';
 #  9 AVG_ROW_LENGTH
@@ -349,8 +335,9 @@ SELECT * FROM information_schema.tables
 # 13 DATA_FREE
 # 15 CREATE_TIME
 # 16 UPDATE_TIME
-# 17 CHRCK_TIME
---replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"
+# 17 CHECK_TIME
+# 20 CREATE_OPTIONS
+--replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"  20 "#CO#"
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema')
   AND NOT (table_schema = 'mysql' AND table_name LIKE 'help_%');
@@ -478,12 +465,8 @@ eval SELECT *
 # check also with a 'simple' user
 CREATE USER user_3212@localhost;
 GRANT ALL ON db_datadict.* TO user_3212@localhost;
-# OBN: The following line was added following the fix to bug 28181  
-#      where queries to information_schema will fail if exporting to 
-#      a file without having the FILE attribute
 GRANT FILE ON *.* TO user_3212@localhost;
 
-
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 connect (u3212,localhost,user_3212,,db_datadict);
 --source suite/funcs_1/include/show_connection.inc
@@ -1660,14 +1643,13 @@ connect (u_6_401017, localhost, u_6_4010
 
 use information_schema;
 
-select * from collation_character_set_applicability
-where collation_name <> 'utf8_general_cs';
+select * from collation_character_set_applicability;
 select * from schemata;
 select table_name from tables;
 --source suite/funcs_1/datadict/datadict_bug_12777.inc
 select table_name, column_name, column_type from columns;
 select character_set_name from character_sets;
-select collation_name from collations where collation_name <> 'utf8_general_cs';
+select collation_name from collations;
 select routine_name, routine_type from routines;
 select table_name, index_name from statistics;
 select table_name from views;
@@ -1927,7 +1909,7 @@ let $message= Testcase 3.2.3.2:;
 #                    the USAGE privilege.
 ################################################################################
 
-SELECT * FROM collations where collation_name <> 'utf8_general_cs';
+SELECT * FROM collations;
 # -------------------------------------------------------------------------------------------------------
 
 let $message= Testcase 3.2.3.3:;
@@ -1974,8 +1956,7 @@ let $message= Testcase 3.2.4.2:;
 #                    and update with expected results afterwards.
 ################################################################################
 
-SELECT * FROM collation_character_set_applicability
-where collation_name <> 'utf8_general_cs';
+SELECT * FROM collation_character_set_applicability;
 # -------------------------------------------------------------------------------------------------------
 
 let $message= Testcase 3.2.4.3:;
@@ -3057,10 +3038,10 @@ GRANT INSERT ON db_datadict.tb3 to 'user
 CREATE VIEW v3 AS SELECT * FROM tb3;
 GRANT SELECT ON db_datadict.v3 to 'user_3'@'localhost';
 
-#FIXME 3.2.12: we split the "SELECT * FROM tables" in two parts until
-#FIXME 3.2.12: Bug #12397: wrong values shown in column CREATE_OPTIONS of
-#FIXME 3.2.12: INFORMATION_SCHEMA.TABLES is solved, one with 'more' and one
-#FIXME 3.2.12: with 'less' replace
+if ($have_bug_32285)
+{
+--disable_ps_protocol
+}
 #  9 AVG_ROW_LENGTH
 # 10 DATA_LENGTH
 # 11 MAX_DATA_LENGTH
@@ -3070,11 +3051,7 @@ GRANT SELECT ON db_datadict.v3 to 'user_
 # 16 UPDATE_TIME
 # 17 CHECK_TIME
 # 20 CREATE_OPTIONS
-if ($have_bug_11589)
-{
---disable_ps_protocol
-}
---replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss" 20 "#CO#"
+--replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"  20 "#CO#"
 SELECT * FROM information_schema.tables
  WHERE table_schema = 'information_schema';
 #  9 AVG_ROW_LENGTH
@@ -3085,7 +3062,8 @@ SELECT * FROM information_schema.tables
 # 15 CREATE_TIME
 # 16 UPDATE_TIME
 # 17 CHECK_TIME
---replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"
+# 20 CREATE_OPTIONS
+--replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"  20 "#CO#"
 SELECT * FROM information_schema.tables
  WHERE NOT( table_schema = 'information_schema');
 --enable_ps_protocol
@@ -3093,11 +3071,10 @@ SELECT * FROM information_schema.tables
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 connect (user_12_2, localhost, user_2, , db_datadict);
 
-# we see only tables for this user, and not any other
-#FIXME 3.2.12: we split the "SELECT * FROM tables" in two parts until
-#FIXME 3.2.12: Bug #12397: wrong values shown in column CREATE_OPTIONS of
-#FIXME 3.2.12: INFORMATION_SCHEMA.TABLES is solved, one with 'more' and one
-#FIXME 3.2.12: with 'less' replace
+if ($have_bug_32285)
+{
+--disable_ps_protocol
+}
 #  9 AVG_ROW_LENGTH
 # 10 DATA_LENGTH
 # 11 MAX_DATA_LENGTH
@@ -3107,11 +3084,7 @@ connect (user_12_2, localhost, user_2, ,
 # 16 UPDATE_TIME
 # 17 CHECK_TIME
 # 20 CREATE_OPTIONS
-if ($have_bug_11589)
-{
---disable_ps_protocol
-}
---replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss" 20 "#CO#"
+--replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"  20 "#CO#"
 SELECT * FROM information_schema.tables
  WHERE table_schema = 'information_schema';
 #  9 AVG_ROW_LENGTH
@@ -3122,7 +3095,8 @@ SELECT * FROM information_schema.tables
 # 15 CREATE_TIME
 # 16 UPDATE_TIME
 # 17 CHECK_TIME
---replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"
+# 20 CREATE_OPTIONS
+--replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"  20 "#CO#"
 SELECT * FROM information_schema.tables
  WHERE NOT( table_schema = 'information_schema');
 --enable_ps_protocol
@@ -3130,12 +3104,10 @@ SELECT * FROM information_schema.tables
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 connect (user_12_3, localhost, user_3, , db_datadict);
 
-# we see only tables for this user, and not any other
-#
-#FIXME 3.2.12: we split the "SELECT * FROM tables" in two parts until
-#FIXME 3.2.12: Bug #12397: wrong values shown in column CREATE_OPTIONS of
-#FIXME 3.2.12: INFORMATION_SCHEMA.TABLES is solved, one with 'more' and one
-#FIXME 3.2.12: with 'less' replace
+if ($have_bug_32285)
+{
+--disable_ps_protocol
+}
 #  9 AVG_ROW_LENGTH
 # 10 DATA_LENGTH
 # 11 MAX_DATA_LENGTH
@@ -3145,10 +3117,6 @@ connect (user_12_3, localhost, user_3, ,
 # 16 UPDATE_TIME
 # 17 CHECK_TIME
 # 20 CREATE_OPTIONS
-if ($have_bug_11589)
-{
---disable_ps_protocol
-}
 --replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"  20 "#CO#"
 SELECT * FROM information_schema.tables
  WHERE table_schema = 'information_schema';
@@ -3160,7 +3128,8 @@ SELECT * FROM information_schema.tables
 # 15 CREATE_TIME
 # 16 UPDATE_TIME
 # 17 CHECK_TIME
---replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"
+# 20 CREATE_OPTIONS
+--replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"  20 "#CO#"
 SELECT * FROM information_schema.tables
  WHERE NOT( table_schema = 'information_schema');
 --enable_ps_protocol
@@ -3169,11 +3138,10 @@ connection default;
 --source suite/funcs_1/include/show_connection.inc
 
 # we see only 'public' tables
-#
-#FIXME 3.2.12: we split the "SELECT * FROM tables" in two parts until
-#FIXME 3.2.12: Bug #12397: wrong values shown in column CREATE_OPTIONS of
-#FIXME 3.2.12: INFORMATION_SCHEMA.TABLES is solved, one with 'more' and one
-#FIXME 3.2.12: with 'less' replace
+if ($have_bug_32285)
+{
+--disable_ps_protocol
+}
 #  9 AVG_ROW_LENGTH
 # 10 DATA_LENGTH
 # 11 MAX_DATA_LENGTH
@@ -3183,10 +3151,6 @@ connection default;
 # 16 UPDATE_TIME
 # 17 CHECK_TIME
 # 20 CREATE_OPTIONS
-if ($have_bug_11589)
-{
---disable_ps_protocol
-}
 --replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"  20 "#CO#"
 SELECT * FROM information_schema.tables
  WHERE table_schema = 'information_schema';
@@ -3198,7 +3162,8 @@ SELECT * FROM information_schema.tables
 # 15 CREATE_TIME
 # 16 UPDATE_TIME
 # 17 CHECK_TIME
---replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"
+# 20 CREATE_OPTIONS
+--replace_column  9 "#ARL#"  10 "#DL#"  11 "#MDL#"  12 "#IL#"  13 "#DF#"  15 "YYYY-MM-DD hh:mm:ss"  16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"  20 "#CO#"
 SELECT * FROM information_schema.tables
  WHERE NOT( table_schema = 'information_schema') AND NOT (table_schema = 'mysql' AND table_name LIKE 'help_%');
 --enable_ps_protocol
@@ -3587,12 +3552,6 @@ let $message= Testcase 3.2.16.1:;
 #                          GRANT OPTION).
 ################################################################################
 
-#-----------
-# Bug #12063 column 'TABLE_SCHEMA' is missing in table
-#                 INFORMATION_SCHEMA.USER_PRIVILEGE
-# ... is not a bug, it has been added by mistake in the TP requirement document.
-#-----------
-
 let $is_table= user_privileges;
 --source suite/funcs_1/datadict/datadict_show_table_design.inc
 # -------------------------------------------------------------------------------------------------------
@@ -3615,10 +3574,6 @@ let $message= Testcase 3.2.16.2 + 3.2.16
 #                    user.
 ################################################################################
 
-#FIXME 3.2.16: - when Bug #12269 is fixed a some of the outputs here may be
-#FIXME 3.2.16:   deleted as I added them for checking where / which information
-#FIXME 3.2.16:   is shown.
-
 --disable_warnings
 DROP DATABASE IF EXISTS db_datadict;
 --enable_warnings
@@ -3643,8 +3598,6 @@ GRANT UPDATE ON *.* TO 'user_2'@'localho
 
 FLUSH PRIVILEGES;
 
-let $message= FIXME (see Bug 12269) Here we expect more than only <USAGE> for user_1;
---source include/show_msg.inc
 eval $cmd1;
 eval $cmd2;
 eval $cmd3;
@@ -3653,8 +3606,6 @@ let $message= add GRANT OPTION db_datadi
 --source include/show_msg.inc
 GRANT UPDATE ON db_datadict.* TO 'user_1'@'localhost' WITH GRANT OPTION;
 
-let $message= FIXME (see Bug 12269) Here the <YES> is missing for the GRANT OPTION for user_1;
---source include/show_msg.inc
 eval $cmd1;
 eval $cmd2;
 eval $cmd3;
@@ -3733,7 +3684,6 @@ eval $cmd2;
 eval $cmd3;
 
 --source suite/funcs_1/include/show_connection.inc
-# checks entered before bug #12269 was reported
 # OK, user_1 has no privs here
 --error ER_TABLEACCESS_DENIED_ERROR
 CREATE TABLE db_datadict.tb_55 ( c1 TEXT );
diff -Nrup a/mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc b/mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc
--- a/mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc	2007-11-21 15:06:36 +01:00
+++ b/mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc	2007-11-27 17:40:04 +01:00
@@ -35,9 +35,8 @@ eval select table_name, index_schema, in
  where table_schema like '$dbname%';
 
 --replace_result $SERVER_NAME <SERVER_NAME>
---sorted_result
 eval select *
-  from information_schema.user_privileges;
+  from information_schema.user_privileges order by grantee, privilege_type;
 # where grantee="'u_6_401013'@'%'";
 
 eval select *
diff -Nrup a/mysql-test/suite/funcs_1/datadict/datadict_tables.inc b/mysql-test/suite/funcs_1/datadict/datadict_tables.inc
--- a/mysql-test/suite/funcs_1/datadict/datadict_tables.inc	2007-11-21 15:06:36 +01:00
+++ b/mysql-test/suite/funcs_1/datadict/datadict_tables.inc	2007-11-27 17:40:04 +01:00
@@ -28,8 +28,8 @@ eval $dd_part1 tables                   
 --source suite/funcs_1/datadict/datadict_bug_12777.inc
 eval $dd_part1 columns                               $dd_part2;
 eval $dd_part1 character_sets                        $dd_part2;
-eval $dd_part1 collations                            where collation_name <> 'utf8_general_cs' $dd_part2;
-eval $dd_part1 collation_character_set_applicability where collation_name <> 'utf8_general_cs' $dd_part2;
+eval $dd_part1 collations                            $dd_part2;
+eval $dd_part1 collation_character_set_applicability $dd_part2;
 --replace_column 16 <Created> 17 <Last_Altered>
 eval $dd_part1 routines                              $dd_part2;
 eval $dd_part1 statistics                            $dd_part2;
diff -Nrup a/mysql-test/suite/funcs_1/r/csv_subquery2.result b/mysql-test/suite/funcs_1/r/csv_subquery2.result
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/funcs_1/r/csv_subquery2.result	2007-11-27 17:40:14 +01:00
@@ -0,0 +1,314 @@
+DROP DATABASE IF EXISTS test1;
+DROP DATABASE IF EXISTS test2;
+DROP DATABASE IF EXISTS test3;
+CREATE DATABASE test1;
+USE test1;
+CREATE TABLE tb1 (f11 int , f12 char(10), f13 int, f14 char(20)) ENGINE CSV;
+CREATE TABLE tb2 (f21 int , f22 char(10), f23 int, f24 char(20)) ENGINE CSV;
+INSERT INTO tb1 VALUES ( 1,'aaaaaaaaaa', 0,'kkkkkkkkkkkkkkkkkkkk');
+INSERT INTO tb1 VALUES ( 2,'bbbbbbbbbb', 2,'llllllllllllllllllll');
+INSERT INTO tb1 VALUES ( 3,'cccccccccc', 4,'mmmmmmmmmmmmmmmmmmmm');
+INSERT INTO tb1 VALUES ( 4,'dddddddddd', 6,'nnnnnnnnnnnnnnnnnnnn');
+INSERT INTO tb1 VALUES ( 5,'eeeeeeeeee', 8,'oooooooooooooooooooo');
+INSERT INTO tb1 VALUES ( 6,'ffffffffff', 0,'pppppppppppppppppppp');
+INSERT INTO tb1 VALUES ( 7,'gggggggggg', 2,'qqqqqqqqqqqqqqqqqqqq');
+INSERT INTO tb1 VALUES ( 8,'hhhhhhhhhh', 4,'rrrrrrrrrrrrrrrrrrrr');
+INSERT INTO tb1 VALUES ( 9,'iiiiiiiiii', 6,'ssssssssssssssssssss');
+INSERT INTO tb1 VALUES (10,'jjjjjjjjjj', 8,'kkkkkkkkkkkkkkkkkkkk');
+INSERT INTO tb1 VALUES (11,'aaaaaaaaaa', 0,'llllllllllllllllllll');
+INSERT INTO tb1 VALUES (12,'bbbbbbbbbb', 2,'mmmmmmmmmmmmmmmmmmmm');
+INSERT INTO tb1 VALUES (13,'cccccccccc', 4,'nnnnnnnnnnnnnnnnnnnn');
+INSERT INTO tb1 VALUES (14,'dddddddddd', 6,'oooooooooooooooooooo');
+INSERT INTO tb1 VALUES (15,'eeeeeeeeee', 8,'pppppppppppppppppppp');
+INSERT INTO tb2 VALUES ( 1,'ffffffffff', 0,'jjjjjjjjjjjjjjjjjjjj');
+INSERT INTO tb2 VALUES ( 2,'bbbbbbbbbb', 2,'kkkkkkkkkkkkkkkkkkkk');
+INSERT INTO tb2 VALUES ( 3,'cccccccccc', 4,'llllllllllllllllllll');
+INSERT INTO tb2 VALUES ( 4,'dddddddddd', 6,'mmmmmmmmmmmmmmmmmmmm');
+INSERT INTO tb2 VALUES ( 5,'eeeeeeeeee', 8,'nnnnnnnnnnnnnnnnnnnn');
+CREATE DATABASE test2;
+USE test2;
+CREATE TABLE tb3 (f31 int , f32 char(10), f33 int, f34 char(20)) ENGINE CSV;
+CREATE TABLE tb4 (f41 int , f42 char(10), f43 int, f44 char(20)) ENGINE CSV;
+INSERT INTO tb3 VALUES ( 1,'aaaaaaaaaa', 0,'jjjjjjjjjjjjjjjjjjjj');
+INSERT INTO tb3 VALUES ( 2,'bbbbbbbbbb', 2,'kkkkkkkkkkkkkkkkkkkk');
+INSERT INTO tb3 VALUES ( 3,'cccccccccc', 4,'llllllllllllllllllll');
+INSERT INTO tb3 VALUES ( 4,'dddddddddd', 6,'mmmmmmmmmmmmmmmmmmmm');
+INSERT INTO tb3 VALUES ( 5,'eeeeeeeeee', 8,'nnnnnnnnnnnnnnnnnnnn');
+INSERT INTO tb4 VALUES ( 1,'ffffffffff', 0,'jjjjjjjjjjjjjjjjjjjj');
+INSERT INTO tb4 VALUES ( 2,'bbbbbbbbbb', 2,'kkkkkkkkkkkkkkkkkkkk');
+INSERT INTO tb4 VALUES ( 3,'cccccccccc', 4,'llllllllllllllllllll');
+INSERT INTO tb4 VALUES ( 4,'dddddddddd', 6,'mmmmmmmmmmmmmmmmmmmm');
+INSERT INTO tb4 VALUES ( 5,'eeeeeeeeee', 8,'nnnnnnnnnnnnnnnnnnnn');
+CREATE DATABASE test3;
+USE test3;
+CREATE TABLE tb5 (f51 int , f52 char(10), f53 int, f54 char(20)) ENGINE CSV;
+CREATE TABLE tb6 (f61 int , f62 char(10), f63 int, f64 char(20)) ENGINE CSV;
+INSERT INTO tb5 VALUES ( 1,'aaaaaaaaaa', 0,'jjjjjjjjjjjjjjjjjjjj');
+INSERT INTO tb5 VALUES ( 2,'bbbbbbbbbb', 2,'kkkkkkkkkkkkkkkkkkkk');
+INSERT INTO tb5 VALUES ( 3,'cccccccccc', 4,'llllllllllllllllllll');
+INSERT INTO tb5 VALUES ( 4,'dddddddddd', 6,'mmmmmmmmmmmmmmmmmmmm');
+INSERT INTO tb5 VALUES ( 5,'eeeeeeeeee', 8,'nnnnnnnnnnnnnnnnnnnn');
+INSERT INTO tb6 VALUES ( 1,'ffffffffff', 0,'jjjjjjjjjjjjjjjjjjjj');
+INSERT INTO tb6 VALUES ( 2,'bbbbbbbbbb', 2,'kkkkkkkkkkkkkkkkkkkk');
+INSERT INTO tb6 VALUES ( 3,'cccccccccc', 4,'llllllllllllllllllll');
+INSERT INTO tb6 VALUES ( 4,'dddddddddd', 6,'mmmmmmmmmmmmmmmmmmmm');
+INSERT INTO tb6 VALUES ( 5,'eeeeeeeeee', 8,'nnnnnnnnnnnnnnnnnnnn');
+USE information_schema;
+####################################################################################
+1.1.2 Create 3 user
+####################################################################################
+DROP USER testuser1@'localhost';
+ERROR HY000: Operation DROP USER failed for 'testuser1'@'localhost'
+DROP USER testuser2@'localhost';
+ERROR HY000: Operation DROP USER failed for 'testuser2'@'localhost'
+DROP USER testuser3@'localhost';
+ERROR HY000: Operation DROP USER failed for 'testuser3'@'localhost'
+CREATE USER testuser1@'localhost';
+SET PASSWORD FOR testuser1@'localhost' = PASSWORD('testpass');
+GRANT SELECT,INSERT,UPDATE ON test1.* TO testuser1@'localhost' IDENTIFIED BY 'testpass';
+GRANT SELECT,INSERT,UPDATE ON test2.* TO testuser1@'localhost' IDENTIFIED BY 'testpass';
+GRANT SELECT,INSERT,UPDATE ON test3.* TO testuser1@'localhost' IDENTIFIED BY 'testpass';
+CREATE USER testuser2@'localhost';
+SET PASSWORD FOR testuser2@'localhost' = PASSWORD('testpass');
+GRANT SELECT,INSERT,UPDATE ON test1.* TO testuser2@'localhost' IDENTIFIED BY 'testpass';
+GRANT SELECT,INSERT,UPDATE ON test2.* TO testuser2@'localhost' IDENTIFIED BY 'testpass';
+GRANT SELECT,INSERT,UPDATE ON test3.* TO testuser2@'localhost' IDENTIFIED BY 'testpass';
+CREATE USER testuser3@'localhost';
+SET PASSWORD FOR testuser3@'localhost' = PASSWORD('testpass');
+GRANT SELECT,INSERT,UPDATE ON test1.* TO testuser3@'localhost' IDENTIFIED BY 'testpass';
+GRANT SELECT,INSERT,UPDATE ON test2.* TO testuser3@'localhost' IDENTIFIED BY 'testpass';
+GRANT SELECT,INSERT,UPDATE ON test3.* TO testuser3@'localhost' IDENTIFIED BY 'testpass';
+####################################################################################
+all subqueries must succeed
+Establish connection con100 (user=testuser1)
+####################################################################################
+INSERT INTO test3.tb5 SELECT * FROM test1.tb1 WHERE f11 > 5;
+INSERT INTO test2.tb3 (f31,f32,f33,f34) 
+SELECT f11,f12,f53,f54 FROM test1.tb1 JOIN test3.tb5 WHERE f11 > 5 AND f11=f51;
+SELECT test1.tb1.f11,test2.tb3.f32 FROM test1.tb1,test2.tb3 WHERE f11 IN (SELECT f31 FROM test2.tb3 WHERE f31=test1.tb1.f13);
+f11	f32
+2	aaaaaaaaaa
+2	aaaaaaaaaa
+2	bbbbbbbbbb
+2	bbbbbbbbbb
+2	cccccccccc
+2	cccccccccc
+2	dddddddddd
+2	dddddddddd
+2	eeeeeeeeee
+2	eeeeeeeeee
+2	ffffffffff
+2	gggggggggg
+2	hhhhhhhhhh
+2	iiiiiiiiii
+2	jjjjjjjjjj
+SELECT DISTINCT test1.tb1.f11,test2.tb3.f32 FROM test1.tb1,test2.tb3 WHERE f11 IN (SELECT f31 FROM test2.tb3 WHERE f31=test1.tb1.f13);
+f11	f32
+2	aaaaaaaaaa
+2	bbbbbbbbbb
+2	cccccccccc
+2	dddddddddd
+2	eeeeeeeeee
+2	ffffffffff
+2	gggggggggg
+2	hhhhhhhhhh
+2	iiiiiiiiii
+2	jjjjjjjjjj
+SELECT test1.tb1.f11 FROM test1.tb1 WHERE f14 IN (SELECT  DISTINCT f34 FROM test2.tb3 WHERE f31 IN (SELECT f51 FROM test3.tb5 WHERE test3.tb5.f54 = 'pppppppppppppppppppp'));
+f11
+15
+6
+UPDATE test1.tb1 set f12 = NULL WHERE f13 = 0;
+UPDATE test2.tb3 set f32 = NULL WHERE f33 = 0;
+UPDATE test3.tb5 set f52 = NULL WHERE f53 = 0;
+SELECT test1.tb1.f12 FROM test1.tb1 WHERE f11 IN (SELECT f31 FROM test2.tb3 WHERE f31 IN (SELECT f51 FROM test3.tb5 WHERE test3.tb5.f52 IS NULL));
+f12
+SELECT test1.tb1.f12 FROM test1.tb1 WHERE f11 IN (SELECT f31 FROM test2.tb3 WHERE f32 IS NULL UNION SELECT f51 FROM test3.tb5 WHERE test3.tb5.f52 IS NULL);
+f12
+SELECT * FROM test1.tb1 WHERE f11 IN (SELECT f31 FROM test2.tb3 WHERE f32 = 'bbbbbbbbbb' UNION SELECT f51 FROM test3.tb5 WHERE test3.tb5.f52 IS NULL);
+f11	f12	f13	f14
+12	bbbbbbbbbb	2	mmmmmmmmmmmmmmmmmmmm
+2	bbbbbbbbbb	2	llllllllllllllllllll
+SELECT * FROM test1.tb1 WHERE f12 IN (SELECT f52 FROM test3.tb5 WHERE test3.tb5.f52 IS NULL);
+f11	f12	f13	f14
+####################################################################################
+no SELECT privilege on of the inner tables
+connection default(user=root)
+REVOKE SELECT ON test2.* FROM testuser1@'localhost' IDENTIFIED BY 'testpass';
+####################################################################################
+Establish connection con100 (user=testuser1)
+SELECT f11 FROM test1.tb1 WHERE f11 = 1;
+f11
+1
+SELECT f31 FROM test2.tb3 WHERE f31 = 1;
+ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table 'tb3'
+SELECT f51 FROM test3.tb5 WHERE f51 = 1;
+f51
+1
+SELECT f51 FROM test3.tb5 WHERE test3.tb5.f52 IS NULL;
+f51
+SELECT f32 FROM test2.tb3 WHERE f31 IN (SELECT f51 FROM test3.tb5 WHERE test3.tb5.f52 IS NULL);
+ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table 'tb3'
+SELECT test1.tb1.f12 FROM test1.tb1 WHERE f11 IN (SELECT f31 FROM test2.tb3 WHERE f31 IN (SELECT f51 FROM test3.tb5 WHERE test3.tb5.f52 IS NULL));
+ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table 'tb3'
+SELECT test1.tb1.f12 FROM test1.tb1 WHERE f11 IN (SELECT f31 FROM test2.tb3 WHERE f32 IS NULL UNION SELECT f51 FROM test3.tb5 WHERE test3.tb5.f52 IS NULL);
+ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table 'tb3'
+SELECT * FROM test1.tb1 WHERE f11 IN (SELECT f31 FROM test2.tb3 WHERE f32 = 'bbbbbbbbbb' UNION SELECT f51 FROM test3.tb5 WHERE test3.tb5.f52 IS NULL);
+ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table 'tb3'
+SELECT * FROM test1.tb1 WHERE f12 IN (SELECT f52 FROM test3.tb5 WHERE test3.tb5.f52 IS NULL);
+f11	f12	f13	f14
+####################################################################################
+connection default(user=root)
+GRANT SELECT ON test2.* TO testuser1@'localhost' IDENTIFIED BY 'testpass';
+REVOKE SELECT ON test1.* FROM testuser1@'localhost' IDENTIFIED BY 'testpass';
+####################################################################################
+no SELECT privilege on the outer table
+Establish connection con100 (user=testuser1)
+SELECT f11 FROM test1.tb1 WHERE f11 = 1;
+ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table 'tb1'
+SELECT f31 FROM test2.tb3 WHERE f31 = 1;
+f31
+1
+SELECT f51 FROM test3.tb5 WHERE f51 = 1;
+f51
+1
+SELECT test1.tb1.f12 FROM test1.tb1 WHERE f11 IN (SELECT f31 FROM test2.tb3 WHERE f31 IN (SELECT f51 FROM test3.tb5 WHERE test3.tb5.f52 IS NULL));
+ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table 'tb1'
+SELECT test1.tb1.f12 FROM test1.tb1 WHERE f11 IN (SELECT f31 FROM test2.tb3 WHERE f32 IS NULL UNION SELECT f51 FROM test3.tb5 WHERE test3.tb5.f52 IS NULL);
+ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table 'tb1'
+SELECT * FROM test1.tb1 WHERE f11 IN (SELECT f31 FROM test2.tb3 WHERE f32 = 'bbbbbbbbbb' UNION SELECT f51 FROM test3.tb5 WHERE test3.tb5.f52 IS NULL);
+ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table 'tb1'
+SELECT * FROM test1.tb1 WHERE f12 IN (SELECT f52 FROM test3.tb5 WHERE test3.tb5.f52 IS NULL);
+ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table 'tb1'
+####################################################################################
+connection default(user=root)
+GRANT SELECT,INSERT,UPDATE ON test1.* TO testuser2@'localhost' IDENTIFIED BY 'testpass' WITH GRANT OPTION;
+GRANT SELECT,INSERT,UPDATE ON test2.* TO testuser2@'localhost' IDENTIFIED BY 'testpass' WITH GRANT OPTION;
+GRANT SELECT,INSERT,UPDATE ON test3.* TO testuser2@'localhost' IDENTIFIED BY 'testpass' WITH GRANT OPTION;
+REVOKE SELECT,INSERT,UPDATE ON test1.* FROM testuser1@'localhost' IDENTIFIED BY 'testpass';
+REVOKE SELECT,INSERT,UPDATE ON test2.* FROM testuser1@'localhost' IDENTIFIED BY 'testpass';
+REVOKE SELECT,INSERT,UPDATE ON test3.* FROM testuser1@'localhost' IDENTIFIED BY 'testpass';
+####################################################################################
+no privilege
+Establish connection con100 (user=testuser1)
+####################################################################################
+SHOW GRANTS;
+Grants for testuser1@localhost
+GRANT USAGE ON *.* TO 'testuser1'@'localhost' IDENTIFIED BY PASSWORD '*00E247AC5F9AF26AE0194B41E1E769DEE1429A29'
+INSERT INTO test3.tb5 SELECT * FROM test1.tb1 WHERE f11 > 5;
+ERROR 42000: INSERT command denied to user 'testuser1'@'localhost' for table 'tb5'
+INSERT INTO test2.tb3 (f31,f32,f33,f34) 
+SELECT f11,f12,f53,f54 FROM test1.tb1 JOIN test3.tb5 WHERE f11 > 5 AND f11=f51;
+ERROR 42000: INSERT command denied to user 'testuser1'@'localhost' for table 'tb3'
+SELECT test1.tb1.f11 FROM test1.tb1 WHERE f14 IN (SELECT  DISTINCT f34 FROM test2.tb3 WHERE f31 IN (SELECT f51 FROM test3.tb5 WHERE test3.tb5.f54 = 'pppppppppppppppppppp'));
+ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table 'tb1'
+UPDATE test1.tb1 set f12 = NULL WHERE f13 = 0;
+ERROR 42000: UPDATE command denied to user 'testuser1'@'localhost' for table 'tb1'
+UPDATE test2.tb3 set f32 = NULL WHERE f33 = 0;
+ERROR 42000: UPDATE command denied to user 'testuser1'@'localhost' for table 'tb3'
+UPDATE test3.tb5 set f52 = NULL WHERE f53 = 0;
+ERROR 42000: UPDATE command denied to user 'testuser1'@'localhost' for table 'tb5'
+SELECT * FROM test1.tb1 WHERE f11 IN (SELECT f31 FROM test2.tb3 WHERE f32 = 'bbbbbbbbbb' UNION SELECT f51 FROM test3.tb5 WHERE test3.tb5.f52 IS NULL);
+ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table 'tb1'
+SELECT * FROM test1.tb1 WHERE f12 IN (SELECT f52 FROM test3.tb5 WHERE test3.tb5.f52 IS NULL);
+ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table 'tb1'
+####################################################################################
+Establish connection con200 (user=testuser2):
+####################################################################################
+SHOW GRANTS;
+Grants for testuser2@localhost
+GRANT USAGE ON *.* TO 'testuser2'@'localhost' IDENTIFIED BY PASSWORD '*00E247AC5F9AF26AE0194B41E1E769DEE1429A29'
+GRANT SELECT, INSERT, UPDATE ON `test1`.* TO 'testuser2'@'localhost' WITH GRANT OPTION
+GRANT SELECT, INSERT, UPDATE ON `test2`.* TO 'testuser2'@'localhost' WITH GRANT OPTION
+GRANT SELECT, INSERT, UPDATE ON `test3`.* TO 'testuser2'@'localhost' WITH GRANT OPTION
+GRANT SELECT,INSERT,UPDATE ON test1.* TO testuser1@'localhost';
+GRANT SELECT,INSERT,UPDATE ON test2.* TO testuser1@'localhost';
+GRANT SELECT,INSERT,UPDATE ON test3.* TO testuser1@'localhost';
+####################################################################################
+INSERT,UPDATE,SELECT privilege granted by testuser2
+Establish connection con100 (user=testuser1)
+####################################################################################
+SHOW GRANTS;
+Grants for testuser1@localhost
+GRANT USAGE ON *.* TO 'testuser1'@'localhost' IDENTIFIED BY PASSWORD '*00E247AC5F9AF26AE0194B41E1E769DEE1429A29'
+GRANT SELECT, INSERT, UPDATE ON `test2`.* TO 'testuser1'@'localhost'
+GRANT SELECT, INSERT, UPDATE ON `test1`.* TO 'testuser1'@'localhost'
+GRANT SELECT, INSERT, UPDATE ON `test3`.* TO 'testuser1'@'localhost'
+INSERT INTO test1.tb2 SELECT * FROM test1.tb1 WHERE f11 > 5;
+INSERT INTO test3.tb6 SELECT * FROM test1.tb1 WHERE f11 > 5;
+INSERT INTO test2.tb4 (f41,f42,f43,f44) 
+SELECT f11,f12,f53,f54 FROM test1.tb1 JOIN test3.tb5 WHERE f11 > 5 AND f11=f51;
+SELECT test1.tb1.f11 FROM test1.tb1 WHERE f14 IN (SELECT  DISTINCT f34 FROM test2.tb3 WHERE f31 IN (SELECT f51 FROM test3.tb5 WHERE test3.tb5.f54 = 'pppppppppppppppppppp'));
+f11
+15
+6
+UPDATE test1.tb2 set f22 = NULL WHERE f23 = 0;
+UPDATE test2.tb4 set f42 = NULL WHERE f43 = 0;
+UPDATE test3.tb6 set f62 = NULL WHERE f63 = 0;
+SELECT * FROM test1.tb1 WHERE f11 IN (SELECT f31 FROM test2.tb3 WHERE f32 = 'bbbbbbbbbb' UNION SELECT f51 FROM test3.tb5 WHERE test3.tb5.f52 IS NULL);
+f11	f12	f13	f14
+12	bbbbbbbbbb	2	mmmmmmmmmmmmmmmmmmmm
+2	bbbbbbbbbb	2	llllllllllllllllllll
+SELECT * FROM test1.tb1 WHERE f12 IN (SELECT f52 FROM test3.tb5 WHERE test3.tb5.f52 IS NULL);
+f11	f12	f13	f14
+####################################################################################
+Establish connection con200 (user=testuser2):
+####################################################################################
+REVOKE SELECT ON test3.* FROM testuser1@'localhost';
+####################################################################################
+no SELECT privilege on one of the inner tables
+Establish connection con100 (user=testuser1)
+####################################################################################
+SHOW GRANTS;
+Grants for testuser1@localhost
+GRANT USAGE ON *.* TO 'testuser1'@'localhost' IDENTIFIED BY PASSWORD '*00E247AC5F9AF26AE0194B41E1E769DEE1429A29'
+GRANT SELECT, INSERT, UPDATE ON `test2`.* TO 'testuser1'@'localhost'
+GRANT SELECT, INSERT, UPDATE ON `test1`.* TO 'testuser1'@'localhost'
+GRANT INSERT, UPDATE ON `test3`.* TO 'testuser1'@'localhost'
+INSERT INTO test3.tb5 SELECT * FROM test1.tb1 WHERE f11 > 5;
+INSERT INTO test2.tb3 (f31,f32,f33,f34) 
+SELECT f11,f12,f53,f54 FROM test1.tb1 JOIN test3.tb5 WHERE f11 > 5 AND f11=f51;
+ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table 'tb5'
+SELECT test1.tb1.f11 FROM test1.tb1 WHERE f14 IN (SELECT  DISTINCT f34 FROM test2.tb3 WHERE f31 IN (SELECT f51 FROM test3.tb5 WHERE test3.tb5.f54 = 'pppppppppppppppppppp'));
+ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table 'tb5'
+SELECT * FROM test1.tb1 WHERE f11 IN (SELECT f31 FROM test2.tb3 WHERE f32 = 'bbbbbbbbbb' UNION SELECT f51 FROM test3.tb5 WHERE test3.tb5.f52 IS NULL);
+ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table 'tb5'
+SELECT * FROM test1.tb1 WHERE f12 IN (SELECT f52 FROM test3.tb5 WHERE test3.tb5.f52 IS NULL);
+ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table 'tb5'
+####################################################################################
+lost SELECT privilege between PREPARE and EXECUTE and got it again
+Establish connection con200 (user=testuser2):
+####################################################################################
+PREPARE subsel1 FROM 'SELECT test1.tb1.f11 FROM test1.tb1 WHERE f14 IN (SELECT  DISTINCT f34 FROM test2.tb3 WHERE f31 IN (SELECT f51 FROM test3.tb5 WHERE test3.tb5.f54 = ''pppppppppppppppppppp''))';
+EXECUTE subsel1;
+f11
+15
+6
+####################################################################################
+connection default(user=root with default privileges):
+####################################################################################
+REVOKE SELECT ON test3.* FROM testuser2@'localhost';
+####################################################################################
+Establish connection con200 (user=testuser2):
+####################################################################################
+EXECUTE subsel1;
+ERROR 42000: SELECT command denied to user 'testuser2'@'localhost' for table 'tb5'
+####################################################################################
+connection default(user=root with default privileges):
+####################################################################################
+GRANT SELECT ON test3.* TO testuser2@'localhost' IDENTIFIED BY 'testpass';
+####################################################################################
+Establish connection con200 (user=testuser2):
+####################################################################################
+EXECUTE subsel1;
+f11
+15
+6
+####################################################################################
+connection default(user=root)
+DROP DATABASE IF EXISTS test1;
+DROP DATABASE IF EXISTS test2;
+DROP DATABASE IF EXISTS test3;
+DROP USER testuser1@'localhost';
+DROP USER testuser2@'localhost';
+DROP USER testuser3@'localhost';
diff -Nrup a/mysql-test/suite/funcs_1/r/csv_subquery3.result b/mysql-test/suite/funcs_1/r/csv_subquery3.result
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/funcs_1/r/csv_subquery3.result	2007-11-27 17:40:14 +01:00
@@ -0,0 +1,127 @@
+SET autocommit= off;
+DROP DATABASE IF EXISTS test1;
+DROP DATABASE IF EXISTS test2;
+DROP DATABASE IF EXISTS test3;
+CREATE DATABASE test1;
+USE test1;
+CREATE TABLE tb1 (f11 int, f12 char(10), f13 int, f14 char(20)) ENGINE csv;
+CREATE TABLE tb2 (f21 int, f22 char(10), f23 int, f24 char(20)) ENGINE csv;
+INSERT INTO tb1 VALUES ( 1,'aaaaaaaaaa', 0,'kkkkkkkkkkkkkkkkkkkk');
+INSERT INTO tb1 VALUES ( 2,'bbbbbbbbbb', 2,'llllllllllllllllllll');
+INSERT INTO tb1 VALUES ( 3,'cccccccccc', 4,'mmmmmmmmmmmmmmmmmmmm');
+INSERT INTO tb1 VALUES ( 4,'dddddddddd', 6,'nnnnnnnnnnnnnnnnnnnn');
+INSERT INTO tb1 VALUES ( 5,'eeeeeeeeee', 8,'oooooooooooooooooooo');
+INSERT INTO tb1 VALUES ( 6,'ffffffffff', 0,'pppppppppppppppppppp');
+INSERT INTO tb1 VALUES ( 7,'gggggggggg', 2,'qqqqqqqqqqqqqqqqqqqq');
+INSERT INTO tb1 VALUES ( 8,'hhhhhhhhhh', 4,'rrrrrrrrrrrrrrrrrrrr');
+INSERT INTO tb1 VALUES ( 9,'iiiiiiiiii', 6,'ssssssssssssssssssss');
+INSERT INTO tb1 VALUES (10,'jjjjjjjjjj', 8,'kkkkkkkkkkkkkkkkkkkk');
+INSERT INTO tb1 VALUES (11,'aaaaaaaaaa', 0,'llllllllllllllllllll');
+INSERT INTO tb1 VALUES (12,'bbbbbbbbbb', 2,'mmmmmmmmmmmmmmmmmmmm');
+INSERT INTO tb1 VALUES (13,'cccccccccc', 4,'nnnnnnnnnnnnnnnnnnnn');
+INSERT INTO tb1 VALUES (14,'dddddddddd', 6,'oooooooooooooooooooo');
+INSERT INTO tb1 VALUES (15,'eeeeeeeeee', 8,'pppppppppppppppppppp');
+INSERT INTO tb2 VALUES ( 1,'ffffffffff', 0,'jjjjjjjjjjjjjjjjjjjj');
+INSERT INTO tb2 VALUES ( 2,'bbbbbbbbbb', 2,'kkkkkkkkkkkkkkkkkkkk');
+INSERT INTO tb2 VALUES ( 3,'cccccccccc', 4,'llllllllllllllllllll');
+INSERT INTO tb2 VALUES ( 4,'dddddddddd', 6,'mmmmmmmmmmmmmmmmmmmm');
+INSERT INTO tb2 VALUES ( 5,'eeeeeeeeee', 8,'nnnnnnnnnnnnnnnnnnnn');
+COMMIT;
+CREATE DATABASE test2;
+USE test2;
+CREATE TABLE tb3 (f31 int, f32 char(10), f33 int, f34 char(20)) ENGINE csv;
+CREATE TABLE tb4 (f41 int, f42 char(10), f43 int, f44 char(20)) ENGINE csv;
+INSERT INTO tb3 VALUES ( 1,'aaaaaaaaaa', 0,'jjjjjjjjjjjjjjjjjjjj');
+INSERT INTO tb3 VALUES ( 2,'bbbbbbbbbb', 2,'kkkkkkkkkkkkkkkkkkkk');
+INSERT INTO tb3 VALUES ( 3,'cccccccccc', 4,'llllllllllllllllllll');
+INSERT INTO tb3 VALUES ( 4,'dddddddddd', 6,'mmmmmmmmmmmmmmmmmmmm');
+INSERT INTO tb3 VALUES ( 5,'eeeeeeeeee', 8,'nnnnnnnnnnnnnnnnnnnn');
+INSERT INTO tb4 VALUES ( 1,'ffffffffff', 0,'jjjjjjjjjjjjjjjjjjjj');
+INSERT INTO tb4 VALUES ( 2,'bbbbbbbbbb', 2,'kkkkkkkkkkkkkkkkkkkk');
+INSERT INTO tb4 VALUES ( 3,'cccccccccc', 4,'llllllllllllllllllll');
+INSERT INTO tb4 VALUES ( 4,'dddddddddd', 6,'mmmmmmmmmmmmmmmmmmmm');
+INSERT INTO tb4 VALUES ( 5,'eeeeeeeeee', 8,'nnnnnnnnnnnnnnnnnnnn');
+COMMIT;
+CREATE DATABASE test3;
+USE test3;
+CREATE TABLE tb5 (f51 int, f52 char(10), f53 int, f54 char(20)) ENGINE csv;
+CREATE TABLE tb6 (f61 int, f62 char(10), f63 int, f64 char(20)) ENGINE csv;
+INSERT INTO tb5 VALUES ( 1,'aaaaaaaaaa', 0,'jjjjjjjjjjjjjjjjjjjj');
+INSERT INTO tb5 VALUES ( 2,'bbbbbbbbbb', 2,'kkkkkkkkkkkkkkkkkkkk');
+INSERT INTO tb5 VALUES ( 3,'cccccccccc', 4,'llllllllllllllllllll');
+INSERT INTO tb5 VALUES ( 4,'dddddddddd', 6,'mmmmmmmmmmmmmmmmmmmm');
+INSERT INTO tb5 VALUES ( 5,'eeeeeeeeee', 8,'nnnnnnnnnnnnnnnnnnnn');
+INSERT INTO tb6 VALUES ( 1,'ffffffffff', 0,'jjjjjjjjjjjjjjjjjjjj');
+INSERT INTO tb6 VALUES ( 2,'bbbbbbbbbb', 2,'kkkkkkkkkkkkkkkkkkkk');
+INSERT INTO tb6 VALUES ( 3,'cccccccccc', 4,'llllllllllllllllllll');
+INSERT INTO tb6 VALUES ( 4,'dddddddddd', 6,'mmmmmmmmmmmmmmmmmmmm');
+INSERT INTO tb6 VALUES ( 5,'eeeeeeeeee', 8,'nnnnnnnnnnnnnnnnnnnn');
+COMMIT;
+USE information_schema;
+####################################################################################
+1.1.2 Create 3 user
+DROP USER testuser1@'localhost';
+ERROR HY000: Operation DROP USER failed for 'testuser1'@'localhost'
+DROP USER testuser2@'localhost';
+ERROR HY000: Operation DROP USER failed for 'testuser2'@'localhost'
+DROP USER testuser3@'localhost';
+ERROR HY000: Operation DROP USER failed for 'testuser3'@'localhost'
+CREATE USER testuser1@'localhost';
+SET PASSWORD FOR testuser1@'localhost' = PASSWORD('testpass');
+GRANT SELECT,INSERT,UPDATE,LOCK TABLES ON test1.* TO testuser1@'localhost' IDENTIFIED BY 'testpass';
+GRANT SELECT,INSERT,UPDATE,LOCK TABLES ON test2.* TO testuser1@'localhost' IDENTIFIED BY 'testpass';
+GRANT SELECT,INSERT,UPDATE,LOCK TABLES ON test3.* TO testuser1@'localhost' IDENTIFIED BY 'testpass';
+CREATE USER testuser2@'localhost';
+SET PASSWORD FOR testuser2@'localhost' = PASSWORD('testpass');
+GRANT SELECT,INSERT,UPDATE,LOCK TABLES ON test1.* TO testuser2@'localhost' IDENTIFIED BY 'testpass';
+GRANT SELECT,INSERT,UPDATE,LOCK TABLES ON test2.* TO testuser2@'localhost' IDENTIFIED BY 'testpass';
+GRANT SELECT,INSERT,UPDATE,LOCK TABLES ON test3.* TO testuser2@'localhost' IDENTIFIED BY 'testpass';
+CREATE USER testuser3@'localhost';
+SET PASSWORD FOR testuser3@'localhost' = PASSWORD('testpass');
+GRANT SELECT,INSERT,UPDATE,LOCK TABLES ON test1.* TO testuser3@'localhost' IDENTIFIED BY 'testpass';
+GRANT SELECT,INSERT,UPDATE,LOCK TABLES ON test2.* TO testuser3@'localhost' IDENTIFIED BY 'testpass';
+GRANT SELECT,INSERT,UPDATE,LOCK TABLES ON test3.* TO testuser3@'localhost' IDENTIFIED BY 'testpass';
+COMMIT;
+############# LOCK/UNLOCK test
+####################################################################################
+Establish connection con200 (user=testuser2)
+SELECT * FROM test1.tb1 WHERE f11 IN (SELECT f31 FROM test2.tb3 WHERE f33 = 0 UNION 
+SELECT f51 FROM test3.tb5 WHERE test3.tb5.f53 = 0);
+f11	f12	f13	f14
+1	aaaaaaaaaa	0	kkkkkkkkkkkkkkkkkkkk
+####################################################################################
+Establish connection con100 (user=testuser1)
+LOCK TABLE test1.tb1 READ,test2.tb3 WRITE,test3.tb5 WRITE;
+####################################################################################
+connection con200
+SELECT * FROM test1.tb1 WHERE f11 IN (SELECT f31 FROM test2.tb3 WHERE f33 = 0 UNION 
+SELECT f51 FROM test3.tb5 WHERE test3.tb5.f53 = 0);
+####################################################################################
+connection default
+# Sleep some time
+SHOW FULL PROCESSLIST;
+Id	User	Host	db	Command	Time	State	Info
+<ID>	root	localhost	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
+<ID>	testuser2	localhost	test	Query	<TIME>	Locked	SELECT * FROM test1.tb1 WHERE f11 IN (SELECT f31 FROM test2.tb3 WHERE f33 = 0 UNION 
+SELECT f51 FROM test3.tb5 WHERE test3.tb5.f53 = 0)
+<ID>	testuser1	localhost	test	Sleep	<TIME>		NULL
+####################################################################################
+connection con100;
+INSERT INTO test3.tb5 SELECT * FROM test1.tb1 WHERE f11 > 5;
+INSERT INTO test2.tb3 (f31,f32,f33,f34) 
+SELECT f11,f12,f53,f54 FROM test1.tb1 JOIN test3.tb5 WHERE f11 > 5 AND f11=f51;
+UNLOCK TABLES;
+COMMIT;
+####################################################################################
+connection con200;
+f11	f12	f13	f14
+1	aaaaaaaaaa	0	kkkkkkkkkkkkkkkkkkkk
+11	aaaaaaaaaa	0	llllllllllllllllllll
+6	ffffffffff	0	pppppppppppppppppppp
+connection default;
+DROP DATABASE IF EXISTS test1;
+DROP DATABASE IF EXISTS test2;
+DROP DATABASE IF EXISTS test3;
+DROP USER testuser1@'localhost';
+DROP USER testuser2@'localhost';
+DROP USER testuser3@'localhost';
diff -Nrup a/mysql-test/suite/funcs_1/r/csv_subquery4.result b/mysql-test/suite/funcs_1/r/csv_subquery4.result
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/funcs_1/r/csv_subquery4.result	2007-11-27 17:40:14 +01:00
@@ -0,0 +1,151 @@
+SET autocommit= off;
+DROP DATABASE IF EXISTS test1;
+DROP DATABASE IF EXISTS test2;
+DROP DATABASE IF EXISTS test3;
+CREATE DATABASE test1;
+USE test1;
+CREATE TABLE tb1 (f11 int , f12 char(10), f13 int, f14 char(20)) ENGINE csv;
+CREATE TABLE tb2 (f21 int , f22 char(10), f23 int, f24 char(20)) ENGINE csv;
+INSERT INTO tb1 VALUES ( 1,'aaaaaaaaaa', 0,'kkkkkkkkkkkkkkkkkkkk');
+INSERT INTO tb1 VALUES ( 2,'bbbbbbbbbb', 2,'llllllllllllllllllll');
+INSERT INTO tb1 VALUES ( 3,'cccccccccc', 4,'mmmmmmmmmmmmmmmmmmmm');
+INSERT INTO tb1 VALUES ( 4,'dddddddddd', 6,'nnnnnnnnnnnnnnnnnnnn');
+INSERT INTO tb1 VALUES ( 5,'eeeeeeeeee', 8,'oooooooooooooooooooo');
+INSERT INTO tb1 VALUES ( 6,'ffffffffff', 0,'pppppppppppppppppppp');
+INSERT INTO tb1 VALUES ( 7,'gggggggggg', 2,'qqqqqqqqqqqqqqqqqqqq');
+INSERT INTO tb1 VALUES ( 8,'hhhhhhhhhh', 4,'rrrrrrrrrrrrrrrrrrrr');
+INSERT INTO tb1 VALUES ( 9,'iiiiiiiiii', 6,'ssssssssssssssssssss');
+INSERT INTO tb1 VALUES (10,'jjjjjjjjjj', 8,'kkkkkkkkkkkkkkkkkkkk');
+INSERT INTO tb1 VALUES (11,'aaaaaaaaaa', 0,'llllllllllllllllllll');
+INSERT INTO tb1 VALUES (12,'bbbbbbbbbb', 2,'mmmmmmmmmmmmmmmmmmmm');
+INSERT INTO tb1 VALUES (13,'cccccccccc', 4,'nnnnnnnnnnnnnnnnnnnn');
+INSERT INTO tb1 VALUES (14,'dddddddddd', 6,'oooooooooooooooooooo');
+INSERT INTO tb1 VALUES (15,'eeeeeeeeee', 8,'pppppppppppppppppppp');
+INSERT INTO tb2 VALUES ( 1,'ffffffffff', 0,'jjjjjjjjjjjjjjjjjjjj');
+INSERT INTO tb2 VALUES ( 2,'bbbbbbbbbb', 2,'kkkkkkkkkkkkkkkkkkkk');
+INSERT INTO tb2 VALUES ( 3,'cccccccccc', 4,'llllllllllllllllllll');
+INSERT INTO tb2 VALUES ( 4,'dddddddddd', 6,'mmmmmmmmmmmmmmmmmmmm');
+INSERT INTO tb2 VALUES ( 5,'eeeeeeeeee', 8,'nnnnnnnnnnnnnnnnnnnn');
+COMMIT;
+CREATE DATABASE test2;
+USE test2;
+CREATE TABLE tb3 (f31 int , f32 char(10), f33 int, f34 char(20)) ENGINE csv;
+CREATE TABLE tb4 (f41 int , f42 char(10), f43 int, f44 char(20)) ENGINE csv;
+INSERT INTO tb3 VALUES ( 1,'aaaaaaaaaa', 0,'jjjjjjjjjjjjjjjjjjjj');
+INSERT INTO tb3 VALUES ( 2,'bbbbbbbbbb', 2,'kkkkkkkkkkkkkkkkkkkk');
+INSERT INTO tb3 VALUES ( 3,'cccccccccc', 4,'llllllllllllllllllll');
+INSERT INTO tb3 VALUES ( 4,'dddddddddd', 6,'mmmmmmmmmmmmmmmmmmmm');
+INSERT INTO tb3 VALUES ( 5,'eeeeeeeeee', 8,'nnnnnnnnnnnnnnnnnnnn');
+INSERT INTO tb4 VALUES ( 1,'ffffffffff', 0,'jjjjjjjjjjjjjjjjjjjj');
+INSERT INTO tb4 VALUES ( 2,'bbbbbbbbbb', 2,'kkkkkkkkkkkkkkkkkkkk');
+INSERT INTO tb4 VALUES ( 3,'cccccccccc', 4,'llllllllllllllllllll');
+INSERT INTO tb4 VALUES ( 4,'dddddddddd', 6,'mmmmmmmmmmmmmmmmmmmm');
+INSERT INTO tb4 VALUES ( 5,'eeeeeeeeee', 8,'nnnnnnnnnnnnnnnnnnnn');
+COMMIT;
+CREATE DATABASE test3;
+USE test3;
+CREATE TABLE tb5 (f51 int , f52 char(10), f53 int, f54 char(20)) ENGINE csv;
+CREATE TABLE tb6 (f61 int , f62 char(10), f63 int, f64 char(20)) ENGINE csv;
+INSERT INTO tb5 VALUES ( 1,'aaaaaaaaaa', 0,'jjjjjjjjjjjjjjjjjjjj');
+INSERT INTO tb5 VALUES ( 2,'bbbbbbbbbb', 2,'kkkkkkkkkkkkkkkkkkkk');
+INSERT INTO tb5 VALUES ( 3,'cccccccccc', 4,'llllllllllllllllllll');
+INSERT INTO tb5 VALUES ( 4,'dddddddddd', 6,'mmmmmmmmmmmmmmmmmmmm');
+INSERT INTO tb5 VALUES ( 5,'eeeeeeeeee', 8,'nnnnnnnnnnnnnnnnnnnn');
+INSERT INTO tb6 VALUES ( 1,'ffffffffff', 0,'jjjjjjjjjjjjjjjjjjjj');
+INSERT INTO tb6 VALUES ( 2,'bbbbbbbbbb', 2,'kkkkkkkkkkkkkkkkkkkk');
+INSERT INTO tb6 VALUES ( 3,'cccccccccc', 4,'llllllllllllllllllll');
+INSERT INTO tb6 VALUES ( 4,'dddddddddd', 6,'mmmmmmmmmmmmmmmmmmmm');
+INSERT INTO tb6 VALUES ( 5,'eeeeeeeeee', 8,'nnnnnnnnnnnnnnnnnnnn');
+COMMIT;
+USE information_schema;
+####################################################################################
+1.1.2 Create 3 user
+DROP USER testuser1@'localhost';
+ERROR HY000: Operation DROP USER failed for 'testuser1'@'localhost'
+DROP USER testuser2@'localhost';
+ERROR HY000: Operation DROP USER failed for 'testuser2'@'localhost'
+DROP USER testuser3@'localhost';
+ERROR HY000: Operation DROP USER failed for 'testuser3'@'localhost'
+CREATE USER testuser1@'localhost';
+SET PASSWORD FOR testuser1@'localhost' = PASSWORD('testpass');
+GRANT SELECT,INSERT,UPDATE,LOCK TABLES ON test1.* TO testuser1@'localhost' IDENTIFIED BY 'testpass';
+GRANT SELECT,INSERT,UPDATE,LOCK TABLES ON test2.* TO testuser1@'localhost' IDENTIFIED BY 'testpass';
+GRANT SELECT,INSERT,UPDATE,LOCK TABLES ON test3.* TO testuser1@'localhost' IDENTIFIED BY 'testpass';
+CREATE USER testuser2@'localhost';
+SET PASSWORD FOR testuser2@'localhost' = PASSWORD('testpass');
+GRANT SELECT,INSERT,UPDATE,LOCK TABLES ON test1.* TO testuser2@'localhost' IDENTIFIED BY 'testpass';
+GRANT SELECT,INSERT,UPDATE,LOCK TABLES ON test2.* TO testuser2@'localhost' IDENTIFIED BY 'testpass';
+GRANT SELECT,INSERT,UPDATE,LOCK TABLES ON test3.* TO testuser2@'localhost' IDENTIFIED BY 'testpass';
+CREATE USER testuser3@'localhost';
+SET PASSWORD FOR testuser3@'localhost' = PASSWORD('testpass');
+GRANT SELECT,INSERT,UPDATE,LOCK TABLES ON test1.* TO testuser3@'localhost' IDENTIFIED BY 'testpass';
+GRANT SELECT,INSERT,UPDATE,LOCK TABLES ON test2.* TO testuser3@'localhost' IDENTIFIED BY 'testpass';
+GRANT SELECT,INSERT,UPDATE,LOCK TABLES ON test3.* TO testuser3@'localhost' IDENTIFIED BY 'testpass';
+COMMIT;
+SELECT @@global.tx_isolation;
+@@global.tx_isolation
+REPEATABLE-READ
+SELECT @@tx_isolation;
+@@tx_isolation
+REPEATABLE-READ
+############# SELECT ... FOR UPDATE test
+####################################################################################
+Establish connection con200 (user=testuser2)
+SET autocommit= off;
+SELECT @@global.tx_isolation;
+@@global.tx_isolation
+REPEATABLE-READ
+SELECT @@tx_isolation;
+@@tx_isolation
+REPEATABLE-READ
+SELECT * FROM test1.tb1 WHERE f11 IN (SELECT f51 FROM test3.tb5 WHERE test3.tb5.f53 = 0);
+f11	f12	f13	f14
+1	aaaaaaaaaa	0	kkkkkkkkkkkkkkkkkkkk
+####################################################################################
+Establish connection con100 (user=testuser1)
+SET autocommit= off;
+SELECT @@global.tx_isolation;
+@@global.tx_isolation
+REPEATABLE-READ
+SELECT @@tx_isolation;
+@@tx_isolation
+REPEATABLE-READ
+SELECT * FROM test1.tb1 WHERE f11 IN (SELECT f51 FROM test3.tb5 WHERE test3.tb5.f53 = 0) FOR UPDATE;
+f11	f12	f13	f14
+1	aaaaaaaaaa	0	kkkkkkkkkkkkkkkkkkkk
+####################################################################################
+connection con200
+SELECT * FROM test1.tb1 WHERE f11 IN (SELECT f51 FROM test3.tb5 WHERE test3.tb5.f53 = 0);
+####################################################################################
+connection con100;
+UPDATE test1.tb1 SET f12 = NULL WHERE f11 IN (SELECT f51 FROM test3.tb5 WHERE test3.tb5.f53 = 0);
+SELECT * FROM test1.tb1 WHERE f11 IN (SELECT f51 FROM test3.tb5 WHERE test3.tb5.f53 = 0);
+f11	f12	f13	f14
+1	0	0	kkkkkkkkkkkkkkkkkkkk
+####################################################################################
+connection con200;
+f11	f12	f13	f14
+1	aaaaaaaaaa	0	kkkkkkkkkkkkkkkkkkkk
+SELECT * FROM test1.tb1 WHERE f11 IN (SELECT f51 FROM test3.tb5 WHERE test3.tb5.f53 = 0);
+f11	f12	f13	f14
+1	0	0	kkkkkkkkkkkkkkkkkkkk
+COMMIT;
+####################################################################################
+connection con100;
+COMMIT;
+####################################################################################
+connection con200;
+SELECT * FROM test1.tb1 WHERE f11 IN (SELECT f51 FROM test3.tb5 WHERE test3.tb5.f53 = 0);
+f11	f12	f13	f14
+1	0	0	kkkkkkkkkkkkkkkkkkkk
+COMMIT;
+connection default;
+SELECT * FROM test1.tb1 WHERE f11 IN (SELECT f51 FROM test3.tb5 WHERE test3.tb5.f53 = 0);
+f11	f12	f13	f14
+1	0	0	kkkkkkkkkkkkkkkkkkkk
+DROP DATABASE IF EXISTS test1;
+DROP DATABASE IF EXISTS test2;
+DROP DATABASE IF EXISTS test3;
+DROP USER testuser1@'localhost';
+DROP USER testuser2@'localhost';
+DROP USER testuser3@'localhost';
diff -Nrup a/mysql-test/suite/funcs_1/r/innodb__datadict.result b/mysql-test/suite/funcs_1/r/innodb__datadict.result
--- a/mysql-test/suite/funcs_1/r/innodb__datadict.result	2007-11-21 15:06:36 +01:00
+++ b/mysql-test/suite/funcs_1/r/innodb__datadict.result	2007-11-27 17:40:04 +01:00
@@ -10,31 +10,18 @@
 . *__datadict.test are started. This can be a result of showing e.g. maximum
 . values of the number of rows of tables.
 .
-. This .result file has been checked OK with Linux 5.0.48,
-. build tree ChangeSet@stripped, 2007-07-30
-. except that the not fixed Bug#30020 causes a difference.
-.
---------------------------------------------------------------------------------
-
-FIXME: There are subtests that are switched off due to known bugs:
-------------------------------------------------------------------
-SELECT 1 AS "have_bug_11589";
-have_bug_11589
-1
-SELECT 1 AS "have_bug_30689";
-have_bug_30689
+--source include/show_msg80.inc
+################################################################################
+#
+let = FIXME: There are subtests that are switched off due to known bugs:
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+SELECT 1 AS "have_bug_32285";
+have_bug_32285
 1
 
 There are some statements where the ps-protocol is switched off.
 This may come from the bug listed below, ir from other problems.
-Bug#11589: mysqltest, --ps-protocol, strange output, float/double/real with zerofill
---------------------------------------------------------------------------------
-
-Selects on INFORMATION_SCHEMA.VIEWS present incomplete
-content for the column VIEW_DEFINITION in cases where
-the view selects(=is based) on an INFORMATION_SCHEMA table.
----> VIEWS vu and vu1
-Bug#30689 Wrong content in I_S.VIEWS.VIEW_DEFINITION if VIEW is based on I_S
+Bug#32285: mysqltest, --ps-protocol, strange output, float/double/real with zerofill
 --------------------------------------------------------------------------------
 SET @NO_REFRESH = IF( '' = '', 0, 1);
 DROP DATABASE IF EXISTS test1;
@@ -1067,7 +1054,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	NULL
 CHECKSUM	NULL
-CREATE_OPTIONS	NULL
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	VIEW
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	db_datadict
@@ -1088,7 +1075,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	NULL
 CHECKSUM	NULL
-CREATE_OPTIONS	NULL
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	VIEW
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	db_datadict
@@ -1109,7 +1096,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	NULL
 CHECKSUM	NULL
-CREATE_OPTIONS	NULL
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	VIEW
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -1130,7 +1117,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	Column privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -1151,7 +1138,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	Database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -1172,7 +1159,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	Events
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -1193,7 +1180,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	User defined functions
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -1214,7 +1201,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	General log
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -1235,7 +1222,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	Host privileges;  Merged with database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -1256,7 +1243,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -1277,7 +1264,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	MySQL plugins
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -1298,7 +1285,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	Stored Procedures
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -1319,7 +1306,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	Procedure privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -1340,7 +1327,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	MySQL Foreign Servers table
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -1361,7 +1348,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	Slow log
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -1382,7 +1369,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	Table privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -1403,7 +1390,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	Time zones
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -1424,7 +1411,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	Leap seconds information for time zones
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -1445,7 +1432,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	Time zone names
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -1466,7 +1453,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	Time zone transitions
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -1487,7 +1474,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	Time zone transition types
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -1508,7 +1495,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	Users and global privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
@@ -1529,7 +1516,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
@@ -1550,7 +1537,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
@@ -1571,7 +1558,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
@@ -1592,7 +1579,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
@@ -1613,7 +1600,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
@@ -1634,7 +1621,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
@@ -1655,7 +1642,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
@@ -1676,7 +1663,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
@@ -1697,7 +1684,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
@@ -1718,7 +1705,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
@@ -1739,7 +1726,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
@@ -1760,7 +1747,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
@@ -1781,7 +1768,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	test1
@@ -1802,7 +1789,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	test4
@@ -1823,7 +1810,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 select s.catalog_name, s.schema_name, s.default_character_set_name,
 t.table_type, t.engine
@@ -3139,9 +3126,9 @@ binary	binary	Binary pseudo charset	1
 geostd8	geostd8_general_ci	GEOSTD8 Georgian	1
 cp932	cp932_japanese_ci	SJIS for Windows Japanese	2
 eucjpms	eucjpms_japanese_ci	UJIS for Windows Japanese	3
-select sum(id) from collations where collation_name <> 'utf8_general_cs';
+select sum(id) from collations;
 sum(id)
-10840
+11094
 select collation_name, character_set_name into @x,@y
 from collation_character_set_applicability limit 1;
 select @x, @y;
@@ -3151,7 +3138,7 @@ select * from routines;
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
 sp_1	NULL	db_datadict	sp_1	PROCEDURE	NULL	SQL	BEGIN
 SELECT * FROM db_datadict.v1;
-END	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss			root@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
+END	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss			#CO#	latin1	latin1_swedish_ci	latin1_swedish_ci
 select count(*) from routines;
 count(*)
 1
@@ -3610,10 +3597,10 @@ NULL	information_schema	CHARACTER_SETS	C
 SELECT * FROM character_sets                        LIMIT 1;
 CHARACTER_SET_NAME	DEFAULT_COLLATE_NAME	DESCRIPTION	MAXLEN
 big5	big5_chinese_ci	Big5 Traditional Chinese	2
-SELECT * FROM collations                            where collation_name <> 'utf8_general_cs' LIMIT 1;
+SELECT * FROM collations                            LIMIT 1;
 COLLATION_NAME	CHARACTER_SET_NAME	ID	IS_DEFAULT	IS_COMPILED	SORTLEN
 big5_chinese_ci	big5	1	Yes	Yes	1
-SELECT * FROM collation_character_set_applicability where collation_name <> 'utf8_general_cs' LIMIT 1;
+SELECT * FROM collation_character_set_applicability LIMIT 1;
 COLLATION_NAME	CHARACTER_SET_NAME
 big5_chinese_ci	big5
 SELECT * FROM routines                              LIMIT 1;
@@ -4322,7 +4309,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	NULL
 CHECKSUM	NULL
-CREATE_OPTIONS	NULL
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	VIEW
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	db_datadict
@@ -4343,7 +4330,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	NULL
 CHECKSUM	NULL
-CREATE_OPTIONS	NULL
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	VIEW
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	db_datadict
@@ -4364,7 +4351,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	NULL
 CHECKSUM	NULL
-CREATE_OPTIONS	NULL
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	VIEW
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -4385,7 +4372,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	Column privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -4406,7 +4393,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	Database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -4427,7 +4414,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	Events
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -4448,7 +4435,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	User defined functions
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -4469,7 +4456,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	General log
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -4490,7 +4477,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	Host privileges;  Merged with database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -4511,7 +4498,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -4532,7 +4519,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	MySQL plugins
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -4553,7 +4540,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	Stored Procedures
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -4574,7 +4561,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	Procedure privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -4595,7 +4582,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	MySQL Foreign Servers table
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -4616,7 +4603,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	Slow log
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -4637,7 +4624,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	Table privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -4658,7 +4645,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	Time zones
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -4679,7 +4666,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	Leap seconds information for time zones
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -4700,7 +4687,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	Time zone names
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -4721,7 +4708,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	Time zone transitions
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -4742,7 +4729,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	Time zone transition types
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
@@ -4763,7 +4750,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	utf8_bin
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	Users and global privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
@@ -4784,7 +4771,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
@@ -4805,7 +4792,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
@@ -4826,7 +4813,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
@@ -4847,7 +4834,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
@@ -4868,7 +4855,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
@@ -4889,7 +4876,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
@@ -4910,7 +4897,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
@@ -4931,7 +4918,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
@@ -4952,7 +4939,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
@@ -4973,7 +4960,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
@@ -4994,7 +4981,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
@@ -5015,7 +5002,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
@@ -5036,7 +5023,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	test1
@@ -5057,7 +5044,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	test4
@@ -5078,7 +5065,7 @@ UPDATE_TIME	YYYY-MM-DD hh:mm:ss
 CHECK_TIME	YYYY-MM-DD hh:mm:ss
 TABLE_COLLATION	latin1_swedish_ci
 CHECKSUM	NULL
-CREATE_OPTIONS	
+CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 select s.catalog_name, s.schema_name, s.default_character_set_name,
 t.table_type, t.engine
@@ -5596,12 +5583,12 @@ COUNT(*)
 SELECT COUNT(*) FROM information_schema. character_sets                        ;
 COUNT(*)
 36
-SELECT COUNT(*) FROM information_schema. collations                            where collation_name <> 'utf8_general_cs' ;
-COUNT(*)
-127
-SELECT COUNT(*) FROM information_schema. collation_character_set_applicability where collation_name <> 'utf8_general_cs' ;
+SELECT COUNT(*) FROM information_schema. collations                            ;
 COUNT(*)
 128
+SELECT COUNT(*) FROM information_schema. collation_character_set_applicability ;
+COUNT(*)
+129
 SELECT COUNT(*) FROM information_schema. routines                              ;
 COUNT(*)
 1
@@ -7354,7 +7341,7 @@ from information_schema.statistics
 where table_schema like 'db_datadict%';
 table_name	index_schema	index_name	index_type
 select *
-from information_schema.user_privileges;
+from information_schema.user_privileges order by grantee, privilege_type;
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	ALTER	YES
 'root'@'127.0.0.1'	NULL	ALTER ROUTINE	YES
@@ -7505,7 +7492,7 @@ where table_schema like 'db_datadict%';
 table_name	index_schema	index_name	index_type
 res_t_401013	db_datadict	i_6_401013	BTREE
 select *
-from information_schema.user_privileges;
+from information_schema.user_privileges order by grantee, privilege_type;
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	ALTER	YES
 'root'@'127.0.0.1'	NULL	ALTER ROUTINE	YES
@@ -7642,7 +7629,7 @@ from information_schema.statistics
 where table_schema like 'db_datadict%';
 table_name	index_schema	index_name	index_type
 select *
-from information_schema.user_privileges;
+from information_schema.user_privileges order by grantee, privilege_type;
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	ALTER	YES
 'root'@'127.0.0.1'	NULL	ALTER ROUTINE	YES
@@ -7791,7 +7778,7 @@ from information_schema.statistics
 where table_schema like 'db_datadict%';
 table_name	index_schema	index_name	index_type
 select *
-from information_schema.user_privileges;
+from information_schema.user_privileges order by grantee, privilege_type;
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	ALTER	YES
 'root'@'127.0.0.1'	NULL	ALTER ROUTINE	YES
@@ -7936,7 +7923,7 @@ from information_schema.statistics
 where table_schema like 'db_datadict%';
 table_name	index_schema	index_name	index_type
 select *
-from information_schema.user_privileges;
+from information_schema.user_privileges order by grantee, privilege_type;
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	ALTER	YES
 'root'@'127.0.0.1'	NULL	ALTER ROUTINE	YES
@@ -8094,7 +8081,7 @@ where table_schema like 'db_datadict%';
 table_name	index_schema	index_name	index_type
 res_t_401015	db_datadict	i_6_401015	BTREE
 select *
-from information_schema.user_privileges;
+from information_schema.user_privileges order by grantee, privilege_type;
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	ALTER	YES
 'root'@'127.0.0.1'	NULL	ALTER ROUTINE	YES
@@ -8230,7 +8217,7 @@ from information_schema.statistics
 where table_schema like 'db_datadict%';
 table_name	index_schema	index_name	index_type
 select *
-from information_schema.user_privileges;
+from information_schema.user_privileges order by grantee, privilege_type;
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	ALTER	YES
 'root'@'127.0.0.1'	NULL	ALTER ROUTINE	YES
@@ -8480,8 +8467,7 @@ ERROR 42000: Access denied for user 'roo
 FLUSH PRIVILEGES;
 connect(localhost,u_6_401017,,test,MYSQL_PORT,MYSQL_SOCK);
 use information_schema;
-select * from collation_character_set_applicability
-where collation_name <> 'utf8_general_cs';
+select * from collation_character_set_applicability;
 COLLATION_NAME	CHARACTER_SET_NAME
 big5_chinese_ci	big5
 big5_bin	big5
@@ -8559,6 +8545,7 @@ utf8_roman_ci	utf8
 utf8_persian_ci	utf8
 utf8_esperanto_ci	utf8
 utf8_hungarian_ci	utf8
+utf8_general_cs	utf8
 ucs2_general_ci	ucs2
 ucs2_bin	ucs2
 ucs2_unicode_ci	ucs2
@@ -9263,7 +9250,7 @@ binary
 geostd8
 cp932
 eucjpms
-select collation_name from collations where collation_name <> 'utf8_general_cs';
+select collation_name from collations;
 collation_name
 big5_chinese_ci
 big5_bin
@@ -9340,6 +9327,7 @@ utf8_roman_ci
 utf8_persian_ci
 utf8_esperanto_ci
 utf8_hungarian_ci
+utf8_general_cs
 ucs2_general_ci
 ucs2_bin
 ucs2_unicode_ci
@@ -9628,7 +9616,7 @@ NULL	information_schema	collations	SORTL
 
 Testcase 3.2.3.2:
 --------------------------------------------------------------------------------
-SELECT * FROM collations where collation_name <> 'utf8_general_cs';
+SELECT * FROM collations;
 COLLATION_NAME	CHARACTER_SET_NAME	ID	IS_DEFAULT	IS_COMPILED	SORTLEN
 big5_chinese_ci	big5	1	Yes	Yes	1
 big5_bin	big5	84		Yes	1
@@ -9705,6 +9693,7 @@ utf8_roman_ci	utf8	207		Yes	8
 utf8_persian_ci	utf8	208		Yes	8
 utf8_esperanto_ci	utf8	209		Yes	8
 utf8_hungarian_ci	utf8	210		Yes	8
+utf8_general_cs	utf8	254		Yes	1
 ucs2_general_ci	ucs2	35	Yes	Yes	1
 ucs2_bin	ucs2	90		Yes	1
 ucs2_unicode_ci	ucs2	128		Yes	8
@@ -9790,8 +9779,7 @@ NULL	information_schema	collation_charac
 
 Testcase 3.2.4.2:
 --------------------------------------------------------------------------------
-SELECT * FROM collation_character_set_applicability
-where collation_name <> 'utf8_general_cs';
+SELECT * FROM collation_character_set_applicability;
 COLLATION_NAME	CHARACTER_SET_NAME
 big5_chinese_ci	big5
 big5_bin	big5
@@ -9869,6 +9857,7 @@ utf8_roman_ci	utf8
 utf8_persian_ci	utf8
 utf8_esperanto_ci	utf8
 utf8_hungarian_ci	utf8
+utf8_general_cs	utf8
 ucs2_general_ci	ucs2
 ucs2_bin	ucs2
 ucs2_unicode_ci	ucs2
@@ -14045,23 +14034,23 @@ NULL	information_schema	VIEWS	SYSTEM VIE
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	db_datadict	tb1	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	db_datadict	tb2	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	db_datadict	tb3	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	db_datadict	v3	VIEW	NULL	NULL	NULL	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	NULL	NULL	VIEW
-NULL	test	t1	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	t10	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	t11	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	t2	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	t3	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	t4	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	t7	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	t8	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	t9	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	tb1	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	tb2	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	tb3	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	tb4	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
+NULL	db_datadict	tb1	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	db_datadict	tb2	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	db_datadict	tb3	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	db_datadict	v3	VIEW	NULL	NULL	NULL	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	NULL	#CO#	VIEW
+NULL	test	t1	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	t10	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	t11	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	t2	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	t3	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	t4	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	t7	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	t8	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	t9	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	tb1	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	tb2	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	tb3	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	tb4	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
 connect(localhost,user_2,,db_datadict,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
@@ -14096,21 +14085,21 @@ NULL	information_schema	VIEWS	SYSTEM VIE
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	db_datadict	tb1	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	db_datadict	tb3	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	t1	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	t10	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	t11	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	t2	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	t3	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	t4	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	t7	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	t8	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	t9	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	tb1	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	tb2	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	tb3	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	tb4	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
+NULL	db_datadict	tb1	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	db_datadict	tb3	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	t1	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	t10	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	t11	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	t2	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	t3	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	t4	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	t7	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	t8	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	t9	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	tb1	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	tb2	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	tb3	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	tb4	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
 connect(localhost,user_3,,db_datadict,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
@@ -14145,21 +14134,21 @@ NULL	information_schema	VIEWS	SYSTEM VIE
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	db_datadict	tb3	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	db_datadict	v3	VIEW	NULL	NULL	NULL	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	NULL	NULL	VIEW
-NULL	test	t1	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	t10	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	t11	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	t2	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	t3	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	t4	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	t7	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	t8	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	t9	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	tb1	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	tb2	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	tb3	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	tb4	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
+NULL	db_datadict	tb3	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	db_datadict	v3	VIEW	NULL	NULL	NULL	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	NULL	#CO#	VIEW
+NULL	test	t1	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	t10	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	t11	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	t2	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	t3	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	t4	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	t7	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	t8	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	t9	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	tb1	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	tb2	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	tb3	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	tb4	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
 	
 root@localhost	db_datadict
 SELECT * FROM information_schema.tables
@@ -14195,44 +14184,44 @@ NULL	information_schema	VIEWS	SYSTEM VIE
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema') AND NOT (table_schema = 'mysql' AND table_name LIKE 'help_%');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	db_datadict	tb1	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	db_datadict	tb2	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	db_datadict	tb3	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	db_datadict	v3	VIEW	NULL	NULL	NULL	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	NULL	NULL	VIEW
-NULL	mysql	columns_priv	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Column privileges
-NULL	mysql	db	BASE TABLE	MyISAM	10	Fixed	3	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Database privileges
-NULL	mysql	event	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Events
-NULL	mysql	func	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		User defined functions
-NULL	mysql	general_log	BASE TABLE	CSV	10	Dynamic	1	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		General log
-NULL	mysql	host	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Host privileges;  Merged with database privileges
-NULL	mysql	ndb_binlog_index	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	mysql	plugin	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		MySQL plugins
-NULL	mysql	proc	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Stored Procedures
-NULL	mysql	procs_priv	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Procedure privileges
-NULL	mysql	servers	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		MySQL Foreign Servers table
-NULL	mysql	slow_log	BASE TABLE	CSV	10	Dynamic	2	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Slow log
-NULL	mysql	tables_priv	BASE TABLE	MyISAM	10	Fixed	5	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Table privileges
-NULL	mysql	time_zone	BASE TABLE	MyISAM	10	Fixed	5	#ARL#	#DL#	#MDL#	#IL#	#DF#	6	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Time zones
-NULL	mysql	time_zone_leap_second	BASE TABLE	MyISAM	10	Fixed	22	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Leap seconds information for time zones
-NULL	mysql	time_zone_name	BASE TABLE	MyISAM	10	Fixed	6	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Time zone names
-NULL	mysql	time_zone_transition	BASE TABLE	MyISAM	10	Fixed	393	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Time zone transitions
-NULL	mysql	time_zone_transition_type	BASE TABLE	MyISAM	10	Fixed	31	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Time zone transition types
-NULL	mysql	user	BASE TABLE	MyISAM	10	Dynamic	6	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Users and global privileges
-NULL	test	t1	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	t10	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	t11	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	t2	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	t3	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	t4	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	t7	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	t8	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	t9	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	tb1	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	tb2	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	tb3	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test	tb4	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test1	tb2	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
-NULL	test4	t6	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
+NULL	db_datadict	tb1	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	db_datadict	tb2	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	db_datadict	tb3	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	db_datadict	v3	VIEW	NULL	NULL	NULL	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	NULL	#CO#	VIEW
+NULL	mysql	columns_priv	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL	#CO#	Column privileges
+NULL	mysql	db	BASE TABLE	MyISAM	10	Fixed	3	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL	#CO#	Database privileges
+NULL	mysql	event	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	Events
+NULL	mysql	func	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL	#CO#	User defined functions
+NULL	mysql	general_log	BASE TABLE	CSV	10	Dynamic	1	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	General log
+NULL	mysql	host	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL	#CO#	Host privileges;  Merged with database privileges
+NULL	mysql	ndb_binlog_index	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	mysql	plugin	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL	#CO#	MySQL plugins
+NULL	mysql	proc	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	Stored Procedures
+NULL	mysql	procs_priv	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL	#CO#	Procedure privileges
+NULL	mysql	servers	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	MySQL Foreign Servers table
+NULL	mysql	slow_log	BASE TABLE	CSV	10	Dynamic	2	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	Slow log
+NULL	mysql	tables_priv	BASE TABLE	MyISAM	10	Fixed	5	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL	#CO#	Table privileges
+NULL	mysql	time_zone	BASE TABLE	MyISAM	10	Fixed	5	#ARL#	#DL#	#MDL#	#IL#	#DF#	6	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	Time zones
+NULL	mysql	time_zone_leap_second	BASE TABLE	MyISAM	10	Fixed	22	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	Leap seconds information for time zones
+NULL	mysql	time_zone_name	BASE TABLE	MyISAM	10	Fixed	6	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	Time zone names
+NULL	mysql	time_zone_transition	BASE TABLE	MyISAM	10	Fixed	393	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	Time zone transitions
+NULL	mysql	time_zone_transition_type	BASE TABLE	MyISAM	10	Fixed	31	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	Time zone transition types
+NULL	mysql	user	BASE TABLE	MyISAM	10	Dynamic	6	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL	#CO#	Users and global privileges
+NULL	test	t1	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	t10	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	t11	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	t2	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	t3	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	t4	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	t7	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	t8	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	t9	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	tb1	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	tb2	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	tb3	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test	tb4	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test1	tb2	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
+NULL	test4	t6	BASE TABLE	InnoDB	10	Compact	10	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL	#CO#	
 DROP USER 'user_1'@'localhost';
 DROP USER 'user_2'@'localhost';
 DROP USER 'user_3'@'localhost';
@@ -14721,9 +14710,6 @@ GRANT SELECT ON mysql.user TO 'user_1'@'
 GRANT INSERT ON *.* TO 'user_2'@'localhost';
 GRANT UPDATE ON *.* TO 'user_2'@'localhost';
 FLUSH PRIVILEGES;
-
-FIXME (see Bug 12269) Here we expect more than only <USAGE> for user_1
-----------------------------------------------------------------------
 SELECT * FROM information_schema.user_privileges
 WHERE grantee LIKE "%user%"
             ORDER BY grantee, table_catalog, privilege_type;
@@ -14744,9 +14730,6 @@ GRANT ALL PRIVILEGES ON *.* TO 'root'@'l
 add GRANT OPTION db_datadict.* to user_1
 ----------------------------------------
 GRANT UPDATE ON db_datadict.* TO 'user_1'@'localhost' WITH GRANT OPTION;
-
-FIXME (see Bug 12269) Here the <YES> is missing for the GRANT OPTION for user_1
--------------------------------------------------------------------------------
 SELECT * FROM information_schema.user_privileges
 WHERE grantee LIKE "%user%"
             ORDER BY grantee, table_catalog, privilege_type;
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-08-07 03:45:53 +02:00
+++ b/mysql-test/suite/funcs_1/r/innodb_func_view.result	2007-11-27 17:40:04 +01: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
@@ -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,
@@ -125,6 +126,7 @@ INSERT INTO t1_values SET select_id = @s
 my_bigint = 1758;
 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,11 +137,13 @@ INSERT INTO t1_values SET select_id = @s
 my_varbinary_1000 = '-3333.3333';
 INSERT INTO t1_values SET select_id = @select_id,
 my_double = -0.33333333E+4;
+##### 1.1.7. CAST --> SIGNED INTEGER
 
 "Attention: CAST --> SIGNED INTEGER
             Bug#5913 Traditional mode: BIGINT range not correctly delimited
             Status: To be fixed later"
 --------------------------------------------------------------------------------
+##### 1.1.8. CAST --> UNSIGNED INTEGER
 
 "Attention: CAST --> UNSIGNED INTEGER
             The file with expected results suffers from Bug 5913"
@@ -184,14 +188,12 @@ SET @my_select = 
 'SELECT LEFT(my_binary_30, 2), my_binary_30, id FROM t1_values';
 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"
-            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),
@@ -284,19 +286,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 = 190 OR select_id IS NULL order by id;
+WHERE select_id = 193 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 190 OR select_id IS NULL) order by id;
+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 = 189 OR select_id IS NULL order by id;
+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
@@ -308,7 +310,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 189 OR select_id IS NULL) order by id;
+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
@@ -322,13 +324,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 = 188 OR select_id IS NULL order by id;
+WHERE select_id = 191 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 188 OR select_id IS NULL) order by id;
+WHERE select_id = 191 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -336,13 +338,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 = 187 OR select_id IS NULL order by id;
+WHERE select_id = 190 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 187 OR select_id IS NULL) order by id;
+WHERE select_id = 190 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -350,13 +352,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 = 186 OR select_id IS NULL order by id;
+WHERE select_id = 189 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 186 OR select_id IS NULL) order by id;
+WHERE select_id = 189 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -364,13 +366,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 = 185 OR select_id IS NULL order by id;
+WHERE select_id = 188 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 185 OR select_id IS NULL) order by id;
+WHERE select_id = 188 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -378,13 +380,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 = 184 OR select_id IS NULL order by id;
+WHERE select_id = 187 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 184 OR select_id IS NULL) order by id;
+WHERE select_id = 187 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -392,13 +394,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 = 183 OR select_id IS NULL order by id;
+WHERE select_id = 186 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 183 OR select_id IS NULL) order by id;
+WHERE select_id = 186 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -406,13 +408,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 = 182 OR select_id IS NULL order by id;
+WHERE select_id = 185 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 182 OR select_id IS NULL) order by id;
+WHERE select_id = 185 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -420,13 +422,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 = 181 OR select_id IS NULL order by id;
+WHERE select_id = 184 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 181 OR select_id IS NULL) order by id;
+WHERE select_id = 184 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -434,13 +436,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 = 180 OR select_id IS NULL order by id;
+WHERE select_id = 183 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 180 OR select_id IS NULL) order by id;
+WHERE select_id = 183 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -448,13 +450,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 = 179 OR select_id IS NULL order by id;
+WHERE select_id = 182 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 179 OR select_id IS NULL) order by id;
+WHERE select_id = 182 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -462,13 +464,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 = 178 OR select_id IS NULL order by id;
+WHERE select_id = 181 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 178 OR select_id IS NULL) order by id;
+WHERE select_id = 181 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -476,13 +478,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 = 177 OR select_id IS NULL order by id;
+WHERE select_id = 180 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 177 OR select_id IS NULL) order by id;
+WHERE select_id = 180 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -490,13 +492,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 = 176 OR select_id IS NULL order by id;
+WHERE select_id = 179 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 176 OR select_id IS NULL) order by id;
+WHERE select_id = 179 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -504,13 +506,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 = 175 OR select_id IS NULL order by id;
+WHERE select_id = 178 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 175 OR select_id IS NULL) order by id;
+WHERE select_id = 178 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -518,13 +520,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 = 174 OR select_id IS NULL order by id;
+WHERE select_id = 177 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 174 OR select_id IS NULL) order by id;
+WHERE select_id = 177 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -532,13 +534,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 = 173 OR select_id IS NULL order by id;
+WHERE select_id = 176 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 173 OR select_id IS NULL) order by id;
+WHERE select_id = 176 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -546,13 +548,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 = 172 OR select_id IS NULL order by id;
+WHERE select_id = 175 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 172 OR select_id IS NULL) order by id;
+WHERE select_id = 175 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -560,13 +562,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 = 171 OR select_id IS NULL order by id;
+WHERE select_id = 174 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 171 OR select_id IS NULL) order by id;
+WHERE select_id = 174 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -574,13 +576,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 = 170 OR select_id IS NULL order by id;
+WHERE select_id = 173 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 170 OR select_id IS NULL) order by id;
+WHERE select_id = 173 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -588,13 +590,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 = 169 OR select_id IS NULL order by id;
+WHERE select_id = 172 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 169 OR select_id IS NULL) order by id;
+WHERE select_id = 172 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -602,13 +604,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 = 168 OR select_id IS NULL order by id;
+WHERE select_id = 171 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 168 OR select_id IS NULL) order by id;
+WHERE select_id = 171 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -616,13 +618,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 = 167 OR select_id IS NULL order by id;
+WHERE select_id = 170 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 167 OR select_id IS NULL) order by id;
+WHERE select_id = 170 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -630,13 +632,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 = 166 OR select_id IS NULL order by id;
+WHERE select_id = 169 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 166 OR select_id IS NULL) order by id;
+WHERE select_id = 169 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -644,13 +646,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 = 165 OR select_id IS NULL order by id;
+WHERE select_id = 168 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 165 OR select_id IS NULL) order by id;
+WHERE select_id = 168 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -658,13 +660,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 = 164 OR select_id IS NULL order by id;
+WHERE select_id = 167 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 164 OR select_id IS NULL) order by id;
+WHERE select_id = 167 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -672,13 +674,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 = 163 OR select_id IS NULL order by id;
+WHERE select_id = 166 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 163 OR select_id IS NULL) order by id;
+WHERE select_id = 166 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -686,13 +688,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 = 162 OR select_id IS NULL order by id;
+WHERE select_id = 165 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 162 OR select_id IS NULL) order by id;
+WHERE select_id = 165 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -700,13 +702,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 = 161 OR select_id IS NULL order by id;
+WHERE select_id = 164 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 161 OR select_id IS NULL) order by id;
+WHERE select_id = 164 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -714,13 +716,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 = 160 OR select_id IS NULL order by id;
+WHERE select_id = 163 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 160 OR select_id IS NULL) order by id;
+WHERE select_id = 163 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -728,13 +730,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 = 159 OR select_id IS NULL order by id;
+WHERE select_id = 162 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 159 OR select_id IS NULL) order by id;
+WHERE select_id = 162 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -742,13 +744,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 = 158 OR select_id IS NULL order by id;
+WHERE select_id = 161 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 158 OR select_id IS NULL) order by id;
+WHERE select_id = 161 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -756,13 +758,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 = 157 OR select_id IS NULL order by id;
+WHERE select_id = 160 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 157 OR select_id IS NULL) order by id;
+WHERE select_id = 160 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -770,13 +772,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 = 156 OR select_id IS NULL order by id;
+WHERE select_id = 159 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 156 OR select_id IS NULL) order by id;
+WHERE select_id = 159 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -784,13 +786,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 = 155 OR select_id IS NULL order by id;
+WHERE select_id = 158 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 155 OR select_id IS NULL) order by id;
+WHERE select_id = 158 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -798,19 +800,19 @@ 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 = 154 OR select_id IS NULL order by id;
+WHERE select_id = 157 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 154 OR select_id IS NULL) order by id;
+WHERE select_id = 157 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
 CREATE VIEW v1 AS SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values;
 SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values
-WHERE select_id = 153 OR select_id IS NULL order by id;
+WHERE select_id = 156 OR select_id IS NULL order by id;
 LOAD_FILE('../tmp/func_view.dat')	id
 äÄ@
 	1
@@ -827,7 +829,7 @@ View	Create View	character_set_client	co
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file(_latin1'../tmp/func_view.dat') AS `LOAD_FILE('../tmp/func_view.dat')`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 153 OR select_id IS NULL) order by id;
+WHERE select_id = 156 OR select_id IS NULL) order by id;
 LOAD_FILE('../tmp/func_view.dat')	id
 äÄ@
 	1
@@ -846,13 +848,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 = 152 OR select_id IS NULL order by id;
+WHERE select_id = 155 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 152 OR select_id IS NULL) order by id;
+WHERE select_id = 155 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -860,13 +862,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 = 151 OR select_id IS NULL order by id;
+WHERE select_id = 154 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 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;
+WHERE select_id = 154 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -874,13 +876,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 = 150 OR select_id IS NULL order by id;
+WHERE select_id = 153 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 150 OR select_id IS NULL) order by id;
+WHERE select_id = 153 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -888,19 +890,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 = 149 OR select_id IS NULL order by id;
+WHERE select_id = 152 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 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;
+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	character_set_client	collation_connection
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(_latin1'AaBbCcDdEeFfGgHhIiJjÄäÜüÖö',`t1_values`.`my_double`) AS `LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_double)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
+SELECT v1.* FROM v1
+WHERE v1.id IN (SELECT id FROM t1_values
+WHERE select_id = 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 = 148 OR select_id IS NULL order by id;
+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
@@ -915,7 +947,7 @@ View	Create View	character_set_client	co
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(_latin1'AaBbCcDdEeFfGgHhIiJjÄäÜüÖö',`t1_values`.`my_decimal`) AS `LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 148 OR select_id IS NULL) order by id;
+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
@@ -928,9 +960,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	character_set_client	collation_connection
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(_latin1'AaBbCcDdEeFfGgHhIiJjÄäÜüÖö',`t1_values`.`my_bigint`) AS `LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_bigint)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
+SELECT v1.* FROM v1
+WHERE v1.id IN (SELECT id FROM t1_values
+WHERE select_id = 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 = 147 OR select_id IS NULL order by id;
+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
@@ -942,7 +998,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 147 OR select_id IS NULL) order by id;
+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
@@ -954,7 +1010,7 @@ 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 = 146 OR select_id IS NULL order by id;
+WHERE select_id = 147 OR select_id IS NULL order by id;
 LEFT(my_binary_30, 2)	my_binary_30	id
 NULL	NULL	1
 @@ -966,7 +1022,7 @@ View	Create View	character_set_client	co
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_binary_30`,2) AS `LEFT(my_binary_30, 2)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 146 OR select_id IS NULL) order by id;
+WHERE select_id = 147 OR select_id IS NULL) order by id;
 LEFT(my_binary_30, 2)	my_binary_30	id
 NULL	NULL	1
 @@ -978,7 +1034,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 = 145 OR select_id IS NULL order by id;
+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
@@ -990,7 +1046,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 145 OR select_id IS NULL) order by id;
+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
@@ -1002,7 +1058,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 = 144 OR select_id IS NULL order by id;
+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
@@ -1014,7 +1070,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 144 OR select_id IS NULL) order by id;
+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
@@ -1028,13 +1084,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 = 143 OR select_id IS NULL order by id;
+WHERE select_id = 144 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 143 OR select_id IS NULL) order by id;
+WHERE select_id = 144 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -1042,13 +1098,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 = 142 OR select_id IS NULL order by id;
+WHERE select_id = 143 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 142 OR select_id IS NULL) order by id;
+WHERE select_id = 143 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -1056,7 +1112,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 = 141 OR select_id IS NULL order by id;
+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
@@ -1068,7 +1124,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 141 OR select_id IS NULL) order by id;
+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
@@ -1082,7 +1138,7 @@ 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 = 140 OR select_id IS NULL order by id;
+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	@@ -1094,7 +1150,7 @@ View	Create View	character_set_client	co
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_binary_30`) AS `BIT_LENGTH(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 140 OR select_id IS NULL) order by id;
+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	@@ -1108,7 +1164,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 = 139 OR select_id IS NULL order by id;
+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
@@ -1120,7 +1176,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 139 OR select_id IS NULL) order by id;
+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
@@ -1134,7 +1190,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 = 138 OR select_id IS NULL order by id;
+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
@@ -1146,7 +1202,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 138 OR select_id IS NULL) order by id;
+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
@@ -1160,7 +1216,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 = 137 OR select_id IS NULL order by id;
+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
@@ -1172,7 +1228,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 137 OR select_id IS NULL) order by id;
+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
@@ -1186,7 +1242,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 = 136 OR select_id IS NULL order by id;
+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
@@ -1198,7 +1254,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 136 OR select_id IS NULL) order by id;
+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
@@ -1212,7 +1268,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 = 135 OR select_id IS NULL order by id;
+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
@@ -1224,7 +1280,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 135 OR select_id IS NULL) order by id;
+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
@@ -1238,7 +1294,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 = 134 OR select_id IS NULL order by id;
+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
@@ -1250,7 +1306,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 134 OR select_id IS NULL) order by id;
+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
@@ -1264,7 +1320,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 = 133 OR select_id IS NULL order by id;
+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
@@ -1276,7 +1332,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 133 OR select_id IS NULL) order by id;
+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
@@ -1290,7 +1346,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 = 132 OR select_id IS NULL order by id;
+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
@@ -1302,7 +1358,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 132 OR select_id IS NULL) order by id;
+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
@@ -1316,7 +1372,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 = 131 OR select_id IS NULL order by id;
+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
@@ -1328,7 +1384,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 131 OR select_id IS NULL) order by id;
+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
@@ -1342,7 +1398,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 = 130 OR select_id IS NULL order by id;
+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
@@ -1354,7 +1410,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 130 OR select_id IS NULL) order by id;
+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
@@ -1368,7 +1424,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 = 129 OR select_id IS NULL order by id;
+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
@@ -1380,7 +1436,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 129 OR select_id IS NULL) order by id;
+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
@@ -1394,7 +1450,7 @@ 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 = 128 OR select_id IS NULL order by id;
+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
 @@ -1406,7 +1462,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 128 OR select_id IS NULL) order by id;
+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
 @@ -1420,7 +1476,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 = 127 OR select_id IS NULL order by id;
+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
@@ -1432,7 +1488,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 127 OR select_id IS NULL) order by id;
+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
@@ -1446,7 +1502,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 = 126 OR select_id IS NULL order by id;
+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
@@ -1458,7 +1514,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 126 OR select_id IS NULL) order by id;
+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
@@ -1472,7 +1528,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 = 125 OR select_id IS NULL order by id;
+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
@@ -1486,7 +1542,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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 125 OR select_id IS NULL) order by id;
+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 +1557,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 = 124 OR select_id IS NULL order by id;
+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
@@ -1515,7 +1571,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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 124 OR select_id IS NULL) order by id;
+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 +1586,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 = 123 OR select_id IS NULL order by id;
+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
@@ -1544,7 +1600,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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 123 OR select_id IS NULL) order by id;
+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 +1615,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 = 122 OR select_id IS NULL order by id;
+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
@@ -1573,7 +1629,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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 122 OR select_id IS NULL) order by id;
+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 +1644,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 = 121 OR select_id IS NULL order by id;
+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
@@ -1602,7 +1658,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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 121 OR select_id IS NULL) order by id;
+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 +1673,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 = 120 OR select_id IS NULL order by id;
+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
@@ -1631,7 +1687,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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 120 OR select_id IS NULL) order by id;
+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 +1702,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 = 119 OR select_id IS NULL order by id;
+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
@@ -1660,7 +1716,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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 119 OR select_id IS NULL) order by id;
+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 +1731,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 = 118 OR select_id IS NULL order by id;
+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
@@ -1689,7 +1745,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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 118 OR select_id IS NULL) order by id;
+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 +1760,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 = 117 OR select_id IS NULL order by id;
+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
@@ -1718,7 +1774,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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 117 OR select_id IS NULL) order by id;
+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 +1789,7 @@ 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 = 116 OR select_id IS NULL order by id;
+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
@@ -1747,7 +1803,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`r
 'IS NOT NULL')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 116 OR select_id IS NULL) order by id;
+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
@@ -1762,7 +1818,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 = 115 OR select_id IS NULL order by id;
+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
@@ -1776,7 +1832,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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 115 OR select_id IS NULL) order by id;
+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 +1847,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 = 114 OR select_id IS NULL order by id;
+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
@@ -1805,7 +1861,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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 114 OR select_id IS NULL) order by id;
+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 +1876,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 = 113 OR select_id IS NULL order by id;
+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
@@ -1832,7 +1888,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 113 OR select_id IS NULL) order by id;
+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
@@ -1846,7 +1902,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 = 112 OR select_id IS NULL order by id;
+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
@@ -1858,7 +1914,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 112 OR select_id IS NULL) order by id;
+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
@@ -1872,7 +1928,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 = 111 OR select_id IS NULL order by id;
+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
@@ -1884,7 +1940,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 111 OR select_id IS NULL) order by id;
+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
@@ -1898,7 +1954,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 = 110 OR select_id IS NULL order by id;
+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
@@ -1910,7 +1966,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 110 OR select_id IS NULL) order by id;
+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
@@ -1924,7 +1980,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 = 109 OR select_id IS NULL order by id;
+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
@@ -1936,7 +1992,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 109 OR select_id IS NULL) order by id;
+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
@@ -1950,7 +2006,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 = 108 OR select_id IS NULL order by id;
+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
@@ -1962,7 +2018,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 108 OR select_id IS NULL) order by id;
+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
@@ -1976,7 +2032,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 = 107 OR select_id IS NULL order by id;
+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
@@ -1988,7 +2044,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 107 OR select_id IS NULL) order by id;
+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
@@ -2002,7 +2058,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 = 106 OR select_id IS NULL order by id;
+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
@@ -2014,7 +2070,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 106 OR select_id IS NULL) order by id;
+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
@@ -2028,7 +2084,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 = 105 OR select_id IS NULL order by id;
+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
@@ -2040,7 +2096,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 105 OR select_id IS NULL) order by id;
+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
@@ -2054,7 +2110,7 @@ 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 = 104 OR select_id IS NULL order by id;
+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	@@ -2071,7 +2127,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 104 OR select_id IS NULL) order by id;
+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	@@ -2090,7 +2146,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 = 103 OR select_id IS NULL order by id;
+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
@@ -2102,7 +2158,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 103 OR select_id IS NULL) order by id;
+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
@@ -2116,7 +2172,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 = 102 OR select_id IS NULL order by id;
+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
@@ -2131,7 +2187,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 102 OR select_id IS NULL) order by id;
+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
@@ -2148,7 +2204,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varb
 my_varbinary_1000, id FROM t1_values;
 SELECT CONVERT(my_varbinary_1000 USING koi8r), 
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 101 OR select_id IS NULL order by id;
+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
@@ -2160,7 +2216,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 101 OR select_id IS NULL) order by id;
+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
@@ -2174,7 +2230,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_bina
 my_binary_30, id FROM t1_values;
 SELECT CONVERT(my_binary_30 USING koi8r), 
 my_binary_30, id FROM t1_values
-WHERE select_id = 100 OR select_id IS NULL order by id;
+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
 @@ -2186,7 +2242,7 @@ View	Create View	character_set_client	co
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using koi8r) AS `CONVERT(my_binary_30 USING koi8r)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 100 OR select_id IS NULL) order by id;
+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
 @@ -2200,7 +2256,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varc
 my_varchar_1000, id FROM t1_values;
 SELECT CONVERT(my_varchar_1000 USING koi8r), 
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 99 OR select_id IS NULL order by id;
+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
@@ -2212,7 +2268,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 99 OR select_id IS NULL) order by id;
+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
@@ -2226,7 +2282,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_char
 my_char_30, id FROM t1_values;
 SELECT CONVERT(my_char_30 USING koi8r), 
 my_char_30, id FROM t1_values
-WHERE select_id = 98 OR select_id IS NULL order by id;
+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
@@ -2238,7 +2294,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 98 OR select_id IS NULL) order by id;
+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
@@ -2252,7 +2308,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varb
 my_varbinary_1000, id FROM t1_values;
 SELECT CONVERT(my_varbinary_1000 USING utf8), 
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 97 OR select_id IS NULL order by id;
+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
@@ -2264,7 +2320,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 97 OR select_id IS NULL) order by id;
+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
@@ -2278,7 +2334,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_bina
 my_binary_30, id FROM t1_values;
 SELECT CONVERT(my_binary_30 USING utf8), 
 my_binary_30, id FROM t1_values
-WHERE select_id = 96 OR select_id IS NULL order by id;
+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
 @@ -2290,7 +2346,7 @@ View	Create View	character_set_client	co
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using utf8) AS `CONVERT(my_binary_30 USING utf8)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 96 OR select_id IS NULL) order by id;
+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
 @@ -2304,7 +2360,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varc
 my_varchar_1000, id FROM t1_values;
 SELECT CONVERT(my_varchar_1000 USING utf8), 
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 95 OR select_id IS NULL order by id;
+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
@@ -2316,7 +2372,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 95 OR select_id IS NULL) order by id;
+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
@@ -2330,7 +2386,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_char
 my_char_30, id FROM t1_values;
 SELECT CONVERT(my_char_30 USING utf8), 
 my_char_30, id FROM t1_values
-WHERE select_id = 94 OR select_id IS NULL order by id;
+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
@@ -2342,7 +2398,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 94 OR select_id IS NULL) order by id;
+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
@@ -2356,7 +2412,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 = 93 OR select_id IS NULL order by id;
+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
@@ -2368,7 +2424,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 93 OR select_id IS NULL) order by id;
+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
@@ -2382,7 +2438,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 = 92 OR select_id IS NULL order by id;
+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
@@ -2394,7 +2450,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 92 OR select_id IS NULL) order by id;
+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
@@ -2408,7 +2464,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 = 91 OR select_id IS NULL order by id;
+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
@@ -2420,7 +2476,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 91 OR select_id IS NULL) order by id;
+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
@@ -2434,7 +2490,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 = 90 OR select_id IS NULL order by id;
+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
@@ -2446,7 +2502,7 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 90 OR select_id IS NULL) order by id;
+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
@@ -2460,7 +2516,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 = 89 OR select_id IS NULL order by id;
+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
@@ -2472,13 +2528,45 @@ View	Create View	character_set_client	co
 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`	latin1	latin1_swedish_ci
 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;
+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
 99991231235959	9999-12-31 23:59:59	3
 20040229235959	2004-02-29 23:59:59	4
 20050628100000	2005-06-28 10:00:00	5
+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	character_set_client	collation_connection
+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`	latin1	latin1_swedish_ci
+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;
 
 
diff -Nrup a/mysql-test/suite/funcs_1/r/innodb_storedproc.result b/mysql-test/suite/funcs_1/r/innodb_storedproc.result
--- a/mysql-test/suite/funcs_1/r/innodb_storedproc.result	2007-07-27 15:41:02 +02:00
+++ b/mysql-test/suite/funcs_1/r/innodb_storedproc.result	2007-11-27 17:40:06 +01:00
@@ -1,29 +1,4 @@
 
-.
-.                         IMPORTANT NOTICE:
-.                         -----------------
-.
-.  FIXME: The .result files are still NOT CHECKED for correctness!
-.
-.  FIXME: Several tests are affected by known problems around DECIMAL
-.  FIXME: and NUMERIC that will be checked again after WL#2984 once
-.  FIXME: has been completed. Some of them are marked in the result.
-.
-. Currently (Dec 06, 2005) this .result file is checked OK for Linux
-. with 5.0.17-bk (ChangeSet@stripped, 2005-12-05 18:33:48+01:00).
-. Using the available Windows version 5.0.16 there are differences
-. that can be ignored (e.g. WL#2984).
-.
---------------------------------------------------------------------------------
-	FIXME: There are subtests that are switched off due to known bugs:
-	------------------------------------------------------------------
-WL#2984: DECIMAL and NUMERIC problems with differences on some machines
-0
-
-There are some statements where the ps-protocol is switched off.
-Bug#11589: mysqltest, --ps-protocol, strange output, float/double/real with zerofill
---------------------------------------------------------------------------------
-
 --source suite/funcs_1/storedproc/load_sp_tb.inc
 --------------------------------------------------------------------------------
 SET @@global.max_heap_table_size=4294967295;
@@ -94,23 +69,24 @@ CREATE PROCEDURE
 --------------------------------------------------------------------------------
 USE db_storedproc;
 DROP PROCEDURE IF EXISTS sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934;
+ERROR 42000: Identifier name 'sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934' is too long
 CREATE PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934 (f1 char(20) )
 SELECT * from t1 where f2 = f1;
+ERROR 42000: Identifier name 'sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934' is too long
 CALL sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934('aaaa');
-f1	f2	f3	f4	f5	f6
+ERROR 42000: Identifier name 'sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934' is too long
 DROP PROCEDURE IF EXISTS sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde;
+ERROR 42000: Identifier name 'sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde' is too long
 CREATE PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde( f1 tinytext ) language sql deterministic sql security definer comment 'this is simple'
   BEGIN
 set @v1 = f1;
 SELECT @v1, @v1;
 END//
+ERROR 42000: Identifier name 'sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde' is too long
 CALL sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde( 'abc' );
-@v1	@v1
-abc	abc
+ERROR 42000: Identifier name 'sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde' is too long
 SHOW PROCEDURE status;
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 binary ) language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
@@ -119,12 +95,12 @@ SELECT @v1;
 END//
 CALL sp1( 34 );
 @v1
-34
+3
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 SHOW PROCEDURE status;
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 blob ) language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
@@ -135,10 +111,8 @@ CALL sp1( 34 );
 @v1
 34
 SHOW PROCEDURE status;
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 int )  language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
@@ -149,25 +123,27 @@ CALL sp1( 34 );
 @v1
 34
 SHOW PROCEDURE status;
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP PROCEDURE IF EXISTS sp1;
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed: SP definition accepted with m>60 in DECIMAL(m,n)
 CREATE PROCEDURE sp1( f1 decimal(256, 30) ) language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
 set @v1 = f1;
 SELECT @v1;
 END//
+ERROR 42000: Too big precision 256 specified for column ''. Maximum is 65.
 DROP PROCEDURE IF EXISTS sp1//
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( f1 decimal(66, 30) ) language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
 set @v1 = f1;
 SELECT @v1;
 END//
+ERROR 42000: Too big precision 66 specified for column ''. Maximum is 65.
 DROP PROCEDURE IF EXISTS sp1//
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( f1 decimal(60, 30) ) language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
 set @v1 = f1;
@@ -175,101 +151,1123 @@ SELECT @v1;
 END//
 CALL sp1( 17976931340000 );
 @v1
-17976931340000
+17976931340000.000000000000000000000000000000
+CALL sp1( 1.797693134e+13 );
+@v1
+17976931340000.000000000000000000000000000000
+CALL sp1( 1.7976931348623157493578e+308 );
+ERROR 22007: Illegal double '1.7976931348623157493578e+308' value found during parsing
+CALL sp1( 0.1234567890987654321e+100 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-100 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+99 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-99 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+98 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-98 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+97 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-97 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+96 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-96 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+95 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-95 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+94 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-94 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+93 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-93 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+92 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-92 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+91 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-91 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+90 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-90 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+89 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-89 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+88 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-88 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+87 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-87 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+86 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-86 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+85 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-85 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+84 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-84 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+83 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-83 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+82 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-82 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+81 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-81 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+80 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-80 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+79 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-79 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+78 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-78 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+77 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-77 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+76 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-76 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+75 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-75 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+74 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-74 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+73 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-73 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+72 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-72 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+71 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-71 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+70 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-70 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+69 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-69 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+68 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-68 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+67 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-67 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+66 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-66 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+65 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-65 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+64 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-64 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+63 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-63 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+62 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-62 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+61 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-61 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+60 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-60 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+59 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-59 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+58 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-58 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+57 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-57 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+56 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-56 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+55 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-55 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+54 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-54 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+53 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-53 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+52 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-52 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+51 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-51 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+50 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-50 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+49 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-49 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+48 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-48 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+47 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-47 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+46 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-46 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+45 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-45 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+44 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-44 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+43 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-43 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+42 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-42 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+41 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-41 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+40 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-40 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+39 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-39 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+38 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-38 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+37 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-37 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+36 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-36 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+35 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-35 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+34 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-34 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+33 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-33 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+32 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-32 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+31 );
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-31 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+30 );
+@v1
+123456789098765400000000000000.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-30 );
+@v1
+0.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+29 );
+@v1
+12345678909876540000000000000.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-29 );
+@v1
+0.000000000000000000000000000001
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+28 );
+@v1
+1234567890987654000000000000.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-28 );
+@v1
+0.000000000000000000000000000012
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+27 );
+@v1
+123456789098765400000000000.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-27 );
+@v1
+0.000000000000000000000000000123
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+26 );
+@v1
+12345678909876540000000000.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-26 );
+@v1
+0.000000000000000000000000001235
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+25 );
+@v1
+1234567890987654000000000.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-25 );
+@v1
+0.000000000000000000000000012346
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+24 );
+@v1
+123456789098765400000000.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-24 );
+@v1
+0.000000000000000000000000123457
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+23 );
+@v1
+12345678909876540000000.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-23 );
+@v1
+0.000000000000000000000001234568
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+22 );
+@v1
+1234567890987654000000.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-22 );
+@v1
+0.000000000000000000000012345679
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+21 );
+@v1
+123456789098765400000.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-21 );
+@v1
+0.000000000000000000000123456789
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+20 );
+@v1
+12345678909876540000.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-20 );
+@v1
+0.000000000000000000001234567891
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+19 );
+@v1
+1234567890987654000.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-19 );
+@v1
+0.000000000000000000012345678910
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+18 );
+@v1
+123456789098765400.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-18 );
+@v1
+0.000000000000000000123456789099
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+17 );
+@v1
+12345678909876540.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-17 );
+@v1
+0.000000000000000001234567890988
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+16 );
+@v1
+1234567890987654.000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-16 );
+@v1
+0.000000000000000012345678909877
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+15 );
+@v1
+123456789098765.400000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-15 );
+@v1
+0.000000000000000123456789098765
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+14 );
+@v1
+12345678909876.540000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-14 );
+@v1
+0.000000000000001234567890987654
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+13 );
+@v1
+1234567890987.654000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-13 );
+@v1
+0.000000000000012345678909876540
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+12 );
+@v1
+123456789098.765400000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-12 );
+@v1
+0.000000000000123456789098765400
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+11 );
+@v1
+12345678909.876540000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-11 );
+@v1
+0.000000000001234567890987654000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+10 );
+@v1
+1234567890.987654000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-10 );
+@v1
+0.000000000012345678909876540000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+9 );
+@v1
+123456789.098765400000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-9 );
+@v1
+0.000000000123456789098765400000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+8 );
+@v1
+12345678.909876540000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-8 );
+@v1
+0.000000001234567890987654000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+7 );
+@v1
+1234567.890987654000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-7 );
+@v1
+0.000000012345678909876540000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+6 );
+@v1
+123456.789098765400000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-6 );
+@v1
+0.000000123456789098765400000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+5 );
+@v1
+12345.678909876540000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-5 );
+@v1
+0.000001234567890987654000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+4 );
+@v1
+1234.567890987654000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-4 );
+@v1
+0.000012345678909876550000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+3 );
+@v1
+123.456789098765400000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-3 );
+@v1
+0.000123456789098765400000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+2 );
+@v1
+12.345678909876540000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-2 );
+@v1
+0.001234567890987654000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+1 );
+@v1
+1.234567890987654000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-1 );
+@v1
+0.012345678909876540000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e+0 );
+@v1
+0.123456789098765400000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+CALL sp1( 0.1234567890987654321e-0 );
+@v1
+0.123456789098765400000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 SHOW PROCEDURE status;
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 enum("value1", "value1") )  language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
 SELECT f1;
 END//
+Warnings:
+Note	1291	Column '' has duplicated value 'value1' in ENUM
 CALL sp1( "value1" );
 f1
 value1
+Warnings:
+Note	1291	Column '' has duplicated value 'value1' in ENUM
 SHOW PROCEDURE status;
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 set("value1", "value1") ) language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
 SELECT f1;
 END//
+Warnings:
+Note	1291	Column '' has duplicated value 'value1' in SET
 CALL sp1( "value1, value1" );
 f1
-value1, value1
+value1
+Warnings:
+Note	1291	Column '' has duplicated value 'value1' in SET
+Warning	1265	Data truncated for column 'f1' at row 1
 SHOW PROCEDURE status;
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 enum("value1", "value1") )  language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
 SELECT f1;
 END//
+Warnings:
+Note	1291	Column '' has duplicated value 'value1' in ENUM
 CALL sp1( "value1" );
 f1
 value1
+Warnings:
+Note	1291	Column '' has duplicated value 'value1' in ENUM
 SHOW PROCEDURE status;
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
-db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 text ) language sql SELECT f1;
 CALL sp1( 'abc' );
 f1
 abc
 SHOW PROCEDURE status like 'sp1';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	DEFINER	
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	DEFINER		latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 text ) deterministic SELECT f1;
 CALL sp1( 'abc' );
 f1
 abc
 SHOW PROCEDURE status like 'sp1';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	DEFINER	
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	DEFINER		latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 text ) not deterministic SELECT f1;
 CALL sp1( 'abc' );
 f1
 abc
 SHOW PROCEDURE status like 'sp1';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	DEFINER	
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	DEFINER		latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 text ) sql security definer SELECT f1;
 CALL sp1( 'abc' );
 f1
 abc
 SHOW PROCEDURE status like 'sp1';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	DEFINER	
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	DEFINER		latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 text ) sql security invoker SELECT f1;
 CALL sp1( 'abc' );
 f1
 abc
 SHOW PROCEDURE status like 'sp1';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER		latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 text ) comment 'this is simple' SELECT f1;
 CALL sp1( 'abc' );
 f1
 abc
 SHOW PROCEDURE status like 'sp1';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934;
+ERROR 42000: Identifier name 'sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934' is too long
 DROP PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde;
+ERROR 42000: Identifier name 'sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde' is too long
 DROP PROCEDURE sp1;
 
 Testcase 4.1.2:
@@ -294,8 +1292,8 @@ SELECT fn1( ' world');
 fn1( ' world')
 hello world
 SHOW FUNCTION STATUS LIKE 'fn1';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	fn1	FUNCTION	root@localhost	modified	created	DEFINER	this is simple
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	fn1	FUNCTION	root@localhost	modified	created	DEFINER	this is simple	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP FUNCTION IF EXISTS fn1;
 CREATE FUNCTION fn1( f1 smallint ) returns smallint language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
@@ -306,8 +1304,8 @@ SELECT fn1( 126 );
 fn1( 126 )
 127
 SHOW FUNCTION STATUS LIKE 'fn1';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	fn1	FUNCTION	root@localhost	modified	created	INVOKER	this is simple
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	fn1	FUNCTION	root@localhost	modified	created	INVOKER	this is simple	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP FUNCTION IF EXISTS fn1;
 CREATE FUNCTION fn1( f1 decimal(63, 31) ) returns decimal(63, 31) language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
@@ -326,34 +1324,34 @@ SELECT fn1( 1.3326e+8 );
 fn1( 1.3326e+8 )
 134260000.000000000000000000000000000000
 SHOW FUNCTION STATUS LIKE 'fn1';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	fn1	FUNCTION	root@localhost	modified	created	INVOKER	this is simple
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	fn1	FUNCTION	root@localhost	modified	created	INVOKER	this is simple	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP FUNCTION IF EXISTS fn1;
 CREATE FUNCTION fn1( f1 enum("value1", "value1") ) returns decimal(63, 30)  language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
 return f1;
 END//
+Warnings:
+Note	1291	Column '' has duplicated value 'value1' in ENUM
 SELECT fn1( "value1" );
 fn1( "value1" )
-0.000000000000000000000000000000
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: 'value1'
+1.000000000000000000000000000000
 SHOW FUNCTION STATUS LIKE 'fn1';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	fn1	FUNCTION	root@localhost	modified	created	INVOKER	this is simple
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	fn1	FUNCTION	root@localhost	modified	created	INVOKER	this is simple	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP FUNCTION IF EXISTS fn1;
 CREATE FUNCTION fn1( f1 set("value1", "value1") ) returns decimal(63, 30) language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
 return f1;
 END//
+Warnings:
+Note	1291	Column '' has duplicated value 'value1' in SET
 SELECT fn1( "value1, value1" );
 fn1( "value1, value1" )
-0.000000000000000000000000000000
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: 'value1, value1'
+1.000000000000000000000000000000
 SHOW FUNCTION STATUS LIKE 'fn1';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	fn1	FUNCTION	root@localhost	modified	created	INVOKER	this is simple
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	fn1	FUNCTION	root@localhost	modified	created	INVOKER	this is simple	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP FUNCTION IF EXISTS fn1;
 CREATE FUNCTION fn1( f1 smallint ) returns smallint language sql
 BEGIN
@@ -364,8 +1362,8 @@ SELECT fn1( 126 );
 fn1( 126 )
 127
 SHOW FUNCTION STATUS LIKE 'fn1';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	fn1	FUNCTION	root@localhost	modified	created	DEFINER	
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	fn1	FUNCTION	root@localhost	modified	created	DEFINER		latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP FUNCTION IF EXISTS fn1;
 CREATE FUNCTION fn1( f1 smallint ) returns smallint deterministic
 BEGIN
@@ -376,8 +1374,8 @@ SELECT fn1( 126 );
 fn1( 126 )
 127
 SHOW FUNCTION STATUS LIKE 'fn1';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	fn1	FUNCTION	root@localhost	modified	created	DEFINER	
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	fn1	FUNCTION	root@localhost	modified	created	DEFINER		latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP FUNCTION IF EXISTS fn1;
 CREATE FUNCTION fn1( f1 smallint ) returns smallint not deterministic
 BEGIN
@@ -388,8 +1386,8 @@ SELECT fn1( 126 );
 fn1( 126 )
 127
 SHOW FUNCTION STATUS LIKE 'fn1';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	fn1	FUNCTION	root@localhost	modified	created	DEFINER	
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	fn1	FUNCTION	root@localhost	modified	created	DEFINER		latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP FUNCTION IF EXISTS fn1;
 CREATE FUNCTION fn1( f1 smallint ) returns smallint
 sql security definer
@@ -401,8 +1399,8 @@ SELECT fn1( 126 );
 fn1( 126 )
 127
 SHOW FUNCTION STATUS LIKE 'fn1';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	fn1	FUNCTION	root@localhost	modified	created	DEFINER	
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	fn1	FUNCTION	root@localhost	modified	created	DEFINER		latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP FUNCTION IF EXISTS fn1;
 CREATE FUNCTION fn1( f1 smallint ) returns smallint
 sql security invoker
@@ -414,8 +1412,8 @@ SELECT fn1( 126 );
 fn1( 126 )
 127
 SHOW FUNCTION STATUS LIKE 'fn1';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	fn1	FUNCTION	root@localhost	modified	created	INVOKER	
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	fn1	FUNCTION	root@localhost	modified	created	INVOKER		latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP FUNCTION IF EXISTS fn1;
 CREATE FUNCTION fn1( f1 smallint ) returns smallint
 comment 'this is simple'
@@ -427,8 +1425,8 @@ SELECT fn1( 126 );
 fn1( 126 )
 127
 SHOW FUNCTION STATUS LIKE 'fn1';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	fn1	FUNCTION	root@localhost	modified	created	DEFINER	this is simple
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	fn1	FUNCTION	root@localhost	modified	created	DEFINER	this is simple	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP FUNCTION fn1;
 
 Testcase 4.1.3:
@@ -440,9 +1438,9 @@ DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1 (f1 char(20) )
 SELECT * from t1 where f2 = f1;
 show CREATE PROCEDURE sp1;
-Procedure	sql_mode	Create Procedure
-sp1		CREATE PROCEDURE `sp1`(f1 char(20) )
-SELECT * from t1 where f2 = f1
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
+sp1		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`(f1 char(20) )
+SELECT * from t1 where f2 = f1	latin1	modified	created
 DROP PROCEDURE sp1;
 
 Testcase 4.1.4:
@@ -453,9 +1451,9 @@ DROP FUNCTION IF EXISTS fn1;
 CREATE FUNCTION fn1 (s char(20)) returns char(50)
 return concat('hello, ', s, '!');
 show CREATE FUNCTION fn1;
-Function	sql_mode	Create Function
-fn1		CREATE FUNCTION `fn1`(s char(20)) RETURNS char(50)
-return concat('hello, ', s, '!')
+Function	sql_mode	Create Function	character_set_client	collation_connection	Database Collation
+fn1		CREATE DEFINER=`root`@`localhost` FUNCTION `fn1`(s char(20)) RETURNS char(50) CHARSET latin1
+return concat('hello, ', s, '!')	latin1	modified	created
 DROP FUNCTION fn1;
 
 Testcase 4.1.5:
@@ -465,8 +1463,8 @@ SHOW PROCEDURE status
 CREATE PROCEDURE sp5()
 SELECT * from t1;
 SHOW PROCEDURE status like 'sp5';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp5	PROCEDURE	root@localhost	modified	created	DEFINER	
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp5	PROCEDURE	root@localhost	modified	created	DEFINER		latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP PROCEDURE sp5;
 
 Testcase 4.1.6:
@@ -479,8 +1477,8 @@ set @b = 0.9 * a;
 return @b;
 END//
 SHOW FUNCTION STATUS LIKE 'fn5';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	fn5	FUNCTION	root@localhost	modified	created	DEFINER	
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	fn5	FUNCTION	root@localhost	modified	created	DEFINER		latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP FUNCTION fn5;
 
 Testcase 4.1.7:
@@ -498,7 +1496,7 @@ CREATE PROCEDURE sp7b (a char (20), out 
 SELECT f1 into b from t1 where t1.f2= a;
 CALL sp7b('xyz', @out_param);
 Warnings:
-Warning	1329	No data to FETCH
+Warning	1329	No data - zero rows fetched, selected, or processed
 SELECT @out_param;
 @out_param
 NULL
@@ -510,9 +1508,6 @@ SELECT f2 into c from t1 where t1.f2=999
 END//
 set @c=1;
 CALL sp7c('xyz', @out_param, @c);
-Warnings:
-Warning	1329	No data to FETCH
-Warning	1329	No data to FETCH
 SELECT @out_param;
 @out_param
 NULL
@@ -539,48 +1534,48 @@ Testcase 4.1.9:
 drop procedure
 --------------------------------------------------------------------------------
 SELECT * from mysql.proc where specific_name='sp9';
-db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment
+db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment	character_set_client	collation_connection	db_collation	body_utf8
 DROP PROCEDURE IF EXISTS sp9;
 SELECT * from mysql.proc where specific_name='sp9';
-db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment
+db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment	character_set_client	collation_connection	db_collation	body_utf8
 CREATE PROCEDURE sp9()SELECT * from t1;
 SELECT * from mysql.proc where specific_name='sp9';
-db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment
-db_storedproc	sp9	PROCEDURE	sp9	SQL	CONTAINS_SQL	NO	DEFINER			SELECT * from t1	root@localhost	created	modified		
+db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment	character_set_client	collation_connection	db_collation	body_utf8
+db_storedproc	sp9	PROCEDURE	sp9	SQL	CONTAINS_SQL	NO	DEFINER			SELECT * from t1	root@localhost	created	modified			latin1	latin1_swedish_ci	latin1_swedish_ci	SELECT * from t1
 DROP PROCEDURE sp9;
 SELECT * from mysql.proc where specific_name='sp9';
-db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment
+db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment	character_set_client	collation_connection	db_collation	body_utf8
 CREATE PROCEDURE sp9()SELECT * from t1;
 SELECT * from mysql.proc where specific_name='sp9';
-db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment
-db_storedproc	sp9	PROCEDURE	sp9	SQL	CONTAINS_SQL	NO	DEFINER			SELECT * from t1	root@localhost	created	modified		
+db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment	character_set_client	collation_connection	db_collation	body_utf8
+db_storedproc	sp9	PROCEDURE	sp9	SQL	CONTAINS_SQL	NO	DEFINER			SELECT * from t1	root@localhost	created	modified			latin1	latin1_swedish_ci	latin1_swedish_ci	SELECT * from t1
 DROP PROCEDURE IF EXISTS sp9;
 SELECT * from mysql.proc where specific_name='sp9';
-db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment
+db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment	character_set_client	collation_connection	db_collation	body_utf8
 
 Testcase 4.1.10:
 ----------------
 DROP FUNCTION
 --------------------------------------------------------------------------------
 SELECT * from mysql.proc where specific_name='fn10' and type='function';
-db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment
+db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment	character_set_client	collation_connection	db_collation	body_utf8
 DROP FUNCTION IF EXISTS fn10;
 SELECT * from mysql.proc where specific_name='fn10' and type='function';
-db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment
+db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment	character_set_client	collation_connection	db_collation	body_utf8
 CREATE FUNCTION fn10() returns int return 100;
 SELECT * from mysql.proc where specific_name='fn10' and type='function';
-db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment
-db_storedproc	fn10	FUNCTION	fn10	SQL	CONTAINS_SQL	NO	DEFINER		int(11)	return 100	root@localhost	created	modified		
+db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment	character_set_client	collation_connection	db_collation	body_utf8
+db_storedproc	fn10	FUNCTION	fn10	SQL	CONTAINS_SQL	NO	DEFINER		int(11)	return 100	root@localhost	created	modified			latin1	latin1_swedish_ci	latin1_swedish_ci	return 100
 DROP FUNCTION fn10;
 SELECT * from mysql.proc where specific_name='fn10' and type='function';
-db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment
+db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment	character_set_client	collation_connection	db_collation	body_utf8
 CREATE FUNCTION fn10() returns int return 100;
 SELECT * from mysql.proc where specific_name='fn10' and type='function';
-db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment
-db_storedproc	fn10	FUNCTION	fn10	SQL	CONTAINS_SQL	NO	DEFINER		int(11)	return 100	root@localhost	created	modified		
+db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment	character_set_client	collation_connection	db_collation	body_utf8
+db_storedproc	fn10	FUNCTION	fn10	SQL	CONTAINS_SQL	NO	DEFINER		int(11)	return 100	root@localhost	created	modified			latin1	latin1_swedish_ci	latin1_swedish_ci	return 100
 DROP FUNCTION IF EXISTS fn10;
 SELECT * from mysql.proc where specific_name='fn10' and type='function';
-db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment
+db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment	character_set_client	collation_connection	db_collation	body_utf8
 
 Testcase 4.1.11:
 ----------------
@@ -604,6 +1599,7 @@ connect(localhost,user_1,,db_storedproc,
 	
 user_1@localhost	db_storedproc
 CALL sp11();
+USE db_storedproc;
 	
 root@localhost	db_storedproc
 alter procedure sp11 sql security invoker;
@@ -612,6 +1608,7 @@ security_type
 INVOKER
 	
 user_1@localhost	db_storedproc
+USE db_storedproc;
 CALL sp11();
 ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table 't1'
 commit work;
@@ -705,6 +1702,10 @@ SELECT * from t1 where f2 = f1' at line 
 CREATE PROCEDURE function()
 SELECT * from t1 where f2=f1;
 DROP PROCEDURE function;
+CREATE PROCEDURE accessible()
+SELECT * from t1 where f2=f1;
+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 'accessible()
+SELECT * from t1 where f2=f1' at line 1
 CREATE PROCEDURE add()
 SELECT * from t1 where f2=f1;
 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 'add()
@@ -765,9 +1766,9 @@ CREATE PROCEDURE by()
 SELECT * from t1 where f2=f1;
 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 'by()
 SELECT * from t1 where f2=f1' at line 1
-CREATE PROCEDURE CALL()
+CREATE PROCEDURE call()
 SELECT * from t1 where f2=f1;
-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 'CALL()
+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 'call()
 SELECT * from t1 where f2=f1' at line 1
 CREATE PROCEDURE cascade()
 SELECT * from t1 where f2=f1;
@@ -801,17 +1802,10 @@ CREATE PROCEDURE column()
 SELECT * from t1 where f2=f1;
 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 'column()
 SELECT * from t1 where f2=f1' at line 1
-CREATE PROCEDURE columns()
-SELECT * from t1 where f2=f1;
-DROP PROCEDURE columns;
 CREATE PROCEDURE condition()
 SELECT * from t1 where f2=f1;
 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 'condition()
 SELECT * from t1 where f2=f1' at line 1
-CREATE PROCEDURE connection()
-SELECT * from t1 where f2=f1;
-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 'connection()
-SELECT * from t1 where f2=f1' at line 1
 CREATE PROCEDURE constraint()
 SELECT * from t1 where f2=f1;
 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 'constraint()
@@ -995,9 +1989,6 @@ CREATE PROCEDURE foreign()
 SELECT * from t1 where f2=f1;
 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 'foreign()
 SELECT * from t1 where f2=f1' at line 1
-CREATE PROCEDURE found()
-SELECT * from t1 where f2=f1;
-DROP PROCEDURE found;
 CREATE PROCEDURE from()
 SELECT * from t1 where f2=f1;
 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 'from()
@@ -1006,9 +1997,6 @@ CREATE PROCEDURE fulltext()
 SELECT * from t1 where f2=f1;
 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 'fulltext()
 SELECT * from t1 where f2=f1' at line 1
-CREATE PROCEDURE goto()
-SELECT * from t1 where f2=f1;
-DROP PROCEDURE goto;
 CREATE PROCEDURE grant()
 SELECT * from t1 where f2=f1;
 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 'grant()
@@ -1077,6 +2065,26 @@ CREATE PROCEDURE int()
 SELECT * from t1 where f2=f1;
 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 'int()
 SELECT * from t1 where f2=f1' at line 1
+CREATE PROCEDURE int1()
+SELECT * from t1 where f2=f1;
+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 'int1()
+SELECT * from t1 where f2=f1' at line 1
+CREATE PROCEDURE int2()
+SELECT * from t1 where f2=f1;
+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 'int2()
+SELECT * from t1 where f2=f1' at line 1
+CREATE PROCEDURE int3()
+SELECT * from t1 where f2=f1;
+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 'int3()
+SELECT * from t1 where f2=f1' at line 1
+CREATE PROCEDURE int4()
+SELECT * from t1 where f2=f1;
+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 'int4()
+SELECT * from t1 where f2=f1' at line 1
+CREATE PROCEDURE int8()
+SELECT * from t1 where f2=f1;
+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 'int8()
+SELECT * from t1 where f2=f1' at line 1
 CREATE PROCEDURE integer()
 SELECT * from t1 where f2=f1;
 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 'integer()
@@ -1133,6 +2141,10 @@ CREATE PROCEDURE limit()
 SELECT * from t1 where f2=f1;
 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 'limit()
 SELECT * from t1 where f2=f1' at line 1
+CREATE PROCEDURE linear()
+SELECT * from t1 where f2=f1;
+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 'linear()
+SELECT * from t1 where f2=f1' at line 1
 CREATE PROCEDURE lines()
 SELECT * from t1 where f2=f1;
 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 'lines()
@@ -1173,6 +2185,10 @@ CREATE PROCEDURE low_priority()
 SELECT * from t1 where f2=f1;
 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 'low_priority()
 SELECT * from t1 where f2=f1' at line 1
+CREATE PROCEDURE master_ssl_verify_server_cert()
+SELECT * from t1 where f2=f1;
+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 'master_ssl_verify_server_cert()
+SELECT * from t1 where f2=f1' at line 1
 CREATE PROCEDURE match()
 SELECT * from t1 where f2=f1;
 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 'match()
@@ -1273,9 +2289,6 @@ CREATE PROCEDURE primary()
 SELECT * from t1 where f2=f1;
 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 'primary()
 SELECT * from t1 where f2=f1' at line 1
-CREATE PROCEDURE privileges()
-SELECT * from t1 where f2=f1;
-DROP PROCEDURE privileges;
 CREATE PROCEDURE procedure()
 SELECT * from t1 where f2=f1;
 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 'procedure()
@@ -1284,6 +2297,10 @@ CREATE PROCEDURE purge()
 SELECT * from t1 where f2=f1;
 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 'purge()
 SELECT * from t1 where f2=f1' at line 1
+CREATE PROCEDURE range()
+SELECT * from t1 where f2=f1;
+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 'range()
+SELECT * from t1 where f2=f1' at line 1
 CREATE PROCEDURE read()
 SELECT * from t1 where f2=f1;
 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 'read()
@@ -1304,6 +2321,10 @@ CREATE PROCEDURE regexp()
 SELECT * from t1 where f2=f1;
 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 'regexp()
 SELECT * from t1 where f2=f1' at line 1
+CREATE PROCEDURE release()
+SELECT * from t1 where f2=f1;
+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 'release()
+SELECT * from t1 where f2=f1' at line 1
 CREATE PROCEDURE rename()
 SELECT * from t1 where f2=f1;
 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 'rename()
@@ -1376,10 +2397,6 @@ CREATE PROCEDURE smallint()
 SELECT * from t1 where f2=f1;
 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 'smallint()
 SELECT * from t1 where f2=f1' at line 1
-CREATE PROCEDURE soname()
-SELECT * from t1 where f2=f1;
-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 'soname()
-SELECT * from t1 where f2=f1' at line 1
 CREATE PROCEDURE spatial()
 SELECT * from t1 where f2=f1;
 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 'spatial()
@@ -1432,9 +2449,6 @@ CREATE PROCEDURE table()
 SELECT * from t1 where f2=f1;
 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 'table()
 SELECT * from t1 where f2=f1' at line 1
-CREATE PROCEDURE tables()
-SELECT * from t1 where f2=f1;
-DROP PROCEDURE tables;
 CREATE PROCEDURE terminated()
 SELECT * from t1 where f2=f1;
 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 'terminated()
@@ -1725,6 +2739,26 @@ CREATE FUNCTION int(f1 int) returns int
 return f1;
 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 'int(f1 int) returns int
 return f1' at line 1
+CREATE FUNCTION int1(f1 int1) returns int1
+return f1;
+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 'int1(f1 int1) returns int1
+return f1' at line 1
+CREATE FUNCTION int2(f1 int2) returns int2
+return f1;
+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 'int2(f1 int2) returns int2
+return f1' at line 1
+CREATE FUNCTION int3(f1 int3) returns int3
+return f1;
+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 'int3(f1 int3) returns int3
+return f1' at line 1
+CREATE FUNCTION int4(f1 int4) returns int4
+return f1;
+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 'int4(f1 int4) returns int4
+return f1' at line 1
+CREATE FUNCTION int8(f1 int8) returns int8
+return f1;
+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 'int8(f1 int8) returns int8
+return f1' at line 1
 CREATE FUNCTION int unsigned(f1 int unsigned) returns int unsigned
 return f1;
 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 'int unsigned(f1 int unsigned) returns int unsigned
@@ -1846,485 +2880,291 @@ return f' at line 1
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
 Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(char f1 ) returns char
+CREATE FUNCTION fn1(f1 char ) returns char
 return f1;
-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 'char f1 ) returns char
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(char binary f1 ) returns char binary
+CREATE FUNCTION fn1(f1 char binary ) returns char binary
 return f1;
-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 'char binary f1 ) returns char binary
-return f1' at line 1
+ERROR 42000: This version of MySQL doesn't yet support 'return value collation'
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
 Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(char ascii f1 ) returns char ascii
+CREATE FUNCTION fn1(f1 char ascii ) returns char ascii
 return f1;
-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 'char ascii f1 ) returns char ascii
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(char not null f1 ) returns char not null
+CREATE FUNCTION fn1(f1 char not null ) returns char not null
 return f1;
-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 'char not null f1 ) returns char not null
+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 'not null ) returns char not null
 return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
 Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(char binary not null f1 ) returns char binary not null
+CREATE FUNCTION fn1(f1 char binary not null ) returns char binary not null
 return f1;
-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 'char binary not null f1 ) returns char binary not null
+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 'not null ) returns char binary not null
 return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
 Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(char ascii not null f1 ) returns char ascii not null
+CREATE FUNCTION fn1(f1 char ascii not null ) returns char ascii not null
 return f1;
-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 'char ascii not null f1 ) returns char ascii not null
+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 'not null ) returns char ascii not null
 return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
 Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(tinytext f1 ) returns tinytext
+CREATE FUNCTION fn1(f1 tinytext ) returns tinytext
 return f1;
-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 'tinytext f1 ) returns tinytext
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(text f1 ) returns text
+CREATE FUNCTION fn1(f1 text ) returns text
 return f1;
-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 'f1 ) returns text
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(mediumtext f1 ) returns mediumtext
+CREATE FUNCTION fn1(f1 mediumtext ) returns mediumtext
 return f1;
-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 'mediumtext f1 ) returns mediumtext
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(longtext f1 ) returns longtext
+CREATE FUNCTION fn1(f1 longtext ) returns longtext
 return f1;
-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 'longtext f1 ) returns longtext
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(tinytext not null f1 ) returns tinytext not null
+CREATE FUNCTION fn1(f1 tinytext not null ) returns tinytext not null
 return f1;
-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 'tinytext not null f1 ) returns tinytext not null
+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 'not null ) returns tinytext not null
 return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
 Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(text not null f1 ) returns text not null
+CREATE FUNCTION fn1(f1 text not null ) returns text not null
 return f1;
-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 'not null f1 ) returns text not null
+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 'not null ) returns text not null
 return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
 Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(mediumtext not null f1 ) returns mediumtext not null
+CREATE FUNCTION fn1(f1 mediumtext not null ) returns mediumtext not null
 return f1;
-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 'mediumtext not null f1 ) returns mediumtext not null
+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 'not null ) returns mediumtext not null
 return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
 Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(longtext not null f1 ) returns longtext not null
+CREATE FUNCTION fn1(f1 longtext not null ) returns longtext not null
 return f1;
-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 'longtext not null f1 ) returns longtext not null
+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 'not null ) returns longtext not null
 return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
 Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(tinyblob f1 ) returns tinyblob
+CREATE FUNCTION fn1(f1 tinyblob ) returns tinyblob
 return f1;
-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 'tinyblob f1 ) returns tinyblob
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(blob f1 ) returns blob
+CREATE FUNCTION fn1(f1 blob ) returns blob
 return f1;
-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 'blob f1 ) returns blob
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(mediumblob f1 ) returns mediumblob
+CREATE FUNCTION fn1(f1 mediumblob ) returns mediumblob
 return f1;
-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 'mediumblob f1 ) returns mediumblob
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(longblob f1 ) returns longblob
+CREATE FUNCTION fn1(f1 longblob ) returns longblob
 return f1;
-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 'longblob f1 ) returns longblob
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(tinyblob not null f1 ) returns tinyblob not null
+CREATE FUNCTION fn1(f1 tinyblob not null ) returns tinyblob not null
 return f1;
-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 'tinyblob not null f1 ) returns tinyblob not null
+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 'not null ) returns tinyblob not null
 return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
 Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(blob not null f1 ) returns blob not null
+CREATE FUNCTION fn1(f1 blob not null ) returns blob not null
 return f1;
-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 'blob not null f1 ) returns blob not null
+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 'not null ) returns blob not null
 return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
 Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(mediumblob not null f1 ) returns mediumblob not null
+CREATE FUNCTION fn1(f1 mediumblob not null ) returns mediumblob not null
 return f1;
-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 'mediumblob not null f1 ) returns mediumblob not null
+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 'not null ) returns mediumblob not null
 return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
 Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(longblob not null f1 ) returns longblob not null
+CREATE FUNCTION fn1(f1 longblob not null ) returns longblob not null
 return f1;
-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 'longblob not null f1 ) returns longblob not null
+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 'not null ) returns longblob not null
 return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
 Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(binary f1 ) returns binary
+CREATE FUNCTION fn1(f1 binary ) returns binary
 return f1;
-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 'binary f1 ) returns binary
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(binary not null f1 ) returns binary not null
+CREATE FUNCTION fn1(f1 binary not null ) returns binary not null
 return f1;
-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 'binary not null f1 ) returns binary not null
+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 'not null ) returns binary not null
 return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
 Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(tinyint f1 ) returns tinyint
+CREATE FUNCTION fn1(f1 tinyint ) returns tinyint
 return f1;
-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 'tinyint f1 ) returns tinyint
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(tinyint unsigned f1 ) returns tinyint unsigned
+CREATE FUNCTION fn1(f1 tinyint unsigned ) returns tinyint unsigned
 return f1;
-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 'tinyint unsigned f1 ) returns tinyint unsigned
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(tinyint zerofill f1 ) returns tinyint zerofill
+CREATE FUNCTION fn1(f1 tinyint zerofill ) returns tinyint zerofill
 return f1;
-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 'tinyint zerofill f1 ) returns tinyint zerofill
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(tinyint unsigned zerofill f1 ) returns tinyint unsigned zerofill
+CREATE FUNCTION fn1(f1 tinyint unsigned zerofill ) returns tinyint unsigned zerofill
 return f1;
-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 'tinyint unsigned zerofill f1 ) returns tinyint unsigned zerofill
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(smallint f1 ) returns smallint
+CREATE FUNCTION fn1(f1 smallint ) returns smallint
 return f1;
-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 'smallint f1 ) returns smallint
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(smallint unsigned f1 ) returns smallint unsigned
+CREATE FUNCTION fn1(f1 smallint unsigned ) returns smallint unsigned
 return f1;
-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 'smallint unsigned f1 ) returns smallint unsigned
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(smallint zerofill f1 ) returns smallint zerofill
+CREATE FUNCTION fn1(f1 smallint zerofill ) returns smallint zerofill
 return f1;
-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 'smallint zerofill f1 ) returns smallint zerofill
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(smallint unsigned zerofill f1 ) returns smallint unsigned zerofill
+CREATE FUNCTION fn1(f1 smallint unsigned zerofill ) returns smallint unsigned zerofill
 return f1;
-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 'smallint unsigned zerofill f1 ) returns smallint unsigned zerofill
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(mediumint f1 ) returns mediumint
+CREATE FUNCTION fn1(f1 mediumint ) returns mediumint
 return f1;
-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 'mediumint f1 ) returns mediumint
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(mediumint unsigned f1 ) returns mediumint unsigned
+CREATE FUNCTION fn1(f1 mediumint unsigned ) returns mediumint unsigned
 return f1;
-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 'mediumint unsigned f1 ) returns mediumint unsigned
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(mediumint zerofill f1 ) returns mediumint zerofill
+CREATE FUNCTION fn1(f1 mediumint zerofill ) returns mediumint zerofill
 return f1;
-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 'mediumint zerofill f1 ) returns mediumint zerofill
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(mediumint unsigned zerofill f1 ) returns mediumint unsigned zerofill
+CREATE FUNCTION fn1(f1 mediumint unsigned zerofill ) returns mediumint unsigned zerofill
 return f1;
-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 'mediumint unsigned zerofill f1 ) returns mediumint unsigned zerofill
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(int f1 ) returns int
+CREATE FUNCTION fn1(f1 int ) returns int
 return f1;
-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 'int f1 ) returns int
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(int unsigned f1 ) returns int unsigned
+CREATE FUNCTION fn1(f1 int unsigned ) returns int unsigned
 return f1;
-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 'int unsigned f1 ) returns int unsigned
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(int zerofill f1 ) returns int zerofill
+CREATE FUNCTION fn1(f1 int1 unsigned ) returns int1 unsigned
 return f1;
-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 'int zerofill f1 ) returns int zerofill
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(int unsigned zerofill f1 ) returns int unsigned zerofill
+CREATE FUNCTION fn1(f1 int2 unsigned ) returns int2 unsigned
 return f1;
-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 'int unsigned zerofill f1 ) returns int unsigned zerofill
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(bigint f1 ) returns bigint
+CREATE FUNCTION fn1(f1 int3 unsigned ) returns int3 unsigned
 return f1;
-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 'bigint f1 ) returns bigint
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(bigint unsigned f1 ) returns bigint unsigned
+CREATE FUNCTION fn1(f1 int4 unsigned ) returns int4 unsigned
 return f1;
-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 'bigint unsigned f1 ) returns bigint unsigned
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(bigint zerofill f1 ) returns bigint zerofill
+CREATE FUNCTION fn1(f1 int8 unsigned ) returns int8 unsigned
 return f1;
-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 'bigint zerofill f1 ) returns bigint zerofill
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(bigint unsigned zerofill f1 ) returns bigint unsigned zerofill
+CREATE FUNCTION fn1(f1 int zerofill ) returns int zerofill
 return f1;
-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 'bigint unsigned zerofill f1 ) returns bigint unsigned zerofill
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(decimal f1 ) returns decimal
+CREATE FUNCTION fn1(f1 int unsigned zerofill ) returns int unsigned zerofill
 return f1;
-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 'decimal f1 ) returns decimal
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(decimal unsigned f1 ) returns decimal unsigned
+CREATE FUNCTION fn1(f1 bigint ) returns bigint
 return f1;
-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 'decimal unsigned f1 ) returns decimal unsigned
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(decimal zerofill f1 ) returns decimal zerofill
+CREATE FUNCTION fn1(f1 bigint unsigned ) returns bigint unsigned
 return f1;
-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 'decimal zerofill f1 ) returns decimal zerofill
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(decimal unsigned zerofill f1 ) returns decimal unsigned zerofill
+CREATE FUNCTION fn1(f1 bigint zerofill ) returns bigint zerofill
 return f1;
-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 'decimal unsigned zerofill f1 ) returns decimal unsigned zerofill
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(numeric f1 ) returns numeric
+CREATE FUNCTION fn1(f1 bigint unsigned zerofill ) returns bigint unsigned zerofill
 return f1;
-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 'numeric f1 ) returns numeric
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(numeric unsigned f1 ) returns numeric unsigned
+CREATE FUNCTION fn1(f1 decimal ) returns decimal
 return f1;
-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 'numeric unsigned f1 ) returns numeric unsigned
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(numeric zerofill f1 ) returns numeric zerofill
+CREATE FUNCTION fn1(f1 decimal unsigned ) returns decimal unsigned
 return f1;
-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 'numeric zerofill f1 ) returns numeric zerofill
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(numeric unsigned zerofill f1 ) returns numeric unsigned zerofill
+CREATE FUNCTION fn1(f1 decimal zerofill ) returns decimal zerofill
 return f1;
-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 'numeric unsigned zerofill f1 ) returns numeric unsigned zerofill
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(real f1 ) returns real
+CREATE FUNCTION fn1(f1 decimal unsigned zerofill ) returns decimal unsigned zerofill
 return f1;
-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 'real f1 ) returns real
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(real unsigned f1 ) returns real unsigned
+CREATE FUNCTION fn1(f1 numeric ) returns numeric
 return f1;
-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 'real unsigned f1 ) returns real unsigned
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(real zerofill f1 ) returns real zerofill
+CREATE FUNCTION fn1(f1 numeric unsigned ) returns numeric unsigned
 return f1;
-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 'real zerofill f1 ) returns real zerofill
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(real unsigned zerofill f1 ) returns real unsigned zerofill
+CREATE FUNCTION fn1(f1 numeric zerofill ) returns numeric zerofill
 return f1;
-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 'real unsigned zerofill f1 ) returns real unsigned zerofill
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(float f1 ) returns float
+CREATE FUNCTION fn1(f1 numeric unsigned zerofill ) returns numeric unsigned zerofill
 return f1;
-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 'float f1 ) returns float
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(float unsigned f1 ) returns float unsigned
+CREATE FUNCTION fn1(f1 real ) returns real
 return f1;
-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 'float unsigned f1 ) returns float unsigned
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(float zerofill f1 ) returns float zerofill
+CREATE FUNCTION fn1(f1 real unsigned ) returns real unsigned
 return f1;
-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 'float zerofill f1 ) returns float zerofill
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(float unsigned zerofill f1 ) returns float unsigned zerofill
+CREATE FUNCTION fn1(f1 real zerofill ) returns real zerofill
 return f1;
-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 'float unsigned zerofill f1 ) returns float unsigned zerofill
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(date f1 ) returns date
+CREATE FUNCTION fn1(f1 real unsigned zerofill ) returns real unsigned zerofill
 return f1;
-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 'f1 ) returns date
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(time f1 ) returns time
+CREATE FUNCTION fn1(f1 float ) returns float
 return f1;
-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 'f1 ) returns time
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(datetime f1 ) returns datetime
+CREATE FUNCTION fn1(f1 float unsigned ) returns float unsigned
 return f1;
-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 'f1 ) returns datetime
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(timestamp f1 ) returns timestamp
+CREATE FUNCTION fn1(f1 float zerofill ) returns float zerofill
 return f1;
-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 'f1 ) returns timestamp
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(year f1 ) returns year
+CREATE FUNCTION fn1(f1 float unsigned zerofill ) returns float unsigned zerofill
 return f1;
-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 'f1 ) returns year
-return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
-Warnings:
-Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(year(3) f1 ) returns year(3)
+CREATE FUNCTION fn1(f1 date ) returns date
+return f1;
+DROP FUNCTION IF EXISTS fn1;
+CREATE FUNCTION fn1(f1 time ) returns time
 return f1;
-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 '(3) f1 ) returns year(3)
+DROP FUNCTION IF EXISTS fn1;
+CREATE FUNCTION fn1(f1 datetime ) returns datetime
+return f1;
+DROP FUNCTION IF EXISTS fn1;
+CREATE FUNCTION fn1(f1 timestamp ) returns timestamp
+return f1;
+DROP FUNCTION IF EXISTS fn1;
+CREATE FUNCTION fn1(f1 year ) returns year
+return f1;
+DROP FUNCTION IF EXISTS fn1;
+CREATE FUNCTION fn1(f1 year(f1 3) ) returns year(3)
+return f1;
+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 'f1 3) ) returns year(3)
 return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
 Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(year(4) f1 ) returns year(4)
+CREATE FUNCTION fn1(f1 year(f1 4) ) returns year(4)
 return f1;
-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 '(4) f1 ) returns year(4)
+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 'f1 4) ) returns year(4)
 return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
 Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(enum("1enum", "2enum") f1 ) returns enum("1enum", "2enum")
+CREATE FUNCTION fn1(f1 enum(f1 "1enum", "2enum") ) returns enum("1enum", "2enum")
 return f1;
-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 '("1enum", "2enum") f1 ) returns enum("1enum", "2enum")
+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 'f1 "1enum", "2enum") ) returns enum("1enum", "2enum")
 return f1' at line 1
 DROP FUNCTION IF EXISTS fn1;
 Warnings:
 Note	1305	FUNCTION fn1 does not exist
-CREATE FUNCTION fn1(set("1set", "2set") f1 ) returns set("1set", "2set")
+CREATE FUNCTION fn1(f1 set(f1 "1set", "2set") ) returns set("1set", "2set")
 return f1;
-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("1set", "2set") f1 ) returns set("1set", "2set")
+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 'f1 "1set", "2set") ) returns set("1set", "2set")
 return f1' at line 1
 
 Testcase 4.1.16:
@@ -2564,15 +3404,15 @@ alter function sp1 sql security invoker 
 alter procedure sp1 sql security definer;
 alter function sp1 sql security definer;
 show CREATE PROCEDURE sp1;
-Procedure	sql_mode	Create Procedure
-sp1		CREATE PROCEDURE `sp1`()
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
+sp1		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`()
     COMMENT 'this is a procedure'
-set @x= 3
+set @x= 3	latin1	modified	created
 show CREATE FUNCTION sp1;
-Function	sql_mode	Create Function
-sp1		CREATE FUNCTION `sp1`() RETURNS int(11)
+Function	sql_mode	Create Function	character_set_client	collation_connection	Database Collation
+sp1		CREATE DEFINER=`root`@`localhost` FUNCTION `sp1`() RETURNS int(11)
     COMMENT 'this is a function'
-return 4
+return 4	latin1	modified	created
 USE db_storedproc;
 DROP DATABASE db_storedproc_3122;
 DROP FUNCTION db_storedproc.sp1;
@@ -2789,7 +3629,7 @@ SELECT count(*) into cnt from t2;
 set @count = cnt;
 SELECT @count;
 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 'SELECT count(*) into cnt from t2;
+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 @count = cnt;
 SELECT @count;
 END' at line 2
@@ -2841,6 +3681,14 @@ Testcase ....:
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
+accessible:BEGIN
+SELECT @x;
+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 'accessible:BEGIN
+SELECT @x;
+END' at line 2
+DROP PROCEDURE IF EXISTS sp1;
+CREATE PROCEDURE sp1()
 add:BEGIN
 SELECT @x;
 END//
@@ -2860,9 +3708,7 @@ CREATE PROCEDURE sp1()
 alter:BEGIN
 SELECT @x;
 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 ':BEGIN
-SELECT @x;
-END' at line 2
+ERROR 0A000: ALTER VIEW is not allowed in stored procedures
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 analyze:BEGIN
@@ -2961,7 +3807,7 @@ SELECT @x;
 END' at line 2
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
-CALL:BEGIN
+call:BEGIN
 SELECT @x;
 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 ':BEGIN
@@ -3033,11 +3879,6 @@ SELECT @x;
 END' at line 2
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
-columns:BEGIN
-SELECT @x;
-END//
-DROP PROCEDURE IF EXISTS sp1;
-CREATE PROCEDURE sp1()
 condition:BEGIN
 SELECT @x;
 END//
@@ -3046,14 +3887,6 @@ SELECT @x;
 END' at line 2
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
-connection:BEGIN
-SELECT @x;
-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 'connection:BEGIN
-SELECT @x;
-END' at line 2
-DROP PROCEDURE IF EXISTS sp1;
-CREATE PROCEDURE sp1()
 constraint:BEGIN
 SELECT @x;
 END//
@@ -3382,15 +4215,26 @@ SELECT @x;
 END' at line 2
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
-fields:BEGIN
+float:BEGIN
 SELECT @x;
 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 'float:BEGIN
+SELECT @x;
+END' at line 2
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
-float:BEGIN
+float4:BEGIN
 SELECT @x;
 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 'float:BEGIN
+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 'float4:BEGIN
+SELECT @x;
+END' at line 2
+DROP PROCEDURE IF EXISTS sp1;
+CREATE PROCEDURE sp1()
+float8:BEGIN
+SELECT @x;
+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 'float8:BEGIN
 SELECT @x;
 END' at line 2
 DROP PROCEDURE IF EXISTS sp1;
@@ -3419,11 +4263,6 @@ SELECT @x;
 END' at line 2
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
-found:BEGIN
-SELECT @x;
-END//
-DROP PROCEDURE IF EXISTS sp1;
-CREATE PROCEDURE sp1()
 from:BEGIN
 SELECT @x;
 END//
@@ -3440,11 +4279,6 @@ SELECT @x;
 END' at line 2
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
-goto:BEGIN
-SELECT @x;
-END//
-DROP PROCEDURE IF EXISTS sp1;
-CREATE PROCEDURE sp1()
 grant:BEGIN
 SELECT @x;
 END//
@@ -3581,6 +4415,46 @@ SELECT @x;
 END' at line 2
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
+int1:BEGIN
+SELECT @x;
+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 'int1:BEGIN
+SELECT @x;
+END' at line 2
+DROP PROCEDURE IF EXISTS sp1;
+CREATE PROCEDURE sp1()
+int2:BEGIN
+SELECT @x;
+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 'int2:BEGIN
+SELECT @x;
+END' at line 2
+DROP PROCEDURE IF EXISTS sp1;
+CREATE PROCEDURE sp1()
+int3:BEGIN
+SELECT @x;
+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 'int3:BEGIN
+SELECT @x;
+END' at line 2
+DROP PROCEDURE IF EXISTS sp1;
+CREATE PROCEDURE sp1()
+int4:BEGIN
+SELECT @x;
+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 'int4:BEGIN
+SELECT @x;
+END' at line 2
+DROP PROCEDURE IF EXISTS sp1;
+CREATE PROCEDURE sp1()
+int8:BEGIN
+SELECT @x;
+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 'int8:BEGIN
+SELECT @x;
+END' at line 2
+DROP PROCEDURE IF EXISTS sp1;
+CREATE PROCEDURE sp1()
 integer:BEGIN
 SELECT @x;
 END//
@@ -3693,6 +4567,14 @@ SELECT @x;
 END' at line 2
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
+linear:BEGIN
+SELECT @x;
+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 'linear:BEGIN
+SELECT @x;
+END' at line 2
+DROP PROCEDURE IF EXISTS sp1;
+CREATE PROCEDURE sp1()
 lines:BEGIN
 SELECT @x;
 END//
@@ -3773,6 +4655,14 @@ SELECT @x;
 END' at line 2
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
+master_ssl_verify_server_cert:BEGIN
+SELECT @x;
+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 'master_ssl_verify_server_cert:BEGIN
+SELECT @x;
+END' at line 2
+DROP PROCEDURE IF EXISTS sp1;
+CREATE PROCEDURE sp1()
 match:BEGIN
 SELECT @x;
 END//
@@ -3973,11 +4863,6 @@ SELECT @x;
 END' at line 2
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
-privileges:BEGIN
-SELECT @x;
-END//
-DROP PROCEDURE IF EXISTS sp1;
-CREATE PROCEDURE sp1()
 procedure:BEGIN
 SELECT @x;
 END//
@@ -3994,6 +4879,14 @@ SELECT @x;
 END' at line 2
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
+range:BEGIN
+SELECT @x;
+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 'range:BEGIN
+SELECT @x;
+END' at line 2
+DROP PROCEDURE IF EXISTS sp1;
+CREATE PROCEDURE sp1()
 read:BEGIN
 SELECT @x;
 END//
@@ -4010,6 +4903,22 @@ SELECT @x;
 END' at line 2
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
+read_only:BEGIN
+SELECT @x;
+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 'read_only:BEGIN
+SELECT @x;
+END' at line 2
+DROP PROCEDURE IF EXISTS sp1;
+CREATE PROCEDURE sp1()
+read_write:BEGIN
+SELECT @x;
+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 'read_write:BEGIN
+SELECT @x;
+END' at line 2
+DROP PROCEDURE IF EXISTS sp1;
+CREATE PROCEDURE sp1()
 real:BEGIN
 SELECT @x;
 END//
@@ -4034,6 +4943,14 @@ SELECT @x;
 END' at line 2
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
+release:BEGIN
+SELECT @x;
+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 ':BEGIN
+SELECT @x;
+END' at line 2
+DROP PROCEDURE IF EXISTS sp1;
+CREATE PROCEDURE sp1()
 rename:BEGIN
 SELECT @x;
 END//
@@ -4178,14 +5095,6 @@ SELECT @x;
 END' at line 2
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
-soname:BEGIN
-SELECT @x;
-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 'soname:BEGIN
-SELECT @x;
-END' at line 2
-DROP PROCEDURE IF EXISTS sp1;
-CREATE PROCEDURE sp1()
 spatial:BEGIN
 SELECT @x;
 END//
@@ -4290,11 +5199,6 @@ SELECT @x;
 END' at line 2
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
-tables:BEGIN
-SELECT @x;
-END//
-DROP PROCEDURE IF EXISTS sp1;
-CREATE PROCEDURE sp1()
 terminated:BEGIN
 SELECT @x;
 END//
@@ -4587,6 +5491,9 @@ END begin_label//
 CALL sp1();
 @v1	@v2
 1	2
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
+Warning	1265	Data truncated for column 'y' at row 1
 DROP PROCEDURE sp1;
 
 Testcase 4.2.7:
@@ -4621,6 +5528,9 @@ declare y char;
 SELECT f1, f2 into x, y from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
+Warning	1265	Data truncated for column 'y' at row 1
 DROP PROCEDURE sp1;
 
 Testcase 4.2.9:
@@ -4684,8 +5594,6 @@ Ensure that the variables, cursors, cond
 a stored procedure (with the declare statement) may only be properly defined
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp6;
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed: DECIMAL(255,255) is not rejected
 CREATE PROCEDURE sp6( )
 BEGIN
 declare x char default 'a';
@@ -4703,9 +5611,9 @@ fetch cur1 into e;
 SELECT x, y, z, a, b, c, d, e;
 close cur1;
 END//
+ERROR 42000: Too big scale 255 specified for column ''. Maximum is 30.
 CALL sp6();
-x	y	z	a	b	c	d	e
-a	1	1.1	value1	1200000000000	mediumtext	2005-02-02 12:12:12	a`
+ERROR 42000: PROCEDURE db_storedproc.sp6 does not exist
 DROP PROCEDURE IF EXISTS sp6;
 CREATE PROCEDURE sp6( )
 BEGIN
@@ -5828,13 +6736,6 @@ declare continue handler for sqlstate '2
 declare x char;
 END//
 ERROR 42000: Variable or condition declaration after cursor or handler declaration
-DROP PROCEDURE IF EXISTS sp1;
-CREATE PROCEDURE sp1()
-BEGIN
-declare continue handler for sqlstate '23000' set @x2 = 1;
-declare x char;
-END//
-ERROR 42000: Variable or condition declaration after cursor or handler declaration
 DROP PROCEDURE IF EXISTS sp6;
 CREATE PROCEDURE sp6( )
 BEGIN
@@ -5864,6 +6765,15 @@ Ensure that the declare statement can de
 and all at once from a variable list. (multiple declaration)
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp1;
+CREATE PROCEDURE sp1()
+BEGIN
+DECLARE x1 CHAR(100) DEFAULT 'outer';
+BEGIN
+DECLARE x1 CHAR(100) DEFAULT x1;
+END;
+END//
+CALL sp1();
+DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
 declare x, y, z char default null;
@@ -5988,7 +6898,11 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--1	-1	-1
+000	000	000
+Warnings:
+Warning	1264	Out of range value for column 'x' at row 1
+Warning	1264	Out of range value for column 'y' at row 1
+Warning	1264	Out of range value for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -5997,7 +6911,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1	1	1
+001	001	001
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6024,7 +6938,11 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--1	-1	-1
+00000	00000	00000
+Warnings:
+Warning	1264	Out of range value for column 'x' at row 1
+Warning	1264	Out of range value for column 'y' at row 1
+Warning	1264	Out of range value for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6033,7 +6951,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1	1	1
+00001	00001	00001
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6060,7 +6978,11 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--1	-1	-1
+00000000	00000000	00000000
+Warnings:
+Warning	1264	Out of range value for column 'x' at row 1
+Warning	1264	Out of range value for column 'y' at row 1
+Warning	1264	Out of range value for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6069,7 +6991,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1	1	1
+00000001	00000001	00000001
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6096,7 +7018,11 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--1	-1	-1
+0000000000	0000000000	0000000000
+Warnings:
+Warning	1264	Out of range value for column 'x' at row 1
+Warning	1264	Out of range value for column 'y' at row 1
+Warning	1264	Out of range value for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6105,7 +7031,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1	1	1
+0000000001	0000000001	0000000001
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6123,7 +7049,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--1	-1	-1
+18446744073709551615	18446744073709551615	18446744073709551615
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6132,7 +7058,11 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--1	-1	-1
+00000000000000000000	00000000000000000000	00000000000000000000
+Warnings:
+Warning	1264	Out of range value for column 'x' at row 1
+Warning	1264	Out of range value for column 'y' at row 1
+Warning	1264	Out of range value for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6141,7 +7071,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1	1	1
+00000000000000000001	00000000000000000001	00000000000000000001
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6150,18 +7080,24 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--34028234660123456789012345678901234567	-34028234660123456789012345678901234567	-34028234660123456789012345678901234567
+-9999999999	-9999999999	-9999999999
+Warnings:
+Warning	1264	Out of range value for column 'x' at row 1
+Warning	1264	Out of range value for column 'y' at row 1
+Warning	1264	Out of range value for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
 declare x, y, z decimal unsigned default 1.175494351e-38;
 SELECT x, y, z;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
+0	0	0
+Warnings:
+Note	1265	Data truncated for column 'x' at row 1
+Note	1265	Data truncated for column 'y' at row 1
+Note	1265	Data truncated for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6170,62 +7106,76 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--34028234660123456789012345678901234567	-34028234660123456789012345678901234567	-34028234660123456789012345678901234567
+0000000000	0000000000	0000000000
+Warnings:
+Warning	1264	Out of range value for column 'x' at row 1
+Warning	1264	Out of range value for column 'y' at row 1
+Warning	1264	Out of range value for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
 declare x, y, z decimal unsigned zerofill default 1.175494351e-38;
 SELECT x, y, z;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
+0000000000	0000000000	0000000000
+Warnings:
+Note	1265	Data truncated for column 'x' at row 1
+Note	1265	Data truncated for column 'y' at row 1
+Note	1265	Data truncated for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
 declare x, y, z numeric default 1.175494351e-38;
 SELECT x, y, z;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
+0	0	0
+Warnings:
+Note	1265	Data truncated for column 'x' at row 1
+Note	1265	Data truncated for column 'y' at row 1
+Note	1265	Data truncated for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
 declare x, y, z numeric unsigned default 1.175494351e-38;
 SELECT x, y, z;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
+0	0	0
+Warnings:
+Note	1265	Data truncated for column 'x' at row 1
+Note	1265	Data truncated for column 'y' at row 1
+Note	1265	Data truncated for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
 declare x, y, z numeric zerofill default 1.175494351e-38;
 SELECT x, y, z;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
+0000000000	0000000000	0000000000
+Warnings:
+Note	1265	Data truncated for column 'x' at row 1
+Note	1265	Data truncated for column 'y' at row 1
+Note	1265	Data truncated for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
 declare x, y, z numeric unsigned zerofill default 1.175494351e-38;
 SELECT x, y, z;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
+0000000000	0000000000	0000000000
+Warnings:
+Note	1265	Data truncated for column 'x' at row 1
+Note	1265	Data truncated for column 'y' at row 1
+Note	1265	Data truncated for column 'z' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6252,7 +7202,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.175494351e-38	1.175494351e-38	1.175494351e-38
+00000001.175494351e-38	00000001.175494351e-38	00000001.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6261,7 +7211,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.175494351e-38	1.175494351e-38	1.175494351e-38
+00000001.175494351e-38	00000001.175494351e-38	00000001.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6270,7 +7220,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.175494351e-38	1.175494351e-38	1.175494351e-38
+1.17549e-38	1.17549e-38	1.17549e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6279,7 +7229,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.175494351e-38	1.175494351e-38	1.175494351e-38
+1.17549e-38	1.17549e-38	1.17549e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6288,7 +7238,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.175494351e-38	1.175494351e-38	1.175494351e-38
+01.17549e-38	01.17549e-38	01.17549e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6297,7 +7247,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.175494351e-38	1.175494351e-38	1.175494351e-38
+01.17549e-38	01.17549e-38	01.17549e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6333,7 +7283,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-20050202122012	20050202122012	20050202122012
+2005-02-02 12:20:12	2005-02-02 12:20:12	2005-02-02 12:20:12
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6419,6 +7369,13 @@ END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
+declare accessible char;
+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 'accessible char;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+CREATE PROCEDURE sp1()
+BEGIN
 declare add char;
 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 'add char;
@@ -6524,9 +7481,9 @@ END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
-declare CALL char;
+declare call char;
 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 'CALL char;
+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 'call char;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
@@ -6587,11 +7544,6 @@ END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
-declare columns char;
-END//
-DROP PROCEDURE IF EXISTS sp1;
-CREATE PROCEDURE sp1()
-BEGIN
 declare condition char;
 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 'condition char;
@@ -6599,13 +7551,6 @@ END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
-declare connection char;
-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 'connection char;
-END' at line 3
-DROP PROCEDURE IF EXISTS sp1;
-CREATE PROCEDURE sp1()
-BEGIN
 declare constraint char;
 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 'constraint char;
@@ -6893,14 +7838,23 @@ END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
-declare fields char;
+declare float char;
+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 'float char;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+CREATE PROCEDURE sp1()
+BEGIN
+declare float4 char;
 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 'float4 char;
+END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
-declare float char;
+declare float8 char;
 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 'float char;
+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 'float8 char;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
@@ -6926,11 +7880,6 @@ END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
-declare found char;
-END//
-DROP PROCEDURE IF EXISTS sp1;
-CREATE PROCEDURE sp1()
-BEGIN
 declare from char;
 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 'from char;
@@ -6945,11 +7894,6 @@ END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
-declare goto char;
-END//
-DROP PROCEDURE IF EXISTS sp1;
-CREATE PROCEDURE sp1()
-BEGIN
 declare grant char;
 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 'grant char;
@@ -7069,6 +8013,41 @@ END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
+declare int1 char;
+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 'int1 char;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+CREATE PROCEDURE sp1()
+BEGIN
+declare int2 char;
+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 'int2 char;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+CREATE PROCEDURE sp1()
+BEGIN
+declare int3 char;
+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 'int3 char;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+CREATE PROCEDURE sp1()
+BEGIN
+declare int4 char;
+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 'int4 char;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+CREATE PROCEDURE sp1()
+BEGIN
+declare int8 char;
+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 'int8 char;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+CREATE PROCEDURE sp1()
+BEGIN
 declare integer char;
 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 'integer char;
@@ -7167,6 +8146,13 @@ END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
+declare linear char;
+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 'linear char;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+CREATE PROCEDURE sp1()
+BEGIN
 declare lines char;
 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 'lines char;
@@ -7237,6 +8223,13 @@ END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
+declare master_ssl_verify_server_cert char;
+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 'master_ssl_verify_server_cert char;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+CREATE PROCEDURE sp1()
+BEGIN
 declare match char;
 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 'match char;
@@ -7412,11 +8405,6 @@ END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
-declare privileges char;
-END//
-DROP PROCEDURE IF EXISTS sp1;
-CREATE PROCEDURE sp1()
-BEGIN
 declare procedure char;
 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 'procedure char;
@@ -7431,6 +8419,13 @@ END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
+declare range char;
+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 'range char;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+CREATE PROCEDURE sp1()
+BEGIN
 declare read char;
 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 'read char;
@@ -7445,6 +8440,18 @@ END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
+declare read_only char;
+END//
+DROP PROCEDURE IF EXISTS sp1;
+CREATE PROCEDURE sp1()
+BEGIN
+declare read_write char;
+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 'read_write char;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+CREATE PROCEDURE sp1()
+BEGIN
 declare real char;
 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 'real char;
@@ -7466,6 +8473,13 @@ END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
+declare release char;
+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 'release char;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+CREATE PROCEDURE sp1()
+BEGIN
 declare rename char;
 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 'rename char;
@@ -7624,15 +8638,6 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
-declare soname char;
-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 'soname char;
-END' at line 3
-DROP PROCEDURE IF EXISTS sp1;
-Warnings:
-Note	1305	PROCEDURE sp1 does not exist
-CREATE PROCEDURE sp1()
-BEGIN
 declare spatial char;
 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 'spatial char;
@@ -7750,11 +8755,6 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
-declare tables char;
-END//
-DROP PROCEDURE IF EXISTS sp1;
-CREATE PROCEDURE sp1()
-BEGIN
 declare terminated char;
 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 'terminated char;
@@ -7899,9 +8899,9 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1()
 BEGIN
-declare USE char;
+declare use char;
 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 'USE char;
+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 'use char;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
@@ -8150,6 +9150,16 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare accessible condition for sqlstate '02000';
+declare exit handler for add set @var2 = 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 'accessible condition for sqlstate '02000';
+declare exit handler for add set @var' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare add condition for sqlstate '02000';
 declare exit handler for add set @var2 = 1;
 END//
@@ -8306,10 +9316,10 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare CALL condition for sqlstate '02000';
+declare call condition for sqlstate '02000';
 declare exit handler for CALL set @var2 = 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 'CALL condition for sqlstate '02000';
+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 'call condition for sqlstate '02000';
 declare exit handler for CALL set @var2 = 1' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
@@ -8409,11 +9419,7 @@ BEGIN
 declare connection condition for sqlstate '02000';
 declare exit handler for connection set @var2 = 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 'connection condition for sqlstate '02000';
-declare exit handler for connection s' at line 3
 DROP PROCEDURE IF EXISTS sp1;
-Warnings:
-Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare constraint condition for sqlstate '02000';
@@ -8829,12 +9835,6 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare fields condition for sqlstate '02000';
-declare exit handler for fields set @var2 = 1;
-END//
-DROP PROCEDURE IF EXISTS sp1;
-CREATE PROCEDURE sp1( )
-BEGIN
 declare float condition for sqlstate '02000';
 declare exit handler for float set @var2 = 1;
 END//
@@ -8845,6 +9845,26 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare float4 condition for sqlstate '02000';
+declare exit handler for add set @var2 = 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 'float4 condition for sqlstate '02000';
+declare exit handler for add set @var2 = ' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
+declare float8 condition for sqlstate '02000';
+declare exit handler for add set @var2 = 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 'float8 condition for sqlstate '02000';
+declare exit handler for add set @var2 = ' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare for condition for sqlstate '02000';
 declare exit handler for for set @var2 = 1;
 END//
@@ -8876,12 +9896,6 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare found condition for sqlstate '02000';
-declare exit handler for found set @var2 = 1;
-END//
-DROP PROCEDURE IF EXISTS sp1;
-CREATE PROCEDURE sp1( )
-BEGIN
 declare from condition for sqlstate '02000';
 declare exit handler for from set @var2 = 1;
 END//
@@ -8902,12 +9916,6 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare goto condition for sqlstate '02000';
-declare exit handler for goto set @var2 = 1;
-END//
-DROP PROCEDURE IF EXISTS sp1;
-CREATE PROCEDURE sp1( )
-BEGIN
 declare grant condition for sqlstate '02000';
 declare exit handler for grant set @var2 = 1;
 END//
@@ -9081,6 +10089,56 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare int1 condition for sqlstate '02000';
+declare exit handler for int set @var2 = 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 'int1 condition for sqlstate '02000';
+declare exit handler for int set @var2 = 1;' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
+declare int2 condition for sqlstate '02000';
+declare exit handler for int set @var2 = 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 'int2 condition for sqlstate '02000';
+declare exit handler for int set @var2 = 1;' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
+declare int3 condition for sqlstate '02000';
+declare exit handler for int set @var2 = 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 'int3 condition for sqlstate '02000';
+declare exit handler for int set @var2 = 1;' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
+declare int4 condition for sqlstate '02000';
+declare exit handler for int set @var2 = 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 'int4 condition for sqlstate '02000';
+declare exit handler for int set @var2 = 1;' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
+declare int8 condition for sqlstate '02000';
+declare exit handler for int set @var2 = 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 'int8 condition for sqlstate '02000';
+declare exit handler for int set @var2 = 1;' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare integer condition for sqlstate '02000';
 declare exit handler for integer set @var2 = 1;
 END//
@@ -9223,6 +10281,16 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare linear condition for sqlstate '02000';
+declare exit handler for int set @var2 = 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 'linear condition for sqlstate '02000';
+declare exit handler for int set @var2 = ' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare lines condition for sqlstate '02000';
 declare exit handler for lines set @var2 = 1;
 END//
@@ -9323,6 +10391,16 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare master_ssl_verify_server_cert condition for sqlstate '02000';
+declare exit handler for int set @var2 = 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 'master_ssl_verify_server_cert condition for sqlstate '02000';
+declare exit handl' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare match condition for sqlstate '02000';
 declare exit handler for match set @var2 = 1;
 END//
@@ -9578,12 +10656,6 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare privileges condition for sqlstate '02000';
-declare exit handler for privileges set @var2 = 1;
-END//
-DROP PROCEDURE IF EXISTS sp1;
-CREATE PROCEDURE sp1( )
-BEGIN
 declare procedure condition for sqlstate '02000';
 declare exit handler for procedure set @var2 = 1;
 END//
@@ -9604,6 +10676,16 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare range condition for sqlstate '02000';
+declare exit handler for int set @var2 = 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 'range condition for sqlstate '02000';
+declare exit handler for int set @var2 = 1' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare read condition for sqlstate '02000';
 declare exit handler for read set @var2 = 1;
 END//
@@ -9624,6 +10706,26 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare read_only condition for sqlstate '02000';
+declare exit handler for int set @var2 = 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 'int set @var2 = 1;
+END' at line 4
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
+declare read_write condition for sqlstate '02000';
+declare exit handler for int set @var2 = 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 'read_write condition for sqlstate '02000';
+declare exit handler for int set @var' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare real condition for sqlstate '02000';
 declare exit handler for real set @var2 = 1;
 END//
@@ -9654,6 +10756,16 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare release condition for sqlstate '02000';
+declare exit handler for int set @var2 = 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 'release condition for sqlstate '02000';
+declare exit handler for int set @var2 =' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare rename condition for sqlstate '02000';
 declare exit handler for rename set @var2 = 1;
 END//
@@ -9774,10 +10886,10 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare SELECT condition for sqlstate '02000';
+declare select condition for sqlstate '02000';
 declare exit handler for SELECT set @var2 = 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 'SELECT condition for sqlstate '02000';
+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 'select condition for sqlstate '02000';
 declare exit handler for SELECT set @var2' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
@@ -9835,16 +10947,6 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare soname condition for sqlstate '02000';
-declare exit handler for soname set @var2 = 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 'soname condition for sqlstate '02000';
-declare exit handler for soname set @var2' at line 3
-DROP PROCEDURE IF EXISTS sp1;
-Warnings:
-Note	1305	PROCEDURE sp1 does not exist
-CREATE PROCEDURE sp1( )
-BEGIN
 declare spatial condition for sqlstate '02000';
 declare exit handler for spatial set @var2 = 1;
 END//
@@ -9977,12 +11079,6 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare tables condition for sqlstate '02000';