384 files changed, 77255 insertions, 15454 deletions

diff --git a/.bzrignore b/.bzrignore
index 6e09cdd7b5d..507f04363f9 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -3012,3 +3012,11 @@ win/vs8cache.txt
 ylwrap
 zlib/*.ds?
 zlib/*.vcproj
+mysql-test/funcs_1.log
+mysql-test/funcs_1.tar
+mysql-test/suite/funcs_1.tar.gz
+mysql-test/.DS_Store
+.DS_Store
+libmysqld/sql_profile.cc
+mysql-test/suite/funcs_1.tar.zip
+mysql-test/reg.log
diff --git a/BUILD/compile-dist b/BUILD/compile-dist
index d9103e0a419..74690fb0c95 100755
--- a/BUILD/compile-dist
+++ b/BUILD/compile-dist
@@ -39,6 +39,8 @@ then
 fi
 
 # Make sure to enable all features that affect "make dist"
+# Remember that configure restricts the man pages to the configured features !
 ./configure \
+  --with-embedded-server \
   --with-ndbcluster
 make
diff --git a/BitKeeper/triggers/post-commit.innodb.pl b/BitKeeper/triggers/post-commit.innodb.pl
new file mode 100755
index 00000000000..44d98b04838
--- /dev/null
+++ b/BitKeeper/triggers/post-commit.innodb.pl
@@ -0,0 +1,22 @@
+#! /usr/bin/perl
+
+use strict;
+use warnings;
+
+use FindBin;
+require "$FindBin::Bin/triggers-lib.pl";
+
+# Don't run unless commit was successful
+check_status() || exit 0;
+
+my $cset = latest_cset();
+
+# Read most recent ChangeSet's changed files.  Send merge changes along, since
+# they'll need to be incorporated in InnoDB's source tree eventually.
+my $changes = innodb_get_changes('cset', $cset, 'yes')
+  or exit 0;
+
+innodb_send_changes_email($cset, $changes)
+  or exit 1;
+
+exit 0;
diff --git a/BitKeeper/triggers/post-incoming.innodb.pl b/BitKeeper/triggers/post-incoming.innodb.pl
new file mode 100755
index 00000000000..4b100d88037
--- /dev/null
+++ b/BitKeeper/triggers/post-incoming.innodb.pl
@@ -0,0 +1,30 @@
+#! /usr/bin/perl
+
+use strict;
+use warnings;
+
+use FindBin;
+require "$FindBin::Bin/triggers-lib.pl";
+
+# Don't run unless push/pull was successful
+check_status() or exit 0;
+
+# Don't run if push/pull is in local clones
+exit 0 if repository_type() eq 'local';
+
+# For each pushed ChangeSet, check it for InnoDB files and send
+# diff of entire ChangeSet to InnoDB developers if such changes
+# exist.
+
+my $error = 0;
+
+foreach my $cset (read_bk_csetlist())
+{
+  my $changes = innodb_get_changes('cset', $cset, 'yes')
+    or next;
+
+  innodb_send_changes_email($cset, $changes)
+    or $error = 1;
+}
+
+exit ($error == 0 ? 0 : 1);
diff --git a/BitKeeper/triggers/pre-commit.innodb.pl b/BitKeeper/triggers/pre-commit.innodb.pl
new file mode 100755
index 00000000000..6e2b65113b0
--- /dev/null
+++ b/BitKeeper/triggers/pre-commit.innodb.pl
@@ -0,0 +1,21 @@
+#! /usr/bin/perl
+
+use strict;
+use warnings;
+
+use FindBin;
+require "$FindBin::Bin/triggers-lib.pl";
+
+die "$0: Script error: \$BK_PENDING is not set in pre-commit trigger\n"
+  unless defined $ENV{BK_PENDING};
+
+# Read changed files from $BK_PENDING directly.  Do not bother user about
+# merge changes; they don't have any choice, the merge must be done.
+my $changes = innodb_get_changes('file', $ENV{BK_PENDING}, undef)
+  or exit 0;
+
+innodb_inform_and_query_user($changes)
+  or exit 1;  # Abort commit
+
+# OK, continue with commit
+exit 0;
diff --git a/BitKeeper/triggers/triggers-lib.pl b/BitKeeper/triggers/triggers-lib.pl
new file mode 100644
index 00000000000..65a334ba926
--- /dev/null
+++ b/BitKeeper/triggers/triggers-lib.pl
@@ -0,0 +1,356 @@
+# To use this convenience library in a trigger, simply require it at
+# at the top of the script.  For example:
+#
+# #! /usr/bin/perl
+#
+# use FindBin;
+# require "$FindBin::Bin/triggers-lib.pl";
+#
+# FindBin is needed, because sometimes a trigger is called from the
+# RESYNC directory, and the trigger dir is ../BitKeeper/triggers
+
+use strict;
+use warnings;
+
+use Carp;
+use FindBin;
+
+
+my $mysql_version = "5.1";
+
+# These addresses must be kept current in all MySQL versions.
+# See the wiki page InnoDBandOracle.
+#my @innodb_to_email = ('dev_innodb_ww@oracle.com');
+#my @innodb_cc_email = ('dev-innodb@mysql.com');
+# FIXME: Keep this for testing; remove it once it's been used for a
+# week or two.
+my @innodb_to_email = ('tim@mysql.com');
+my @innodb_cc_email = ();
+
+# This is for MySQL >= 5.1.  Regex which defines the InnoDB files
+# which should generally not be touched by MySQL developers.
+my $innodb_files_description = <<EOF;
+  storage/innobase/*
+  mysql-test/t/innodb*    (except mysql-test/t/innodb_mysql*)
+  mysql-test/r/innodb*    (except mysql-test/r/innodb_mysql*)
+EOF
+my $innodb_files_regex = qr{
+  ^
+  (
+  # Case 1: innobase/*
+  storage/innobase/
+  |
+  # Case 2: mysql-test/[tr]/innodb* (except innodb_mysql*)
+  mysql-test/(t|r)/SCCS/s.innodb
+    # The mysql-test/[tr]/innodb_mysql* are OK to edit
+    (?!_mysql)
+  )
+}x;
+
+
+# See 'bk help log', and the format of, e.g., $BK_PENDING.
+# Important: this already contains the terminating newline!
+my $file_rev_dspec = ':SFILE:|:REV:\n';
+
+my $bktmp = "$FindBin::Bin/../tmp";
+
+my $sendmail;
+foreach ('/usr/sbin/sendmail', 'sendmail') {
+  $sendmail = $_;
+  last if -x $sendmail;
+}
+my $from = $ENV{REAL_EMAIL} || $ENV{USER} . '@mysql.com';
+
+
+# close_or_warn
+#   $fh  file handle to be closed
+#   $description  description of the file handle
+#   RETURN  Return value of close($fh)
+#
+# Print a nice warning message if close() isn't successful.  See
+# perldoc perlvar and perldoc -f close for details.
+
+sub close_or_warn (*$)
+{
+  my ($fh, $description) = @_;
+
+  my $status = close $fh;
+  if (not $status) {
+    warn "$0: error on close of '$description': ",
+         ($! ? "$!" : "exit status " . ($? >> 8)), "\n";
+  }
+
+  return $status;
+}
+
+
+# check_status
+#   $warn  If true, warn about bad status
+#   RETURN  TRUE, if $BK_STATUS is "OK"; FALSE otherwise
+#
+# Also checks the undocumented $BK_COMMIT env variable
+
+sub check_status
+{
+  my ($warn) = @_;
+
+  my $status = (grep { defined $_ }
+                     $ENV{BK_STATUS}, $ENV{BK_COMMIT}, '<undef>')[0];
+
+  unless ($status eq 'OK')
+  {
+    warn "Bad BK_STATUS '$status'\n" if $warn;
+    return undef;
+  }
+
+  return 1;
+}
+
+
+# repository_location
+#
+# RETURN  ('HOST', 'ROOT') for the repository being modified
+
+sub repository_location
+{
+  if ($ENV{BK_SIDE} eq 'client') {
+    return ($ENV{BK_HOST}, $ENV{BK_ROOT});
+  } else {
+    return ($ENV{BKD_HOST}, $ENV{BKD_ROOT});
+  }
+}
+
+
+# repository_type
+# RETURN:
+#   'main' for repo on bk-internal with post-incoming.bugdb trigger
+#   'team' for repo on bk-internal with post-incoming.queuepush.pl trigger
+#   'local' otherwise
+#
+# This definition may need to be modified if the host name or triggers change.
+
+sub repository_type
+{
+  my ($host, $root) = repository_location();
+
+  return 'local'
+    unless uc($host) eq 'BK-INTERNAL.MYSQL.COM'
+           and -e "$root/BitKeeper/triggers/post-incoming.queuepush.pl";
+
+  return 'main' if -e "$root/BitKeeper/triggers/post-incoming.bugdb";
+
+  return 'team';
+}
+
+
+# latest_cset
+#   RETURN  Key for most recent ChangeSet
+
+sub latest_cset {
+  chomp(my $retval = `bk changes -r+ -k`);
+  return $retval;
+}
+
+
+# read_bk_csetlist
+#   RETURN  list of cset keys from $BK_CSETLIST file
+sub read_bk_csetlist
+{
+  die "$0: script error: \$BK_CSETLIST not set\n"
+    unless defined $ENV{BK_CSETLIST};
+
+  open CSETS, '<', $ENV{BK_CSETLIST}
+    or die "$0: can't read \$BK_CSETLIST='$ENV{BK_CSETLIST}': $!\n";
+  chomp(my @csets = <CSETS>);
+  close_or_warn(CSETS, "\$BK_CSETLIST='$ENV{BK_CSETLIST}'");
+
+  return @csets;
+}
+
+
+# innodb_get_changes
+#   $type   'file' or 'cset'
+#   $value  file name (e.g., $BK_PENDING) or ChangeSet key
+#   $want_merge_changes  flag; if false, merge changes will be ignored
+#   RETURN  A string describing the InnoDB changes, or undef if no changes
+#
+# The return value does *not* include ChangeSet comments, only per-file
+# comments.
+
+sub innodb_get_changes
+{
+  my ($type, $value, $want_merge_changes) = @_;
+
+  if ($type eq 'file')
+  {
+    open CHANGES, '<', $value
+      or die "$0: can't read '$value': $!\n";
+  }
+  elsif ($type eq 'cset')
+  {
+    open CHANGES, '-|', "bk changes -r'$value' -v -d'$file_rev_dspec'"
+      or die "$0: can't exec 'bk changes': $!\n";
+  }
+  else
+  {
+    croak "$0: script error: invalid type '$type'";
+  }
+
+  my @changes = grep { /$innodb_files_regex/ } <CHANGES>;
+
+  close_or_warn(CHANGES, "($type, '$value')");
+
+  return undef unless @changes;
+
+
+  # Set up a pipeline of 'bk log' commands to weed out unwanted deltas.  We
+  # never want deltas which contain no actual changes.  We may not want deltas
+  # which are merges.
+
+  my @filters;
+
+  # This tests if :LI: (lines inserted) or :LD: (lines deleted) is
+  # non-zero.  That is, did this delta change the file contents?
+  push @filters,
+    "bk log -d'"
+    . "\$if(:LI: -gt 0){$file_rev_dspec}"
+    . "\$if(:LI: -eq 0){\$if(:LD: -gt 0){$file_rev_dspec}}"
+    . "' -";
+
+  push @filters, "bk log -d'\$unless(:MERGE:){$file_rev_dspec}' -"
+    unless $want_merge_changes;
+
+  my $tmpname = "$bktmp/ibchanges.txt";
+  my $pipeline = join(' | ', @filters) . " > $tmpname";
+  open TMP, '|-', $pipeline
+      or die "$0: can't exec [[$pipeline]]: $!\n";
+
+  print TMP @changes;
+  close_or_warn(TMP, "| $pipeline");
+
+  # Use bk log to describe the changes
+  open LOG, "bk log - < $tmpname |"
+    or die "$0: can't exec 'bk log - < $tmpname': $!\n";
+  my @log = <LOG>;
+  close_or_warn(LOG, "bk log - < $tmpname |");
+
+  unlink $tmpname;
+
+  return undef unless @log;
+
+  return join('', @log);
+}
+
+
+# Ask user if they really want to commit.
+#   RETURN  TRUE = YES, commit; FALSE = NO, do not commit
+
+sub innodb_inform_and_query_user
+{
+  my ($description) = @_;
+
+  my $tmpname = "$bktmp/ibquery.txt";
+
+  open MESSAGE, "> $tmpname"
+    or die "$0: can't write message to '$tmpname': $!";
+
+  print MESSAGE <<EOF;
+This ChangeSet modifies some files which should normally be changed by
+InnoDB developers only.  In general, MySQL developers should not change:
+
+$innodb_files_description
+The following InnoDB files were modified:
+=========================================================
+$description
+=========================================================
+
+If you understand this, you may Commit these changes.  The changes
+will be sent to the InnoDB developers at @{[join ', ', @innodb_to_email]},
+CC @{[join ', ', @innodb_cc_email]}.
+EOF
+
+  close_or_warn(MESSAGE, "$tmpname");
+
+  my $status = system('bk', 'prompt', '-w',
+      '-yCommit these changes', '-nDo not Commit', "-f$tmpname");
+
+  unlink $tmpname;
+
+  return ($status == 0 ? 1 : undef);
+}
+
+
+# innodb_send_changes_email
+#   $cset  The ChangeSet key
+#   $description  A (maybe brief) description of the changes
+#   RETURN  TRUE = Success, e-mail sent; FALSE = Failure
+#
+# Sends a complete diff of changes in $cset by e-mail.
+
+sub innodb_send_changes_email
+{
+  my ($cset, $description) = @_;
+
+  # FIXME: Much of this is duplicated in the 'post-commit' Bourne shell
+  # trigger
+
+  my $cset_short = `bk changes -r'$cset' -d':P:::I:'`;
+  my $cset_key = `bk changes -r'$cset' -d':KEY:'`;
+
+  my ($host, $bk_root) = repository_location();
+  my $type = repository_type();
+  (my $treename = $bk_root) =~ s,^.*/,,;
+
+  print "Nofifying InnoDB developers at ",
+        (join ', ', @innodb_to_email, @innodb_cc_email), "\n";
+
+  open SENDMAIL, '|-', "$sendmail -t"
+    or die "Can't exec '$sendmail -t': $!\n";
+
+  my @headers;
+  push @headers, "List-ID: <bk.innodb-$mysql_version>";
+  push @headers, "From: $from";
+  push @headers, "To: " . (join ', ', @innodb_to_email);
+  push @headers, "Cc: " . (join ', ', @innodb_cc_email) if @innodb_cc_email;
+  push @headers,
+       "Subject: InnoDB changes in $type $mysql_version tree ($cset_short)";
+  push @headers, "X-CSetKey: <$cset_key>";
+
+  print SENDMAIL map { "$_\n" } @headers, '';
+
+  if ($type eq 'main')
+  {
+    print SENDMAIL <<EOF;
+Changes pushed to $treename by $ENV{USER} affect the following
+files.  These changes are in a $mysql_version main tree.  They
+will be available publicly within 24 hours.
+EOF
+  }
+  elsif ($type eq 'team')
+  {
+    print SENDMAIL <<EOF;
+Changes added to $treename by $ENV{USER} affect the
+following files.  These changes are in a $mysql_version team tree.
+EOF
+  }
+  else
+  {
+    print SENDMAIL <<EOF;
+A local commit by $ENV{USER} affects the following files.  These
+changes are in a clone of a $mysql_version tree.
+EOF
+  }
+  print SENDMAIL "\n";
+  print SENDMAIL qx(bk changes -r'$cset');
+  print SENDMAIL "$description";
+  print SENDMAIL "The complete ChangeSet diffs follow.\n\n";
+  print SENDMAIL qx(bk rset -r'$cset' -ah | bk gnupatch -h -dup -T);
+
+  close_or_warn(SENDMAIL, "$sendmail -t")
+    or return undef;
+
+  return 1;
+}
+
+
+1;
diff --git a/client/get_password.c b/client/get_password.c
index 37761d5bb5d..ea024f76fb6 100644
--- a/client/get_password.c
+++ b/client/get_password.c
@@ -107,7 +107,7 @@ char *get_tty_password(const char *opt_message)
 *  to will not include the eol characters.
 */
 
-static void get_password(char *to,uint length,int fd,bool echo)
+static void get_password(char *to,uint length,int fd, my_bool echo)
 {
   char *pos=to,*end=to+length;
 
diff --git a/client/mysql.cc b/client/mysql.cc
index 1d673348f58..8500927bd53 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (C) 2000-2008 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -290,13 +290,6 @@ static COMMANDS commands[] = {
   /* Get bash-like expansion for some commands */
   { "create table",     0, 0, 0, ""},
   { "create database",  0, 0, 0, ""},
-  { "drop",             0, 0, 0, ""},
-  { "select",           0, 0, 0, ""},
-  { "insert",           0, 0, 0, ""},
-  { "replace",          0, 0, 0, ""},
-  { "update",           0, 0, 0, ""},
-  { "delete",           0, 0, 0, ""},
-  { "explain",          0, 0, 0, ""},
   { "show databases",   0, 0, 0, ""},
   { "show fields from", 0, 0, 0, ""},
   { "show keys from",   0, 0, 0, ""},
@@ -306,6 +299,718 @@ static COMMANDS commands[] = {
   { "set option",       0, 0, 0, ""},
   { "lock tables",      0, 0, 0, ""},
   { "unlock tables",    0, 0, 0, ""},
+  /* generated 2006-12-28.  Refresh occasionally from lexer. */
+  { "ACTION", 0, 0, 0, ""},
+  { "ADD", 0, 0, 0, ""},
+  { "AFTER", 0, 0, 0, ""},
+  { "AGAINST", 0, 0, 0, ""},
+  { "AGGREGATE", 0, 0, 0, ""},
+  { "ALL", 0, 0, 0, ""},
+  { "ALGORITHM", 0, 0, 0, ""},
+  { "ALTER", 0, 0, 0, ""},
+  { "ANALYZE", 0, 0, 0, ""},
+  { "AND", 0, 0, 0, ""},
+  { "ANY", 0, 0, 0, ""},
+  { "AS", 0, 0, 0, ""},
+  { "ASC", 0, 0, 0, ""},
+  { "ASCII", 0, 0, 0, ""},
+  { "ASENSITIVE", 0, 0, 0, ""},
+  { "AUTO_INCREMENT", 0, 0, 0, ""},
+  { "AVG", 0, 0, 0, ""},
+  { "AVG_ROW_LENGTH", 0, 0, 0, ""},
+  { "BACKUP", 0, 0, 0, ""},
+  { "BDB", 0, 0, 0, ""},
+  { "BEFORE", 0, 0, 0, ""},
+  { "BEGIN", 0, 0, 0, ""},
+  { "BERKELEYDB", 0, 0, 0, ""},
+  { "BETWEEN", 0, 0, 0, ""},
+  { "BIGINT", 0, 0, 0, ""},
+  { "BINARY", 0, 0, 0, ""},
+  { "BINLOG", 0, 0, 0, ""},
+  { "BIT", 0, 0, 0, ""},
+  { "BLOB", 0, 0, 0, ""},
+  { "BOOL", 0, 0, 0, ""},
+  { "BOOLEAN", 0, 0, 0, ""},
+  { "BOTH", 0, 0, 0, ""},
+  { "BTREE", 0, 0, 0, ""},
+  { "BY", 0, 0, 0, ""},
+  { "BYTE", 0, 0, 0, ""},
+  { "CACHE", 0, 0, 0, ""},
+  { "CALL", 0, 0, 0, ""},
+  { "CASCADE", 0, 0, 0, ""},
+  { "CASCADED", 0, 0, 0, ""},
+  { "CASE", 0, 0, 0, ""},
+  { "CHAIN", 0, 0, 0, ""},
+  { "CHANGE", 0, 0, 0, ""},
+  { "CHANGED", 0, 0, 0, ""},
+  { "CHAR", 0, 0, 0, ""},
+  { "CHARACTER", 0, 0, 0, ""},
+  { "CHARSET", 0, 0, 0, ""},
+  { "CHECK", 0, 0, 0, ""},
+  { "CHECKSUM", 0, 0, 0, ""},
+  { "CIPHER", 0, 0, 0, ""},
+  { "CLIENT", 0, 0, 0, ""},
+  { "CLOSE", 0, 0, 0, ""},
+  { "CODE", 0, 0, 0, ""},
+  { "COLLATE", 0, 0, 0, ""},
+  { "COLLATION", 0, 0, 0, ""},
+  { "COLUMN", 0, 0, 0, ""},
+  { "COLUMNS", 0, 0, 0, ""},
+  { "COMMENT", 0, 0, 0, ""},
+  { "COMMIT", 0, 0, 0, ""},
+  { "COMMITTED", 0, 0, 0, ""},
+  { "COMPACT", 0, 0, 0, ""},
+  { "COMPRESSED", 0, 0, 0, ""},
+  { "CONCURRENT", 0, 0, 0, ""},
+  { "CONDITION", 0, 0, 0, ""},
+  { "CONNECTION", 0, 0, 0, ""},
+  { "CONSISTENT", 0, 0, 0, ""},
+  { "CONSTRAINT", 0, 0, 0, ""},
+  { "CONTAINS", 0, 0, 0, ""},
+  { "CONTINUE", 0, 0, 0, ""},
+  { "CONVERT", 0, 0, 0, ""},
+  { "CREATE", 0, 0, 0, ""},
+  { "CROSS", 0, 0, 0, ""},
+  { "CUBE", 0, 0, 0, ""},
+  { "CURRENT_DATE", 0, 0, 0, ""},
+  { "CURRENT_TIME", 0, 0, 0, ""},
+  { "CURRENT_TIMESTAMP", 0, 0, 0, ""},
+  { "CURRENT_USER", 0, 0, 0, ""},
+  { "CURSOR", 0, 0, 0, ""},
+  { "DATA", 0, 0, 0, ""},
+  { "DATABASE", 0, 0, 0, ""},
+  { "DATABASES", 0, 0, 0, ""},
+  { "DATE", 0, 0, 0, ""},
+  { "DATETIME", 0, 0, 0, ""},
+  { "DAY", 0, 0, 0, ""},
+  { "DAY_HOUR", 0, 0, 0, ""},
+  { "DAY_MICROSECOND", 0, 0, 0, ""},
+  { "DAY_MINUTE", 0, 0, 0, ""},
+  { "DAY_SECOND", 0, 0, 0, ""},
+  { "DEALLOCATE", 0, 0, 0, ""},     
+  { "DEC", 0, 0, 0, ""},
+  { "DECIMAL", 0, 0, 0, ""},
+  { "DECLARE", 0, 0, 0, ""},
+  { "DEFAULT", 0, 0, 0, ""},
+  { "DEFINER", 0, 0, 0, ""},
+  { "DELAYED", 0, 0, 0, ""},
+  { "DELAY_KEY_WRITE", 0, 0, 0, ""},
+  { "DELETE", 0, 0, 0, ""},
+  { "DESC", 0, 0, 0, ""},
+  { "DESCRIBE", 0, 0, 0, ""},
+  { "DES_KEY_FILE", 0, 0, 0, ""},
+  { "DETERMINISTIC", 0, 0, 0, ""},
+  { "DIRECTORY", 0, 0, 0, ""},
+  { "DISABLE", 0, 0, 0, ""},
+  { "DISCARD", 0, 0, 0, ""},
+  { "DISTINCT", 0, 0, 0, ""},
+  { "DISTINCTROW", 0, 0, 0, ""},
+  { "DIV", 0, 0, 0, ""},
+  { "DO", 0, 0, 0, ""},
+  { "DOUBLE", 0, 0, 0, ""},
+  { "DROP", 0, 0, 0, ""},
+  { "DUAL", 0, 0, 0, ""},
+  { "DUMPFILE", 0, 0, 0, ""},
+  { "DUPLICATE", 0, 0, 0, ""},
+  { "DYNAMIC", 0, 0, 0, ""},
+  { "EACH", 0, 0, 0, ""},
+  { "ELSE", 0, 0, 0, ""},
+  { "ELSEIF", 0, 0, 0, ""},
+  { "ENABLE", 0, 0, 0, ""},
+  { "ENCLOSED", 0, 0, 0, ""},
+  { "END", 0, 0, 0, ""},
+  { "ENGINE", 0, 0, 0, ""},
+  { "ENGINES", 0, 0, 0, ""},
+  { "ENUM", 0, 0, 0, ""},
+  { "ERRORS", 0, 0, 0, ""},
+  { "ESCAPE", 0, 0, 0, ""},
+  { "ESCAPED", 0, 0, 0, ""},
+  { "EVENTS", 0, 0, 0, ""},
+  { "EXECUTE", 0, 0, 0, ""},
+  { "EXISTS", 0, 0, 0, ""},
+  { "EXIT", 0, 0, 0, ""},
+  { "EXPANSION", 0, 0, 0, ""},
+  { "EXPLAIN", 0, 0, 0, ""},
+  { "EXTENDED", 0, 0, 0, ""},
+  { "FALSE", 0, 0, 0, ""},
+  { "FAST", 0, 0, 0, ""},
+  { "FETCH", 0, 0, 0, ""},
+  { "FIELDS", 0, 0, 0, ""},
+  { "FILE", 0, 0, 0, ""},
+  { "FIRST", 0, 0, 0, ""},
+  { "FIXED", 0, 0, 0, ""},
+  { "FLOAT", 0, 0, 0, ""},
+  { "FLOAT4", 0, 0, 0, ""},
+  { "FLOAT8", 0, 0, 0, ""},
+  { "FLUSH", 0, 0, 0, ""},
+  { "FOR", 0, 0, 0, ""},
+  { "FORCE", 0, 0, 0, ""},
+  { "FOREIGN", 0, 0, 0, ""},
+  { "FOUND", 0, 0, 0, ""},
+  { "FRAC_SECOND", 0, 0, 0, ""},
+  { "FROM", 0, 0, 0, ""},
+  { "FULL", 0, 0, 0, ""},
+  { "FULLTEXT", 0, 0, 0, ""},
+  { "FUNCTION", 0, 0, 0, ""},
+  { "GEOMETRY", 0, 0, 0, ""},
+  { "GEOMETRYCOLLECTION", 0, 0, 0, ""},
+  { "GET_FORMAT", 0, 0, 0, ""},
+  { "GLOBAL", 0, 0, 0, ""},
+  { "GRANT", 0, 0, 0, ""},
+  { "GRANTS", 0, 0, 0, ""},
+  { "GROUP", 0, 0, 0, ""},
+  { "HANDLER", 0, 0, 0, ""},
+  { "HASH", 0, 0, 0, ""},
+  { "HAVING", 0, 0, 0, ""},
+  { "HELP", 0, 0, 0, ""},
+  { "HIGH_PRIORITY", 0, 0, 0, ""},
+  { "HOSTS", 0, 0, 0, ""},
+  { "HOUR", 0, 0, 0, ""},
+  { "HOUR_MICROSECOND", 0, 0, 0, ""},
+  { "HOUR_MINUTE", 0, 0, 0, ""},
+  { "HOUR_SECOND", 0, 0, 0, ""},
+  { "IDENTIFIED", 0, 0, 0, ""},
+  { "IF", 0, 0, 0, ""},
+  { "IGNORE", 0, 0, 0, ""},
+  { "IMPORT", 0, 0, 0, ""},
+  { "IN", 0, 0, 0, ""},
+  { "INDEX", 0, 0, 0, ""},
+  { "INDEXES", 0, 0, 0, ""},
+  { "INFILE", 0, 0, 0, ""},
+  { "INNER", 0, 0, 0, ""},
+  { "INNOBASE", 0, 0, 0, ""},
+  { "INNODB", 0, 0, 0, ""},
+  { "INOUT", 0, 0, 0, ""},
+  { "INSENSITIVE", 0, 0, 0, ""},
+  { "INSERT", 0, 0, 0, ""},
+  { "INSERT_METHOD", 0, 0, 0, ""},
+  { "INT", 0, 0, 0, ""},
+  { "INT1", 0, 0, 0, ""},
+  { "INT2", 0, 0, 0, ""},
+  { "INT3", 0, 0, 0, ""},
+  { "INT4", 0, 0, 0, ""},
+  { "INT8", 0, 0, 0, ""},
+  { "INTEGER", 0, 0, 0, ""},
+  { "INTERVAL", 0, 0, 0, ""},
+  { "INTO", 0, 0, 0, ""},
+  { "IO_THREAD", 0, 0, 0, ""},
+  { "IS", 0, 0, 0, ""},
+  { "ISOLATION", 0, 0, 0, ""},
+  { "ISSUER", 0, 0, 0, ""},
+  { "ITERATE", 0, 0, 0, ""},
+  { "INVOKER", 0, 0, 0, ""},
+  { "JOIN", 0, 0, 0, ""},
+  { "KEY", 0, 0, 0, ""},
+  { "KEYS", 0, 0, 0, ""},
+  { "KILL", 0, 0, 0, ""},
+  { "LANGUAGE", 0, 0, 0, ""},
+  { "LAST", 0, 0, 0, ""},
+  { "LEADING", 0, 0, 0, ""},
+  { "LEAVE", 0, 0, 0, ""},
+  { "LEAVES", 0, 0, 0, ""},
+  { "LEFT", 0, 0, 0, ""},
+  { "LEVEL", 0, 0, 0, ""},
+  { "LIKE", 0, 0, 0, ""},
+  { "LIMIT", 0, 0, 0, ""},
+  { "LINES", 0, 0, 0, ""},
+  { "LINESTRING", 0, 0, 0, ""},
+  { "LOAD", 0, 0, 0, ""},
+  { "LOCAL", 0, 0, 0, ""},
+  { "LOCALTIME", 0, 0, 0, ""},
+  { "LOCALTIMESTAMP", 0, 0, 0, ""},
+  { "LOCK", 0, 0, 0, ""},
+  { "LOCKS", 0, 0, 0, ""},
+  { "LOGS", 0, 0, 0, ""},
+  { "LONG", 0, 0, 0, ""},
+  { "LONGBLOB", 0, 0, 0, ""},
+  { "LONGTEXT", 0, 0, 0, ""},
+  { "LOOP", 0, 0, 0, ""},
+  { "LOW_PRIORITY", 0, 0, 0, ""},
+  { "MASTER", 0, 0, 0, ""},
+  { "MASTER_CONNECT_RETRY", 0, 0, 0, ""},
+  { "MASTER_HOST", 0, 0, 0, ""},
+  { "MASTER_LOG_FILE", 0, 0, 0, ""},
+  { "MASTER_LOG_POS", 0, 0, 0, ""},
+  { "MASTER_PASSWORD", 0, 0, 0, ""},
+  { "MASTER_PORT", 0, 0, 0, ""},
+  { "MASTER_SERVER_ID", 0, 0, 0, ""},
+  { "MASTER_SSL", 0, 0, 0, ""},
+  { "MASTER_SSL_CA", 0, 0, 0, ""},
+  { "MASTER_SSL_CAPATH", 0, 0, 0, ""},
+  { "MASTER_SSL_CERT", 0, 0, 0, ""},
+  { "MASTER_SSL_CIPHER", 0, 0, 0, ""},
+  { "MASTER_SSL_KEY", 0, 0, 0, ""},
+  { "MASTER_USER", 0, 0, 0, ""},
+  { "MATCH", 0, 0, 0, ""},
+  { "MAX_CONNECTIONS_PER_HOUR", 0, 0, 0, ""},
+  { "MAX_QUERIES_PER_HOUR", 0, 0, 0, ""},
+  { "MAX_ROWS", 0, 0, 0, ""},
+  { "MAX_UPDATES_PER_HOUR", 0, 0, 0, ""},
+  { "MAX_USER_CONNECTIONS", 0, 0, 0, ""},
+  { "MEDIUM", 0, 0, 0, ""},
+  { "MEDIUMBLOB", 0, 0, 0, ""},
+  { "MEDIUMINT", 0, 0, 0, ""},
+  { "MEDIUMTEXT", 0, 0, 0, ""},
+  { "MERGE", 0, 0, 0, ""},
+  { "MICROSECOND", 0, 0, 0, ""},
+  { "MIDDLEINT", 0, 0, 0, ""},
+  { "MIGRATE", 0, 0, 0, ""},
+  { "MINUTE", 0, 0, 0, ""},
+  { "MINUTE_MICROSECOND", 0, 0, 0, ""},
+  { "MINUTE_SECOND", 0, 0, 0, ""},
+  { "MIN_ROWS", 0, 0, 0, ""},
+  { "MOD", 0, 0, 0, ""},
+  { "MODE", 0, 0, 0, ""},
+  { "MODIFIES", 0, 0, 0, ""},
+  { "MODIFY", 0, 0, 0, ""},
+  { "MONTH", 0, 0, 0, ""},
+  { "MULTILINESTRING", 0, 0, 0, ""},
+  { "MULTIPOINT", 0, 0, 0, ""},
+  { "MULTIPOLYGON", 0, 0, 0, ""},
+  { "MUTEX", 0, 0, 0, ""},
+  { "NAME", 0, 0, 0, ""},
+  { "NAMES", 0, 0, 0, ""},
+  { "NATIONAL", 0, 0, 0, ""},
+  { "NATURAL", 0, 0, 0, ""},
+  { "NDB", 0, 0, 0, ""},
+  { "NDBCLUSTER", 0, 0, 0, ""},
+  { "NCHAR", 0, 0, 0, ""},
+  { "NEW", 0, 0, 0, ""},
+  { "NEXT", 0, 0, 0, ""},
+  { "NO", 0, 0, 0, ""},
+  { "NONE", 0, 0, 0, ""},
+  { "NOT", 0, 0, 0, ""},
+  { "NO_WRITE_TO_BINLOG", 0, 0, 0, ""},
+  { "NULL", 0, 0, 0, ""},
+  { "NUMERIC", 0, 0, 0, ""},
+  { "NVARCHAR", 0, 0, 0, ""},
+  { "OFFSET", 0, 0, 0, ""},
+  { "OLD_PASSWORD", 0, 0, 0, ""},
+  { "ON", 0, 0, 0, ""},
+  { "ONE", 0, 0, 0, ""},
+  { "ONE_SHOT", 0, 0, 0, ""},
+  { "OPEN", 0, 0, 0, ""},
+  { "OPTIMIZE", 0, 0, 0, ""},
+  { "OPTION", 0, 0, 0, ""},
+  { "OPTIONALLY", 0, 0, 0, ""},
+  { "OR", 0, 0, 0, ""},
+  { "ORDER", 0, 0, 0, ""},
+  { "OUT", 0, 0, 0, ""},
+  { "OUTER", 0, 0, 0, ""},
+  { "OUTFILE", 0, 0, 0, ""},
+  { "PACK_KEYS", 0, 0, 0, ""},
+  { "PARTIAL", 0, 0, 0, ""},
+  { "PASSWORD", 0, 0, 0, ""},
+  { "PHASE", 0, 0, 0, ""},
+  { "POINT", 0, 0, 0, ""},
+  { "POLYGON", 0, 0, 0, ""},
+  { "PRECISION", 0, 0, 0, ""},
+  { "PREPARE", 0, 0, 0, ""},
+  { "PREV", 0, 0, 0, ""},
+  { "PRIMARY", 0, 0, 0, ""},
+  { "PRIVILEGES", 0, 0, 0, ""},
+  { "PROCEDURE", 0, 0, 0, ""},
+  { "PROCESS", 0, 0, 0, ""},
+  { "PROCESSLIST", 0, 0, 0, ""},
+  { "PURGE", 0, 0, 0, ""},
+  { "QUARTER", 0, 0, 0, ""},
+  { "QUERY", 0, 0, 0, ""},
+  { "QUICK", 0, 0, 0, ""},
+  { "RAID0", 0, 0, 0, ""},
+  { "RAID_CHUNKS", 0, 0, 0, ""},
+  { "RAID_CHUNKSIZE", 0, 0, 0, ""},
+  { "RAID_TYPE", 0, 0, 0, ""},
+  { "READ", 0, 0, 0, ""},
+  { "READS", 0, 0, 0, ""},
+  { "REAL", 0, 0, 0, ""},
+  { "RECOVER", 0, 0, 0, ""},
+  { "REDUNDANT", 0, 0, 0, ""},
+  { "REFERENCES", 0, 0, 0, ""},
+  { "REGEXP", 0, 0, 0, ""},
+  { "RELAY_LOG_FILE", 0, 0, 0, ""},
+  { "RELAY_LOG_POS", 0, 0, 0, ""},
+  { "RELAY_THREAD", 0, 0, 0, ""},
+  { "RELEASE", 0, 0, 0, ""},
+  { "RELOAD", 0, 0, 0, ""},
+  { "RENAME", 0, 0, 0, ""},
+  { "REPAIR", 0, 0, 0, ""},
+  { "REPEATABLE", 0, 0, 0, ""},
+  { "REPLACE", 0, 0, 0, ""},
+  { "REPLICATION", 0, 0, 0, ""},
+  { "REPEAT", 0, 0, 0, ""},
+  { "REQUIRE", 0, 0, 0, ""},
+  { "RESET", 0, 0, 0, ""},
+  { "RESTORE", 0, 0, 0, ""},
+  { "RESTRICT", 0, 0, 0, ""},
+  { "RESUME", 0, 0, 0, ""},
+  { "RETURN", 0, 0, 0, ""},
+  { "RETURNS", 0, 0, 0, ""},
+  { "REVOKE", 0, 0, 0, ""},
+  { "RIGHT", 0, 0, 0, ""},
+  { "RLIKE", 0, 0, 0, ""},
+  { "ROLLBACK", 0, 0, 0, ""},
+  { "ROLLUP", 0, 0, 0, ""},
+  { "ROUTINE", 0, 0, 0, ""},
+  { "ROW", 0, 0, 0, ""},
+  { "ROWS", 0, 0, 0, ""},
+  { "ROW_FORMAT", 0, 0, 0, ""},
+  { "RTREE", 0, 0, 0, ""},
+  { "SAVEPOINT", 0, 0, 0, ""},
+  { "SCHEMA", 0, 0, 0, ""},
+  { "SCHEMAS", 0, 0, 0, ""},
+  { "SECOND", 0, 0, 0, ""},
+  { "SECOND_MICROSECOND", 0, 0, 0, ""},
+  { "SECURITY", 0, 0, 0, ""},
+  { "SELECT", 0, 0, 0, ""},
+  { "SENSITIVE", 0, 0, 0, ""},
+  { "SEPARATOR", 0, 0, 0, ""},
+  { "SERIAL", 0, 0, 0, ""},
+  { "SERIALIZABLE", 0, 0, 0, ""},
+  { "SESSION", 0, 0, 0, ""},
+  { "SET", 0, 0, 0, ""},
+  { "SHARE", 0, 0, 0, ""},
+  { "SHOW", 0, 0, 0, ""},
+  { "SHUTDOWN", 0, 0, 0, ""},
+  { "SIGNED", 0, 0, 0, ""},
+  { "SIMPLE", 0, 0, 0, ""},
+  { "SLAVE", 0, 0, 0, ""},
+  { "SNAPSHOT", 0, 0, 0, ""},
+  { "SMALLINT", 0, 0, 0, ""},
+  { "SOME", 0, 0, 0, ""},
+  { "SONAME", 0, 0, 0, ""},
+  { "SOUNDS", 0, 0, 0, ""},
+  { "SPATIAL", 0, 0, 0, ""},
+  { "SPECIFIC", 0, 0, 0, ""},
+  { "SQL", 0, 0, 0, ""},
+  { "SQLEXCEPTION", 0, 0, 0, ""},
+  { "SQLSTATE", 0, 0, 0, ""},
+  { "SQLWARNING", 0, 0, 0, ""},
+  { "SQL_BIG_RESULT", 0, 0, 0, ""},
+  { "SQL_BUFFER_RESULT", 0, 0, 0, ""},
+  { "SQL_CACHE", 0, 0, 0, ""},
+  { "SQL_CALC_FOUND_ROWS", 0, 0, 0, ""},
+  { "SQL_NO_CACHE", 0, 0, 0, ""},
+  { "SQL_SMALL_RESULT", 0, 0, 0, ""},
+  { "SQL_THREAD", 0, 0, 0, ""},
+  { "SQL_TSI_FRAC_SECOND", 0, 0, 0, ""},
+  { "SQL_TSI_SECOND", 0, 0, 0, ""},
+  { "SQL_TSI_MINUTE", 0, 0, 0, ""},
+  { "SQL_TSI_HOUR", 0, 0, 0, ""},
+  { "SQL_TSI_DAY", 0, 0, 0, ""},
+  { "SQL_TSI_WEEK", 0, 0, 0, ""},
+  { "SQL_TSI_MONTH", 0, 0, 0, ""},
+  { "SQL_TSI_QUARTER", 0, 0, 0, ""},
+  { "SQL_TSI_YEAR", 0, 0, 0, ""},
+  { "SSL", 0, 0, 0, ""},
+  { "START", 0, 0, 0, ""},
+  { "STARTING", 0, 0, 0, ""},
+  { "STATUS", 0, 0, 0, ""},
+  { "STOP", 0, 0, 0, ""},
+  { "STORAGE", 0, 0, 0, ""},
+  { "STRAIGHT_JOIN", 0, 0, 0, ""},
+  { "STRING", 0, 0, 0, ""},
+  { "STRIPED", 0, 0, 0, ""},
+  { "SUBJECT", 0, 0, 0, ""},
+  { "SUPER", 0, 0, 0, ""},
+  { "SUSPEND", 0, 0, 0, ""},
+  { "TABLE", 0, 0, 0, ""},
+  { "TABLES", 0, 0, 0, ""},
+  { "TABLESPACE", 0, 0, 0, ""},
+  { "TEMPORARY", 0, 0, 0, ""},
+  { "TEMPTABLE", 0, 0, 0, ""},
+  { "TERMINATED", 0, 0, 0, ""},
+  { "TEXT", 0, 0, 0, ""},
+  { "THEN", 0, 0, 0, ""},
+  { "TIME", 0, 0, 0, ""},
+  { "TIMESTAMP", 0, 0, 0, ""},
+  { "TIMESTAMPADD", 0, 0, 0, ""},
+  { "TIMESTAMPDIFF", 0, 0, 0, ""},
+  { "TINYBLOB", 0, 0, 0, ""},
+  { "TINYINT", 0, 0, 0, ""},
+  { "TINYTEXT", 0, 0, 0, ""},
+  { "TO", 0, 0, 0, ""},
+  { "TRAILING", 0, 0, 0, ""},
+  { "TRANSACTION", 0, 0, 0, ""},
+  { "TRIGGER", 0, 0, 0, ""},
+  { "TRIGGERS", 0, 0, 0, ""},
+  { "TRUE", 0, 0, 0, ""},
+  { "TRUNCATE", 0, 0, 0, ""},
+  { "TYPE", 0, 0, 0, ""},
+  { "TYPES", 0, 0, 0, ""},
+  { "UNCOMMITTED", 0, 0, 0, ""},
+  { "UNDEFINED", 0, 0, 0, ""},
+  { "UNDO", 0, 0, 0, ""},
+  { "UNICODE", 0, 0, 0, ""},
+  { "UNION", 0, 0, 0, ""},
+  { "UNIQUE", 0, 0, 0, ""},
+  { "UNKNOWN", 0, 0, 0, ""},
+  { "UNLOCK", 0, 0, 0, ""},
+  { "UNSIGNED", 0, 0, 0, ""},
+  { "UNTIL", 0, 0, 0, ""},
+  { "UPDATE", 0, 0, 0, ""},
+  { "UPGRADE", 0, 0, 0, ""},
+  { "USAGE", 0, 0, 0, ""},
+  { "USE", 0, 0, 0, ""},
+  { "USER", 0, 0, 0, ""},
+  { "USER_RESOURCES", 0, 0, 0, ""},
+  { "USE_FRM", 0, 0, 0, ""},
+  { "USING", 0, 0, 0, ""},
+  { "UTC_DATE", 0, 0, 0, ""},
+  { "UTC_TIME", 0, 0, 0, ""},
+  { "UTC_TIMESTAMP", 0, 0, 0, ""},
+  { "VALUE", 0, 0, 0, ""},
+  { "VALUES", 0, 0, 0, ""},
+  { "VARBINARY", 0, 0, 0, ""},
+  { "VARCHAR", 0, 0, 0, ""},
+  { "VARCHARACTER", 0, 0, 0, ""},
+  { "VARIABLES", 0, 0, 0, ""},
+  { "VARYING", 0, 0, 0, ""},
+  { "WARNINGS", 0, 0, 0, ""},
+  { "WEEK", 0, 0, 0, ""},
+  { "WHEN", 0, 0, 0, ""},
+  { "WHERE", 0, 0, 0, ""},
+  { "WHILE", 0, 0, 0, ""},
+  { "VIEW", 0, 0, 0, ""},
+  { "WITH", 0, 0, 0, ""},
+  { "WORK", 0, 0, 0, ""},
+  { "WRITE", 0, 0, 0, ""},
+  { "X509", 0, 0, 0, ""},
+  { "XOR", 0, 0, 0, ""},
+  { "XA", 0, 0, 0, ""},
+  { "YEAR", 0, 0, 0, ""},
+  { "YEAR_MONTH", 0, 0, 0, ""},
+  { "ZEROFILL", 0, 0, 0, ""},
+  { "ABS", 0, 0, 0, ""},
+  { "ACOS", 0, 0, 0, ""},
+  { "ADDDATE", 0, 0, 0, ""},
+  { "ADDTIME", 0, 0, 0, ""},
+  { "AES_ENCRYPT", 0, 0, 0, ""},
+  { "AES_DECRYPT", 0, 0, 0, ""},
+  { "AREA", 0, 0, 0, ""},
+  { "ASIN", 0, 0, 0, ""},
+  { "ASBINARY", 0, 0, 0, ""},
+  { "ASTEXT", 0, 0, 0, ""},
+  { "ASWKB", 0, 0, 0, ""},
+  { "ASWKT", 0, 0, 0, ""},
+  { "ATAN", 0, 0, 0, ""},
+  { "ATAN2", 0, 0, 0, ""},
+  { "BENCHMARK", 0, 0, 0, ""},
+  { "BIN", 0, 0, 0, ""},
+  { "BIT_COUNT", 0, 0, 0, ""},
+  { "BIT_OR", 0, 0, 0, ""},
+  { "BIT_AND", 0, 0, 0, ""},
+  { "BIT_XOR", 0, 0, 0, ""},
+  { "CAST", 0, 0, 0, ""},
+  { "CEIL", 0, 0, 0, ""},
+  { "CEILING", 0, 0, 0, ""},
+  { "BIT_LENGTH", 0, 0, 0, ""},
+  { "CENTROID", 0, 0, 0, ""},
+  { "CHAR_LENGTH", 0, 0, 0, ""},
+  { "CHARACTER_LENGTH", 0, 0, 0, ""},
+  { "COALESCE", 0, 0, 0, ""},
+  { "COERCIBILITY", 0, 0, 0, ""},
+  { "COMPRESS", 0, 0, 0, ""},
+  { "CONCAT", 0, 0, 0, ""},
+  { "CONCAT_WS", 0, 0, 0, ""},
+  { "CONNECTION_ID", 0, 0, 0, ""},
+  { "CONV", 0, 0, 0, ""},
+  { "CONVERT_TZ", 0, 0, 0, ""},
+  { "COUNT", 0, 0, 0, ""},
+  { "COS", 0, 0, 0, ""},
+  { "COT", 0, 0, 0, ""},
+  { "CRC32", 0, 0, 0, ""},
+  { "CROSSES", 0, 0, 0, ""},
+  { "CURDATE", 0, 0, 0, ""},
+  { "CURTIME", 0, 0, 0, ""},
+  { "DATE_ADD", 0, 0, 0, ""},
+  { "DATEDIFF", 0, 0, 0, ""},
+  { "DATE_FORMAT", 0, 0, 0, ""},
+  { "DATE_SUB", 0, 0, 0, ""},
+  { "DAYNAME", 0, 0, 0, ""},
+  { "DAYOFMONTH", 0, 0, 0, ""},
+  { "DAYOFWEEK", 0, 0, 0, ""},
+  { "DAYOFYEAR", 0, 0, 0, ""},
+  { "DECODE", 0, 0, 0, ""},
+  { "DEGREES", 0, 0, 0, ""},
+  { "DES_ENCRYPT", 0, 0, 0, ""},
+  { "DES_DECRYPT", 0, 0, 0, ""},
+  { "DIMENSION", 0, 0, 0, ""},
+  { "DISJOINT", 0, 0, 0, ""},
+  { "ELT", 0, 0, 0, ""},
+  { "ENCODE", 0, 0, 0, ""},
+  { "ENCRYPT", 0, 0, 0, ""},
+  { "ENDPOINT", 0, 0, 0, ""},
+  { "ENVELOPE", 0, 0, 0, ""},
+  { "EQUALS", 0, 0, 0, ""},
+  { "EXTERIORRING", 0, 0, 0, ""},
+  { "EXTRACT", 0, 0, 0, ""},
+  { "EXP", 0, 0, 0, ""},
+  { "EXPORT_SET", 0, 0, 0, ""},
+  { "FIELD", 0, 0, 0, ""},
+  { "FIND_IN_SET", 0, 0, 0, ""},
+  { "FLOOR", 0, 0, 0, ""},
+  { "FORMAT", 0, 0, 0, ""},
+  { "FOUND_ROWS", 0, 0, 0, ""},
+  { "FROM_DAYS", 0, 0, 0, ""},
+  { "FROM_UNIXTIME", 0, 0, 0, ""},
+  { "GET_LOCK", 0, 0, 0, ""},
+  { "GEOMETRYN", 0, 0, 0, ""},
+  { "GEOMETRYTYPE", 0, 0, 0, ""},
+  { "GEOMCOLLFROMTEXT", 0, 0, 0, ""},
+  { "GEOMCOLLFROMWKB", 0, 0, 0, ""},
+  { "GEOMETRYCOLLECTIONFROMTEXT", 0, 0, 0, ""},
+  { "GEOMETRYCOLLECTIONFROMWKB", 0, 0, 0, ""},
+  { "GEOMETRYFROMTEXT", 0, 0, 0, ""},
+  { "GEOMETRYFROMWKB", 0, 0, 0, ""},
+  { "GEOMFROMTEXT", 0, 0, 0, ""},
+  { "GEOMFROMWKB", 0, 0, 0, ""},
+  { "GLENGTH", 0, 0, 0, ""},
+  { "GREATEST", 0, 0, 0, ""},
+  { "GROUP_CONCAT", 0, 0, 0, ""},
+  { "GROUP_UNIQUE_USERS", 0, 0, 0, ""},
+  { "HEX", 0, 0, 0, ""},
+  { "IFNULL", 0, 0, 0, ""},
+  { "INET_ATON", 0, 0, 0, ""},
+  { "INET_NTOA", 0, 0, 0, ""},
+  { "INSTR", 0, 0, 0, ""},
+  { "INTERIORRINGN", 0, 0, 0, ""},
+  { "INTERSECTS", 0, 0, 0, ""},
+  { "ISCLOSED", 0, 0, 0, ""},
+  { "ISEMPTY", 0, 0, 0, ""},
+  { "ISNULL", 0, 0, 0, ""},
+  { "IS_FREE_LOCK", 0, 0, 0, ""},
+  { "IS_USED_LOCK", 0, 0, 0, ""},
+  { "LAST_INSERT_ID", 0, 0, 0, ""},
+  { "ISSIMPLE", 0, 0, 0, ""},
+  { "LAST_DAY", 0, 0, 0, ""},
+  { "LCASE", 0, 0, 0, ""},
+  { "LEAST", 0, 0, 0, ""},
+  { "LENGTH", 0, 0, 0, ""},
+  { "LN", 0, 0, 0, ""},
+  { "LINEFROMTEXT", 0, 0, 0, ""},
+  { "LINEFROMWKB", 0, 0, 0, ""},
+  { "LINESTRINGFROMTEXT", 0, 0, 0, ""},
+  { "LINESTRINGFROMWKB", 0, 0, 0, ""},
+  { "LOAD_FILE", 0, 0, 0, ""},
+  { "LOCATE", 0, 0, 0, ""},
+  { "LOG", 0, 0, 0, ""},
+  { "LOG2", 0, 0, 0, ""},
+  { "LOG10", 0, 0, 0, ""},
+  { "LOWER", 0, 0, 0, ""},
+  { "LPAD", 0, 0, 0, ""},
+  { "LTRIM", 0, 0, 0, ""},
+  { "MAKE_SET", 0, 0, 0, ""},
+  { "MAKEDATE", 0, 0, 0, ""},
+  { "MAKETIME", 0, 0, 0, ""},
+  { "MASTER_POS_WAIT", 0, 0, 0, ""},
+  { "MAX", 0, 0, 0, ""},
+  { "MBRCONTAINS", 0, 0, 0, ""},
+  { "MBRDISJOINT", 0, 0, 0, ""},
+  { "MBREQUAL", 0, 0, 0, ""},
+  { "MBRINTERSECTS", 0, 0, 0, ""},
+  { "MBROVERLAPS", 0, 0, 0, ""},
+  { "MBRTOUCHES", 0, 0, 0, ""},
+  { "MBRWITHIN", 0, 0, 0, ""},
+  { "MD5", 0, 0, 0, ""},
+  { "MID", 0, 0, 0, ""},
+  { "MIN", 0, 0, 0, ""},
+  { "MLINEFROMTEXT", 0, 0, 0, ""},
+  { "MLINEFROMWKB", 0, 0, 0, ""},
+  { "MPOINTFROMTEXT", 0, 0, 0, ""},
+  { "MPOINTFROMWKB", 0, 0, 0, ""},
+  { "MPOLYFROMTEXT", 0, 0, 0, ""},
+  { "MPOLYFROMWKB", 0, 0, 0, ""},
+  { "MONTHNAME", 0, 0, 0, ""},
+  { "MULTILINESTRINGFROMTEXT", 0, 0, 0, ""},
+  { "MULTILINESTRINGFROMWKB", 0, 0, 0, ""},
+  { "MULTIPOINTFROMTEXT", 0, 0, 0, ""},
+  { "MULTIPOINTFROMWKB", 0, 0, 0, ""},
+  { "MULTIPOLYGONFROMTEXT", 0, 0, 0, ""},
+  { "MULTIPOLYGONFROMWKB", 0, 0, 0, ""},
+  { "NAME_CONST", 0, 0, 0, ""},
+  { "NOW", 0, 0, 0, ""},
+  { "NULLIF", 0, 0, 0, ""},
+  { "NUMGEOMETRIES", 0, 0, 0, ""},
+  { "NUMINTERIORRINGS", 0, 0, 0, ""},
+  { "NUMPOINTS", 0, 0, 0, ""},
+  { "OCTET_LENGTH", 0, 0, 0, ""},
+  { "OCT", 0, 0, 0, ""},
+  { "ORD", 0, 0, 0, ""},
+  { "OVERLAPS", 0, 0, 0, ""},
+  { "PERIOD_ADD", 0, 0, 0, ""},
+  { "PERIOD_DIFF", 0, 0, 0, ""},
+  { "PI", 0, 0, 0, ""},
+  { "POINTFROMTEXT", 0, 0, 0, ""},
+  { "POINTFROMWKB", 0, 0, 0, ""},
+  { "POINTN", 0, 0, 0, ""},
+  { "POLYFROMTEXT", 0, 0, 0, ""},
+  { "POLYFROMWKB", 0, 0, 0, ""},
+  { "POLYGONFROMTEXT", 0, 0, 0, ""},
+  { "POLYGONFROMWKB", 0, 0, 0, ""},
+  { "POSITION", 0, 0, 0, ""},
+  { "POW", 0, 0, 0, ""},
+  { "POWER", 0, 0, 0, ""},
+  { "QUOTE", 0, 0, 0, ""},
+  { "RADIANS", 0, 0, 0, ""},
+  { "RAND", 0, 0, 0, ""},
+  { "RELEASE_LOCK", 0, 0, 0, ""},
+  { "REVERSE", 0, 0, 0, ""},
+  { "ROUND", 0, 0, 0, ""},
+  { "ROW_COUNT", 0, 0, 0, ""},
+  { "RPAD", 0, 0, 0, ""},
+  { "RTRIM", 0, 0, 0, ""},
+  { "SEC_TO_TIME", 0, 0, 0, ""},
+  { "SESSION_USER", 0, 0, 0, ""},
+  { "SUBDATE", 0, 0, 0, ""},
+  { "SIGN", 0, 0, 0, ""},
+  { "SIN", 0, 0, 0, ""},
+  { "SHA", 0, 0, 0, ""},
+  { "SHA1", 0, 0, 0, ""},
+  { "SLEEP", 0, 0, 0, ""},
+  { "SOUNDEX", 0, 0, 0, ""},
+  { "SPACE", 0, 0, 0, ""},
+  { "SQRT", 0, 0, 0, ""},
+  { "SRID", 0, 0, 0, ""},
+  { "STARTPOINT", 0, 0, 0, ""},
+  { "STD", 0, 0, 0, ""},
+  { "STDDEV", 0, 0, 0, ""},
+  { "STDDEV_POP", 0, 0, 0, ""},
+  { "STDDEV_SAMP", 0, 0, 0, ""},
+  { "STR_TO_DATE", 0, 0, 0, ""},
+  { "STRCMP", 0, 0, 0, ""},
+  { "SUBSTR", 0, 0, 0, ""},
+  { "SUBSTRING", 0, 0, 0, ""},
+  { "SUBSTRING_INDEX", 0, 0, 0, ""},
+  { "SUBTIME", 0, 0, 0, ""},
+  { "SUM", 0, 0, 0, ""},
+  { "SYSDATE", 0, 0, 0, ""},
+  { "SYSTEM_USER", 0, 0, 0, ""},
+  { "TAN", 0, 0, 0, ""},
+  { "TIME_FORMAT", 0, 0, 0, ""},
+  { "TIME_TO_SEC", 0, 0, 0, ""},
+  { "TIMEDIFF", 0, 0, 0, ""},
+  { "TO_DAYS", 0, 0, 0, ""},
+  { "TOUCHES", 0, 0, 0, ""},
+  { "TRIM", 0, 0, 0, ""},
+  { "UCASE", 0, 0, 0, ""},
+  { "UNCOMPRESS", 0, 0, 0, ""},
+  { "UNCOMPRESSED_LENGTH", 0, 0, 0, ""},
+  { "UNHEX", 0, 0, 0, ""},
+  { "UNIQUE_USERS", 0, 0, 0, ""},
+  { "UNIX_TIMESTAMP", 0, 0, 0, ""},
+  { "UPPER", 0, 0, 0, ""},
+  { "UUID", 0, 0, 0, ""},
+  { "VARIANCE", 0, 0, 0, ""},
+  { "VAR_POP", 0, 0, 0, ""},
+  { "VAR_SAMP", 0, 0, 0, ""},
+  { "VERSION", 0, 0, 0, ""},
+  { "WEEKDAY", 0, 0, 0, ""},
+  { "WEEKOFYEAR", 0, 0, 0, ""},
+  { "WITHIN", 0, 0, 0, ""},
+  { "X", 0, 0, 0, ""},
+  { "Y", 0, 0, 0, ""},
+  { "YEARWEEK", 0, 0, 0, ""},
+  /* end sentinel */
   { (char *)NULL,       0, 0, 0, ""}
 };
 
@@ -813,7 +1518,7 @@ static void usage(int version)
   if (version)
     return;
   printf("\
-Copyright (C) 2002 MySQL AB\n\
+Copyright (C) 2000-2008 MySQL AB\n\
 This software comes with ABSOLUTELY NO WARRANTY. This is free software,\n\
 and you are welcome to modify and redistribute it under the GPL license\n");
   printf("Usage: %s [OPTIONS] [database]\n", my_progname);
@@ -1767,12 +2472,6 @@ static void build_completion_hash(bool rehash, bool write_info)
 
   if (status.batch || quick || !current_db)
     DBUG_VOID_RETURN;			// We don't need completion in batches
-
-  /* hash SQL commands */
-  while (cmd->name) {
-    add_word(&ht,(char*) cmd->name);
-    cmd++;
-  }
   if (!rehash)
     DBUG_VOID_RETURN;
 
@@ -1782,6 +2481,12 @@ static void build_completion_hash(bool rehash, bool write_info)
   completion_hash_clean(&ht);
   free_root(&hash_mem_root,MYF(0));
 
+  /* hash this file's known subset of SQL commands */
+  while (cmd->name) {
+    add_word(&ht,(char*) cmd->name);
+    cmd++;
+  }
+
   /* hash MySQL functions (to be implemented) */
 
   /* hash all database names */
@@ -2163,7 +2868,8 @@ com_charset(String *buffer __attribute__((unused)), char *line)
 static int
 com_go(String *buffer,char *line __attribute__((unused)))
 {
-  char		buff[200], time_buff[32], *pos;
+  char		buff[200]; /* about 110 chars used so far */
+  char		time_buff[52+3+1]; /* time max + space&parens + NUL */
   MYSQL_RES	*result;
   ulong		timer, warnings= 0;
   uint		error= 0;
@@ -2224,6 +2930,8 @@ com_go(String *buffer,char *line __attribute__((unused)))
 
   do
   {
+    char *pos;
+
     if (quick)
     {
       if (!(result=mysql_use_result(&mysql)) && mysql_field_count(&mysql))
@@ -2242,7 +2950,9 @@ com_go(String *buffer,char *line __attribute__((unused)))
     if (verbose >= 3 || !opt_silent)
       mysql_end_timer(timer,time_buff);
     else
-      time_buff[0]=0;
+      time_buff[0]= '\0';
+
+    /* Every branch must truncate  buff . */
     if (result)
     {
       if (!mysql_num_rows(result) && ! quick && !column_types_flag)
@@ -3809,6 +4519,11 @@ static ulong start_timer(void)
 }
 
 
+/** 
+  Write as many as 52+1 bytes to buff, in the form of a legible duration of time.
+
+  len("4294967296 days, 23 hours, 59 minutes, 60.00 seconds")  ->  52
+*/
 static void nice_time(double sec,char *buff,bool part_second)
 {
   ulong tmp;
diff --git a/client/mysqldump.c b/client/mysqldump.c
index f119e0b40b0..5f896a0a44f 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -1042,7 +1042,7 @@ static int fetch_db_collation(const char *db_name,
                               char *db_cl_name,
                               int db_cl_size)
 {
-  bool err_status= FALSE;
+  my_bool err_status= FALSE;
   char query[QUERY_LENGTH];
   MYSQL_RES *db_cl_res;
   MYSQL_ROW db_cl_row;
diff --git a/client/mysqltest.c b/client/mysqltest.c
index a21a7113557..52e02789579 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -4260,7 +4260,7 @@ void do_connect(struct st_command *command)
 {
   int con_port= opt_port;
   char *con_options;
-  bool con_ssl= 0, con_compress= 0;
+  my_bool con_ssl= 0, con_compress= 0;
   struct st_connection* con_slot;
 
   static DYNAMIC_STRING ds_connection_name;
@@ -5552,7 +5552,7 @@ void fix_win_paths(const char *val, int len)
 */
 
 void append_field(DYNAMIC_STRING *ds, uint col_idx, MYSQL_FIELD* field,
-                  const char* val, ulonglong len, bool is_null)
+                  const char* val, ulonglong len, my_bool is_null)
 {
   if (col_idx < max_replace_column && replace_column[col_idx])
   {
@@ -7480,12 +7480,12 @@ void free_replace()
 
 
 typedef struct st_replace {
-  bool	 found;
+  my_bool found;
   struct st_replace *next[256];
 } REPLACE;
 
 typedef struct st_replace_found {
-  bool found;
+  my_bool found;
   char *replace_string;
   uint to_offset;
   int from_offset;
diff --git a/cmd-line-utils/readline/bind.c b/cmd-line-utils/readline/bind.c
index 08c906bfcc3..baed1dfad49 100644
--- a/cmd-line-utils/readline/bind.c
+++ b/cmd-line-utils/readline/bind.c
@@ -27,7 +27,7 @@
 #endif
 
 #if defined (HAVE_CONFIG_H)
-#  include <config.h>
+#  include "config_readline.h"
 #endif
 
 #include <stdio.h>
diff --git a/cmd-line-utils/readline/callback.c b/cmd-line-utils/readline/callback.c
index ada04d8593b..2f7e4b78057 100644
--- a/cmd-line-utils/readline/callback.c
+++ b/cmd-line-utils/readline/callback.c
@@ -22,7 +22,7 @@
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
-#  include <config.h>
+#  include "config_readline.h"
 #endif
 
 #include "rlconf.h"
diff --git a/cmd-line-utils/readline/compat.c b/cmd-line-utils/readline/compat.c
index a66d210fd2e..3949bf6a16b 100644
--- a/cmd-line-utils/readline/compat.c
+++ b/cmd-line-utils/readline/compat.c
@@ -22,7 +22,7 @@
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
-#  include <config.h>
+#  include "config_readline.h"
 #endif
 
 #include <stdio.h>
diff --git a/cmd-line-utils/readline/complete.c b/cmd-line-utils/readline/complete.c
index a0232b2afdf..916aa5dd9b9 100644
--- a/cmd-line-utils/readline/complete.c
+++ b/cmd-line-utils/readline/complete.c
@@ -22,7 +22,7 @@
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
-#  include <config.h>
+#  include "config_readline.h"
 #endif
 
 #include <sys/types.h>
diff --git a/cmd-line-utils/readline/display.c b/cmd-line-utils/readline/display.c
index 47ff0615974..6f63faa9738 100644
--- a/cmd-line-utils/readline/display.c
+++ b/cmd-line-utils/readline/display.c
@@ -22,7 +22,7 @@
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
-#  include <config.h>
+#  include "config_readline.h"
 #endif
 
 #include <sys/types.h>
diff --git a/cmd-line-utils/readline/funmap.c b/cmd-line-utils/readline/funmap.c
index 9c760cc3475..2d2a35ed0c8 100644
--- a/cmd-line-utils/readline/funmap.c
+++ b/cmd-line-utils/readline/funmap.c
@@ -22,7 +22,7 @@
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
-#  include <config.h>
+#  include "config_readline.h"
 #endif
 
 #if !defined (BUFSIZ)
diff --git a/cmd-line-utils/readline/histexpand.c b/cmd-line-utils/readline/histexpand.c
index f46c0b2a45d..45377fc3b5e 100644
--- a/cmd-line-utils/readline/histexpand.c
+++ b/cmd-line-utils/readline/histexpand.c
@@ -23,7 +23,7 @@
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
-#  include <config.h>
+#  include "config_readline.h"
 #endif
 
 #include <stdio.h>
diff --git a/cmd-line-utils/readline/histfile.c b/cmd-line-utils/readline/histfile.c
index 2f051a32563..d98293d933c 100644
--- a/cmd-line-utils/readline/histfile.c
+++ b/cmd-line-utils/readline/histfile.c
@@ -31,7 +31,7 @@
 #endif
 
 #if defined (HAVE_CONFIG_H)
-#  include <config.h>
+#  include "config_readline.h"
 #endif
 
 #include <stdio.h>
diff --git a/cmd-line-utils/readline/history.c b/cmd-line-utils/readline/history.c
index 1ccf4db786c..5cd5788d1da 100644
--- a/cmd-line-utils/readline/history.c
+++ b/cmd-line-utils/readline/history.c
@@ -26,7 +26,7 @@
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
-#  include <config.h>
+#  include "config_readline.h"
 #endif
 
 #include <stdio.h>
diff --git a/cmd-line-utils/readline/histsearch.c b/cmd-line-utils/readline/histsearch.c
index 1cc5875a4b4..b71965135cc 100644
--- a/cmd-line-utils/readline/histsearch.c
+++ b/cmd-line-utils/readline/histsearch.c
@@ -23,7 +23,7 @@
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
-#  include <config.h>
+#  include "config_readline.h"
 #endif
 
 #include <stdio.h>
diff --git a/cmd-line-utils/readline/input.c b/cmd-line-utils/readline/input.c
index da5d771c481..62c0443d890 100644
--- a/cmd-line-utils/readline/input.c
+++ b/cmd-line-utils/readline/input.c
@@ -26,7 +26,7 @@
 #endif
 
 #if defined (HAVE_CONFIG_H)
-#  include <config.h>
+#  include "config_readline.h"
 #endif
 
 #include <sys/types.h>
diff --git a/cmd-line-utils/readline/isearch.c b/cmd-line-utils/readline/isearch.c
index 9f67bfc0801..8060adb97cd 100644
--- a/cmd-line-utils/readline/isearch.c
+++ b/cmd-line-utils/readline/isearch.c
@@ -27,7 +27,7 @@
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
-#  include <config.h>
+#  include "config_readline.h"
 #endif
 
 #include <sys/types.h>
diff --git a/cmd-line-utils/readline/keymaps.c b/cmd-line-utils/readline/keymaps.c
index 70d0cc08d3f..562c22d7558 100644
--- a/cmd-line-utils/readline/keymaps.c
+++ b/cmd-line-utils/readline/keymaps.c
@@ -21,7 +21,7 @@
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
-#  include <config.h>
+#  include "config_readline.h"
 #endif
 
 #if defined (HAVE_STDLIB_H)
diff --git a/cmd-line-utils/readline/kill.c b/cmd-line-utils/readline/kill.c
index 031ddf47c5b..42c53948689 100644
--- a/cmd-line-utils/readline/kill.c
+++ b/cmd-line-utils/readline/kill.c
@@ -22,7 +22,7 @@
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
-#  include <config.h>
+#  include "config_readline.h"
 #endif
 
 #include <sys/types.h>
diff --git a/cmd-line-utils/readline/macro.c b/cmd-line-utils/readline/macro.c
index 00cd58d628c..3473f705335 100644
--- a/cmd-line-utils/readline/macro.c
+++ b/cmd-line-utils/readline/macro.c
@@ -22,7 +22,7 @@
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
-#  include <config.h>
+#  include "config_readline.h"
 #endif
 
 #include <sys/types.h>
diff --git a/cmd-line-utils/readline/mbutil.c b/cmd-line-utils/readline/mbutil.c
index 17dde53ed7b..e21708fb748 100644
--- a/cmd-line-utils/readline/mbutil.c
+++ b/cmd-line-utils/readline/mbutil.c
@@ -22,7 +22,7 @@
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
-#  include <config.h>
+#  include "config_readline.h"
 #endif
 
 #include <sys/types.h>
diff --git a/cmd-line-utils/readline/misc.c b/cmd-line-utils/readline/misc.c
index 94ecb25900a..e0e6893c60e 100644
--- a/cmd-line-utils/readline/misc.c
+++ b/cmd-line-utils/readline/misc.c
@@ -22,7 +22,7 @@
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
-#  include <config.h>
+#  include "config_readline.h"
 #endif
 
 #if defined (HAVE_UNISTD_H)
diff --git a/cmd-line-utils/readline/nls.c b/cmd-line-utils/readline/nls.c
index bcee87561aa..6ec685ed9ea 100644
--- a/cmd-line-utils/readline/nls.c
+++ b/cmd-line-utils/readline/nls.c
@@ -22,7 +22,7 @@
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
-#  include <config.h>
+#  include "config_readline.h"
 #endif
 
 #include <sys/types.h>
diff --git a/cmd-line-utils/readline/parens.c b/cmd-line-utils/readline/parens.c
index 737f7675e93..fe1578ed3e2 100644
--- a/cmd-line-utils/readline/parens.c
+++ b/cmd-line-utils/readline/parens.c
@@ -28,7 +28,7 @@
 #include "rlconf.h"
 
 #if defined (HAVE_CONFIG_H)
-#  include <config.h>
+#  include "config_readline.h"
 #endif
 
 #include <stdio.h>
diff --git a/cmd-line-utils/readline/readline.c b/cmd-line-utils/readline/readline.c
index c2b74006b05..8c3cad52d36 100644
--- a/cmd-line-utils/readline/readline.c
+++ b/cmd-line-utils/readline/readline.c
@@ -23,7 +23,7 @@
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
-#  include <config.h>
+#  include "config_readline.h"
 #endif
 
 #include <sys/types.h>
diff --git a/cmd-line-utils/readline/rldefs.h b/cmd-line-utils/readline/rldefs.h
index 0f6c87446dd..dcdfc49fbbc 100644
--- a/cmd-line-utils/readline/rldefs.h
+++ b/cmd-line-utils/readline/rldefs.h
@@ -27,7 +27,7 @@
 #define _RLDEFS_H_
 
 #if defined (HAVE_CONFIG_H)
-#  include "config.h"
+#  include "config_readline.h"
 #endif
 
 #include "rlstdc.h"
diff --git a/cmd-line-utils/readline/rltty.c b/cmd-line-utils/readline/rltty.c
index 12f3a93e524..8c896bd3b26 100644
--- a/cmd-line-utils/readline/rltty.c
+++ b/cmd-line-utils/readline/rltty.c
@@ -23,7 +23,7 @@
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
-#  include <config.h>
+#  include "config_readline.h"
 #endif
 
 #include <sys/types.h>
diff --git a/cmd-line-utils/readline/rlwinsize.h b/cmd-line-utils/readline/rlwinsize.h
index 7838154d023..60729b0f549 100644
--- a/cmd-line-utils/readline/rlwinsize.h
+++ b/cmd-line-utils/readline/rlwinsize.h
@@ -26,7 +26,7 @@
 #define _RLWINSIZE_H_
 
 #if defined (HAVE_CONFIG_H)
-#  include "config.h"
+#  include "config_readline.h"
 #endif
 
 /* Try to find the definitions of `struct winsize' and TIOGCWINSZ */
diff --git a/cmd-line-utils/readline/savestring.c b/cmd-line-utils/readline/savestring.c
index 820428d8881..d42bcadf5d7 100644
--- a/cmd-line-utils/readline/savestring.c
+++ b/cmd-line-utils/readline/savestring.c
@@ -21,7 +21,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#include <config.h>
+#include "config_readline.h"
 #ifdef HAVE_STRING_H
 #  include <string.h>
 #endif
diff --git a/cmd-line-utils/readline/search.c b/cmd-line-utils/readline/search.c
index 33cc4fc1e73..cfa5db1dc17 100644
--- a/cmd-line-utils/readline/search.c
+++ b/cmd-line-utils/readline/search.c
@@ -23,7 +23,7 @@
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
-#  include <config.h>
+#  include "config_readline.h"
 #endif
 
 #include <sys/types.h>
diff --git a/cmd-line-utils/readline/shell.c b/cmd-line-utils/readline/shell.c
index 346f8113d43..5d084476bed 100644
--- a/cmd-line-utils/readline/shell.c
+++ b/cmd-line-utils/readline/shell.c
@@ -23,7 +23,7 @@
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
-#  include <config.h>
+#  include "config_readline.h"
 #endif
 
 #include <sys/types.h>
diff --git a/cmd-line-utils/readline/signals.c b/cmd-line-utils/readline/signals.c
index 54f2a642846..65c2ff308f6 100644
--- a/cmd-line-utils/readline/signals.c
+++ b/cmd-line-utils/readline/signals.c
@@ -22,7 +22,7 @@
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
-#  include <config.h>
+#  include "config_readline.h"
 #endif
 
 #include <stdio.h>		/* Just for NULL.  Yuck. */
diff --git a/cmd-line-utils/readline/tcap.h b/cmd-line-utils/readline/tcap.h
index 58ab894d93e..04252e72f2d 100644
--- a/cmd-line-utils/readline/tcap.h
+++ b/cmd-line-utils/readline/tcap.h
@@ -25,7 +25,7 @@
 #define _RLTCAP_H_
 
 #if defined (HAVE_CONFIG_H)
-#  include "config.h"
+#  include "config_readline.h"
 #endif
 
 #if defined (HAVE_TERMCAP_H)
diff --git a/cmd-line-utils/readline/terminal.c b/cmd-line-utils/readline/terminal.c
index 547f6f5dfe5..a630bc02e05 100644
--- a/cmd-line-utils/readline/terminal.c
+++ b/cmd-line-utils/readline/terminal.c
@@ -22,7 +22,7 @@
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
-#  include <config.h>
+#  include "config_readline.h"
 #endif
 
 #include <sys/types.h>
diff --git a/cmd-line-utils/readline/text.c b/cmd-line-utils/readline/text.c
index 399a48c5f1e..b26afeda525 100644
--- a/cmd-line-utils/readline/text.c
+++ b/cmd-line-utils/readline/text.c
@@ -22,7 +22,7 @@
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
-#  include <config.h>
+#  include "config_readline.h"
 #endif
 
 #if defined (HAVE_UNISTD_H)
diff --git a/cmd-line-utils/readline/tilde.c b/cmd-line-utils/readline/tilde.c
index 1b76c9f2404..d50f7a0ffa4 100644
--- a/cmd-line-utils/readline/tilde.c
+++ b/cmd-line-utils/readline/tilde.c
@@ -20,7 +20,7 @@
    Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 
 #if defined (HAVE_CONFIG_H)
-#  include <config.h>
+#  include "config_readline.h"
 #endif
 
 #if defined (HAVE_UNISTD_H)
diff --git a/cmd-line-utils/readline/undo.c b/cmd-line-utils/readline/undo.c
index 9d9bd25ba8f..5699193b14c 100644
--- a/cmd-line-utils/readline/undo.c
+++ b/cmd-line-utils/readline/undo.c
@@ -23,7 +23,7 @@
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
-#  include <config.h>
+#  include "config_readline.h"
 #endif
 
 #include <sys/types.h>
diff --git a/cmd-line-utils/readline/util.c b/cmd-line-utils/readline/util.c
index e44ef64349d..935c9c927c2 100644
--- a/cmd-line-utils/readline/util.c
+++ b/cmd-line-utils/readline/util.c
@@ -22,7 +22,7 @@
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
-#  include <config.h>
+#  include "config_readline.h"
 #endif
 
 #include <sys/types.h>
diff --git a/cmd-line-utils/readline/vi_mode.c b/cmd-line-utils/readline/vi_mode.c
index d0b7e330adc..25213cb762f 100644
--- a/cmd-line-utils/readline/vi_mode.c
+++ b/cmd-line-utils/readline/vi_mode.c
@@ -32,7 +32,7 @@
 #if defined (VI_MODE)
 
 #if defined (HAVE_CONFIG_H)
-#  include <config.h>
+#  include "config_readline.h"
 #endif
 
 #include <sys/types.h>
diff --git a/cmd-line-utils/readline/xmalloc.c b/cmd-line-utils/readline/xmalloc.c
index 8985d340d39..cf52da351a8 100644
--- a/cmd-line-utils/readline/xmalloc.c
+++ b/cmd-line-utils/readline/xmalloc.c
@@ -21,7 +21,7 @@
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
-#include <config.h>
+#include "config_readline.h"
 #endif
 
 #include <stdio.h>
diff --git a/config/ac-macros/ha_ndbcluster.m4 b/config/ac-macros/ha_ndbcluster.m4
index 60ca92abc10..9ea2e9972f7 100644
--- a/config/ac-macros/ha_ndbcluster.m4
+++ b/config/ac-macros/ha_ndbcluster.m4
@@ -2,15 +2,10 @@ dnl ---------------------------------------------------------------------------
 dnl Macro: MYSQL_CHECK_NDBCLUSTER
 dnl ---------------------------------------------------------------------------
 
-NDB_VERSION_MAJOR=`echo $VERSION | cut -d. -f1`
-NDB_VERSION_MINOR=`echo $VERSION | cut -d. -f2`
-NDB_VERSION_BUILD=`echo $VERSION | cut -d. -f3 | cut -d- -f1`
-NDB_VERSION_STATUS=`echo $VERSION | cut -d- -f2`
-# if there was now -suffix, $NDB_VERSION_STATUS will be the same as $VERSION
-if test "$NDB_VERSION_STATUS" = "$VERSION"
-then
-  NDB_VERSION_STATUS=""
-fi
+NDB_VERSION_MAJOR=`echo $MYSQL_NO_DASH_VERSION | cut -d. -f1`
+NDB_VERSION_MINOR=`echo $MYSQL_NO_DASH_VERSION | cut -d. -f2`
+NDB_VERSION_BUILD=`echo $MYSQL_NO_DASH_VERSION | cut -d. -f3`
+NDB_VERSION_STATUS=`echo $VERSION | sed 's/^[[-.0-9]]*//'`
 TEST_NDBCLUSTER=""
 
 dnl for build ndb docs
diff --git a/configure.in b/configure.in
index 2e623aacaf7..fec2938760a 100644
--- a/configure.in
+++ b/configure.in
@@ -188,7 +188,7 @@ CC_VERSION=`$CC --version | sed 1q`
 esac
 if test $? -eq "0"
 then
-  AC_MSG_CHECKING("C Compiler version");
+  AC_MSG_CHECKING("C Compiler version")
   AC_MSG_RESULT("$CC $CC_VERSION")
 else
 CC_VERSION=""
@@ -1296,7 +1296,7 @@ See the Installation chapter in the Reference Manual for more information.])
             AC_MSG_RESULT("no need to check headers")
         fi
         
-        AC_MSG_CHECKING("for pthread_create in -lpthread");
+        AC_MSG_CHECKING("for pthread_create in -lpthread")
         ac_save_LIBS="$LIBS"
         LIBS="$LIBS -lpthread"
         AC_TRY_LINK( [#include <pthread.h>],
@@ -1356,7 +1356,7 @@ then
       then
 	AC_MSG_RESULT("yes")
       else
-	AC_MSG_ERROR([On SCO UNIX MySQL must be compiled with gcc. See the Installation chapter in the Reference Manual.]);
+	AC_MSG_ERROR([On SCO UNIX MySQL must be compiled with gcc. See the Installation chapter in the Reference Manual.])
       fi
       AC_MSG_RESULT("yes")
     elif test -f /usr/local/lib/libpthread.a -o -f /usr/local/lib/libpthread.so
@@ -1372,7 +1372,7 @@ then
       then
 	AC_MSG_RESULT("yes")
       else
-	AC_MSG_ERROR([On SCO UNIX MySQL must be compiled with gcc. See the Installation chapter in the Reference Manual.]);
+	AC_MSG_ERROR([On SCO UNIX MySQL must be compiled with gcc. See the Installation chapter in the Reference Manual.])
       fi
       AC_MSG_RESULT("yes")
     # Hack for SCO UnixWare 7.1.x
@@ -1517,7 +1517,7 @@ else
   AC_MSG_RESULT("$with_posix_threads")
   if test "$with_posix_threads" = "no"
   then
-    AC_MSG_CHECKING("for pthread_create in -lpthread");
+    AC_MSG_CHECKING("for pthread_create in -lpthread")
     ac_save_LIBS="$LIBS"
     LIBS="$LIBS -lpthread"
     CLIENT_THREAD_LIBS="-lpthread"
@@ -1530,7 +1530,7 @@ else
     then
       LIBS=" $ac_save_LIBS -lpthreads"
       CLIENT_THREAD_LIBS="-lpthreads"
-      AC_MSG_CHECKING("for pthread_create in -lpthreads");
+      AC_MSG_CHECKING("for pthread_create in -lpthreads")
       AC_TRY_LINK(
       [#include <pthread.h>],
       [ pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ],
@@ -1541,7 +1541,7 @@ else
         # This is for FreeBSD
         LIBS="$ac_save_LIBS -pthread"
         CLIENT_THREAD_LIBS="-pthread"
-        AC_MSG_CHECKING("for pthread_create in -pthread");
+        AC_MSG_CHECKING("for pthread_create in -pthread")
         AC_TRY_LINK(
         [#include <pthread.h>],
         [ pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ],
@@ -1915,7 +1915,7 @@ if test "$ac_cv_conv_longlong_to_float" != "yes"
 then
   AC_MSG_ERROR([Your compiler cannot convert a longlong value to a float!
 If you are using gcc 2.8.# you should upgrade to egcs 1.0.3 or newer and try
-again]);
+again])
 fi
 fi
 AC_CHECK_TYPES([sigset_t, off_t], [], [], [#include <sys/types.h>])
@@ -2079,7 +2079,7 @@ CFLAGS="$ORG_CFLAGS"
 AC_CHECK_FUNC(fseeko,
 [if test "$large_file_support" = no -a "$TARGET_LINUX" = "true";
 then
-  AC_MSG_ERROR("Found fseeko symbol but large_file_support is not enabled!");
+  AC_MSG_ERROR("Found fseeko symbol but large_file_support is not enabled!")
 fi]
 )
 
diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt
index 42561a97888..cec0db6a4ae 100755
--- a/extra/CMakeLists.txt
+++ b/extra/CMakeLists.txt
@@ -44,6 +44,9 @@ TARGET_LINK_LIBRARIES(my_print_defaults strings mysys debug dbug taocrypt wsock3
 ADD_EXECUTABLE(perror perror.c)
 TARGET_LINK_LIBRARIES(perror strings mysys debug dbug wsock32)
 
+ADD_EXECUTABLE(resolveip resolveip.c)
+TARGET_LINK_LIBRARIES(resolveip strings mysys debug dbug wsock32)
+
 ADD_EXECUTABLE(replace replace.c)
 TARGET_LINK_LIBRARIES(replace strings mysys debug dbug wsock32)
 
diff --git a/extra/replace.c b/extra/replace.c
index 9d1d8335014..9b7695eddcb 100644
--- a/extra/replace.c
+++ b/extra/replace.c
@@ -67,7 +67,7 @@ typedef struct st_replace {
 } REPLACE;
 
 typedef struct st_replace_found {
-  bool found;
+  my_bool found;
   char *replace_string;
   uint to_offset;
   int from_offset;
diff --git a/extra/resolveip.c b/extra/resolveip.c
index e5fede7fda8..5f2a9269f62 100644
--- a/extra/resolveip.c
+++ b/extra/resolveip.c
@@ -21,13 +21,15 @@
 #include <m_ctype.h>
 #include <my_sys.h>
 #include <m_string.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#ifndef HAVE_BROKEN_NETINET_INCLUDES
-#include <netinet/in.h>
+#ifndef WIN32
+#  include <sys/types.h>
+#  include <sys/socket.h>
+#  ifndef HAVE_BROKEN_NETINET_INCLUDES
+#    include <netinet/in.h>
+#  endif
+#  include <arpa/inet.h>
+#  include <netdb.h>
 #endif
-#include <arpa/inet.h>
-#include <netdb.h>
 #include <my_net.h>
 #include <my_getopt.h>
 
@@ -116,13 +118,21 @@ int main(int argc, char **argv)
 
   while (argc--)
   {
+#ifndef WIN32
     struct in_addr addr;
+#endif
     ip = *argv++;    
 
     /* Not compatible with IPv6!  Probably should use getnameinfo(). */
+#ifdef WIN32
+    taddr = inet_addr(ip);
+    if(taddr != INADDR_NONE)
+    {
+#else
     if (inet_aton(ip, &addr) != 0)
     {
       taddr= addr.s_addr;
+#endif
       if (taddr == htonl(INADDR_BROADCAST))
       {	
 	puts("Broadcast");
diff --git a/extra/yassl/CMakeLists.txt b/extra/yassl/CMakeLists.txt
index 26e682cbb0c..ffb72b831af 100755
--- a/extra/yassl/CMakeLists.txt
+++ b/extra/yassl/CMakeLists.txt
@@ -24,4 +24,5 @@ SET(YASSL_SOURCES  src/buffer.cpp src/cert_wrapper.cpp src/crypto_wrapper.cpp sr
 				src/yassl_imp.cpp src/yassl_int.cpp)
 IF(NOT SOURCE_SUBLIBS)
   ADD_LIBRARY(yassl ${YASSL_SOURCES})
+  ADD_DEPENDENCIES(yassl GenError)
 ENDIF(NOT SOURCE_SUBLIBS)
diff --git a/extra/yassl/src/handshake.cpp b/extra/yassl/src/handshake.cpp
index 1d5a95820bb..262b5cb3b8b 100644
--- a/extra/yassl/src/handshake.cpp
+++ b/extra/yassl/src/handshake.cpp
@@ -527,6 +527,11 @@ void ProcessOldClientHello(input_buffer& input, SSL& ssl)
     input.read(len, sizeof(len));
     uint16 randomLen;
     ato16(len, randomLen);
+    if (ch.suite_len_ > MAX_SUITE_SZ || sessionLen > ID_LEN ||
+        randomLen > RAN_LEN) {
+        ssl.SetError(bad_input);
+        return;
+    }
 
     int j = 0;
     for (uint16 i = 0; i < ch.suite_len_; i += 3) {    
diff --git a/extra/yassl/src/template_instnt.cpp b/extra/yassl/src/template_instnt.cpp
index f82f7924359..fe3a251b865 100644
--- a/extra/yassl/src/template_instnt.cpp
+++ b/extra/yassl/src/template_instnt.cpp
@@ -101,6 +101,7 @@ template void ysArrayDelete<unsigned char>(unsigned char*);
 template void ysArrayDelete<char>(char*);
 
 template int min<int>(int, int);
+template uint16 min<uint16>(uint16, uint16);
 template unsigned int min<unsigned int>(unsigned int, unsigned int);
 template unsigned long min<unsigned long>(unsigned long, unsigned long);
 }
diff --git a/extra/yassl/src/yassl_imp.cpp b/extra/yassl/src/yassl_imp.cpp
index 0bc95f64abc..b43d9c27355 100644
--- a/extra/yassl/src/yassl_imp.cpp
+++ b/extra/yassl/src/yassl_imp.cpp
@@ -621,6 +621,10 @@ void HandShakeHeader::Process(input_buffer& input, SSL& ssl)
     }
 
     uint len = c24to32(length_);
+    if (len > input.get_remaining()) {
+        ssl.SetError(bad_input);
+        return;
+    }
     hashHandShake(ssl, input, len);
 
     hs->set_length(len);
@@ -1391,10 +1395,15 @@ input_buffer& operator>>(input_buffer& input, ClientHello& hello)
     
     // Suites
     byte tmp[2];
+    uint16 len;
     tmp[0] = input[AUTO];
     tmp[1] = input[AUTO];
-    ato16(tmp, hello.suite_len_);
+    ato16(tmp, len);
+
+    hello.suite_len_ = min(len, static_cast<uint16>(MAX_SUITE_SZ));
     input.read(hello.cipher_suites_, hello.suite_len_);
+    if (len > hello.suite_len_) // ignore extra suites
+        input.set_current(input.get_current() + len -  hello.suite_len_);
 
     // Compression
     hello.comp_len_ = input[AUTO];
diff --git a/include/my_getopt.h b/include/my_getopt.h
index 14f8e6df95b..50ebe9190d8 100644
--- a/include/my_getopt.h
+++ b/include/my_getopt.h
@@ -75,8 +75,9 @@ extern void my_getopt_register_get_addr(uchar ** (*func_addr)(const char *, uint
 							   const struct my_option *));
 
 ulonglong getopt_ull_limit_value(ulonglong num, const struct my_option *optp,
-                                 bool *fix);
-longlong getopt_ll_limit_value(longlong, const struct my_option *,bool *fix);
+                                 my_bool *fix);
+longlong getopt_ll_limit_value(longlong, const struct my_option *,
+                               my_bool *fix);
 my_bool getopt_compare_strings(const char *s, const char *t, uint length);
 
 C_MODE_END
diff --git a/include/my_global.h b/include/my_global.h
index 4b0786aa826..ab960a9e6cd 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -1508,4 +1508,8 @@ inline void  operator delete[](void*, void*) { /* Do nothing */ }
 #define min(a, b)	((a) < (b) ? (a) : (b))
 #endif
 
+#if !defined(__cplusplus) && !defined(bool)
+#define bool In_C_you_should_use_my_bool_instead()
+#endif
+
 #endif /* my_global_h */
diff --git a/include/my_sys.h b/include/my_sys.h
index ee79806c40e..57711b7ae82 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -919,12 +919,12 @@ extern CHARSET_INFO *get_charset_by_name(const char *cs_name, myf flags);
 extern CHARSET_INFO *get_charset_by_csname(const char *cs_name,
 					   uint cs_flags, myf my_flags);
 
-extern bool resolve_charset(const char *cs_name,
-                            CHARSET_INFO *default_cs,
-                            CHARSET_INFO **cs);
-extern bool resolve_collation(const char *cl_name,
-                              CHARSET_INFO *default_cl,
-                              CHARSET_INFO **cl);
+extern my_bool resolve_charset(const char *cs_name,
+                               CHARSET_INFO *default_cs,
+                               CHARSET_INFO **cs);
+extern my_bool resolve_collation(const char *cl_name,
+                                 CHARSET_INFO *default_cl,
+                                 CHARSET_INFO **cl);
 
 extern void free_charsets(void);
 extern char *get_charsets_dir(char *buf);
diff --git a/include/my_time.h b/include/my_time.h
index e3bdb58e5c2..af3fc103530 100644
--- a/include/my_time.h
+++ b/include/my_time.h
@@ -111,7 +111,7 @@ void init_time(void);
     TRUE    The MYSQL_TIME value is definitely out of range
 */
 
-static inline bool validate_timestamp_range(const MYSQL_TIME *t)
+static inline my_bool validate_timestamp_range(const MYSQL_TIME *t)
 {
   if ((t->year > TIMESTAMP_MAX_YEAR || t->year < TIMESTAMP_MIN_YEAR) ||
       (t->year == TIMESTAMP_MAX_YEAR && (t->month > 1 || t->day > 19)) ||
diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h
index 50ec051d111..7f96d3f33b7 100644
--- a/include/mysql/plugin.h
+++ b/include/mysql/plugin.h
@@ -714,6 +714,16 @@ int mysql_tmpfile(const char *prefix);
 */
 int thd_killed(const MYSQL_THD thd);
 
+
+/**
+  Return the thread id of a user thread
+
+  @param thd  user thread connection handle
+  @return  thread id
+*/
+unsigned long thd_get_thread_id(const MYSQL_THD thd);
+
+
 /**
   Allocate memory in the connection's local memory pool
 
diff --git a/include/thr_alarm.h b/include/thr_alarm.h
index a2694ba105b..fb906039269 100644
--- a/include/thr_alarm.h
+++ b/include/thr_alarm.h
@@ -98,7 +98,7 @@ void thr_end_alarm(thr_alarm_t *alarmed);
 void end_thr_alarm(my_bool free_structures);
 sig_handler process_alarm(int);
 #ifndef thr_got_alarm
-bool thr_got_alarm(thr_alarm_t *alrm);
+my_bool thr_got_alarm(thr_alarm_t *alrm);
 #endif
 
 
diff --git a/include/thr_lock.h b/include/thr_lock.h
index 74d65c2fa7a..a4ca6e6ddf2 100644
--- a/include/thr_lock.h
+++ b/include/thr_lock.h
@@ -148,7 +148,7 @@ void thr_unlock(THR_LOCK_DATA *data);
 enum enum_thr_lock_result thr_multi_lock(THR_LOCK_DATA **data,
                                          uint count, THR_LOCK_OWNER *owner);
 void thr_multi_unlock(THR_LOCK_DATA **data,uint count);
-void thr_abort_locks(THR_LOCK *lock, bool upgrade_lock);
+void thr_abort_locks(THR_LOCK *lock, my_bool upgrade_lock);
 my_bool thr_abort_locks_for_thread(THR_LOCK *lock, my_thread_id thread);
 void thr_print_locks(void);		/* For debugging */
 my_bool thr_upgrade_write_delay_lock(THR_LOCK_DATA *data);
diff --git a/libmysql/dll.c b/libmysql/dll.c
index f5db0bb4669..7aa3b5bf96f 100644
--- a/libmysql/dll.c
+++ b/libmysql/dll.c
@@ -25,7 +25,7 @@
 #include <my_sys.h>
 #include <my_pthread.h>
 
-static bool libmysql_inited=0;
+static my_bool libmysql_inited=0;
 
 void libmysql_init(void)
 {
diff --git a/libmysql/get_password.c b/libmysql/get_password.c
index 4c251677a66..cbe5fce6949 100644
--- a/libmysql/get_password.c
+++ b/libmysql/get_password.c
@@ -118,7 +118,7 @@ char *get_tty_password(const char *opt_message)
   to will not include the eol characters.
 */
 
-static void get_password(char *to,uint length,int fd,bool echo)
+static void get_password(char *to,uint length,int fd, my_bool echo)
 {
   char *pos=to,*end=to+length;
 
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index f5ac1c09248..06eae528574 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -3388,7 +3388,7 @@ static void read_binary_time(MYSQL_TIME *tm, uchar **pos)
   if (length)
   {
     uchar *to= *pos;
-    tm->neg= (bool) to[0];
+    tm->neg=    to[0];
 
     tm->day=    (ulong) sint4korr(to+1);
     tm->hour=   (uint) to[5];
@@ -4218,7 +4218,7 @@ static my_bool is_binary_compatible(enum enum_field_types type1,
   for (range= range_list; range != range_list_end; ++range)
   {
     /* check that both type1 and type2 are in the same range */
-    bool type1_found= FALSE, type2_found= FALSE;
+    my_bool type1_found= FALSE, type2_found= FALSE;
     for (type= *range; *type != MYSQL_TYPE_NULL; type++)
     {
       type1_found|= type1 == *type;
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt
index 9fa7d46d466..b1895e98014 100644
--- a/libmysqld/CMakeLists.txt
+++ b/libmysqld/CMakeLists.txt
@@ -183,7 +183,7 @@ SET(LIBMYSQLD_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc
            ../sql/sql_show.cc ../sql/sql_state.c ../sql/sql_string.cc
            ../sql/sql_tablespace.cc ../sql/sql_table.cc ../sql/sql_test.cc
            ../sql/sql_trigger.cc ../sql/sql_udf.cc ../sql/sql_union.cc
-           ../sql/sql_update.cc ../sql/sql_view.cc 
+           ../sql/sql_update.cc ../sql/sql_view.cc ../sql/sql_profile.cc
            ../sql/strfunc.cc ../sql/table.cc ../sql/thr_malloc.cc
            ../sql/time.cc ../sql/tztime.cc ../sql/uniques.cc ../sql/unireg.cc
            ../sql/partition_info.cc ../sql/sql_connect.cc 
diff --git a/libmysqld/examples/CMakeLists.txt b/libmysqld/examples/CMakeLists.txt
index ee129ff2df0..a07d089c757 100644
--- a/libmysqld/examples/CMakeLists.txt
+++ b/libmysqld/examples/CMakeLists.txt
@@ -23,6 +23,9 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
 IF(WIN32)
   ADD_DEFINITIONS(-DUSE_TLS)
 ENDIF(WIN32)
+
+ADD_DEFINITIONS(-DEMBEDDED_LIBRARY)
+
 ADD_EXECUTABLE(mysql_embedded ../../client/completion_hash.cc
                ../../client/mysql.cc ../../client/readline.cc
                ../../client/sql_string.cc)
diff --git a/mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test b/mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test
index 926c4106d6d..4677f6da25d 100644
--- a/mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test
+++ b/mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test
@@ -50,17 +50,30 @@ insert into t1 values (1,2);
 --echo
 
 connection master;
-# here is actually a bug, since there is no begin statement, the
-# query is autocommitted, and end_pos shows end of the insert and not
-# end of the commit
+--echo # Now check that that is in the apply_status table is consistant
+--echo # with what is in the binlog
+--echo
+--echo # since insert is done with transactional engine, expect a BEGIN
+--echo # at <start_pos>
+--echo
 --replace_result $start_pos <start_pos>
 --replace_column 5 #
 --eval show binlog events from $start_pos limit 1
+
+--echo
+--echo # Now the insert, one step after
+--echo
+--replace_result $start_pos <start_pos>
+--replace_column 2 # 5 #
+--eval show binlog events from $start_pos limit 1,1
+
+--echo
+--echo # and the COMMIT should be at <end_pos>
 --echo
 --replace_result $start_pos <start_pos> $end_pos <end_pos>
 --replace_column 2 #
 --replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
---eval show binlog events from $start_pos limit 1,1
+--eval show binlog events from $start_pos limit 2,1
 
 --echo
 
diff --git a/mysql-test/include/ndb_wait_connected.inc b/mysql-test/include/ndb_wait_connected.inc
new file mode 100644
index 00000000000..cfea94db1f1
--- /dev/null
+++ b/mysql-test/include/ndb_wait_connected.inc
@@ -0,0 +1,26 @@
+# Check that mysqld has reconnected to ndbd after
+# restart of ndbd
+#
+--disable_query_log
+--disable_result_log
+let $mysql_errno= 1;
+let $counter= 600;
+while ($mysql_errno)
+{
+  --error 0,157
+  CREATE TABLE ndb_wait_connected (a int primary key);
+  if ($mysql_errno)
+  {
+    if (!$counter)
+    {
+      die Failed waiting for mysqld to reconnect to ndbd;
+    }
+    dec $counter;
+    --sleep 0.1
+  }
+}
+DROP TABLE ndb_wait_connected;
+--enable_query_log
+--enable_result_log
+
+
diff --git a/mysql-test/lib/mtr_cases.pl b/mysql-test/lib/mtr_cases.pl
index d9ba9466482..2ca2669eb7f 100644
--- a/mysql-test/lib/mtr_cases.pl
+++ b/mysql-test/lib/mtr_cases.pl
@@ -889,6 +889,7 @@ our @tags=
  ["include/have_ndb.inc", "ndb_test", 1],
  ["include/have_multi_ndb.inc", "ndb_test", 1],
  ["include/have_ndb_extra.inc", "ndb_extra", 1],
+ ["include/ndb_master-slave.inc", "ndb_test", 1],
  ["require_manager", "require_manager", 1],
 );
 
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 89b4073ca87..373aecf77aa 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -136,9 +136,12 @@ our $opt_suites;
 our $opt_suites_default= "main,binlog,rpl,rpl_ndb,ndb"; # Default suites to run
 our @extra_suites=
 (
- ["mysql-5.1-new-ndb",   "ndb_team"],
- ["mysql-5.1-telco-6.2", "ndb_team"],
- ["mysql-5.1-telco-6.3", "ndb_team"],
+ ["mysql-5.1-new-ndb",         "ndb_team"],
+ ["mysql-5.1-new-ndb-merge",   "ndb_team"],
+ ["mysql-5.1-telco-6.2",       "ndb_team"],
+ ["mysql-5.1-telco-6.2-merge", "ndb_team"],
+ ["mysql-5.1-telco-6.3",       "ndb_team"],
+ ["mysql-6.0-ndb",             "ndb_team"],
 );
 
 
@@ -413,13 +416,20 @@ sub main () {
     {
       # use default and add any extra_suites as defined
       $opt_suites= $opt_suites_default;
-      my $ddd= basename(dirname($glob_mysql_test_dir));
-      foreach my $extra_suite (@extra_suites)
+      my $ccc= dirname($glob_mysql_test_dir);
+      my $found= 1; # BUG#34761 - disable this feature
+      while (!$found and !($ccc eq "/") and !($ccc eq ""))
       {
-	if ($extra_suite->[0] eq "$ddd")
+	my $ddd= basename($ccc);
+	foreach my $extra_suite (@extra_suites)
 	{
-	  $opt_suites= "$extra_suite->[1],$opt_suites";
+	  if ($extra_suite->[0] eq "$ddd")
+	  {
+	    $opt_suites= "$extra_suite->[1],$opt_suites";
+	    $found= 1;
+	  }
 	}
+	$ccc= dirname($ccc);
       }
     }
 
@@ -3862,12 +3872,11 @@ sub mysqld_arguments ($$$$) {
 
 
   # When mysqld is run by a root user(euid is 0), it will fail
-  # to start unless we specify what user to run as. If not running
-  # as root it will be ignored, see BUG#30630
+  # to start unless we specify what user to run as, see BUG#30630
   my $euid= $>;
   if (!$glob_win32 and $euid == 0 and
       grep(/^--user/, @$extra_opt, @opt_extra_mysqld_opt) == 0) {
-    mtr_add_arg($args, "%s--user=root");
+    mtr_add_arg($args, "%s--user=root", $prefix);
   }
 
   if ( $opt_valgrind_mysqld )
diff --git a/mysql-test/r/csv_not_null.result b/mysql-test/r/csv_not_null.result
new file mode 100644
index 00000000000..77026b8f056
--- /dev/null
+++ b/mysql-test/r/csv_not_null.result
@@ -0,0 +1,53 @@
+# ===== csv_not_null.1 =====
+DROP TABLE IF EXISTS t1, t2;
+# === Will fail -- no NOT NULL ===
+CREATE TABLE t1 (a int) ENGINE = CSV;
+ERROR 42000: The storage engine for the table doesn't support nullable columns
+# === Good CREATE ===
+CREATE TABLE t1 (a int NOT NULL) ENGINE = CSV;
+# === Will fail -- ALL columns need NOT NULL ==
+CREATE TABLE t2 (a int NOT NULL, b char(20)) ENGINE = CSV;
+ERROR 42000: The storage engine for the table doesn't support nullable columns
+DROP TABLE t1;
+# ===== csv_not_null.2 =====
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 (a int NOT NULL, b blob NOT NULL, c CHAR(20) NOT NULL, 
+d VARCHAR(20) NOT NULL, e enum('foo','bar') NOT NULL,f DATE NOT NULL) 
+ENGINE = CSV;
+# === should result in default for each datatype ===
+INSERT INTO t1 VALUES();
+SELECT * FROM t1;
+a	b	c	d	e	f
+0				foo	0000-00-00
+SELECT * FROM t1;
+a	b	c	d	e	f
+0				foo	0000-00-00
+INSERT INTO t1 VALUES(0,'abc','def','ghi','bar','1999-12-31');
+SELECT * FROM t1;
+a	b	c	d	e	f
+0				foo	0000-00-00
+0	abc	def	ghi	bar	1999-12-31
+# === insert failures ===
+INSERT INTO t1 VALUES(NULL,'ab','a','b','foo','2007-01-01');
+ERROR 23000: Column 'a' cannot be null
+INSERT INTO t1 VALUES(default(a),default(b), default(c), default(d),
+default(e), default(f));
+ERROR HY000: Field 'a' doesn't have a default value
+DROP TABLE t1;
+# ===== csv_not_null.3 =====
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 (a int NOT NULL, b char(10) NOT NULL) ENGINE = CSV;
+INSERT INTO t1 VALUES();
+SELECT * FROM t1;
+a	b
+0	
+UPDATE t1 set b = 'new_value' where a = 0;
+SELECT * FROM t1;
+a	b
+0	new_value
+UPDATE t1 set b = NULL where b = 'new_value';
+ERROR 23000: Column 'b' cannot be null
+SELECT * FROM t1;
+a	b
+0	new_value
+DROP TABLE t1;
diff --git a/mysql-test/r/events.result b/mysql-test/r/events_1.result
index 7b68914e219..e7b645f5556 100644
--- a/mysql-test/r/events.result
+++ b/mysql-test/r/events_1.result
@@ -309,7 +309,7 @@ ERROR HY000: Unknown event 'intact_check'
 DROP EVENT no_such_event;
 ERROR HY000: Unknown event 'no_such_event'
 CREATE EVENT intact_check_1 ON SCHEDULE EVERY 5 HOUR DO SELECT 5;
-ERROR HY000: Cannot load from mysql.event. The table is probably corrupted
+ERROR HY000: Failed to store event name. Error code 2 from storage engine.
 ALTER EVENT intact_check_1 ON SCHEDULE EVERY 8 HOUR DO SELECT 8;
 ERROR HY000: Unknown event 'intact_check_1'
 ALTER EVENT intact_check_1 RENAME TO intact_check_2;
@@ -425,321 +425,4 @@ CREATE TABLE mysql.event like event_like;
 DROP TABLE event_like;
 SHOW EVENTS;
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
-create event e_26 on schedule at '2017-01-01 00:00:00' disable do set @a = 5;
-select db, name, body, definer, convert_tz(execute_at, 'UTC', 'SYSTEM'), on_completion from mysql.event;
-db	name	body	definer	convert_tz(execute_at, 'UTC', 'SYSTEM')	on_completion
-events_test	e_26	set @a = 5	root@localhost	2017-01-01 00:00:00	DROP
-drop event e_26;
-create event e_26 on schedule at NULL disable do set @a = 5;
-ERROR HY000: Incorrect AT value: 'NULL'
-create event e_26 on schedule at 'definitely not a datetime' disable do set @a = 5;
-ERROR HY000: Incorrect AT value: 'definitely not a datetime'
-set names utf8;
-create event задачка on schedule every 123 minute starts now() ends now() + interval 1 month do select 1;
-drop event задачка;
-set event_scheduler=off;
-ERROR HY000: Variable 'event_scheduler' is a GLOBAL variable and should be set with SET GLOBAL
-set global event_scheduler=3;
-ERROR 42000: Variable 'event_scheduler' can't be set to the value of '3'
-set global event_scheduler=disabled;
-ERROR 42000: Variable 'event_scheduler' can't be set to the value of 'disabled'
-"DISABLE the scheduler. Testing that it does not work when the variable is 0"
-set global event_scheduler=off;
-select definer, name, db from mysql.event;
-definer	name	db
-select get_lock("test_lock1", 20);
-get_lock("test_lock1", 20)
-1
-create event закачка on schedule every 10 hour do select get_lock("test_lock1", 20);
-"Should return 1 row"
-select definer, name, db from mysql.event;
-definer	name	db
-root@localhost	закачка	events_test
-"Should be only 0 process"
-select /*1*/ user, host, db, command, state, info
-from information_schema.processlist
-where (user='event_scheduler')
-order by info;
-user	host	db	command	state	info
-select release_lock("test_lock1");
-release_lock("test_lock1")
-1
-drop event закачка;
-"Should have 0 events"
-select count(*) from mysql.event;
-count(*)
-0
-"ENABLE the scheduler and get a lock"
-set global event_scheduler=on;
-select get_lock("test_lock2", 20);
-get_lock("test_lock2", 20)
-1
-"Create an event which tries to acquire a mutex. The event locks on the mutex"
-create event закачка on schedule every 10 hour do select get_lock("test_lock2", 20);
-"Should have only 2 processes: the scheduler and the locked event"
-select /*2*/ user, host, db, command, state, info
-from information_schema.processlist
-where (info like "select get_lock%" OR user='event_scheduler')
-order by info;
-user	host	db	command	state	info
-event_scheduler	localhost	NULL	Daemon	Waiting for next activation	NULL
-root	localhost	events_test	Connect	User lock	select get_lock("test_lock2", 20)
-"Release the mutex, the event worker should finish."
-select release_lock("test_lock2");
-release_lock("test_lock2")
-1
-drop event закачка;
-set global event_scheduler=1;
-select get_lock("test_lock2_1", 20);
-get_lock("test_lock2_1", 20)
-1
-create event закачка21 on schedule every 10 hour do select get_lock("test_lock2_1", 20);
-"Should have only 2 processes: the scheduler and the locked event"
-select /*3*/ user, host, db, command, state, info
-from information_schema.processlist
-where (info like "select get_lock%" OR user='event_scheduler')
-order by info;
-user	host	db	command	state	info
-event_scheduler	localhost	NULL	Daemon	Waiting for next activation	NULL
-root	localhost	events_test	Connect	User lock	select get_lock("test_lock2_1", 20)
-set global event_scheduler=off;
-"Should have only our process now:"
-select /*4*/ user, host, db, command, state, info
-from information_schema.processlist
-where (info like "select get_lock%" OR user='event_scheduler')
-order by info;
-user	host	db	command	state	info
-root	localhost	events_test	Connect	User lock	select get_lock("test_lock2_1", 20)
-select release_lock("test_lock2_1");
-release_lock("test_lock2_1")
-1
-drop event закачка21;
-create table t_16 (s1 int);
-create trigger t_16_bi before insert on t_16 for each row create event  e_16 on schedule every 1 second do set @a=5;
-ERROR HY000: Recursion of EVENT DDL statements is forbidden when body is present
-drop table t_16;
-create event white_space
-on schedule every 10 hour
-disable
-do
-select 1;
-select event_schema, event_name, definer, event_definition from information_schema.events where event_name='white_space';
-event_schema	event_name	definer	event_definition
-events_test	white_space	root@localhost	select 1
-drop event white_space;
-create event white_space on schedule every 10 hour disable do
-select 2;
-select event_schema, event_name, definer, event_definition from information_schema.events where event_name='white_space';
-event_schema	event_name	definer	event_definition
-events_test	white_space	root@localhost	select 2
-drop event white_space;
-create event white_space on schedule every 10 hour disable do	select 3;
-select event_schema, event_name, definer, event_definition from information_schema.events where event_name='white_space';
-event_schema	event_name	definer	event_definition
-events_test	white_space	root@localhost	select 3
-drop event white_space;
-create event e1 on schedule every 1 year do set @a = 5;
-create table t1 (s1 int);
-create trigger t1_ai after insert on t1 for each row show create event e1;
-ERROR 0A000: Not allowed to return a result set from a trigger
-drop table t1;
-drop event e1;
-SHOW EVENTS FROM aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;
-ERROR 42000: Incorrect database name 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
-SHOW EVENTS FROM ``;
-ERROR 42000: Incorrect database name ''
-SHOW EVENTS FROM `events\\test`;
-Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
-
-LOCK TABLES mode.
-
-create table t1 (a int);
-create event e1 on schedule every 10 hour do select 1;
-lock table t1 read;
-show create event e1;
-Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-e1		SYSTEM	CREATE EVENT `e1` ON SCHEDULE EVERY 10 HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8	utf8_general_ci	latin1_swedish_ci
-select event_name from information_schema.events;
-event_name
-e1
-create event e2 on schedule every 10 hour do select 1;
-ERROR HY000: Table 'event' was not locked with LOCK TABLES
-alter event e2 disable;
-ERROR HY000: Table 'event' was not locked with LOCK TABLES
-alter event e2 rename to e3;
-ERROR HY000: Table 'event' was not locked with LOCK TABLES
-drop event e2;
-ERROR HY000: Table 'event' was not locked with LOCK TABLES
-drop event e1;
-ERROR HY000: Table 'event' was not locked with LOCK TABLES
-unlock tables;
-lock table t1 write;
-show create event e1;
-Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-e1		SYSTEM	CREATE EVENT `e1` ON SCHEDULE EVERY 10 HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8	utf8_general_ci	latin1_swedish_ci
-select event_name from information_schema.events;
-event_name
-e1
-create event e2 on schedule every 10 hour do select 1;
-ERROR HY000: Table 'event' was not locked with LOCK TABLES
-alter event e2 disable;
-ERROR HY000: Table 'event' was not locked with LOCK TABLES
-alter event e2 rename to e3;
-ERROR HY000: Table 'event' was not locked with LOCK TABLES
-drop event e2;
-ERROR HY000: Table 'event' was not locked with LOCK TABLES
-drop event e1;
-ERROR HY000: Table 'event' was not locked with LOCK TABLES
-unlock tables;
-lock table t1 read, mysql.event read;
-show create event e1;
-Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-e1		SYSTEM	CREATE EVENT `e1` ON SCHEDULE EVERY 10 HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8	utf8_general_ci	latin1_swedish_ci
-select event_name from information_schema.events;
-event_name
-e1
-create event e2 on schedule every 10 hour do select 1;
-ERROR HY000: Table 'event' was locked with a READ lock and can't be updated
-alter event e2 disable;
-ERROR HY000: Table 'event' was locked with a READ lock and can't be updated
-alter event e2 rename to e3;
-ERROR HY000: Table 'event' was locked with a READ lock and can't be updated
-drop event e2;
-ERROR HY000: Table 'event' was locked with a READ lock and can't be updated
-drop event e1;
-ERROR HY000: Table 'event' was locked with a READ lock and can't be updated
-unlock tables;
-lock table t1 write, mysql.event read;
-show create event e1;
-Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-e1		SYSTEM	CREATE EVENT `e1` ON SCHEDULE EVERY 10 HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8	utf8_general_ci	latin1_swedish_ci
-select event_name from information_schema.events;
-event_name
-e1
-create event e2 on schedule every 10 hour do select 1;
-ERROR HY000: Table 'event' was locked with a READ lock and can't be updated
-alter event e2 disable;
-ERROR HY000: Table 'event' was locked with a READ lock and can't be updated
-alter event e2 rename to e3;
-ERROR HY000: Table 'event' was locked with a READ lock and can't be updated
-drop event e2;
-ERROR HY000: Table 'event' was locked with a READ lock and can't be updated
-drop event e1;
-ERROR HY000: Table 'event' was locked with a READ lock and can't be updated
-unlock tables;
-lock table t1 read, mysql.event write;
-ERROR HY000: You can't combine write-locking of system tables with other tables or lock types
-lock table t1 write, mysql.event write;
-ERROR HY000: You can't combine write-locking of system tables with other tables or lock types
-lock table mysql.event write;
-show create event e1;
-Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-e1		SYSTEM	CREATE EVENT `e1` ON SCHEDULE EVERY 10 HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8	utf8_general_ci	latin1_swedish_ci
-select event_name from information_schema.events;
-event_name
-e1
-create event e2 on schedule every 10 hour do select 1;
-alter event e2 disable;
-alter event e2 rename to e3;
-drop event e3;
-drop event e1;
-unlock tables;
-Make sure we have left no events 
-select event_name from information_schema.events;
-event_name
-
-Events in sub-statements, events and prelocking
-
-
-create event e1 on schedule every 10 hour do select 1;
-create function f1() returns int
-begin
-show create event e1;
-return 1;
-end|
-ERROR 0A000: Not allowed to return a result set from a function
-create trigger trg before insert on t1 for each row
-begin
-show create event e1;
-end|
-ERROR 0A000: Not allowed to return a result set from a trigger
-create function f1() returns int
-begin
-select event_name from information_schema.events;
-return 1;
-end|
-ERROR 0A000: Not allowed to return a result set from a function
-create trigger trg before insert on t1 for each row
-begin
-select event_name from information_schema.events;
-end|
-ERROR 0A000: Not allowed to return a result set from a trigger
-create function f1() returns int
-begin
-create event e2 on schedule every 10 hour do select 1;
-return 1;
-end|
-ERROR HY000: Recursion of EVENT DDL statements is forbidden when body is present
-create function f1() returns int
-begin
-alter event e1 rename to e2;
-return 1;
-end|
-ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
-create function f1() returns int
-begin
-drop event e2;
-return 1;
-end|
-ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
-----------------------------------------------------------------------
-create trigger trg before insert on t1 for each row
-begin
-set new.a= f1();
-end|
-create function f1() returns int
-begin
-call p1();
-return 0;
-end|
-create procedure p1()
-begin
-select event_name from information_schema.events;
-end|
-insert into t1 (a) values (1)|
-ERROR 0A000: Not allowed to return a result set from a trigger
-drop procedure p1|
-create procedure p1()
-begin
-show create event e1; 
-end|
-insert into t1 (a) values (1)|
-ERROR 0A000: Not allowed to return a result set from a trigger
-drop procedure p1|
-create procedure p1()
-begin
-create temporary table tmp select event_name from information_schema.events;
-end|
-expected to work, since we redirect the output into a tmp table
-insert into t1 (a) values (1)|
-select * from tmp|
-event_name
-e1
-drop temporary table tmp|
-drop procedure p1|
-create procedure p1()
-begin
-alter event e1 rename to e2;
-end|
-insert into t1 (a) values (1)|
-ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
-drop procedure p1|
-create procedure p1()
-begin
-drop event e1;
-end|
-insert into t1 (a) values (1)|
-ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
-drop table t1|
-drop event e1|
 drop database events_test;
diff --git a/mysql-test/r/events_2.result b/mysql-test/r/events_2.result
new file mode 100644
index 00000000000..9da8c37edae
--- /dev/null
+++ b/mysql-test/r/events_2.result
@@ -0,0 +1,321 @@
+drop database if exists events_test;
+create database events_test;
+use events_test;
+create event e_26 on schedule at '2017-01-01 00:00:00' disable do set @a = 5;
+select db, name, body, definer, convert_tz(execute_at, 'UTC', 'SYSTEM'), on_completion from mysql.event;
+db	name	body	definer	convert_tz(execute_at, 'UTC', 'SYSTEM')	on_completion
+events_test	e_26	set @a = 5	root@localhost	2017-01-01 00:00:00	DROP
+drop event e_26;
+create event e_26 on schedule at NULL disable do set @a = 5;
+ERROR HY000: Incorrect AT value: 'NULL'
+create event e_26 on schedule at 'definitely not a datetime' disable do set @a = 5;
+ERROR HY000: Incorrect AT value: 'definitely not a datetime'
+set names utf8;
+create event задачка on schedule every 123 minute starts now() ends now() + interval 1 month do select 1;
+drop event задачка;
+set event_scheduler=off;
+ERROR HY000: Variable 'event_scheduler' is a GLOBAL variable and should be set with SET GLOBAL
+set global event_scheduler=3;
+ERROR 42000: Variable 'event_scheduler' can't be set to the value of '3'
+set global event_scheduler=disabled;
+ERROR 42000: Variable 'event_scheduler' can't be set to the value of 'disabled'
+"DISABLE the scheduler. Testing that it does not work when the variable is 0"
+set global event_scheduler=off;
+select definer, name, db from mysql.event;
+definer	name	db
+select get_lock("test_lock1", 20);
+get_lock("test_lock1", 20)
+1
+create event закачка on schedule every 10 hour do select get_lock("test_lock1", 20);
+"Should return 1 row"
+select definer, name, db from mysql.event;
+definer	name	db
+root@localhost	закачка	events_test
+"Should be only 0 process"
+select /*1*/ user, host, db, command, state, info
+from information_schema.processlist
+where (user='event_scheduler')
+order by info;
+user	host	db	command	state	info
+select release_lock("test_lock1");
+release_lock("test_lock1")
+1
+drop event закачка;
+"Should have 0 events"
+select count(*) from mysql.event;
+count(*)
+0
+"ENABLE the scheduler and get a lock"
+set global event_scheduler=on;
+select get_lock("test_lock2", 20);
+get_lock("test_lock2", 20)
+1
+"Create an event which tries to acquire a mutex. The event locks on the mutex"
+create event закачка on schedule every 10 hour do select get_lock("test_lock2", 20);
+"Should have only 2 processes: the scheduler and the locked event"
+select /*2*/ user, host, db, command, state, info
+from information_schema.processlist
+where (info like "select get_lock%" OR user='event_scheduler')
+order by info;
+user	host	db	command	state	info
+event_scheduler	localhost	NULL	Daemon	Waiting for next activation	NULL
+root	localhost	events_test	Connect	User lock	select get_lock("test_lock2", 20)
+"Release the mutex, the event worker should finish."
+select release_lock("test_lock2");
+release_lock("test_lock2")
+1
+drop event закачка;
+set global event_scheduler=1;
+select get_lock("test_lock2_1", 20);
+get_lock("test_lock2_1", 20)
+1
+create event закачка21 on schedule every 10 hour do select get_lock("test_lock2_1", 20);
+"Should have only 2 processes: the scheduler and the locked event"
+select /*3*/ user, host, db, command, state, info
+from information_schema.processlist
+where (info like "select get_lock%" OR user='event_scheduler')
+order by info;
+user	host	db	command	state	info
+event_scheduler	localhost	NULL	Daemon	Waiting for next activation	NULL
+root	localhost	events_test	Connect	User lock	select get_lock("test_lock2_1", 20)
+set global event_scheduler=off;
+"Should have only our process now:"
+select /*4*/ user, host, db, command, state, info
+from information_schema.processlist
+where (info like "select get_lock%" OR user='event_scheduler')
+order by info;
+user	host	db	command	state	info
+root	localhost	events_test	Connect	User lock	select get_lock("test_lock2_1", 20)
+select release_lock("test_lock2_1");
+release_lock("test_lock2_1")
+1
+drop event закачка21;
+create table t_16 (s1 int);
+create trigger t_16_bi before insert on t_16 for each row create event  e_16 on schedule every 1 second do set @a=5;
+ERROR HY000: Recursion of EVENT DDL statements is forbidden when body is present
+drop table t_16;
+create event white_space
+on schedule every 10 hour
+disable
+do
+select 1;
+select event_schema, event_name, definer, event_definition from information_schema.events where event_name='white_space';
+event_schema	event_name	definer	event_definition
+events_test	white_space	root@localhost	select 1
+drop event white_space;
+create event white_space on schedule every 10 hour disable do
+select 2;
+select event_schema, event_name, definer, event_definition from information_schema.events where event_name='white_space';
+event_schema	event_name	definer	event_definition
+events_test	white_space	root@localhost	select 2
+drop event white_space;
+create event white_space on schedule every 10 hour disable do	select 3;
+select event_schema, event_name, definer, event_definition from information_schema.events where event_name='white_space';
+event_schema	event_name	definer	event_definition
+events_test	white_space	root@localhost	select 3
+drop event white_space;
+create event e1 on schedule every 1 year do set @a = 5;
+create table t1 (s1 int);
+create trigger t1_ai after insert on t1 for each row show create event e1;
+ERROR 0A000: Not allowed to return a result set from a trigger
+drop table t1;
+drop event e1;
+SHOW EVENTS FROM aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;
+ERROR 42000: Incorrect database name 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
+SHOW EVENTS FROM ``;
+ERROR 42000: Incorrect database name ''
+SHOW EVENTS FROM `events\\test`;
+Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
+
+LOCK TABLES mode.
+
+create table t1 (a int);
+create event e1 on schedule every 10 hour do select 1;
+lock table t1 read;
+show create event e1;
+Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
+e1		SYSTEM	CREATE EVENT `e1` ON SCHEDULE EVERY 10 HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8	utf8_general_ci	latin1_swedish_ci
+select event_name from information_schema.events;
+event_name
+e1
+create event e2 on schedule every 10 hour do select 1;
+ERROR HY000: Table 'event' was not locked with LOCK TABLES
+alter event e2 disable;
+ERROR HY000: Table 'event' was not locked with LOCK TABLES
+alter event e2 rename to e3;
+ERROR HY000: Table 'event' was not locked with LOCK TABLES
+drop event e2;
+ERROR HY000: Table 'event' was not locked with LOCK TABLES
+drop event e1;
+ERROR HY000: Table 'event' was not locked with LOCK TABLES
+unlock tables;
+lock table t1 write;
+show create event e1;
+Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
+e1		SYSTEM	CREATE EVENT `e1` ON SCHEDULE EVERY 10 HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8	utf8_general_ci	latin1_swedish_ci
+select event_name from information_schema.events;
+event_name
+e1
+create event e2 on schedule every 10 hour do select 1;
+ERROR HY000: Table 'event' was not locked with LOCK TABLES
+alter event e2 disable;
+ERROR HY000: Table 'event' was not locked with LOCK TABLES
+alter event e2 rename to e3;
+ERROR HY000: Table 'event' was not locked with LOCK TABLES
+drop event e2;
+ERROR HY000: Table 'event' was not locked with LOCK TABLES
+drop event e1;
+ERROR HY000: Table 'event' was not locked with LOCK TABLES
+unlock tables;
+lock table t1 read, mysql.event read;
+show create event e1;
+Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
+e1		SYSTEM	CREATE EVENT `e1` ON SCHEDULE EVERY 10 HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8	utf8_general_ci	latin1_swedish_ci
+select event_name from information_schema.events;
+event_name
+e1
+create event e2 on schedule every 10 hour do select 1;
+ERROR HY000: Table 'event' was locked with a READ lock and can't be updated
+alter event e2 disable;
+ERROR HY000: Table 'event' was locked with a READ lock and can't be updated
+alter event e2 rename to e3;
+ERROR HY000: Table 'event' was locked with a READ lock and can't be updated
+drop event e2;
+ERROR HY000: Table 'event' was locked with a READ lock and can't be updated
+drop event e1;
+ERROR HY000: Table 'event' was locked with a READ lock and can't be updated
+unlock tables;
+lock table t1 write, mysql.event read;
+show create event e1;
+Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
+e1		SYSTEM	CREATE EVENT `e1` ON SCHEDULE EVERY 10 HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8	utf8_general_ci	latin1_swedish_ci
+select event_name from information_schema.events;
+event_name
+e1
+create event e2 on schedule every 10 hour do select 1;
+ERROR HY000: Table 'event' was locked with a READ lock and can't be updated
+alter event e2 disable;
+ERROR HY000: Table 'event' was locked with a READ lock and can't be updated
+alter event e2 rename to e3;
+ERROR HY000: Table 'event' was locked with a READ lock and can't be updated
+drop event e2;
+ERROR HY000: Table 'event' was locked with a READ lock and can't be updated
+drop event e1;
+ERROR HY000: Table 'event' was locked with a READ lock and can't be updated
+unlock tables;
+lock table t1 read, mysql.event write;
+ERROR HY000: You can't combine write-locking of system tables with other tables or lock types
+lock table t1 write, mysql.event write;
+ERROR HY000: You can't combine write-locking of system tables with other tables or lock types
+lock table mysql.event write;
+show create event e1;
+Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
+e1		SYSTEM	CREATE EVENT `e1` ON SCHEDULE EVERY 10 HOUR STARTS '#' ON COMPLETION NOT PRESERVE ENABLE DO select 1	utf8	utf8_general_ci	latin1_swedish_ci
+select event_name from information_schema.events;
+event_name
+e1
+create event e2 on schedule every 10 hour do select 1;
+alter event e2 disable;
+alter event e2 rename to e3;
+drop event e3;
+drop event e1;
+unlock tables;
+Make sure we have left no events 
+select event_name from information_schema.events;
+event_name
+
+Events in sub-statements, events and prelocking
+
+
+create event e1 on schedule every 10 hour do select 1;
+create function f1() returns int
+begin
+show create event e1;
+return 1;
+end|
+ERROR 0A000: Not allowed to return a result set from a function
+create trigger trg before insert on t1 for each row
+begin
+show create event e1;
+end|
+ERROR 0A000: Not allowed to return a result set from a trigger
+create function f1() returns int
+begin
+select event_name from information_schema.events;
+return 1;
+end|
+ERROR 0A000: Not allowed to return a result set from a function
+create trigger trg before insert on t1 for each row
+begin
+select event_name from information_schema.events;
+end|
+ERROR 0A000: Not allowed to return a result set from a trigger
+create function f1() returns int
+begin
+create event e2 on schedule every 10 hour do select 1;
+return 1;
+end|
+ERROR HY000: Recursion of EVENT DDL statements is forbidden when body is present
+create function f1() returns int
+begin
+alter event e1 rename to e2;
+return 1;
+end|
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+create function f1() returns int
+begin
+drop event e2;
+return 1;
+end|
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+----------------------------------------------------------------------
+create trigger trg before insert on t1 for each row
+begin
+set new.a= f1();
+end|
+create function f1() returns int
+begin
+call p1();
+return 0;
+end|
+create procedure p1()
+begin
+select event_name from information_schema.events;
+end|
+insert into t1 (a) values (1)|
+ERROR 0A000: Not allowed to return a result set from a trigger
+drop procedure p1|
+create procedure p1()
+begin
+show create event e1; 
+end|
+insert into t1 (a) values (1)|
+ERROR 0A000: Not allowed to return a result set from a trigger
+drop procedure p1|
+create procedure p1()
+begin
+create temporary table tmp select event_name from information_schema.events;
+end|
+expected to work, since we redirect the output into a tmp table
+insert into t1 (a) values (1)|
+select * from tmp|
+event_name
+e1
+drop temporary table tmp|
+drop procedure p1|
+create procedure p1()
+begin
+alter event e1 rename to e2;
+end|
+insert into t1 (a) values (1)|
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+drop procedure p1|
+create procedure p1()
+begin
+drop event e1;
+end|
+insert into t1 (a) values (1)|
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+drop table t1|
+drop event e1|
+drop database events_test;
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
index d0c586de8d4..15d451c03ae 100644
--- a/mysql-test/r/innodb.result
+++ b/mysql-test/r/innodb.result
@@ -1062,6 +1062,19 @@ select count(*) from t2 /* must be 2 as restored after rollback caused by the er
 count(*)
 2
 drop table t1, t2;
+drop table if exists t1, t2;
+CREATE TABLE t1 (a int, PRIMARY KEY (a));
+CREATE TABLE t2 (a int, PRIMARY KEY (a)) ENGINE=InnoDB;
+create trigger trg_del_t2 after  delete on t2 for each row
+insert into t1 values (1);
+insert into t1 values (1);
+insert into t2 values (1),(2);
+delete t2 from t2;
+ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
+select count(*) from t2 /* must be 2 as restored after rollback caused by the error */;
+count(*)
+2
+drop table t1, t2;
 create table t1 (a int, b int) engine=innodb;
 insert into t1 values(20,null);
 select t2.b, ifnull(t2.b,"this is null") from t1 as t2 left join t1 as t3 on
@@ -1727,10 +1740,10 @@ Variable_name	Value
 Innodb_page_size	16384
 show status like "Innodb_rows_deleted";
 Variable_name	Value
-Innodb_rows_deleted	70
+Innodb_rows_deleted	71
 show status like "Innodb_rows_inserted";
 Variable_name	Value
-Innodb_rows_inserted	1082
+Innodb_rows_inserted	1084
 show status like "Innodb_rows_updated";
 Variable_name	Value
 Innodb_rows_updated	885
@@ -3218,3 +3231,16 @@ a
 2
 DROP TABLE t1;
 DROP TABLE t2;
+create table t1 (i int, j int) engine=innodb;
+insert into t1 (i, j) values (1, 1), (2, 2);
+update t1 set j = 2;
+affected rows: 1
+info: Rows matched: 2  Changed: 1  Warnings: 0
+drop table t1;
+create table t1 (id int) comment='this is a comment' engine=innodb;
+select table_comment, data_free > 0 as data_free_is_set
+from information_schema.tables
+where table_schema='test' and table_name = 't1';
+table_comment	data_free_is_set
+this is a comment	1
+drop table t1;
diff --git a/mysql-test/r/innodb_bug34053.result b/mysql-test/r/innodb_bug34053.result
new file mode 100644
index 00000000000..195775f74c8
--- /dev/null
+++ b/mysql-test/r/innodb_bug34053.result
@@ -0,0 +1 @@
+SET storage_engine=InnoDB;
diff --git a/mysql-test/r/partition_innodb.result b/mysql-test/r/partition_innodb.result
index 5cbe34c94ca..8cb8bc7c13f 100644
--- a/mysql-test/r/partition_innodb.result
+++ b/mysql-test/r/partition_innodb.result
@@ -13,33 +13,33 @@ DROP TABLE t1;
 create table t1 (a int) engine=innodb partition by hash(a) ;
 show table status like 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	InnoDB	10	Compact	2	8192	16384	0	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	partitioned	
+t1	InnoDB	10	Compact	2	8192	16384	0	0	#	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	partitioned	
 drop table t1;
 create table t1 (a int)
 engine = innodb
 partition by key (a);
 show table status;
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	InnoDB	10	Compact	2	8192	16384	0	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	partitioned	
+t1	InnoDB	10	Compact	2	8192	16384	0	0	#	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	partitioned	
 insert into t1 values (0), (1), (2), (3);
 show table status;
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	InnoDB	10	Compact	4	4096	16384	0	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	partitioned	
+t1	InnoDB	10	Compact	4	4096	16384	0	0	#	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	partitioned	
 drop table t1;
 create table t1 (a int auto_increment primary key)
 engine = innodb
 partition by key (a);
 show table status;
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	InnoDB	10	Compact	2	8192	16384	0	0	0	1	NULL	NULL	NULL	latin1_swedish_ci	NULL	partitioned	
+t1	InnoDB	10	Compact	2	8192	16384	0	0	#	1	NULL	NULL	NULL	latin1_swedish_ci	NULL	partitioned	
 insert into t1 values (NULL), (NULL), (NULL), (NULL);
 show table status;
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	InnoDB	10	Compact	4	4096	16384	0	0	0	5	NULL	NULL	NULL	latin1_swedish_ci	NULL	partitioned	
+t1	InnoDB	10	Compact	4	4096	16384	0	0	#	5	NULL	NULL	NULL	latin1_swedish_ci	NULL	partitioned	
 insert into t1 values (NULL), (NULL), (NULL), (NULL);
 show table status;
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	InnoDB	10	Compact	8	2048	16384	0	0	0	9	NULL	NULL	NULL	latin1_swedish_ci	NULL	partitioned	
+t1	InnoDB	10	Compact	8	2048	16384	0	0	#	9	NULL	NULL	NULL	latin1_swedish_ci	NULL	partitioned	
 drop table t1;
 create table t1 (a int)
 partition by key (a)
diff --git a/mysql-test/suite/funcs_1/datadict/processlist_val.inc b/mysql-test/suite/funcs_1/datadict/processlist_val.inc
index 62e5d95f875..f383cf20405 100644
--- a/mysql-test/suite/funcs_1/datadict/processlist_val.inc
+++ b/mysql-test/suite/funcs_1/datadict/processlist_val.inc
@@ -2,7 +2,7 @@
 #                                                                      #
 # Testing of values within INFORMATION_SCHEMA.PROCESSLIST              #
 #                                                                      #
-# Ensure that the values fit to the current state of the connection    #
+# Ensure that the values fit to the current event of the connection    #
 # and especially that they change if a connection does nothing or      #
 # runs some SQL.                                                       #
 # Examples:                                                            #
@@ -32,7 +32,9 @@
 # Creation:                                                            #
 # 2007-08-09 mleich Implement this test as part of                     #
 #                   WL#3982 Test information_schema.processlist        #
-#                                                                      #
+# 2008-01-05 HHunger Changed time test and long statement test.        #
+#                    It could happen that the long statement test      #
+#                    fail due to timing problems.                      #          #                                                                      #
 ########################################################################
 
 # Basic preparations
@@ -108,29 +110,22 @@ connection default;
 #   - State IS NULL
 #   - INFO must be empty
 #
-let $wait_condition= SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST
+let $wait_condition= SELECT id,user,host,db,command,@time:=time,state,info FROM INFORMATION_SCHEMA.PROCESSLIST
         WHERE COMMAND = 'Sleep' AND TIME > 0;
 --source include/wait_condition.inc
 #
-# Expect to hit TIME = 1.
---replace_column 1 <ID>
-SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
-#    Change the SQL command (affects content of INFO)
---replace_column 1 <ID>
-SHOW FULL PROCESSLIST;
+# Expect to hit TIME > 1.
+SELECT @time > 0;
 #
 --echo # Sleep some time
 # The value of TIME must increase and reach 2 after some sleeps.
-let $wait_timeout= 2;
-let $wait_condition= SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST
-        WHERE TIME > 1;
+let $wait_timeout= 4;
+let $wait_condition= SELECT id,user,host,db,command,@time2:=time,state,info FROM INFORMATION_SCHEMA.PROCESSLIST
+        WHERE TIME > @time;
 --source include/wait_condition.inc
 # 
-# Expect to hit TIME = 2.
---replace_column 1 <ID>
-SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
---replace_column 1 <ID>
-SHOW FULL PROCESSLIST;
+# Expect to hit TIME > @time
+SELECT @time < @time2;
 #
 #
 # The second connection must have an ID = my ID + 1;
@@ -201,28 +196,22 @@ connection default;
 --echo # Sleep some time
 # The command must be after some time in work by the server.
 # So poll till INFO is no more NULL and TIME > 0.
-let $wait_condition= SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST
+let $wait_condition= SELECT id,user,host,db,command,@time:=time,state,info FROM INFORMATION_SCHEMA.PROCESSLIST
         WHERE INFO IS NOT NULL AND TIME > 0;
 --source include/wait_condition.inc
 #
-# Expect to see TIME = 1
---replace_column 1 <ID>
-SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
---replace_column 1 <ID>
-SHOW FULL PROCESSLIST;
+# Expect to see TIME > 0;
+SELECT @time > 0;
 #
 --echo # Sleep some time
 # The value of TIME must increase and reach 2 after some sleeps.
 let $wait_timeout= 2;
-let $wait_condition= SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST
-        WHERE TIME > 1;
+let $wait_condition= SELECT id,user,host,db,command,@time2:=time,state,info FROM INFORMATION_SCHEMA.PROCESSLIST
+        WHERE TIME > @time;
 --source include/wait_condition.inc
 #
-# Expect to see TIME = 2
---replace_column 1 <ID>
-SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
---replace_column 1 <ID>
-SHOW FULL PROCESSLIST;
+# Expect to see @time < @time2
+SELECT @time < @time2;
 #
 --echo
 --echo ----- switch to connection ddicttestuser1 (user = ddicttestuser1) -----
@@ -247,19 +236,20 @@ connection default;
 --echo # Sleep some time
 # The command must be after some time in work by the server.
 # There is a short phase with STATE IS NULL followed by a longer phase
-# with STATE = 'init'.
-# So poll till INFO is no more NULL AND STATE = 'init'.
+# with STATE = 'executing'.
+# So poll till INFO is no more NULL AND STATE = 'executing'.
+let $wait_timeout= 9;
 let $wait_condition= SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST
-        WHERE INFO IS NOT NULL AND STATE = 'init';
+       WHERE INFO IS NOT NULL AND STATE = 'executing';
 --source include/wait_condition.inc
 #
 # Expect to see that SELECT/SHOW PROCESSLIST can handle my statement monster.
---replace_column 1 <ID> 6 <TIME>
+--replace_column 1 <ID> 5 <COMMAND> 6 <TIME> 7 <STATE>
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
---replace_column 1 <ID> 6 <TIME>
+--replace_column 1 <ID> 5 <COMMAND> 6 <TIME> 7 <STATE>
 SHOW FULL PROCESSLIST;
 # SHOW PROCESSLIST truncates INFO after 100 characters.
---replace_column 1 <ID> 6 <TIME>
+--replace_column 1 <ID> 5 <COMMAND> 6 <TIME> 7 <STATE>
 SHOW PROCESSLIST;
 --echo
 --echo ----- switch to connection ddicttestuser1 (user = ddicttestuser1) -----
@@ -267,7 +257,6 @@ connection ddicttestuser1;
 --echo # Pull("reap") the result set from the monster statement executed with "send".
 reap;
 
-
 # Ensure that we see that a connection "hangs" when colliding with a
 # WRITE TABLE LOCK
 #----------------------------------------------------------------------------
@@ -289,6 +278,7 @@ connection default;
 --echo # Sleep some time
 # The command must be after some time in work by the server.
 # So poll till INFO is no more NULL.
+let $wait_timeout= 4;
 let $wait_condition= SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST
         WHERE INFO IS NOT NULL AND STATE = 'Locked';
 --source include/wait_condition.inc
diff --git a/mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result b/mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result
index 233544ec134..8ed815ab667 100644
--- a/mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result
+++ b/mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result
@@ -39,11 +39,11 @@ Id	User	Host	db	Command	Time	State	Info
 2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-1	root	localhost	information_schema	Query	TIME	preparing	SELECT * FROM processlist  ORDER BY id
+1	root	localhost	information_schema	Query	TIME	executing	SELECT * FROM processlist  ORDER BY id
 2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-1	root	localhost	information_schema	Query	TIME	preparing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
+1	root	localhost	information_schema	Query	TIME	executing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
 2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 CREATE TEMPORARY TABLE test.t_processlist AS SELECT * FROM processlist;
 UPDATE test.t_processlist SET user='horst' WHERE id=1  ;
@@ -108,10 +108,10 @@ Id	User	Host	db	Command	Time	State	Info
 2	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-2	ddicttestuser1	localhost	information_schema	Query	TIME	preparing	SELECT * FROM processlist  ORDER BY id
+2	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM processlist  ORDER BY id
 SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-2	ddicttestuser1	localhost	information_schema	Query	TIME	preparing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
+2	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
 CREATE TEMPORARY TABLE test.t_processlist AS SELECT * FROM processlist;
 UPDATE test.t_processlist SET user='horst' WHERE id=1  ;
 INSERT INTO processlist SELECT * FROM test.t_processlist;
@@ -173,7 +173,7 @@ Id	User	Host	db	Command	Time	State	Info
 2	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-2	ddicttestuser1	localhost	information_schema	Query	TIME	preparing	SELECT * FROM information_schema.processlist
+2	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
 ####################################################################################
 4.2 New connection con101 (ddicttestuser1 with PROCESS privilege)
 SHOW/SELECT shows all processes/threads.
@@ -188,7 +188,7 @@ Id	User	Host	db	Command	Time	State	Info
 3	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-3	ddicttestuser1	localhost	information_schema	Query	TIME	preparing	SELECT * FROM information_schema.processlist
+3	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
 2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 1	root	localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
@@ -212,7 +212,7 @@ Id	User	Host	db	Command	Time	State	Info
 4		localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-4		localhost	information_schema	Query	TIME	preparing	SELECT * FROM information_schema.processlist
+4		localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
 3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 1	root	localhost	information_schema	Sleep	TIME		NULL
@@ -236,7 +236,7 @@ Id	User	Host	db	Command	Time	State	Info
 5	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-5	ddicttestuser1	localhost	information_schema	Query	TIME	preparing	SELECT * FROM information_schema.processlist
+5	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
 3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
@@ -254,7 +254,7 @@ Grants for @localhost
 GRANT USAGE ON *.* TO ''@'localhost'
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-6		localhost	information_schema	Query	TIME	preparing	SELECT * FROM information_schema.processlist
+6		localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
 4		localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
 8 Grant SUPER (does not imply PROCESS) privilege to ddicttestuser1
@@ -276,7 +276,7 @@ Id	User	Host	db	Command	Time	State	Info
 7	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-7	ddicttestuser1	localhost	information_schema	Query	TIME	preparing	SELECT * FROM information_schema.processlist
+7	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
 5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
@@ -302,7 +302,7 @@ Id	User	Host	db	Command	Time	State	Info
 8	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-8	ddicttestuser1	localhost	information_schema	Query	TIME	preparing	SELECT * FROM information_schema.processlist
+8	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
 7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
@@ -356,7 +356,7 @@ Id	User	Host	db	Command	Time	State	Info
 11	ddicttestuser2	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-11	ddicttestuser2	localhost	information_schema	Query	TIME	preparing	SELECT * FROM information_schema.processlist
+11	ddicttestuser2	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
 10	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 8	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
@@ -385,7 +385,7 @@ Id	User	Host	db	Command	Time	State	Info
 12	ddicttestuser2	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-12	ddicttestuser2	localhost	information_schema	Query	TIME	preparing	SELECT * FROM information_schema.processlist
+12	ddicttestuser2	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
 11	ddicttestuser2	localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
 11.2 Revoke SUPER,PROCESS,GRANT OPTION privilege from user ddicttestuser1
@@ -414,7 +414,7 @@ Id	User	Host	db	Command	Time	State	Info
 13	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-13	ddicttestuser1	localhost	information_schema	Query	TIME	preparing	SELECT * FROM information_schema.processlist
+13	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
 10	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 8	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
@@ -450,7 +450,7 @@ Id	User	Host	db	Command	Time	State	Info
 14	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-14	ddicttestuser1	localhost	information_schema	Query	TIME	preparing	SELECT * FROM information_schema.processlist
+14	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
 13	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 10	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
diff --git a/mysql-test/suite/funcs_1/r/a_processlist_val_no_prot.result b/mysql-test/suite/funcs_1/r/a_processlist_val_no_prot.result
index 967c157f535..86054aacd20 100644
--- a/mysql-test/suite/funcs_1/r/a_processlist_val_no_prot.result
+++ b/mysql-test/suite/funcs_1/r/a_processlist_val_no_prot.result
@@ -24,14 +24,14 @@ COUNT(*)
 USE test;
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	root	localhost	test	Query	0	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	root	localhost	test	Query	0	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
 <ID>	root	localhost	test	Query	0	NULL	SHOW FULL PROCESSLIST
 USE information_schema;
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	root	localhost	information_schema	Query	<TIME>	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	root	localhost	information_schema	Query	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
 <ID>	root	localhost	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
@@ -43,23 +43,13 @@ SELECT ID INTO @my_proclist_id FROM INFORMATION_SCHEMA.PROCESSLIST;
 ----- establish connection ddicttestuser1 (user = ddicttestuser1) -----
 
 ----- switch to connection default (user = root) -----
-SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
-ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	ddicttestuser1	localhost	information_schema	Sleep	1		NULL
-<ID>	root	localhost	information_schema	Query	0	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
-SHOW FULL PROCESSLIST;
-Id	User	Host	db	Command	Time	State	Info
-<ID>	root	localhost	information_schema	Query	0	NULL	SHOW FULL PROCESSLIST
-<ID>	ddicttestuser1	localhost	information_schema	Sleep	1		NULL
+SELECT @time > 0;
+@time > 0
+1
 # Sleep some time
-SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
-ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	ddicttestuser1	localhost	information_schema	Sleep	2		NULL
-<ID>	root	localhost	information_schema	Query	0	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
-SHOW FULL PROCESSLIST;
-Id	User	Host	db	Command	Time	State	Info
-<ID>	root	localhost	information_schema	Query	0	NULL	SHOW FULL PROCESSLIST
-<ID>	ddicttestuser1	localhost	information_schema	Sleep	2		NULL
+SELECT @time < @time2;
+@time < @time2
+1
 SELECT ID = @my_proclist_id + 1 FROM INFORMATION_SCHEMA.PROCESSLIST
 WHERE USER = 'ddicttestuser1';
 ID = @my_proclist_id + 1
@@ -68,7 +58,7 @@ ID = @my_proclist_id + 1
 ----- switch to connection ddicttestuser1 (user = ddicttestuser1) -----
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
 <ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
@@ -76,7 +66,7 @@ Id	User	Host	db	Command	Time	State	Info
 ----- establish connection con2 (user = ddicttestuser1) ------
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 <ID>	ddicttestuser1	localhost	information_schema	Sleep	<TIME>		NULL
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
@@ -95,23 +85,13 @@ SELECT sleep(2.5),'Command time';
 
 ----- switch to connection default (user = root) -----
 # Sleep some time
-SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
-ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	ddicttestuser1	localhost	information_schema	Query	1	init	SELECT sleep(2.5),'Command time'
-<ID>	root	localhost	information_schema	Query	0	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
-SHOW FULL PROCESSLIST;
-Id	User	Host	db	Command	Time	State	Info
-<ID>	root	localhost	information_schema	Query	0	NULL	SHOW FULL PROCESSLIST
-<ID>	ddicttestuser1	localhost	information_schema	Query	1	init	SELECT sleep(2.5),'Command time'
+SELECT @time > 0;
+@time > 0
+1
 # Sleep some time
-SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
-ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	ddicttestuser1	localhost	information_schema	Query	2	init	SELECT sleep(2.5),'Command time'
-<ID>	root	localhost	information_schema	Query	0	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
-SHOW FULL PROCESSLIST;
-Id	User	Host	db	Command	Time	State	Info
-<ID>	root	localhost	information_schema	Query	0	NULL	SHOW FULL PROCESSLIST
-<ID>	ddicttestuser1	localhost	information_schema	Query	2	init	SELECT sleep(2.5),'Command time'
+SELECT @time < @time2;
+@time < @time2
+1
 
 ----- switch to connection ddicttestuser1 (user = ddicttestuser1) -----
 # Pull("reap") the result set from the statement executed with "send".
@@ -127,16 +107,16 @@ SELECT sleep(2),'BEGIN this is the representative of a very long statement.this
 # Sleep some time
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	init	SELECT sleep(2),'BEGIN this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.END' AS "my_monster_statement"
-<ID>	root	localhost	information_schema	Query	<TIME>	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	ddicttestuser1	localhost	information_schema	<COMMAND>	<TIME>	<STATE>	SELECT sleep(2),'BEGIN this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.END' AS "my_monster_statement"
+<ID>	root	localhost	information_schema	<COMMAND>	<TIME>	<STATE>	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-<ID>	root	localhost	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
-<ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	init	SELECT sleep(2),'BEGIN this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.END' AS "my_monster_statement"
+<ID>	root	localhost	information_schema	<COMMAND>	<TIME>	<STATE>	SHOW FULL PROCESSLIST
+<ID>	ddicttestuser1	localhost	information_schema	<COMMAND>	<TIME>	<STATE>	SELECT sleep(2),'BEGIN this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.END' AS "my_monster_statement"
 SHOW PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-<ID>	root	localhost	information_schema	Query	<TIME>	NULL	SHOW PROCESSLIST
-<ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	init	SELECT sleep(2),'BEGIN this is the representative of a very long statement.this is the representativ
+<ID>	root	localhost	information_schema	<COMMAND>	<TIME>	<STATE>	SHOW PROCESSLIST
+<ID>	ddicttestuser1	localhost	information_schema	<COMMAND>	<TIME>	<STATE>	SELECT sleep(2),'BEGIN this is the representative of a very long statement.this is the representativ
 
 ----- switch to connection ddicttestuser1 (user = ddicttestuser1) -----
 # Pull("reap") the result set from the monster statement executed with "send".
@@ -156,7 +136,7 @@ SELECT COUNT(*) FROM test.t1;
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 <ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	Locked	SELECT COUNT(*) FROM test.t1
-<ID>	root	localhost	information_schema	Query	<TIME>	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	root	localhost	information_schema	Query	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
 <ID>	root	localhost	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
diff --git a/mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result b/mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result
index c37d47eaf97..974bdb4831d 100644
--- a/mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result
+++ b/mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result
@@ -39,11 +39,11 @@ Id	User	Host	db	Command	Time	State	Info
 4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-3	root	localhost	information_schema	Execute	TIME	preparing	SELECT * FROM processlist  ORDER BY id
+3	root	localhost	information_schema	Execute	TIME	executing	SELECT * FROM processlist  ORDER BY id
 4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-3	root	localhost	information_schema	Execute	TIME	preparing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
+3	root	localhost	information_schema	Execute	TIME	executing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
 4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 CREATE TEMPORARY TABLE test.t_processlist AS SELECT * FROM processlist;
 UPDATE test.t_processlist SET user='horst' WHERE id=1  ;
@@ -108,10 +108,10 @@ Id	User	Host	db	Command	Time	State	Info
 4	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-4	ddicttestuser1	localhost	information_schema	Execute	TIME	preparing	SELECT * FROM processlist  ORDER BY id
+4	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM processlist  ORDER BY id
 SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-4	ddicttestuser1	localhost	information_schema	Execute	TIME	preparing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
+4	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
 CREATE TEMPORARY TABLE test.t_processlist AS SELECT * FROM processlist;
 UPDATE test.t_processlist SET user='horst' WHERE id=1  ;
 INSERT INTO processlist SELECT * FROM test.t_processlist;
@@ -173,7 +173,7 @@ Id	User	Host	db	Command	Time	State	Info
 4	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-4	ddicttestuser1	localhost	information_schema	Execute	TIME	preparing	SELECT * FROM information_schema.processlist
+4	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
 ####################################################################################
 4.2 New connection con101 (ddicttestuser1 with PROCESS privilege)
 SHOW/SELECT shows all processes/threads.
@@ -188,7 +188,7 @@ Id	User	Host	db	Command	Time	State	Info
 5	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-5	ddicttestuser1	localhost	information_schema	Execute	TIME	preparing	SELECT * FROM information_schema.processlist
+5	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
 4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 3	root	localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
@@ -212,7 +212,7 @@ Id	User	Host	db	Command	Time	State	Info
 6		localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-6		localhost	information_schema	Execute	TIME	preparing	SELECT * FROM information_schema.processlist
+6		localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
 5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 3	root	localhost	information_schema	Sleep	TIME		NULL
@@ -236,7 +236,7 @@ Id	User	Host	db	Command	Time	State	Info
 7	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-7	ddicttestuser1	localhost	information_schema	Execute	TIME	preparing	SELECT * FROM information_schema.processlist
+7	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
 5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
@@ -254,7 +254,7 @@ Grants for @localhost
 GRANT USAGE ON *.* TO ''@'localhost'
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-8		localhost	information_schema	Execute	TIME	preparing	SELECT * FROM information_schema.processlist
+8		localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
 6		localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
 8 Grant SUPER (does not imply PROCESS) privilege to ddicttestuser1
@@ -276,7 +276,7 @@ Id	User	Host	db	Command	Time	State	Info
 9	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-9	ddicttestuser1	localhost	information_schema	Execute	TIME	preparing	SELECT * FROM information_schema.processlist
+9	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
 7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
@@ -302,7 +302,7 @@ Id	User	Host	db	Command	Time	State	Info
 10	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-10	ddicttestuser1	localhost	information_schema	Execute	TIME	preparing	SELECT * FROM information_schema.processlist
+10	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
 9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
@@ -356,7 +356,7 @@ Id	User	Host	db	Command	Time	State	Info
 13	ddicttestuser2	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-13	ddicttestuser2	localhost	information_schema	Execute	TIME	preparing	SELECT * FROM information_schema.processlist
+13	ddicttestuser2	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
 12	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 11	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 10	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
@@ -385,7 +385,7 @@ Id	User	Host	db	Command	Time	State	Info
 14	ddicttestuser2	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-14	ddicttestuser2	localhost	information_schema	Execute	TIME	preparing	SELECT * FROM information_schema.processlist
+14	ddicttestuser2	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
 13	ddicttestuser2	localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
 11.2 Revoke SUPER,PROCESS,GRANT OPTION privilege from user ddicttestuser1
@@ -414,7 +414,7 @@ Id	User	Host	db	Command	Time	State	Info
 15	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-15	ddicttestuser1	localhost	information_schema	Execute	TIME	preparing	SELECT * FROM information_schema.processlist
+15	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
 12	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 11	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 10	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
@@ -450,7 +450,7 @@ Id	User	Host	db	Command	Time	State	Info
 16	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-16	ddicttestuser1	localhost	information_schema	Execute	TIME	preparing	SELECT * FROM information_schema.processlist
+16	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
 15	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 12	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 11	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
diff --git a/mysql-test/suite/funcs_1/r/b_processlist_val_ps.result b/mysql-test/suite/funcs_1/r/b_processlist_val_ps.result
index b4d8095125a..44e738f3478 100644
--- a/mysql-test/suite/funcs_1/r/b_processlist_val_ps.result
+++ b/mysql-test/suite/funcs_1/r/b_processlist_val_ps.result
@@ -24,14 +24,14 @@ COUNT(*)
 USE test;
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	root	localhost	test	Execute	0	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	root	localhost	test	Execute	0	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
 <ID>	root	localhost	test	Query	0	NULL	SHOW FULL PROCESSLIST
 USE information_schema;
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	root	localhost	information_schema	Execute	<TIME>	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	root	localhost	information_schema	Execute	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
 <ID>	root	localhost	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
@@ -43,23 +43,13 @@ SELECT ID INTO @my_proclist_id FROM INFORMATION_SCHEMA.PROCESSLIST;
 ----- establish connection ddicttestuser1 (user = ddicttestuser1) -----
 
 ----- switch to connection default (user = root) -----
-SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
-ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	ddicttestuser1	localhost	information_schema	Sleep	1		NULL
-<ID>	root	localhost	information_schema	Execute	0	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
-SHOW FULL PROCESSLIST;
-Id	User	Host	db	Command	Time	State	Info
-<ID>	root	localhost	information_schema	Query	0	NULL	SHOW FULL PROCESSLIST
-<ID>	ddicttestuser1	localhost	information_schema	Sleep	1		NULL
+SELECT @time > 0;
+@time > 0
+1
 # Sleep some time
-SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
-ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	ddicttestuser1	localhost	information_schema	Sleep	2		NULL
-<ID>	root	localhost	information_schema	Execute	0	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
-SHOW FULL PROCESSLIST;
-Id	User	Host	db	Command	Time	State	Info
-<ID>	root	localhost	information_schema	Query	0	NULL	SHOW FULL PROCESSLIST
-<ID>	ddicttestuser1	localhost	information_schema	Sleep	2		NULL
+SELECT @time < @time2;
+@time < @time2
+1
 SELECT ID = @my_proclist_id + 1 FROM INFORMATION_SCHEMA.PROCESSLIST
 WHERE USER = 'ddicttestuser1';
 ID = @my_proclist_id + 1
@@ -68,7 +58,7 @@ ID = @my_proclist_id + 1
 ----- switch to connection ddicttestuser1 (user = ddicttestuser1) -----
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	ddicttestuser1	localhost	information_schema	Execute	<TIME>	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	ddicttestuser1	localhost	information_schema	Execute	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
 <ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
@@ -76,7 +66,7 @@ Id	User	Host	db	Command	Time	State	Info
 ----- establish connection con2 (user = ddicttestuser1) ------
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	ddicttestuser1	localhost	information_schema	Execute	<TIME>	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	ddicttestuser1	localhost	information_schema	Execute	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 <ID>	ddicttestuser1	localhost	information_schema	Sleep	<TIME>		NULL
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
@@ -95,23 +85,13 @@ SELECT sleep(2.5),'Command time';
 
 ----- switch to connection default (user = root) -----
 # Sleep some time
-SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
-ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	ddicttestuser1	localhost	information_schema	Query	1	init	SELECT sleep(2.5),'Command time'
-<ID>	root	localhost	information_schema	Execute	0	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
-SHOW FULL PROCESSLIST;
-Id	User	Host	db	Command	Time	State	Info
-<ID>	root	localhost	information_schema	Query	0	NULL	SHOW FULL PROCESSLIST
-<ID>	ddicttestuser1	localhost	information_schema	Query	1	init	SELECT sleep(2.5),'Command time'
+SELECT @time > 0;
+@time > 0
+1
 # Sleep some time
-SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
-ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	ddicttestuser1	localhost	information_schema	Query	2	init	SELECT sleep(2.5),'Command time'
-<ID>	root	localhost	information_schema	Execute	0	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
-SHOW FULL PROCESSLIST;
-Id	User	Host	db	Command	Time	State	Info
-<ID>	root	localhost	information_schema	Query	0	NULL	SHOW FULL PROCESSLIST
-<ID>	ddicttestuser1	localhost	information_schema	Query	2	init	SELECT sleep(2.5),'Command time'
+SELECT @time < @time2;
+@time < @time2
+1
 
 ----- switch to connection ddicttestuser1 (user = ddicttestuser1) -----
 # Pull("reap") the result set from the statement executed with "send".
@@ -127,16 +107,16 @@ SELECT sleep(2),'BEGIN this is the representative of a very long statement.this
 # Sleep some time
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	init	SELECT sleep(2),'BEGIN this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.END' AS "my_monster_statement"
-<ID>	root	localhost	information_schema	Execute	<TIME>	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	ddicttestuser1	localhost	information_schema	<COMMAND>	<TIME>	<STATE>	SELECT sleep(2),'BEGIN this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.END' AS "my_monster_statement"
+<ID>	root	localhost	information_schema	<COMMAND>	<TIME>	<STATE>	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-<ID>	root	localhost	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
-<ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	init	SELECT sleep(2),'BEGIN this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.END' AS "my_monster_statement"
+<ID>	root	localhost	information_schema	<COMMAND>	<TIME>	<STATE>	SHOW FULL PROCESSLIST
+<ID>	ddicttestuser1	localhost	information_schema	<COMMAND>	<TIME>	<STATE>	SELECT sleep(2),'BEGIN this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.END' AS "my_monster_statement"
 SHOW PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-<ID>	root	localhost	information_schema	Query	<TIME>	NULL	SHOW PROCESSLIST
-<ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	init	SELECT sleep(2),'BEGIN this is the representative of a very long statement.this is the representativ
+<ID>	root	localhost	information_schema	<COMMAND>	<TIME>	<STATE>	SHOW PROCESSLIST
+<ID>	ddicttestuser1	localhost	information_schema	<COMMAND>	<TIME>	<STATE>	SELECT sleep(2),'BEGIN this is the representative of a very long statement.this is the representativ
 
 ----- switch to connection ddicttestuser1 (user = ddicttestuser1) -----
 # Pull("reap") the result set from the monster statement executed with "send".
@@ -156,7 +136,7 @@ SELECT COUNT(*) FROM test.t1;
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 <ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	Locked	SELECT COUNT(*) FROM test.t1
-<ID>	root	localhost	information_schema	Execute	<TIME>	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	root	localhost	information_schema	Execute	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
 <ID>	root	localhost	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
diff --git a/mysql-test/suite/funcs_1/r/innodb__datadict.result b/mysql-test/suite/funcs_1/r/innodb__datadict.result
index 76e699614c8..590ee638ff5 100644
--- a/mysql-test/suite/funcs_1/r/innodb__datadict.result
+++ b/mysql-test/suite/funcs_1/r/innodb__datadict.result
@@ -455,6 +455,7 @@ KEY_COLUMN_USAGE
 PARTITIONS
 PLUGINS
 PROCESSLIST
+PROFILING
 REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
@@ -774,6 +775,27 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	PROFILING
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+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	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	REFERENTIAL_CONSTRAINTS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
@@ -1887,6 +1909,7 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
@@ -1955,6 +1978,7 @@ NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
@@ -2023,6 +2047,7 @@ NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
@@ -2091,6 +2116,7 @@ NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
@@ -2159,6 +2185,7 @@ NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
@@ -2227,6 +2254,7 @@ NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
@@ -2405,6 +2433,24 @@ NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	u
 NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
 NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PROFILING	QUERY_ID	1	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SEQ	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	STATE	3		NO	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	DURATION	4	0.000000	NO	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_USER	5	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_SYSTEM	6	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CONTEXT_VOLUNTARY	7	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	CONTEXT_INVOLUNTARY	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_IN	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_OUT	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_SENT	11	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_RECEIVED	12	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MAJOR	13	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MINOR	14	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SWAPS	15	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SOURCE_FUNCTION	16	NULL	YES	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	SOURCE_FILE	17	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PROFILING	SOURCE_LINE	18	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -3438,6 +3484,7 @@ Table or view 'KEY_COLUMN_USAGE' is associated with the database 'information_sc
 Table or view 'PARTITIONS' is associated with the database 'information_schema'.
 Table or view 'PLUGINS' is associated with the database 'information_schema'.
 Table or view 'PROCESSLIST' is associated with the database 'information_schema'.
+Table or view 'PROFILING' is associated with the database 'information_schema'.
 Table or view 'REFERENTIAL_CONSTRAINTS' is associated with the database 'information_schema'.
 Table or view 'ROUTINES' is associated with the database 'information_schema'.
 Table or view 'SCHEMATA' is associated with the database 'information_schema'.
@@ -3556,6 +3603,7 @@ PLUGINS	10
 proc	20
 PROCESSLIST	8
 procs_priv	8
+PROFILING	18
 REFERENTIAL_CONSTRAINTS	11
 ROUTINES	23
 SCHEMATA	5
@@ -4029,6 +4077,27 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	PROFILING
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+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	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	REFERENTIAL_CONSTRAINTS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
@@ -5142,6 +5211,7 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
@@ -5210,6 +5280,7 @@ NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
@@ -5278,6 +5349,7 @@ NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
@@ -5346,6 +5418,7 @@ NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
@@ -5414,6 +5487,7 @@ NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
@@ -5482,6 +5556,7 @@ NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
@@ -5589,10 +5664,10 @@ COUNT(*)
 6
 SELECT COUNT(*) FROM information_schema. tables                                ;
 COUNT(*)
-68
+69
 SELECT COUNT(*) FROM information_schema. columns                               ;
 COUNT(*)
-861
+879
 SELECT COUNT(*) FROM information_schema. character_sets                        ;
 COUNT(*)
 36
@@ -5654,10 +5729,10 @@ NULL	test1	latin1
 NULL	test4	latin1
 select count(*) as tot_tabs from tables;
 tot_tabs
-65
+66
 select count(*) as the_cols from columns;
 the_cols
-836
+854
 select max(maxlen) as the_max from character_sets;
 the_max
 3
@@ -5704,6 +5779,7 @@ information_schema, KEY_COLUMN_USAGE
 information_schema, PARTITIONS
 information_schema, PLUGINS
 information_schema, PROCESSLIST
+information_schema, PROFILING
 information_schema, REFERENTIAL_CONSTRAINTS
 information_schema, ROUTINES
 information_schema, SCHEMATA
@@ -8362,6 +8438,7 @@ information_schema	KEY_COLUMN_USAGE	MEMORY
 information_schema	PARTITIONS	MyISAM
 information_schema	PLUGINS	MyISAM
 information_schema	PROCESSLIST	MyISAM
+information_schema	PROFILING	MEMORY
 information_schema	REFERENTIAL_CONSTRAINTS	MEMORY
 information_schema	ROUTINES	MyISAM
 information_schema	SCHEMATA	MEMORY
@@ -8405,6 +8482,7 @@ KEY_COLUMN_USAGE
 PARTITIONS
 PLUGINS
 PROCESSLIST
+PROFILING
 REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
@@ -8446,6 +8524,7 @@ KEY_COLUMN_USAGE
 PARTITIONS
 PLUGINS
 PROCESSLIST
+PROFILING
 REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
@@ -8631,6 +8710,7 @@ KEY_COLUMN_USAGE
 PARTITIONS
 PLUGINS
 PROCESSLIST
+PROFILING
 REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
@@ -8824,6 +8904,24 @@ PROCESSLIST	COMMAND	varchar(16)
 PROCESSLIST	TIME	bigint(7)
 PROCESSLIST	STATE	varchar(64)
 PROCESSLIST	INFO	longtext
+PROFILING	QUERY_ID	int(20)
+PROFILING	SEQ	int(20)
+PROFILING	STATE	varchar(30)
+PROFILING	DURATION	decimal(9,6)
+PROFILING	CPU_USER	decimal(9,6)
+PROFILING	CPU_SYSTEM	decimal(9,6)
+PROFILING	CONTEXT_VOLUNTARY	int(20)
+PROFILING	CONTEXT_INVOLUNTARY	int(20)
+PROFILING	BLOCK_OPS_IN	int(20)
+PROFILING	BLOCK_OPS_OUT	int(20)
+PROFILING	MESSAGES_SENT	int(20)
+PROFILING	MESSAGES_RECEIVED	int(20)
+PROFILING	PAGE_FAULTS_MAJOR	int(20)
+PROFILING	PAGE_FAULTS_MINOR	int(20)
+PROFILING	SWAPS	int(20)
+PROFILING	SOURCE_FUNCTION	varchar(30)
+PROFILING	SOURCE_FILE	varchar(20)
+PROFILING	SOURCE_LINE	int(20)
 REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	varchar(4096)
 REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	varchar(64)
 REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	varchar(64)
@@ -10351,6 +10449,24 @@ NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	u
 NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
 NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PROFILING	QUERY_ID	1	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SEQ	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	STATE	3		NO	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	DURATION	4	0.000000	NO	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_USER	5	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_SYSTEM	6	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CONTEXT_VOLUNTARY	7	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	CONTEXT_INVOLUNTARY	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_IN	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_OUT	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_SENT	11	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_RECEIVED	12	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MAJOR	13	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MINOR	14	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SWAPS	15	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SOURCE_FUNCTION	16	NULL	YES	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	SOURCE_FILE	17	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PROFILING	SOURCE_LINE	18	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -11193,6 +11309,24 @@ NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	u
 NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
 NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PROFILING	QUERY_ID	1	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SEQ	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	STATE	3		NO	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	DURATION	4	0.000000	NO	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_USER	5	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_SYSTEM	6	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CONTEXT_VOLUNTARY	7	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	CONTEXT_INVOLUNTARY	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_IN	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_OUT	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_SENT	11	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_RECEIVED	12	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MAJOR	13	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MINOR	14	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SWAPS	15	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SOURCE_FUNCTION	16	NULL	YES	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	SOURCE_FILE	17	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PROFILING	SOURCE_LINE	18	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -11765,6 +11899,24 @@ NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	u
 NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
 NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PROFILING	QUERY_ID	1	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SEQ	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	STATE	3		NO	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	DURATION	4	0.000000	NO	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_USER	5	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_SYSTEM	6	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CONTEXT_VOLUNTARY	7	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	CONTEXT_INVOLUNTARY	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_IN	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_OUT	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_SENT	11	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_RECEIVED	12	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MAJOR	13	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MINOR	14	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SWAPS	15	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SOURCE_FUNCTION	16	NULL	YES	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	SOURCE_FILE	17	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PROFILING	SOURCE_LINE	18	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -12435,6 +12587,24 @@ NULL	information_schema	PROCESSLIST	ID	bigint	NULL	NULL	NULL	NULL	bigint(4)
 NULL	information_schema	PROCESSLIST	TIME	bigint	NULL	NULL	NULL	NULL	bigint(7)
 3.0000	information_schema	PROCESSLIST	STATE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 1.0000	information_schema	PROCESSLIST	INFO	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+NULL	information_schema	PROFILING	QUERY_ID	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	SEQ	int	NULL	NULL	NULL	NULL	int(20)
+3.0000	information_schema	PROFILING	STATE	varchar	30	90	utf8	utf8_general_ci	varchar(30)
+NULL	information_schema	PROFILING	DURATION	decimal	NULL	NULL	NULL	NULL	decimal(9,6)
+NULL	information_schema	PROFILING	CPU_USER	decimal	NULL	NULL	NULL	NULL	decimal(9,6)
+NULL	information_schema	PROFILING	CPU_SYSTEM	decimal	NULL	NULL	NULL	NULL	decimal(9,6)
+NULL	information_schema	PROFILING	CONTEXT_VOLUNTARY	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	CONTEXT_INVOLUNTARY	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	BLOCK_OPS_IN	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	BLOCK_OPS_OUT	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	MESSAGES_SENT	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	MESSAGES_RECEIVED	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	PAGE_FAULTS_MAJOR	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	PAGE_FAULTS_MINOR	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	SWAPS	int	NULL	NULL	NULL	NULL	int(20)
+3.0000	information_schema	PROFILING	SOURCE_FUNCTION	varchar	30	90	utf8	utf8_general_ci	varchar(30)
+3.0000	information_schema	PROFILING	SOURCE_FILE	varchar	20	60	utf8	utf8_general_ci	varchar(20)
+NULL	information_schema	PROFILING	SOURCE_LINE	int	NULL	NULL	NULL	NULL	int(20)
 3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
 3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
@@ -14029,6 +14199,7 @@ NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#
 NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROFILING	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
@@ -14080,6 +14251,7 @@ NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#
 NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROFILING	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
@@ -14129,6 +14301,7 @@ NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#
 NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROFILING	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
@@ -14179,6 +14352,7 @@ NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#
 NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROFILING	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
diff --git a/mysql-test/suite/funcs_1/r/innodb_func_view.result b/mysql-test/suite/funcs_1/r/innodb_func_view.result
index 02ef728fad5..14568643665 100644
--- a/mysql-test/suite/funcs_1/r/innodb_func_view.result
+++ b/mysql-test/suite/funcs_1/r/innodb_func_view.result
@@ -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 = @select_id,
 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 = @select_id,
 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 = @select_id,
 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 = @select_id,
 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 = @select_id,
 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	collation_connection
 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_varbinary_1000),
 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_30),
 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_varchar_1000),
 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_30),
 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_varbinary_1000),
 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_30),
 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_varchar_1000),
 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_30),
 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('-', ' - -ABC', my_decimal),
 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('-', ' - -ABC', my_double),
 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('-', ' - -ABC', my_bigint),
 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_varbinary_1000, 3),
 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_binary_30, 3),
 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_varchar_1000, 3),
 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_char_30, 3),
 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_varbinary_1000, my_binary_30 ),
 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_varbinary_1000, my_varchar_1000 ),
 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_varbinary_1000, my_char_30 ),
 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_varbinary_1000, my_varbinary_1000 ),
 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_binary_30, my_varbinary_1000 ),
 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_binary_30, my_varchar_1000 ),
 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_binary_30, my_char_30 ),
 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_binary_30, my_binary_30 ),
 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_varchar_1000, my_varbinary_1000 ),
 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_varchar_1000, my_binary_30 ),
 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_varchar_1000, my_char_30 ),
 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_varchar_1000, my_varchar_1000 ),
 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_30, my_varbinary_1000 ),
 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_30, my_binary_30 ),
 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_30, my_varchar_1000 ),
 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_30, my_char_30 ),
 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),
 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),
 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),
 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),
 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	collation_connection
 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_varbinary_1000),
 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_binary_30),
 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_varchar_1000),
 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_30),
 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	collation_connection
 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 value: ''
 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	collation_connection
 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	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_binary_30`,2) AS `LEFT(my_binary_30, 2)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
 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	collation_connection
 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	collation_connection
 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_varchar_1000),
 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_30, 'char'),
 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_varbinary_1000),
 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	collation_connection
 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_binary_30),
 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	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_binary_30`) AS `BIT_LENGTH(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
 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_varchar_1000),
 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	collation_connection
 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_char_30),
 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	collation_connection
 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,'IS_NULL'),
 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	collation_connection
 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,'IS_NULL'),
 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	collation_connection
 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_timestamp,'IS_NULL'),
 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	collation_connection
 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,'IS_NULL'),
 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	collation_connection
 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_datetime,'IS_NULL'),
 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	collation_connection
 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_double,'IS_NULL'),
 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	collation_connection
 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_decimal,'IS_NULL'),
 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	collation_connection
 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_bigint,'IS_NULL'),
 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	collation_connection
 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_varbinary_1000,'IS_NULL'),
 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	collation_connection
 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_binary_30,'IS_NULL'),
 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	collation_connection
 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_varchar_1000,'IS_NULL'),
 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	collation_connection
 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_30,'IS_NULL'),
 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	collation_connection
 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 NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 IS NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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_1000 IS NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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_1000 IS NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 IS NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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_1000, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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_1000, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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_varbinary_1000 USING koi8r),
 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	collation_connection
 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_binary_30 USING koi8r),
 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	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using koi8r) AS `CONVERT(my_binary_30 USING koi8r)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
 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_varchar_1000 USING koi8r),
 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	collation_connection
 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_30 USING koi8r),
 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	collation_connection
 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_varbinary_1000 USING utf8),
 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	collation_connection
 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_binary_30 USING utf8),
 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	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using utf8) AS `CONVERT(my_binary_30 USING utf8)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
 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_varchar_1000 USING utf8),
 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	collation_connection
 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_30 USING utf8),
 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	collation_connection
 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 UNSIGNED INTEGER),
 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	collation_connection
 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 UNSIGNED INTEGER),
 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	collation_connection
 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_timestamp AS UNSIGNED INTEGER),
 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	collation_connection
 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 UNSIGNED INTEGER),
 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	collation_connection
 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_datetime AS UNSIGNED INTEGER),
 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,7 +2528,7 @@ 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_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
@@ -2482,6 +2538,38 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
+CREATE VIEW v1 AS SELECT CAST(my_double AS UNSIGNED INTEGER),
+my_double, id FROM t1_values;
+SELECT CAST(my_double AS UNSIGNED INTEGER),
+my_double, id FROM t1_values
+WHERE select_id = 89 OR select_id IS NULL order by id;
+CAST(my_double AS UNSIGNED INTEGER)	my_double	id
+NULL	NULL	1
+9223372036854775808	-1.7976931348623e+308	2
+9223372036854775807	1.7976931348623e+308	3
+0	0	4
+18446744073709551615	-1	5
+Warnings:
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+SHOW CREATE VIEW v1;
+View	Create View	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;
+
+
 CREATE VIEW v1 AS SELECT CAST(my_decimal AS UNSIGNED INTEGER),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS UNSIGNED INTEGER),
diff --git a/mysql-test/suite/funcs_1/r/innodb_storedproc.result b/mysql-test/suite/funcs_1/r/innodb_storedproc.result
index fbc908b8ccf..4ffafaa22be 100644
--- a/mysql-test/suite/funcs_1/r/innodb_storedproc.result
+++ b/mysql-test/suite/funcs_1/r/innodb_storedproc.result
@@ -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@1.1975.1.2, 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 b char(20))
 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,MYSQL_PORT,MYSQL_SOCK);
 	
 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 1
 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 comment 'this is a function';
 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()
+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 'float4:BEGIN
+SELECT @x;
+END' at line 2
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
-float:BEGIN
+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 '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 '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, conditions, and handlers declared for
 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 '23000' set @x2 = 1;
 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 declare multiple variables both separately
 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';
-declare exit handler for tables set @var2 = 1;
-END//
-DROP PROCEDURE IF EXISTS sp1;
-CREATE PROCEDURE sp1( )
-BEGIN
 declare terminated condition for sqlstate '02000';
 declare exit handler for terminated set @var2 = 1;
 END//
@@ -10144,10 +11240,10 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare USE condition for sqlstate '02000';
+declare use condition for sqlstate '02000';
 declare exit handler for USE 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 'USE 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 'use condition for sqlstate '02000';
 declare exit handler for USE set @var2 = 1;
 ' at line 3
 DROP PROCEDURE IF EXISTS sp1;
@@ -10409,6 +11505,15 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare accessible handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare add handler for sqlstate '02000' 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 'add handler for sqlstate '02000' set @var2 = 1;
@@ -10544,9 +11649,9 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare CALL handler for sqlstate '02000' set @var2 = 1;
+declare call handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'call handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
@@ -10625,15 +11730,6 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare columns handler for sqlstate '02000' 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 'handler for sqlstate '02000' set @var2 = 1;
-END' at line 3
-DROP PROCEDURE IF EXISTS sp1;
-Warnings:
-Note	1305	PROCEDURE sp1 does not exist
-CREATE PROCEDURE sp1( )
-BEGIN
 declare condition handler for sqlstate '02000' 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 'condition handler for sqlstate '02000' set @var2 = 1;
@@ -10643,22 +11739,18 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare connection handler for sqlstate '02000' set @var2 = 1;
+declare constraint handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'constraint handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare constraint handler for sqlstate '02000' set @var2 = 1;
+declare continue handler for sqlstate '02000' 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 'constraint handler for sqlstate '02000' set @var2 = 1;
-END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
-Warnings:
-Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare convert handler for sqlstate '02000' set @var2 = 1;
@@ -10976,6 +12068,11 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare exit handler for sqlstate '02000' set @var2 = 1;
+END//
+DROP PROCEDURE IF EXISTS sp1;
+CREATE PROCEDURE sp1( )
+BEGIN
 declare explain handler for sqlstate '02000' 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 'explain handler for sqlstate '02000' set @var2 = 1;
@@ -11003,54 +12100,54 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare fields handler for sqlstate '02000' set @var2 = 1;
+declare float handler for sqlstate '02000' 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 'handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare float handler for sqlstate '02000' set @var2 = 1;
+declare float4 handler for sqlstate '02000' 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 'float handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float4 handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare for handler for sqlstate '02000' set @var2 = 1;
+declare float8 handler for sqlstate '02000' 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 'for handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float8 handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare force handler for sqlstate '02000' set @var2 = 1;
+declare for handler for sqlstate '02000' 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 'force handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'for handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare foreign handler for sqlstate '02000' set @var2 = 1;
+declare force handler for sqlstate '02000' 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 'foreign handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'force handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare found handler for sqlstate '02000' set @var2 = 1;
+declare foreign handler for sqlstate '02000' 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 'handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'foreign handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
@@ -11075,15 +12172,6 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare goto handler for sqlstate '02000' 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 'handler for sqlstate '02000' set @var2 = 1;
-END' at line 3
-DROP PROCEDURE IF EXISTS sp1;
-Warnings:
-Note	1305	PROCEDURE sp1 does not exist
-CREATE PROCEDURE sp1( )
-BEGIN
 declare grant handler for sqlstate '02000' 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 'grant handler for sqlstate '02000' set @var2 = 1;
@@ -11237,6 +12325,51 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare int1 handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
+declare int2 handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
+declare int3 handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
+declare int4 handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
+declare int8 handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare integer handler for sqlstate '02000' 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 'integer handler for sqlstate '02000' set @var2 = 1;
@@ -11363,6 +12496,15 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare linear handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare lines handler for sqlstate '02000' 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 'lines handler for sqlstate '02000' set @var2 = 1;
@@ -11453,6 +12595,15 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare master_ssl_verify_server_cert handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare match handler for sqlstate '02000' 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 'match handler for sqlstate '02000' set @var2 = 1;
@@ -11705,6 +12856,15 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare range handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare read handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
@@ -11723,6 +12883,24 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare read_only handler for sqlstate '02000' 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 'handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
+declare read_write handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare real handler for sqlstate '02000' 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 'real handler for sqlstate '02000' set @var2 = 1;
@@ -11750,6 +12928,15 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare release handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare rename handler for sqlstate '02000' 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 'rename handler for sqlstate '02000' set @var2 = 1;
@@ -11858,9 +13045,9 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare SELECT handler for sqlstate '02000' set @var2 = 1;
+declare select handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'select handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
@@ -11912,15 +13099,6 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare soname handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
-END' at line 3
-DROP PROCEDURE IF EXISTS sp1;
-Warnings:
-Note	1305	PROCEDURE sp1 does not exist
-CREATE PROCEDURE sp1( )
-BEGIN
 declare spatial handler for sqlstate '02000' 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 'spatial handler for sqlstate '02000' set @var2 = 1;
@@ -12038,15 +13216,6 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare tables handler for sqlstate '02000' 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 'handler for sqlstate '02000' set @var2 = 1;
-END' at line 3
-DROP PROCEDURE IF EXISTS sp1;
-Warnings:
-Note	1305	PROCEDURE sp1 does not exist
-CREATE PROCEDURE sp1( )
-BEGIN
 declare terminated handler for sqlstate '02000' 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 'terminated handler for sqlstate '02000' set @var2 = 1;
@@ -12191,9 +13360,9 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare USE handler for sqlstate '02000' set @var2 = 1;
+declare use handler for sqlstate '02000' 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 'USE handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'use handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
@@ -12384,10 +13553,13 @@ set @v2 = y;
 END//
 CALL sp1();
 x	y	@x
-NULL	abaa	3
+NULL	a	3
+Warnings:
+Warning	1265	Data truncated for column 'y' at row 3
+Warning	1265	Data truncated for column 'y' at row 1
 SELECT @v1, @v2;
 @v1	@v2
-4	a`
+4	a
 DROP PROCEDURE sp1;
 
 Testcase 4.2.28:
@@ -12454,7 +13626,7 @@ CALL sp1();
 @xx
 0
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: 'asd'
+Warning	1366	Incorrect integer value: 'asd' for column 'xx' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12481,9 +13653,11 @@ set xx = 'temp';
 set @xx = xx;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'xx' at row 1
 SELECT @xx;
 @xx
-temp
+t
 DROP PROCEDURE sp1;
 
 Testcase 4.2.31 - b:
@@ -12501,7 +13675,7 @@ CALL sp1();
 xx
 0
 Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: 'asd'
+Warning	1265	Data truncated for column 'xx' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12527,7 +13701,9 @@ SELECT xx;
 END//
 CALL sp1();
 xx
-asd
+0000-00-00 00:00:00
+Warnings:
+Warning	1264	Out of range value for column 'xx' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12571,7 +13747,7 @@ CALL sp1();
 xx
 0
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: 'asd'
+Warning	1366	Incorrect integer value: 'asd' for column 'xx' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12602,6 +13778,8 @@ declare x char ascii;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12665,6 +13843,8 @@ declare x binary;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12812,8 +13992,6 @@ declare x decimal;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12821,8 +13999,6 @@ declare x decimal unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12830,8 +14006,6 @@ declare x decimal zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12839,8 +14013,6 @@ declare x decimal unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12848,8 +14020,6 @@ declare x numeric;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12857,8 +14027,6 @@ declare x numeric unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12866,8 +14034,6 @@ declare x numeric zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12875,8 +14041,6 @@ declare x numeric unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13254,7 +14418,7 @@ declare continue handler for sqlstate '02000' set done = 1;
 BEGIN
 open cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newlf1, newf3, newsal;
 set count = count - 1;
 END while;
@@ -13279,7 +14443,7 @@ declare continue handler for sqlstate '02000' set done = 1;
 BEGIN
 open cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newlf1, newf3, newsal;
 set count = count - 1;
 END while;
@@ -13306,7 +14470,7 @@ declare continue handler for sqlstate '02000' set done = 1;
 BEGIN
 open cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
 set count = count - 1;
 END while;
@@ -13330,7 +14494,7 @@ open cur1;
 BEGIN
 open cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf3, newf4;
 set count = count - 1;
 END while;
@@ -13358,7 +14522,7 @@ BEGIN
 open cur1;
 open cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
 set count = count - 1;
 END while;
@@ -13388,7 +14552,7 @@ declare continue handler for sqlstate '02000' set done = 1;
 BEGIN
 open cur2;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
 set count = count - 1;
 END while;
@@ -13416,7 +14580,7 @@ declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 limit 20, 10;
 declare continue handler for sqlstate '02000' set done = 1;
 BEGIN
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
 set count = count - 1;
 END while;
@@ -13430,7 +14594,7 @@ DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
 declare done int default 0;
-declare count integer default 0;
+declare count integer default 10;
 declare newf1 char(20);
 declare newf2 char(20);
 declare newf3 char(20);
@@ -13441,7 +14605,7 @@ open cur1;
 BEGIN
 declare cur1 cursor for SELECT f1, f2, f3, f4 from t2;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf3, newf4;
 set count = count - 1;
 END while;
@@ -13473,7 +14637,7 @@ BEGIN
 open cur1;
 close cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
 set count = count - 1;
 END while;
@@ -13485,7 +14649,7 @@ DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
 declare done int default 0;
-declare count integer default 0;
+declare count integer default 20;
 declare newf1 char(20);
 declare newf2 char(20);
 declare newf3 char(20);
@@ -13514,13 +14678,13 @@ BEGIN
 declare done int default 0;
 declare count integer default 20;
 declare newf2 char(20);
-declare newf1 date;
+declare newf1 int1;
 declare cur1 cursor for SELECT f1, f3 from t2 limit 20, 10;
 declare continue handler for sqlstate '02000' set done = 1;
 BEGIN
 open cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2;
 set @x = newf1;
 set @y = newf2;
@@ -13590,7 +14754,7 @@ BEGIN
 close cur1;
 open cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
 set count = count - 1;
 END while;
@@ -13643,7 +14807,7 @@ fetch cur1 into newf1, newf2, newf4, newf3;
 END;
 END//
 CALL sp1();
-ERROR 02000: No data to FETCH
+ERROR 02000: No data - zero rows fetched, selected, or processed
 DROP PROCEDURE sp1;
 
 Testcase 4.2.65:
@@ -13669,7 +14833,7 @@ commit;
 END;
 END//
 CALL sp1();
-ERROR 02000: No data to FETCH
+ERROR 02000: No data - zero rows fetched, selected, or processed
 DROP PROCEDURE sp1;
 
 Testcase 4.2.66:
@@ -13690,7 +14854,7 @@ declare continue handler for sqlstate '02000' set done = 1;
 BEGIN
 open cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
 set count = count - 1;
 END while;
@@ -13719,12 +14883,13 @@ declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 limit 20, 10;
 declare continue handler for sqlstate '02000' set done = 1;
 BEGIN
 open cur1;
-set count = count - 1;
-while count <> 0 do
+#      set count = count - 1;
+#      while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
-set count = count - 1;
-END while;
+#        set count = count - 1;
+#      END while;
 END;
+fetch cur1 into newf1, newf2, newf4, newf3;
 END//
 CALL sp1();
 DROP PROCEDURE sp1;
@@ -13756,7 +14921,7 @@ BEGIN
 set count = 10;
 BEGIN
 open cur2;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
 set count = count - 1;
 END while;
@@ -13765,7 +14930,8 @@ insert into temp1 values(newf1, newf2, newf4, newf3);
 close cur1;
 END;
 BEGIN
-while count <> 0 do
+set count = 10;
+while count > 0 do
 fetch cur2 into newf21, newf22, newf24, newf23;
 set count = count - 1;
 END while;
@@ -13774,9 +14940,9 @@ insert into temp2 values(newf21, newf22, newf24, newf23);
 close cur2;
 END//
 CALL sp1();
-SELECT * from temp1;
-f1	f2	f3	f4
-agaaaaaaa	agaaaaaaa	-4993	agaaaaaaa
+SELECT count(*) from temp1;
+count(*)
+1
 SELECT * from temp2;
 f1	f2	f3	f4
 NULL	NULL	NULL	NULL
@@ -13924,23 +15090,23 @@ CALL sp2( 'insert' );
 SELECT * from t3 where f3 <=5 && f3 >= 0;
 f1	f2	f3
 f1	address	1
-f1	address	2
-f1	address	3
-f1	address	4
-f1	address	5
 f1	address	1
-f1	address	2
-f1	address	3
-f1	address	4
-f1	address	5
 f1	address	1
-f1	address	2
-f1	address	3
-f1	address	4
 f1	address	1
 f1	address	2
+f1	address	2
+f1	address	2
+f1	address	2
 f1	address	3
+f1	address	3
+f1	address	3
+f1	address	3
+f1	address	4
 f1	address	4
+f1	address	4
+f1	address	4
+f1	address	5
+f1	address	5
 SELECT count(*) from t3;
 count(*)
 28
@@ -14023,7 +15189,7 @@ delete from res_t3_itisalongname_1381742_itsaverylongname_1381742;
 END case;
 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 'when 'delete'  then
-delete from res_t3_itisalongname_1381742_itsaverylongname_13' at line 10
+delete from res_t3_itisalongname_1381742_itsaverylongname_13' at line 11
 DROP PROCEDURE IF EXISTS sp3;
 CREATE PROCEDURE sp3( action char(20) )
 BEGIN
@@ -14041,8 +15207,9 @@ label2: while count < 10 do
 BEGIN
 insert into res_t3_itisalongname_1381742_itsaverylongname_1381742
 values('xxxxxxxxxxxxxxxxxxx', '1231230981(*&(*&)(*&(', count);
-if done=1 then
-set count=10;
+set count = count + 1;
+if count= 10 then
+set done=1;
 END if;
 END;
 END while label2;
@@ -14056,6 +15223,19 @@ END if;
 END loop label1;
 SELECT count, done;
 END//
+CALL sp3('insert');
+count	done
+10	1
+Warnings:
+Warning	1265	Data truncated for column 'name' at row 1
+Warning	1265	Data truncated for column 'name' at row 2
+Warning	1265	Data truncated for column 'name' at row 3
+Warning	1265	Data truncated for column 'name' at row 4
+Warning	1265	Data truncated for column 'name' at row 5
+Warning	1265	Data truncated for column 'name' at row 6
+Warning	1265	Data truncated for column 'name' at row 7
+Warning	1265	Data truncated for column 'name' at row 8
+Warning	1265	Data truncated for column 'name' at row 9
 DROP PROCEDURE sp3;
 drop table res_t3_itisalongname_1381742_itsaverylongname_1381742;
 
@@ -14330,11 +15510,14 @@ CREATE PROCEDURE sp6()
 BEGIN
 declare count1 integer default 1;
 label1: repeat
-set count1 = count1;
+set count1 = count1-1;
 until count1 < 0
 END repeat label1;
 SELECT count1;
 END//
+CALL sp6();
+count1
+-1
 DROP PROCEDURE sp6;
 
 Testcase 4.3.7:
@@ -14403,7 +15586,7 @@ do v1 > 0 while
 set v1 = v1 - 1;
 END while;
 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 'do v1 > 0 while
+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 'while
 set v1 = v1 - 1;
 END while;
 END' at line 4
@@ -14442,7 +15625,7 @@ set count1 = count1 + 1;
 iterate label1;
 END loop label2;
 END//
-ERROR 42000: End-label label2 without match
+ERROR 42000: End-label label1 without match
 drop table res_t3_itisalongname_1381742_itsaverylongname_1381742;
 
 Testcase 4.3.13:
@@ -14606,7 +15789,7 @@ until count1 < 3
 END repeat label1;
 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 'label1;
-END' at line 7
+END' at line 8
 
 Testcase 4.3.21:
 --------------------------------------------------------------------------------
@@ -14789,15 +15972,15 @@ insert into t43 values('abcde', 'a!@#$%^&*(');
 CREATE PROCEDURE d1.sp4()
 SELECT * from d1.t43;
 SELECT * from mysql.proc where specific_name = 'sp4';
-db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment
-d1	sp4	PROCEDURE	sp4	SQL	CONTAINS_SQL	NO	DEFINER			SELECT * from d1.t43	root@localhost	modified	created		
+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
+d1	sp4	PROCEDURE	sp4	SQL	CONTAINS_SQL	NO	DEFINER			SELECT * from d1.t43	root@localhost	modified	created			latin1	latin1_swedish_ci	latin1_swedish_ci	SELECT * from d1.t43
 USE db_storedproc;
 DROP DATABASE d1;
 CREATE DATABASE d1;
 USE d1;
 create table t44(a char(5), b char(10));
 SELECT * from mysql.proc where specific_name = 'sp4';
-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
 USE db_storedproc;
 DROP DATABASE d1;
 
@@ -14839,8 +16022,8 @@ CREATE PROCEDURE sp8 ( n char(20) ) sql security definer comment 'initial'
 USE d2;
 alter procedure d1.sp8 sql security definer comment 'updated';
 SELECT * from mysql.proc where specific_name='sp8' and db='d1';
-db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment
-d1	sp8	PROCEDURE	sp8	SQL	CONTAINS_SQL	NO	DEFINER	 n char(20) 		SELECT * from t1 where t1.f1 = n	root@localhost	modified	created		updated
+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
+d1	sp8	PROCEDURE	sp8	SQL	CONTAINS_SQL	NO	DEFINER	 n char(20) 		SELECT * from t1 where t1.f1 = n	root@localhost	modified	created		updated	latin1	latin1_swedish_ci	latin1_swedish_ci	SELECT * from t1 where t1.f1 = n
 
 Testcase 4.4.9:
 --------------------------------------------------------------------------------
@@ -14856,12 +16039,16 @@ END//
 USE d2;
 alter function d1.fn2 sql security definer comment 'updated';
 SELECT * from mysql.proc where specific_name='fn2' and db='d1';
-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
 d1	fn2	FUNCTION	fn2	SQL	CONTAINS_SQL	NO	DEFINER	n int	int(11)	BEGIN
 declare a int;
 set a = 0.9 * n;
 return a;
-END	root@localhost	modified	created		updated
+END	root@localhost	modified	created		updated	latin1	latin1_swedish_ci	latin1_swedish_ci	BEGIN
+declare a int;
+set a = 0.9 * n;
+return a;
+END
 
 Testcase 4.4.10:
 --------------------------------------------------------------------------------
@@ -14871,7 +16058,7 @@ SELECT * from t1 where t1.f1 = n;
 USE d2;
 DROP PROCEDURE d1.sp9;
 SELECT * from mysql.proc where specific_name='sp9' and db='d1';
-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.4.11:
 --------------------------------------------------------------------------------
@@ -14885,7 +16072,7 @@ END//
 USE d2;
 DROP FUNCTION d1.fn3;
 SELECT * from mysql.proc where specific_name='fn3' and db='d1';
-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
 USE db_storedproc;
 DROP DATABASE d1;
 DROP DATABASE d2;
@@ -14893,19 +16080,6 @@ DROP DATABASE d2;
 Section 3.1.5 - Parameter use checks:
 Functions with all data types
 --------------------------------------------------------------------------------
-SELECT 1 as 'bug_dec_num';
-bug_dec_num
-1
-
-.
-FIXME:  There are differences with datatypes DECIMAL and NUMERIC if large
-FIXME:  exponent values are used. The diffs are shown only on some machines like
-FIXME:  AIX52 and HPUX11. Until this has been solved we use numbers that
-FIXME:  *should* be equal to the exponent representation but have no exponents
-FIXME:  and use the specified count of *0*s instead.
-FIXME:  In the source file these tests are marked with the comment  hpux11
-.
---------------------------------------------------------------------------------
 DROP DATABASE IF EXISTS d1;
 CREATE DATABASE d1;
 USE d1;
@@ -14926,7 +16100,7 @@ return f1;
 END//
 SELECT fn2(1.84e+19);
 fn2(1.84e+19)
-0
+18400000000000000000
 DROP FUNCTION IF EXISTS fn3;
 CREATE FUNCTION fn3( f1 bigint unsigned zerofill) returns bigint unsigned zerofill
 BEGIN
@@ -14945,6 +16119,8 @@ END//
 SELECT fn4(-9.22e+15);
 fn4(-9.22e+15)
 0
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn5;
 CREATE FUNCTION fn5( f1 decimal) returns decimal
 BEGIN
@@ -14972,6 +16148,10 @@ END//
 SELECT fn7(99999999999);
 fn7(99999999999)
 9999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn8;
 CREATE FUNCTION fn8( f1 decimal (0) unsigned zerofill) returns decimal (0) unsigned zerofill
 BEGIN
@@ -14980,7 +16160,9 @@ return f1;
 END//
 SELECT fn8(999999999);
 fn8(999999999)
-0999999999
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn9;
 CREATE FUNCTION fn9( f1 decimal (0) zerofill) returns decimal (0) zerofill
 BEGIN
@@ -14989,7 +16171,10 @@ return f1;
 END//
 SELECT fn9(-1.00e+09);
 fn9(-1.00e+09)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn10;
 CREATE FUNCTION fn10( f1 decimal (0, 0)) returns decimal (0, 0)
 BEGIN
@@ -15008,6 +16193,10 @@ END//
 SELECT fn11(99999999999);
 fn11(99999999999)
 9999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn12;
 CREATE FUNCTION fn12( f1 decimal (0, 0) unsigned zerofill) returns decimal (0, 0) unsigned zerofill
 BEGIN
@@ -15016,7 +16205,9 @@ return f1;
 END//
 SELECT fn12(999999999);
 fn12(999999999)
-0999999999
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn13;
 CREATE FUNCTION fn13( f1 decimal (0, 0) zerofill) returns decimal (0, 0) zerofill
 BEGIN
@@ -15025,7 +16216,10 @@ return f1;
 END//
 SELECT fn13(-1.00e+09);
 fn13(-1.00e+09)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn14;
 CREATE FUNCTION fn14( f1 decimal (63, 30)) returns decimal (63, 30)
 BEGIN
@@ -15061,7 +16255,10 @@ return f1;
 END//
 SELECT fn17(-1.00e+21);
 fn17(-1.00e+21)
-000000000000000000000000000000000.000000000000000000000000000000
+000000000000000000000000000000010.000000000000000000000000000000
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn18_d;
 CREATE FUNCTION fn18_d( f1 decimal (64)) returns decimal (64)
 BEGIN
@@ -15097,7 +16294,10 @@ return f1;
 END//
 SELECT fn21_d_z(1.00e+00);
 fn21_d_z(1.00e+00)
-0000000000000000000000000000000000000000000000000000000000000001
+0000000000000000000000000000000000000000000000000000000000000010
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn22;
 CREATE FUNCTION fn22( f1 decimal unsigned) returns decimal unsigned
 BEGIN
@@ -15106,7 +16306,10 @@ return f1;
 END//
 SELECT fn22(1.00e+00);
 fn22(1.00e+00)
-1
+10
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn23;
 CREATE FUNCTION fn23( f1 decimal unsigned zerofill) returns decimal unsigned zerofill
 BEGIN
@@ -15115,7 +16318,10 @@ return f1;
 END//
 SELECT fn23(1.00e+00);
 fn23(1.00e+00)
-0000000001
+0000000010
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn24;
 CREATE FUNCTION fn24( f1 decimal zerofill) returns decimal zerofill
 BEGIN
@@ -15124,7 +16330,10 @@ return f1;
 END//
 SELECT fn24(-1.00e+09);
 fn24(-1.00e+09)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn25;
 CREATE FUNCTION fn25( f1 double) returns double
 BEGIN
@@ -15142,7 +16351,9 @@ return f1;
 END//
 SELECT fn26(1.00e+00);
 fn26(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn27;
 CREATE FUNCTION fn27( f1 double unsigned zerofill) returns double unsigned zerofill
 BEGIN
@@ -15151,7 +16362,9 @@ return f1;
 END//
 SELECT fn27(1.00e+00);
 fn27(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn28;
 CREATE FUNCTION fn28( f1 double zerofill) returns double zerofill
 BEGIN
@@ -15160,7 +16373,9 @@ return f1;
 END//
 SELECT fn28(1.00e+00);
 fn28(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn29;
 CREATE FUNCTION fn29( f1 float) returns float
 BEGIN
@@ -15178,7 +16393,9 @@ return f1;
 END//
 SELECT fn30(1.00e+00);
 fn30(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn31;
 CREATE FUNCTION fn31( f1 float unsigned zerofill) returns float unsigned zerofill
 BEGIN
@@ -15187,7 +16404,9 @@ return f1;
 END//
 SELECT fn31(1.00e+00);
 fn31(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn32;
 CREATE FUNCTION fn32( f1 float zerofill) returns float zerofill
 BEGIN
@@ -15196,7 +16415,9 @@ return f1;
 END//
 SELECT fn32(1.00e+00);
 fn32(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn33;
 CREATE FUNCTION fn33( f1 float(0)) returns float(0)
 BEGIN
@@ -15214,7 +16435,9 @@ return f1;
 END//
 SELECT fn34(1.00e+00);
 fn34(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn35;
 CREATE FUNCTION fn35( f1 float(0) unsigned zerofill) returns float(0) unsigned zerofill
 BEGIN
@@ -15223,7 +16446,9 @@ return f1;
 END//
 SELECT fn35(1.00e+00);
 fn35(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn36;
 CREATE FUNCTION fn36( f1 float(0) zerofill) returns float(0) zerofill
 BEGIN
@@ -15232,7 +16457,9 @@ return f1;
 END//
 SELECT fn36(1.00e+00);
 fn36(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn37;
 CREATE FUNCTION fn37( f1 float(23)) returns float(23)
 BEGIN
@@ -15250,7 +16477,9 @@ return f1;
 END//
 SELECT fn38(1.00e+00);
 fn38(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn39;
 CREATE FUNCTION fn39( f1 float(23) unsigned zerofill) returns float(23) unsigned zerofill
 BEGIN
@@ -15259,7 +16488,9 @@ return f1;
 END//
 SELECT fn39(1.00e+00);
 fn39(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn40;
 CREATE FUNCTION fn40( f1 float(23) zerofill) returns float(23) zerofill
 BEGIN
@@ -15268,7 +16499,9 @@ return f1;
 END//
 SELECT fn40(1.00e+00);
 fn40(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn41;
 CREATE FUNCTION fn41( f1 float(24)) returns float(24)
 BEGIN
@@ -15286,7 +16519,9 @@ return f1;
 END//
 SELECT fn42(1.00e+00);
 fn42(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn43;
 CREATE FUNCTION fn43( f1 float(24) unsigned zerofill) returns float(24) unsigned zerofill
 BEGIN
@@ -15295,7 +16530,9 @@ return f1;
 END//
 SELECT fn43(1.00e+00);
 fn43(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn44;
 CREATE FUNCTION fn44( f1 float(24) zerofill) returns float(24) zerofill
 BEGIN
@@ -15304,7 +16541,9 @@ return f1;
 END//
 SELECT fn44(1.00e+00);
 fn44(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn45;
 CREATE FUNCTION fn45( f1 float(53)) returns float(53)
 BEGIN
@@ -15322,7 +16561,9 @@ return f1;
 END//
 SELECT fn46(1.00e+00);
 fn46(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn47;
 CREATE FUNCTION fn47( f1 float(53) unsigned zerofill) returns float(53) unsigned zerofill
 BEGIN
@@ -15331,7 +16572,9 @@ return f1;
 END//
 SELECT fn47(1.00e+00);
 fn47(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn48;
 CREATE FUNCTION fn48( f1 float(53) zerofill) returns float(53) zerofill
 BEGIN
@@ -15340,7 +16583,9 @@ return f1;
 END//
 SELECT fn48(1.00e+00);
 fn48(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn49;
 CREATE FUNCTION fn49( f1 int) returns int
 BEGIN
@@ -15349,7 +16594,10 @@ return f1;
 END//
 SELECT fn49(-2.15e+09);
 fn49(-2.15e+09)
--2147483648
+-2147483638
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn50;
 CREATE FUNCTION fn50( f1 int unsigned) returns int unsigned
 BEGIN
@@ -15385,7 +16633,9 @@ return f1;
 END//
 SELECT fn53(-8388600);
 fn53(-8388600)
--8388600
+-8388598
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn54;
 CREATE FUNCTION fn54( f1 mediumint unsigned) returns mediumint unsigned
 BEGIN
@@ -15412,7 +16662,11 @@ return f1;
 END//
 SELECT fn56(-8388601);
 fn56(-8388601)
-0
+16777215
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn57;
 CREATE FUNCTION fn57( f1 numeric) returns numeric
 BEGIN
@@ -15421,7 +16675,9 @@ return f1;
 END//
 SELECT fn57(-999999999);
 fn57(-999999999)
--999999999
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn58;
 CREATE FUNCTION fn58( f1 numeric (0)) returns numeric (0)
 BEGIN
@@ -15430,7 +16686,9 @@ return f1;
 END//
 SELECT fn58(-999999999);
 fn58(-999999999)
--999999999
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn59;
 CREATE FUNCTION fn59( f1 numeric (0) unsigned) returns numeric (0) unsigned
 BEGIN
@@ -15440,6 +16698,9 @@ END//
 SELECT fn59(9999999999);
 fn59(9999999999)
 9999999999
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn60;
 CREATE FUNCTION fn60( f1 numeric (0) unsigned zerofill) returns numeric (0) unsigned zerofill
 BEGIN
@@ -15448,7 +16709,9 @@ return f1;
 END//
 SELECT fn60(99999999);
 fn60(99999999)
-0099999999
+0100000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn61;
 CREATE FUNCTION fn61( f1 numeric (0) zerofill) returns numeric (0) zerofill
 BEGIN
@@ -15457,7 +16720,10 @@ return f1;
 END//
 SELECT fn61(-99999999);
 fn61(-99999999)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn62;
 CREATE FUNCTION fn62( f1 numeric (0, 0)) returns numeric (0, 0)
 BEGIN
@@ -15466,7 +16732,9 @@ return f1;
 END//
 SELECT fn62(-999999999);
 fn62(-999999999)
--999999999
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn63;
 CREATE FUNCTION fn63( f1 numeric (0, 0) unsigned) returns numeric (0, 0) unsigned
 BEGIN
@@ -15476,6 +16744,9 @@ END//
 SELECT fn63(9999999999);
 fn63(9999999999)
 9999999999
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn64;
 CREATE FUNCTION fn64( f1 numeric (0, 0) unsigned zerofill) returns numeric (0, 0) unsigned zerofill
 BEGIN
@@ -15484,7 +16755,9 @@ return f1;
 END//
 SELECT fn64(99999999);
 fn64(99999999)
-0099999999
+0100000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn65;
 CREATE FUNCTION fn65( f1 numeric (0, 0) zerofill) returns numeric (0, 0) zerofill
 BEGIN
@@ -15493,7 +16766,10 @@ return f1;
 END//
 SELECT fn65(-99999999);
 fn65(-99999999)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn66;
 CREATE FUNCTION fn66( f1 numeric (63, 30)) returns numeric (63, 30)
 BEGIN
@@ -15502,7 +16778,12 @@ return f1;
 END//
 SELECT fn66(-1e+36);
 fn66(-1e+36)
--999999999999999999999999999999999.999999999999999999999999999999
+-999999999999999999999999999999989.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn67;
 CREATE FUNCTION fn67( f1 numeric (63, 30) unsigned) returns numeric (63, 30) unsigned
 BEGIN
@@ -15512,6 +16793,10 @@ END//
 SELECT fn67(1e+36);
 fn67(1e+36)
 999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn68;
 CREATE FUNCTION fn68( f1 numeric (63, 30) unsigned zerofill) returns numeric (63, 30) unsigned zerofill
 BEGIN
@@ -15521,6 +16806,10 @@ END//
 SELECT fn68(1e+36);
 fn68(1e+36)
 999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn69;
 CREATE FUNCTION fn69( f1 numeric (63, 30) zerofill) returns numeric (63, 30) zerofill
 BEGIN
@@ -15529,7 +16818,10 @@ return f1;
 END//
 SELECT fn69(-1e+36);
 fn69(-1e+36)
-000000000000000000000000000000000.000000000000000000000000000000
+000000000000000000000000000000010.000000000000000000000000000000
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn70_n;
 CREATE FUNCTION fn70_n( f1 numeric (64)) returns numeric (64)
 BEGIN
@@ -15577,7 +16869,9 @@ return f1;
 END//
 SELECT fn74(999999999);
 fn74(999999999)
-999999999
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn75;
 CREATE FUNCTION fn75( f1 numeric unsigned zerofill) returns numeric unsigned zerofill
 BEGIN
@@ -15586,7 +16880,9 @@ return f1;
 END//
 SELECT fn75(999999999);
 fn75(999999999)
-0999999999
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn76;
 CREATE FUNCTION fn76( f1 numeric zerofill) returns numeric zerofill
 BEGIN
@@ -15595,7 +16891,10 @@ return f1;
 END//
 SELECT fn76(-999999999);
 fn76(-999999999)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn77;
 CREATE FUNCTION fn77( f1 real) returns real
 BEGIN
@@ -15613,7 +16912,9 @@ return f1;
 END//
 SELECT fn78(1.1);
 fn78(1.1)
-1.1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn79;
 CREATE FUNCTION fn79( f1 real unsigned zerofill) returns real unsigned zerofill
 BEGIN
@@ -15622,7 +16923,9 @@ return f1;
 END//
 SELECT fn79(1.1);
 fn79(1.1)
-1.1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn80;
 CREATE FUNCTION fn80( f1 real zerofill) returns real zerofill
 BEGIN
@@ -15631,7 +16934,9 @@ return f1;
 END//
 SELECT fn80(1.1);
 fn80(1.1)
-1.1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn81;
 CREATE FUNCTION fn81( f1 smallint) returns smallint
 BEGIN
@@ -15667,7 +16972,11 @@ return f1;
 END//
 SELECT fn84(-32601);
 fn84(-32601)
-0
+65535
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn85;
 CREATE FUNCTION fn85( f1 tinyint) returns tinyint
 BEGIN
@@ -15703,45 +17012,37 @@ return f1;
 END//
 SELECT fn88(-101);
 fn88(-101)
-0
+255
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn89;
 CREATE FUNCTION fn89( f1 enum('1enum', '2enum')) returns enum('1enum', '2enum')
 BEGIN
-if f1 eq "1enum" then
-set f1 = '2enum';
-else
-set f1 = '1enum';
-END if;
-return f1;
+IF f1 = '1enum' THEN
+SET f1 = '2enum';
+ELSE
+SET f1 = '1enum';
+END IF;
+RETURN f1;
 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 'eq "1enum" then
-set f1 = '2enum';
-else
-set f1 = '1enum';
-END if;
-return f1;
-END' at line 3
 SELECT fn89( '1enum');
-ERROR 42000: FUNCTION d1.fn89 does not exist
+fn89( '1enum')
+2enum
 DROP FUNCTION IF EXISTS fn90;
-CREATE FUNCTION fn90( f1 set("1set", "2set")) returns set("1set", "2set")
+CREATE FUNCTION fn90( f1 set('1set', '2set')) returns set('1set', '2set')
 BEGIN
-if(f1 == "1set") then
-set f1 = "2set";
-else
-set f1 = "1set";
-END if;
-return f1;
+IF f1 = '1set' THEN
+SET f1 = '2set';
+ELSE
+SET f1 = '1set';
+END IF;
+RETURN f1;
 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 '== "1set") then
-set f1 = "2set";
-else
-set f1 = "1set";
-END if;
-return f1;
-END' at line 3
 SELECT fn90( '1set');
-ERROR 42000: FUNCTION d1.fn90 does not exist
+fn90( '1set')
+2set
 DROP FUNCTION IF EXISTS fn91;
 CREATE FUNCTION fn91( f1 date) returns date
 BEGIN
@@ -15759,7 +17060,7 @@ return f1;
 END//
 SELECT fn92( '23:59:59.999999');
 fn92( '23:59:59.999999')
-26:00:00
+25:59:59
 DROP FUNCTION IF EXISTS fn93;
 CREATE FUNCTION fn93( f1 datetime) returns datetime
 BEGIN
@@ -15768,7 +17069,7 @@ return f1;
 END//
 SELECT fn93('1997-12-31 23:59:59.999999');
 fn93('1997-12-31 23:59:59.999999')
-1998-01-02 01:01:01
+1998-01-02 01:01:00
 DROP FUNCTION IF EXISTS fn94;
 CREATE FUNCTION fn94( f1 char) returns char
 BEGIN
@@ -15778,6 +17079,8 @@ END//
 SELECT fn94( 'h');
 fn94( 'h')
 a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn95;
 CREATE FUNCTION fn95( f1 char ascii) returns char ascii
 BEGIN
@@ -15787,15 +17090,19 @@ END//
 SELECT fn95('h');
 fn95('h')
 a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn96;
-CREATE FUNCTION fn96( f1 char binary) returns char binary
+CREATE FUNCTION fn96( f1 binary) returns binary(2)
 BEGIN
 set f1 = concat('a', f1);
 return f1;
 END//
 SELECT fn96( 'h');
 fn96( 'h')
-a
+a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn97;
 CREATE FUNCTION fn97( f1 longtext) returns longtext
 BEGIN
@@ -15917,7 +17224,7 @@ SELECT f1;
 END//
 CALL sp2(1.84e+19);
 f1
--9223372036854775808
+18400000000000000000
 DROP PROCEDURE IF EXISTS sp3;
 CREATE PROCEDURE sp3( f1 bigint unsigned zerofill)
 BEGIN
@@ -15926,7 +17233,7 @@ SELECT f1;
 END//
 CALL sp3(1.84e+17);
 f1
-184000000000000000
+00184000000000000000
 DROP PROCEDURE IF EXISTS sp4;
 CREATE PROCEDURE sp4( f1 bigint zerofill)
 BEGIN
@@ -15935,31 +17242,27 @@ SELECT f1;
 END//
 CALL sp4(-9.22e+15);
 f1
--9220000000000000
+00000000000000000000
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp5;
 CREATE PROCEDURE sp5( f1 decimal)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: default (10) for DECIMAL not checked, decimal digits shown although not defined
 CALL sp5(-1.00e+09);
 f1
--1000000000.000000000
+-1000000000
 DROP PROCEDURE IF EXISTS sp6;
 CREATE PROCEDURE sp6( f1 decimal (0))
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp6(-1.00e+09);
 f1
--1000000000.000000000
+-1000000000
 DROP PROCEDURE IF EXISTS sp7;
 CREATE PROCEDURE sp7( f1 decimal (0) unsigned)
 BEGIN
@@ -15968,7 +17271,11 @@ SELECT f1;
 END//
 CALL sp7(99999999999);
 f1
-99999999999.000000000
+9999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp8;
 CREATE PROCEDURE sp8( f1 decimal (0) unsigned zerofill)
 BEGIN
@@ -15977,199 +17284,201 @@ SELECT f1;
 END//
 CALL sp8(999999999);
 f1
-999999999.000000000
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp9;
 CREATE PROCEDURE sp9( f1 decimal (0) zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp9(-1.00e+09);
 f1
--1000000000.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp10;
 CREATE PROCEDURE sp10( f1 decimal (0, 0))
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp10(-1.00e+09);
 f1
--1000000000.000000000
+-1000000000
 DROP PROCEDURE IF EXISTS sp11;
 CREATE PROCEDURE sp11( f1 decimal (0, 0) unsigned)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp11(99999999999);
 f1
-99999999999.000000000
+9999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp12;
 CREATE PROCEDURE sp12( f1 decimal (0, 0) unsigned zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp12(999999999);
 f1
-999999999.000000000
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp13;
 CREATE PROCEDURE sp13( f1 decimal (0, 0) zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp13(-1.00e+09);
 f1
--1000000000.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp14;
 CREATE PROCEDURE sp14( f1 decimal (63, 30))
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: wrong number of decimal digits shown
 CALL sp14(-1.00e+21);
 f1
--1000000000000000000000.000000000
+-1000000000000000000000.000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp15;
 CREATE PROCEDURE sp15( f1 decimal (63, 30) unsigned)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: wrong number of decimal digits shown
 CALL sp15(1.00e+16);
 f1
-10000000000000000.000000000
+10000000000000000.000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp16;
 CREATE PROCEDURE sp16( f1 decimal (63, 30) unsigned zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: wrong number of decimal digits shown
 CALL sp16(1.00e+16);
 f1
-10000000000000000.000000000
+000000000000000010000000000000000.000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp17;
 CREATE PROCEDURE sp17( f1 decimal (63, 30) zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: wrong number of decimal digits shown
 CALL sp17(-1.00e+21);
 f1
--1000000000000000000000.000000000
+000000000000000000000000000000010.000000000000000000000000000000
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp18_d;
 CREATE PROCEDURE sp18_d( f1 decimal (64))
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp18_d(-1.00e+30);
+f1
+-1000000000000000000000000000000
 CALL sp18_d( -1000000000000000000000000000000 );
 f1
--1000000000000000000000000000000.000000000
+-1000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp19_du;
 CREATE PROCEDURE sp19_du( f1 decimal (64) unsigned)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp19_du(1.00e+20);
+f1
+100000000000000000000
 CALL sp19_du( 100000000000000000000 );
 f1
-100000000000000000000.000000000
+100000000000000000000
+CALL sp19_du(1.00e+24);
+f1
+1000000000000000000000000
 CALL sp19_du( 1000000000000000000000000 );
 f1
-1000000000000000000000000.000000000
+1000000000000000000000000
 DROP PROCEDURE IF EXISTS sp20_duz;
 CREATE PROCEDURE sp20_duz( f1 decimal (64) unsigned zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
+CALL sp20_duz(1.00e+20);
+f1
+0000000000000000000000000000000000000000000100000000000000000000
 CALL sp20_duz( 100000000000000000000 );
 f1
-100000000000000000000.000000000
+0000000000000000000000000000000000000000000100000000000000000000
+CALL sp20_duz(1.00e+24);
+f1
+0000000000000000000000000000000000000001000000000000000000000000
 CALL sp20_duz( 1000000000000000000000000 );
 f1
-1000000000000000000000000.000000000
+0000000000000000000000000000000000000001000000000000000000000000
 DROP PROCEDURE IF EXISTS sp21;
 CREATE PROCEDURE sp21( f1 decimal (64) zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp21(1.00e+00);
 f1
-1.000000000
+0000000000000000000000000000000000000000000000000000000000000010
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp22;
 CREATE PROCEDURE sp22( f1 decimal unsigned)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp22(1.00e+00);
 f1
-1.000000000
+10
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp23;
 CREATE PROCEDURE sp23( f1 decimal unsigned zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp23(1.00e+00);
 f1
-1.000000000
+0000000010
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp24;
 CREATE PROCEDURE sp24( f1 decimal zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp24(-1.00e+09);
 f1
--1000000000.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp25;
 CREATE PROCEDURE sp25( f1 double)
 BEGIN
@@ -16187,7 +17496,9 @@ SELECT f1;
 END//
 CALL sp26(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp27;
 CREATE PROCEDURE sp27( f1 double unsigned zerofill)
 BEGIN
@@ -16196,7 +17507,9 @@ SELECT f1;
 END//
 CALL sp27(1.00e+00);
 f1
-1
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp28;
 CREATE PROCEDURE sp28( f1 double zerofill)
 BEGIN
@@ -16205,7 +17518,9 @@ SELECT f1;
 END//
 CALL sp28(1.00e+00);
 f1
-1
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp29;
 CREATE PROCEDURE sp29( f1 float)
 BEGIN
@@ -16223,7 +17538,9 @@ SELECT f1;
 END//
 CALL sp30(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp31;
 CREATE PROCEDURE sp31( f1 float unsigned zerofill)
 BEGIN
@@ -16232,7 +17549,9 @@ SELECT f1;
 END//
 CALL sp31(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp32;
 CREATE PROCEDURE sp32( f1 float zerofill)
 BEGIN
@@ -16241,7 +17560,9 @@ SELECT f1;
 END//
 CALL sp32(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp33;
 CREATE PROCEDURE sp33( f1 float(0))
 BEGIN
@@ -16259,7 +17580,9 @@ SELECT f1;
 END//
 CALL sp34(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp35;
 CREATE PROCEDURE sp35( f1 float(0) unsigned zerofill)
 BEGIN
@@ -16268,7 +17591,9 @@ SELECT f1;
 END//
 CALL sp35(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp36;
 CREATE PROCEDURE sp36( f1 float(0) zerofill)
 BEGIN
@@ -16277,7 +17602,9 @@ SELECT f1;
 END//
 CALL sp36(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp37;
 CREATE PROCEDURE sp37( f1 float(23))
 BEGIN
@@ -16295,7 +17622,9 @@ SELECT f1;
 END//
 CALL sp38(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp39;
 CREATE PROCEDURE sp39( f1 float(23) unsigned zerofill)
 BEGIN
@@ -16304,7 +17633,9 @@ SELECT f1;
 END//
 CALL sp39(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp40;
 CREATE PROCEDURE sp40( f1 float(23) zerofill)
 BEGIN
@@ -16313,7 +17644,9 @@ SELECT f1;
 END//
 CALL sp40(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp41;
 CREATE PROCEDURE sp41( f1 float(24))
 BEGIN
@@ -16331,7 +17664,9 @@ SELECT f1;
 END//
 CALL sp42(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp43;
 CREATE PROCEDURE sp43( f1 float(24) unsigned zerofill)
 BEGIN
@@ -16340,7 +17675,9 @@ SELECT f1;
 END//
 CALL sp43(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp44;
 CREATE PROCEDURE sp44( f1 float(24) zerofill)
 BEGIN
@@ -16349,7 +17686,9 @@ SELECT f1;
 END//
 CALL sp44(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp45;
 CREATE PROCEDURE sp45( f1 float(53))
 BEGIN
@@ -16367,7 +17706,9 @@ SELECT f1;
 END//
 CALL sp46(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp47;
 CREATE PROCEDURE sp47( f1 float(53) unsigned zerofill)
 BEGIN
@@ -16376,7 +17717,9 @@ SELECT f1;
 END//
 CALL sp47(1.00e+00);
 f1
-1
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp48;
 CREATE PROCEDURE sp48( f1 float(53) zerofill)
 BEGIN
@@ -16385,7 +17728,9 @@ SELECT f1;
 END//
 CALL sp48(1.00e+00);
 f1
-1
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp49;
 CREATE PROCEDURE sp49( f1 int)
 BEGIN
@@ -16394,7 +17739,10 @@ SELECT f1;
 END//
 CALL sp49(-2.15e+09);
 f1
--2150000000
+-2147483638
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp50;
 CREATE PROCEDURE sp50( f1 int unsigned)
 BEGIN
@@ -16421,7 +17769,7 @@ SELECT f1;
 END//
 CALL sp52(2.15e+08);
 f1
-215000000
+0215000000
 DROP PROCEDURE IF EXISTS sp53;
 CREATE PROCEDURE sp53( f1 mediumint)
 BEGIN
@@ -16430,7 +17778,9 @@ SELECT f1;
 END//
 CALL sp53(-8388600);
 f1
--8388600
+-8388598
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp54;
 CREATE PROCEDURE sp54( f1 mediumint unsigned)
 BEGIN
@@ -16457,7 +17807,11 @@ SELECT f1;
 END//
 CALL sp56(-8388601);
 f1
--8388602
+16777215
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp57;
 CREATE PROCEDURE sp57( f1 numeric)
 BEGIN
@@ -16466,7 +17820,9 @@ SELECT f1;
 END//
 CALL sp57(-999999999);
 f1
--999999999.000000000
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp58;
 CREATE PROCEDURE sp58( f1 numeric (0))
 BEGIN
@@ -16475,7 +17831,9 @@ SELECT f1;
 END//
 CALL sp58(-999999999);
 f1
--999999999.000000000
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp59;
 CREATE PROCEDURE sp59( f1 numeric (0) unsigned)
 BEGIN
@@ -16484,7 +17842,10 @@ SELECT f1;
 END//
 CALL sp59(9999999999);
 f1
-9999999999.000000000
+9999999999
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp60;
 CREATE PROCEDURE sp60( f1 numeric (0) unsigned zerofill)
 BEGIN
@@ -16493,7 +17854,9 @@ SELECT f1;
 END//
 CALL sp60(99999999);
 f1
-99999999.000000000
+0100000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp61;
 CREATE PROCEDURE sp61( f1 numeric (0) zerofill)
 BEGIN
@@ -16502,7 +17865,10 @@ SELECT f1;
 END//
 CALL sp61(-99999999);
 f1
--99999999.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp62;
 CREATE PROCEDURE sp62( f1 numeric (0, 0))
 BEGIN
@@ -16511,7 +17877,9 @@ SELECT f1;
 END//
 CALL sp62(-999999999);
 f1
--999999999.000000000
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp63;
 CREATE PROCEDURE sp63( f1 numeric (0, 0) unsigned)
 BEGIN
@@ -16520,7 +17888,10 @@ SELECT f1;
 END//
 CALL sp63(9999999999);
 f1
-9999999999.000000000
+9999999999
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp64;
 CREATE PROCEDURE sp64( f1 numeric (0, 0) unsigned zerofill)
 BEGIN
@@ -16529,7 +17900,9 @@ SELECT f1;
 END//
 CALL sp64(99999999);
 f1
-99999999.000000000
+0100000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp65;
 CREATE PROCEDURE sp65( f1 numeric (0, 0) zerofill)
 BEGIN
@@ -16538,79 +17911,146 @@ SELECT f1;
 END//
 CALL sp65(-99999999);
 f1
--99999999.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp66_n;
 CREATE PROCEDURE sp66_n( f1 numeric (63, 30))
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp66_n(-1e+36);
+f1
+-999999999999999999999999999999989.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 CALL sp66_n( -1000000000000000000000000000000000000 );
 f1
--1000000000000000000000000000000000000.000000000
+-999999999999999999999999999999989.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp67_nu;
 CREATE PROCEDURE sp67_nu( f1 numeric (63, 30) unsigned)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp67_nu(1e+36);
+f1
+999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 CALL sp67_nu( 1000000000000000000000000000000000000 );
 f1
-1000000000000000000000000000000000000.000000000
+999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp68_nuz;
 CREATE PROCEDURE sp68_nuz( f1 numeric (63, 30) unsigned zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp68_nuz(1e+36);
+f1
+999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 CALL sp68_nuz( 1000000000000000000000000000000000000 );
 f1
-1000000000000000000000000000000000000.000000000
+999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp69_n_z;
 CREATE PROCEDURE sp69_n_z( f1 numeric (63, 30) zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp69_n_z(-1e+36);
+f1
+000000000000000000000000000000010.000000000000000000000000000000
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 CALL sp69_n_z( -1000000000000000000000000000000000000 );
 f1
--1000000000000000000000000000000000000.000000000
+000000000000000000000000000000010.000000000000000000000000000000
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp70_n;
 CREATE PROCEDURE sp70_n( f1 numeric (64))
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp70_n(-1e+40);
+f1
+-10000000000000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 CALL sp70_n( -10000000000000000000000000000000000000000 );
 f1
--10000000000000000000000000000000000000000.000000000
+-10000000000000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp71_nu;
 CREATE PROCEDURE sp71_nu( f1 numeric (64) unsigned)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp71_nu(1.00e+40);
+f1
+10000000000000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 CALL sp71_nu( 10000000000000000000000000000000000000000 );
 f1
-10000000000000000000000000000000000000000.000000000
+10000000000000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp72_nuz;
 CREATE PROCEDURE sp72_nuz( f1 numeric (64) unsigned zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp72_nuz(1.00e+40);
+f1
+0000000000000000000000010000000000000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 CALL sp72_nuz( 10000000000000000000000000000000000000000 );
 f1
-10000000000000000000000000000000000000000.000000000
+0000000000000000000000010000000000000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp73_n_z;
 CREATE PROCEDURE sp73_n_z( f1 numeric (64) zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp73_n_z(1.00e+40);
+f1
+0000000000000000000000010000000000000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 CALL sp73_n_z( 10000000000000000000000000000000000000000 );
 f1
-10000000000000000000000000000000000000000.000000000
+0000000000000000000000010000000000000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp74;
 CREATE PROCEDURE sp74( f1 numeric unsigned)
 BEGIN
@@ -16619,7 +18059,9 @@ SELECT f1;
 END//
 CALL sp74(999999999);
 f1
-999999999.000000000
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp75;
 CREATE PROCEDURE sp75( f1 numeric unsigned zerofill)
 BEGIN
@@ -16628,7 +18070,9 @@ SELECT f1;
 END//
 CALL sp75(999999999);
 f1
-999999999.000000000
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp76;
 CREATE PROCEDURE sp76( f1 numeric zerofill)
 BEGIN
@@ -16637,7 +18081,10 @@ SELECT f1;
 END//
 CALL sp76(-999999999);
 f1
--999999999.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp77;
 CREATE PROCEDURE sp77( f1 real)
 BEGIN
@@ -16646,7 +18093,7 @@ SELECT f1;
 END//
 CALL sp77(1.1);
 f1
-1.10000
+1.1
 DROP PROCEDURE IF EXISTS sp78;
 CREATE PROCEDURE sp78( f1 real unsigned)
 BEGIN
@@ -16655,7 +18102,9 @@ SELECT f1;
 END//
 CALL sp78(1.1);
 f1
-1.10000
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp79;
 CREATE PROCEDURE sp79( f1 real unsigned zerofill)
 BEGIN
@@ -16664,7 +18113,9 @@ SELECT f1;
 END//
 CALL sp79(1.1);
 f1
-1.10000
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp80;
 CREATE PROCEDURE sp80( f1 real zerofill)
 BEGIN
@@ -16673,7 +18124,9 @@ SELECT f1;
 END//
 CALL sp80(1.1);
 f1
-1.10000
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp81;
 CREATE PROCEDURE sp81( f1 smallint)
 BEGIN
@@ -16709,7 +18162,11 @@ SELECT f1;
 END//
 CALL sp84(-32601);
 f1
--32602
+65535
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp85;
 CREATE PROCEDURE sp85( f1 tinyint)
 BEGIN
@@ -16745,9 +18202,23 @@ SELECT f1;
 END//
 CALL sp88(-101);
 f1
--102
+255
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp89;
+CREATE PROCEDURE sp89( f1 enum('1enum', '2enum'))
+BEGIN
+IF f1 = '1enum' THEN set f1 = '2enum'; ELSE  set f1 = '1enum'; END IF;
+END//
+CALL sp89( '1enum');
 DROP PROCEDURE IF EXISTS sp90;
+CREATE PROCEDURE sp90( f1 set('1set', '2set'))
+BEGIN
+IF f1 = '1set' THEN  set f1 = '2set';  ELSE set f1 = '1set'; END IF;
+END//
+CALL sp90( '1set');
 DROP PROCEDURE IF EXISTS sp91;
 CREATE PROCEDURE sp91( f1 date)
 BEGIN
@@ -16765,7 +18236,7 @@ SELECT f1;
 END//
 CALL sp92( '23:59:59.999999');
 f1
-26:00:00.999997
+25:59:59
 DROP PROCEDURE IF EXISTS sp93;
 CREATE PROCEDURE sp93( f1 datetime)
 BEGIN
@@ -16774,7 +18245,7 @@ SELECT f1;
 END//
 CALL sp93('1997-12-31 23:59:59.999999');
 f1
-1998-01-02 01:01:01.000001
+1998-01-02 01:01:00
 DROP PROCEDURE IF EXISTS sp94;
 CREATE PROCEDURE sp94( f1 char)
 BEGIN
@@ -16783,7 +18254,9 @@ SELECT f1;
 END//
 CALL sp94( 'h');
 f1
-ah
+a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp95;
 CREATE PROCEDURE sp95( f1 char ascii)
 BEGIN
@@ -16792,7 +18265,9 @@ SELECT f1;
 END//
 CALL sp95( 'h');
 f1
-ah
+a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp96;
 CREATE PROCEDURE sp96( f1 char binary)
 BEGIN
@@ -16801,7 +18276,9 @@ SELECT f1;
 END//
 CALL sp96( 'h');
 f1
-ah
+a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp97;
 CREATE PROCEDURE sp97( f1 longtext)
 BEGIN
@@ -16846,7 +18323,7 @@ SELECT f1;
 END//
 CALL sp101(51);
 f1
-61
+2061
 DROP PROCEDURE IF EXISTS sp102;
 CREATE PROCEDURE sp102( f1 year(4))
 BEGIN
@@ -16901,6 +18378,8 @@ END//
 CALL sp107(2.00e+13);
 f1
 returned
+Warnings:
+returned	1265	Data truncated for column 'f1' at row 1
 USE db_storedproc;
 DROP DATABASE db1;
 DROP DATABASE IF EXISTS db1;
@@ -16937,9 +18416,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute01();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-61	61	71	61	61	71	2033	2033	2084	2033	2033	2084
+2061	2061	2071	2061	2061	2071	2033	2033	2084	2033	2033	2084
 var1	var2	var3	var4	var5	var6	var7	var8
-61	71	61	71	2033	2084	2033	2084
+2061	2071	2061	2071	2033	2084	2033	2084
 DROP PROCEDURE spexecute01;
 DROP PROCEDURE sp1;
 DROP PROCEDURE IF EXISTS sp2;
@@ -17010,9 +18489,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute03();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-ah	ah	aah	ah	ah	aah	helloworld	helloworld	NULL	helloworld	helloworld	hellohelloworld
+a	a	a	a	a	a	helloworld	helloworld	NULL	helloworld	helloworld	hellohelloworld
 var1	var2	var3	var4	var5	var6	var7	var8
-ah	aah	ah	aah	helloworld	NULL	helloworld	hellohelloworld
+a	a	a	a	helloworld	NULL	helloworld	hellohelloworld
 DROP PROCEDURE spexecute03;
 DROP PROCEDURE sp3;
 DROP PROCEDURE IF EXISTS sp4;
@@ -17155,7 +18634,7 @@ SELECT var7, var8;
 END//
 CALL spexecute07();
 var1	var2
-9223372036854775807	NULL
+18400000000000000000	NULL
 var3	var4
 -9220000000000000000	NULL
 var5	var6
@@ -17163,7 +18642,7 @@ var5	var6
 var7	var8
 -9220000000000000000	NULL
 f1	f2	f3
-9223372036854775807	9223372036854775807	NULL
+18400000000000000000	18400000000000000000	NULL
 f4	f5	f6
 -9220000000000000000	-9220000000000000000	NULL
 f7	f8	f9
@@ -17171,7 +18650,7 @@ f7	f8	f9
 f10	f11	f12
 -9220000000000000000	-9220000000000000000	NULL
 f1	f2	f3
--2	-2	-2
+18353255926290448384	18353255926290448384	18353255926290448384
 f4	f5	f6
 -9220000000000000000	6744073709551616	6744073709551616
 f7	f8	f9
@@ -17179,7 +18658,7 @@ f7	f8	f9
 f10	f11	f12
 -9220000000000000000	6744073709551616	6744073709551616
 var1	var2
--2	-2
+18353255926290448384	18353255926290448384
 var3	var4
 6744073709551616	6744073709551616
 var5	var6
@@ -17237,9 +18716,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute08();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-368000000000000000	368000000000000000	368000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+00368000000000000000	00368000000000000000	00368000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-368000000000000000	368000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+00368000000000000000	00368000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute08;
 DROP PROCEDURE sp8;
 DROP PROCEDURE IF EXISTS sp9;
@@ -17291,9 +18770,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute09();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--18440000000000000	-18440000000000000	-18439999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+00000000000000000000	00000000000000000000	00000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--18440000000000000	-18439999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+00000000000000000000	00000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute09;
 DROP PROCEDURE sp9;
 DROP PROCEDURE IF EXISTS sp10;
@@ -17337,9 +18816,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute10();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute10;
 DROP PROCEDURE sp10;
 DROP PROCEDURE IF EXISTS sp11;
@@ -17372,9 +18851,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute11();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1000000000.000000000	1000000000.000000000	1000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1000000000	1000000000	1000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1000000000.000000000	1000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1000000000	1000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute11;
 DROP PROCEDURE sp11;
 DROP PROCEDURE IF EXISTS sp12;
@@ -17407,9 +18886,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute12();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-99999999999.000000000	99999999999.000000000	100000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-99999999999.000000000	100000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute12;
 DROP PROCEDURE sp12;
 DROP PROCEDURE IF EXISTS sp13;
@@ -17442,9 +18921,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute13();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute13;
 DROP PROCEDURE sp13;
 DROP PROCEDURE IF EXISTS sp14;
@@ -17477,9 +18956,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute14();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000000000000000.000000000	-1000000000000000000000.000000000	-999999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000000000000000.000000000000000000000000000000	-1000000000000000000000.000000000000000000000000000000	-999999999999999999990.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000000000000000.000000000	-999999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000000000000000.000000000000000000000000000000	-999999999999999999990.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute14;
 DROP PROCEDURE sp14;
 DROP PROCEDURE IF EXISTS sp15;
@@ -17545,9 +19024,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute16();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute16;
 DROP PROCEDURE sp16;
 DROP PROCEDURE IF EXISTS sp17;
@@ -17579,9 +19058,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute17();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute17;
 DROP PROCEDURE sp17;
 DROP PROCEDURE IF EXISTS sp18;
@@ -17613,9 +19092,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute18();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute18;
 DROP PROCEDURE sp18;
 DROP PROCEDURE IF EXISTS sp19;
@@ -17647,9 +19126,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute19();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute19;
 DROP PROCEDURE sp19;
 DROP PROCEDURE IF EXISTS sp20;
@@ -17681,9 +19160,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute20();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute20;
 DROP PROCEDURE sp20;
 DROP PROCEDURE IF EXISTS sp21;
@@ -17715,9 +19194,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute21();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute21;
 DROP PROCEDURE sp21;
 DROP PROCEDURE IF EXISTS sp22;
@@ -17783,9 +19262,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute23();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute23;
 DROP PROCEDURE sp23;
 DROP PROCEDURE IF EXISTS sp24;
@@ -17817,9 +19296,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute24();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.1	1.1	11.1	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.1	11.1	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute24;
 DROP PROCEDURE sp24;
 DROP PROCEDURE IF EXISTS sp25;
@@ -17851,9 +19330,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute25();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--65402	-65402	-65392	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-32758	-32758	-32748	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--65402	-65392	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-32758	-32748	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute25;
 DROP PROCEDURE sp25;
 DROP PROCEDURE IF EXISTS sp26;
@@ -17919,9 +19398,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute27();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-26:00:00.999997	26:00:00.999997	28:00:01.999995	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+25:59:59	25:59:59	27:59:59	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-26:00:00.999997	28:00:01.999995	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+25:59:59	27:59:59	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute27;
 DROP PROCEDURE sp27;
 DROP PROCEDURE IF EXISTS sp28;
@@ -17953,9 +19432,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute28();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1998-01-02 01:01:01.000001	1998-01-02 01:01:01.000001	1998-01-03 02:02:02.000003	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1998-01-02 01:01:00	1998-01-02 01:01:00	1998-01-03 02:02:01	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1998-01-02 01:01:01.000001	1998-01-03 02:02:02.000003	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1998-01-02 01:01:00	1998-01-03 02:02:01	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute28;
 DROP PROCEDURE sp28;
 DROP PROCEDURE IF EXISTS sp29;
@@ -17987,9 +19466,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute29();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute29;
 DROP PROCEDURE sp29;
 DROP PROCEDURE IF EXISTS sp30;
@@ -18021,9 +19500,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute30();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute30;
 DROP PROCEDURE sp30;
 DROP PROCEDURE IF EXISTS sp31;
@@ -18089,9 +19568,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute32();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute32;
 DROP PROCEDURE sp32;
 DROP PROCEDURE IF EXISTS sp33;
@@ -18123,9 +19602,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute33();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute33;
 DROP PROCEDURE sp33;
 DROP PROCEDURE IF EXISTS sp34;
@@ -18191,9 +19670,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute35();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute35;
 DROP PROCEDURE sp35;
 DROP PROCEDURE IF EXISTS sp36;
@@ -18225,9 +19704,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute36();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute36;
 DROP PROCEDURE sp36;
 DROP PROCEDURE IF EXISTS sp37;
@@ -18293,9 +19772,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute38();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute38;
 DROP PROCEDURE sp38;
 DROP PROCEDURE IF EXISTS sp39;
@@ -18327,9 +19806,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute39();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute39;
 DROP PROCEDURE sp39;
 DROP PROCEDURE IF EXISTS sp40;
@@ -18361,9 +19840,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute40();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute40;
 DROP PROCEDURE sp40;
 DROP PROCEDURE IF EXISTS sp41;
@@ -18395,9 +19874,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute41();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute41;
 DROP PROCEDURE sp41;
 DROP PROCEDURE IF EXISTS sp42;
@@ -18429,9 +19908,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute42();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute42;
 DROP PROCEDURE sp42;
 DROP PROCEDURE IF EXISTS sp43;
@@ -18463,9 +19942,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute43();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute43;
 DROP PROCEDURE sp43;
 DROP PROCEDURE IF EXISTS sp44;
@@ -18497,9 +19976,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute44();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute44;
 DROP PROCEDURE sp44;
 DROP PROCEDURE IF EXISTS sp45;
@@ -18531,9 +20010,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute45();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute45;
 DROP PROCEDURE sp45;
 DROP PROCEDURE IF EXISTS sp46;
@@ -18565,9 +20044,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute46();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute46;
 DROP PROCEDURE sp46;
 DROP PROCEDURE IF EXISTS sp47;
@@ -18599,9 +20078,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute47();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute47;
 DROP PROCEDURE sp47;
 DROP PROCEDURE IF EXISTS sp48;
@@ -18633,9 +20112,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute48();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute48;
 DROP PROCEDURE sp48;
 DROP PROCEDURE IF EXISTS sp49;
@@ -18667,9 +20146,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute49();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute49;
 DROP PROCEDURE sp49;
 DROP PROCEDURE IF EXISTS sp50;
@@ -18701,9 +20180,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute50();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute50;
 DROP PROCEDURE sp50;
 DROP PROCEDURE IF EXISTS sp51;
@@ -18735,9 +20214,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute51();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute51;
 DROP PROCEDURE sp51;
 DROP PROCEDURE IF EXISTS sp52;
@@ -18769,9 +20248,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute52();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000000000000000000000000	-10000000000000000000000.000000000000000000000000000000	-99999999999999999990.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000000000000000000000000	-99999999999999999990.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute52;
 DROP PROCEDURE sp52;
 DROP PROCEDURE IF EXISTS sp53;
@@ -18803,9 +20282,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute53();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000	-10000000000000000000000	-99999999999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000	-99999999999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute53;
 DROP PROCEDURE sp53;
 DROP PROCEDURE IF EXISTS sp54;
@@ -18837,9 +20316,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute54();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000	10000000000000000000000	100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000	100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute54;
 DROP PROCEDURE sp54;
 DROP PROCEDURE IF EXISTS sp55;
@@ -18871,9 +20350,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute55();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute55;
 DROP PROCEDURE sp55;
 DROP PROCEDURE IF EXISTS sp56;
@@ -18905,9 +20384,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute56();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-61	61	71	61	61	71	61	61	71	61	61	71
+2061	2061	2071	2061	2061	2071	2061	2061	2071	2061	2061	2071
 var1	var2	var3	var4	var5	var6	var7	var8
-61	71	61	71	61	71	61	71
+2061	2071	2061	2071	2061	2071	2061	2071
 DROP PROCEDURE spexecute56;
 DROP PROCEDURE sp56;
 DROP PROCEDURE IF EXISTS sp57;
@@ -19041,9 +20520,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute60();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-ah	ah	aah	ah	ah	aah	ah	ah	aah	ah	ah	aah
+a	a	a	a	a	a	a	a	a	a	a	a
 var1	var2	var3	var4	var5	var6	var7	var8
-ah	aah	ah	aah	ah	aah	ah	aah
+a	a	a	a	a	a	a	a
 DROP PROCEDURE spexecute60;
 DROP PROCEDURE sp60;
 DROP PROCEDURE IF EXISTS sp61;
@@ -19075,9 +20554,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute61();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-ah	ah	aah	ah	ah	aah	ah	ah	NULL	ah	ah	aah
+a	a	a	a	a	a	a	a	NULL	a	a	a
 var1	var2	var3	var4	var5	var6	var7	var8
-ah	aah	ah	aah	ah	NULL	ah	aah
+a	a	a	a	a	NULL	a	a
 DROP PROCEDURE spexecute61;
 DROP PROCEDURE sp61;
 DROP PROCEDURE IF EXISTS sp62;
@@ -19177,9 +20656,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute64();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000
+1000000000	1000000000	1000000010	1000000000	1000000000	1000000010	1000000000	1000000000	1000000010	1000000000	1000000000	1000000010
 var1	var2	var3	var4	var5	var6	var7	var8
-1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000
+1000000000	1000000010	1000000000	1000000010	1000000000	1000000010	1000000000	1000000010
 DROP PROCEDURE spexecute64;
 DROP PROCEDURE sp64;
 DROP PROCEDURE IF EXISTS sp65;
@@ -19211,9 +20690,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute65();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-999999999.000000000	999999999.000000000	1000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1000000000	1000000000	1000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-999999999.000000000	1000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1000000000	1000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute65;
 DROP PROCEDURE sp65;
 DROP PROCEDURE IF EXISTS sp66;
@@ -19245,9 +20724,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute66();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10000000000000000.000000000	10000000000000000.000000000	10000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10000000000000000.000000000000000000000000000000	10000000000000000.000000000000000000000000000000	10000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000.000000000	10000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000.000000000000000000000000000000	10000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute66;
 DROP PROCEDURE sp66;
 DROP PROCEDURE IF EXISTS sp67;
@@ -19279,9 +20758,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute67();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10000000000000000.000000000	10000000000000000.000000000	10000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000.000000000	10000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute67;
 DROP PROCEDURE sp67;
 DROP PROCEDURE IF EXISTS sp68;
@@ -19313,9 +20792,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute68();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000000000000000.000000000	-1000000000000000000000.000000000	-999999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000000000000000.000000000	-999999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute68;
 DROP PROCEDURE sp68;
 DROP PROCEDURE IF EXISTS sp69;
@@ -19347,9 +20826,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute69();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000	-10000000000000000000000	-99999999999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000	-99999999999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute69;
 DROP PROCEDURE sp69;
 DROP PROCEDURE IF EXISTS sp70;
@@ -19381,9 +20860,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute70();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000	10000000000000000000000	100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000	100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute70;
 DROP PROCEDURE sp70;
 DROP PROCEDURE IF EXISTS sp71;
@@ -19415,9 +20894,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute71();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000100000000000000000000	0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute71;
 DROP PROCEDURE sp71;
 DROP PROCEDURE IF EXISTS sp72;
@@ -19449,9 +20928,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute72();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute72;
 DROP PROCEDURE sp72;
 DROP PROCEDURE IF EXISTS sp73;
@@ -19483,9 +20962,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute73();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute73;
 DROP PROCEDURE sp73;
 DROP PROCEDURE IF EXISTS sp74;
@@ -19517,9 +20996,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute74();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute74;
 DROP PROCEDURE sp74;
 DROP PROCEDURE IF EXISTS sp75;
@@ -19551,9 +21030,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute75();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute75;
 DROP PROCEDURE sp75;
 DROP PROCEDURE IF EXISTS sp76;
@@ -19585,9 +21064,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute76();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute76;
 DROP PROCEDURE sp76;
 DROP PROCEDURE IF EXISTS sp77;
@@ -19619,9 +21098,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute77();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute77;
 DROP PROCEDURE sp77;
 DROP PROCEDURE IF EXISTS sp78;
@@ -19653,9 +21132,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute78();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute78;
 DROP PROCEDURE sp78;
 DROP PROCEDURE IF EXISTS sp79;
@@ -19687,9 +21166,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute79();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute79;
 DROP PROCEDURE sp79;
 DROP PROCEDURE IF EXISTS sp80;
@@ -19721,9 +21200,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute80();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--2150000000	-2150000000	-2149999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-2147483638	-2147483638	-2147483628	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--2150000000	-2149999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-2147483638	-2147483628	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute80;
 DROP PROCEDURE sp80;
 DROP PROCEDURE IF EXISTS sp81;
@@ -19823,9 +21302,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute83();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-215000000	215000000	215000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0215000000	0215000000	0215000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-215000000	215000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0215000000	0215000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute83;
 DROP PROCEDURE sp83;
 DROP PROCEDURE IF EXISTS sp84;
@@ -19857,9 +21336,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute84();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--8388600	-8388600	-8388590	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-8388598	-8388598	-8388588	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--8388600	-8388590	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-8388598	-8388588	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute84;
 DROP PROCEDURE sp84;
 DROP PROCEDURE IF EXISTS sp85;
@@ -19925,9 +21404,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute86();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-16777210	16777210	16777220	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+16777210	16777210	16777215	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-16777210	16777220	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+16777210	16777215	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute86;
 DROP PROCEDURE sp86;
 DROP PROCEDURE IF EXISTS sp87;
@@ -19959,9 +21438,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute87();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--8388602	-8388602	-8388592	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+16777215	16777215	16777215	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--8388602	-8388592	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+16777215	16777215	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute87;
 DROP PROCEDURE sp87;
 DROP PROCEDURE IF EXISTS sp88;
@@ -19993,9 +21472,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute88();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-99999999.000000000	99999999.000000000	100000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0100000000	0100000000	0100000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-99999999.000000000	100000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0100000000	0100000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute88;
 DROP PROCEDURE sp88;
 DROP PROCEDURE IF EXISTS sp89;
@@ -20027,9 +21506,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute89();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-99999999.000000000	99999999.000000000	100000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0100000000	0100000000	0100000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-99999999.000000000	100000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0100000000	0100000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute89;
 DROP PROCEDURE sp89;
 DROP PROCEDURE IF EXISTS sp90;
@@ -20061,9 +21540,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute90();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000000000000000000000000	10000000000000000000000.000000000000000000000000000000	100000000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000000000000000000000000	100000000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute90;
 DROP PROCEDURE sp90;
 DROP PROCEDURE IF EXISTS sp91;
@@ -20095,9 +21574,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute91();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000000100000000000000000000.000000000000000000000000000000	000000000010000000000000000000000.000000000000000000000000000000	000000000000100000000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010000000000000000000000.000000000000000000000000000000	000000000000100000000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute91;
 DROP PROCEDURE sp91;
 DROP PROCEDURE IF EXISTS sp92;
@@ -20129,9 +21608,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute92();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute92;
 DROP PROCEDURE sp92;
 DROP PROCEDURE IF EXISTS sp93;
@@ -20163,9 +21642,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute93();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000100000000000000000000	0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute93;
 DROP PROCEDURE sp93;
 DROP PROCEDURE IF EXISTS sp94;
@@ -20231,9 +21710,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute95();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-65532	65532	65542	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+65532	65532	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-65532	65542	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+65532	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute95;
 DROP PROCEDURE sp95;
 DROP PROCEDURE IF EXISTS sp96;
@@ -20265,9 +21744,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute96();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-65532	65532	65542	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+65532	65532	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-65532	65542	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+65532	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute96;
 DROP PROCEDURE sp96;
 DROP PROCEDURE IF EXISTS sp97;
@@ -20299,9 +21778,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute97();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--32602	-32602	-32592	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+65535	65535	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--32602	-32592	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+65535	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute97;
 DROP PROCEDURE sp97;
 DROP PROCEDURE IF EXISTS sp98;
@@ -20367,9 +21846,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute99();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-252	252	262	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+252	252	255	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-252	262	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+252	255	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute99;
 DROP PROCEDURE sp99;
 DROP PROCEDURE IF EXISTS sp100;
@@ -20435,9 +21914,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute101();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--102	-102	-92	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+255	255	255	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--102	-92	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+255	255	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute101;
 DROP PROCEDURE sp101;
 USE db_storedproc;
@@ -20462,13 +21941,13 @@ set a = '2005-03-14 01:01:02';
 insert into temp_table values(a);
 END//
 show CREATE PROCEDURE sp2;
-Procedure	sql_mode	Create Procedure
-sp2	ALLOW_INVALID_DATES	CREATE PROCEDURE `sp2`()
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
+sp2	ALLOW_INVALID_DATES	CREATE DEFINER=`root`@`localhost` PROCEDURE `sp2`()
 BEGIN
 declare a datetime;
 set a = '2005-03-14 01:01:02';
 insert into temp_table values(a);
-END
+END	latin1	latin1_swedish_ci	latin1_swedish_ci
 set @@sql_mode = 'traditional';
 CALL sp2 ();
 SELECT * from temp_table;
@@ -20498,15 +21977,15 @@ set b = 5;
 SELECT not 1 between a and b;
 END//
 show CREATE PROCEDURE sp3;
-Procedure	sql_mode	Create Procedure
-sp3	HIGH_NOT_PRECEDENCE	CREATE PROCEDURE `sp3`()
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
+sp3	HIGH_NOT_PRECEDENCE	CREATE DEFINER=`root`@`localhost` PROCEDURE `sp3`()
 BEGIN
 declare a int signed;
 declare b int unsigned;
 set a = -5;
 set b = 5;
 SELECT not 1 between a and b;
-END
+END	latin1	latin1_swedish_ci	latin1_swedish_ci
 set @@sql_mode='';
 CALL sp3();
 not 1 between a and b
@@ -20541,8 +22020,8 @@ set c = b/a;
 show warnings;
 END//
 show CREATE PROCEDURE sp4;
-Procedure	sql_mode	Create Procedure
-sp4	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI,ERROR_FOR_DIVISION_BY_ZERO	CREATE PROCEDURE "sp4"()
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
+sp4	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI,ERROR_FOR_DIVISION_BY_ZERO	CREATE DEFINER="root"@"localhost" PROCEDURE "sp4"()
 BEGIN
 declare a int;
 declare b int;
@@ -20551,7 +22030,7 @@ set a = 0;
 set b = 1;
 set c = b/a;
 show warnings;
-END
+END	latin1	latin1_swedish_ci	latin1_swedish_ci
 set @@sql_mode='';
 CALL sp4();
 Level	Code	Message
@@ -20589,37 +22068,37 @@ set @x=i1;
 set @y=@x;
 END//
 show CREATE PROCEDURE sp6a;
-Procedure	sql_mode	Create Procedure
-sp6a		CREATE PROCEDURE `sp6a`(i1 longtext, out i2 mediumint , inout i3 longblob, in i4 year, out i5 real)
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
+sp6a		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6a`(i1 longtext, out i2 mediumint , inout i3 longblob, in i4 year, out i5 real)
 BEGIN
 set @x=i1;
 set @y=@x;
-END
+END	latin1	latin1_swedish_ci	latin1_swedish_ci
 show CREATE PROCEDURE sp6b;
-Procedure	sql_mode	Create Procedure
-sp6b		CREATE PROCEDURE `sp6b`(out i1 longtext, out i2 mediumint , out i3 longblob, out i4 year, out i5 real)
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
+sp6b		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6b`(out i1 longtext, out i2 mediumint , out i3 longblob, out i4 year, out i5 real)
     DETERMINISTIC
 BEGIN
 set @x=i1;
 set @y=@x;
-END
+END	latin1	latin1_swedish_ci	latin1_swedish_ci
 show CREATE PROCEDURE sp6c;
-Procedure	sql_mode	Create Procedure
-sp6c		CREATE PROCEDURE `sp6c`(inout i1 longtext, inout  i2 mediumint , inout i3 longblob, inout  i4 year, inout  i5 real)
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
+sp6c		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6c`(inout i1 longtext, inout  i2 mediumint , inout i3 longblob, inout  i4 year, inout  i5 real)
     COMMENT 'this is a comment'
 BEGIN
 set @x=i1;
 set @y=@x;
-END
+END	latin1	latin1_swedish_ci	latin1_swedish_ci
 SHOW PROCEDURE status like 'sp6a';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp6a	PROCEDURE	root@localhost	modified	created	DEFINER	
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp6a	PROCEDURE	root@localhost	modified	created	DEFINER		latin1	latin1_swedish_ci	latin1_swedish_ci
 SHOW PROCEDURE status like 'sp6b';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp6b	PROCEDURE	root@localhost	modified	created	DEFINER	
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp6b	PROCEDURE	root@localhost	modified	created	DEFINER		latin1	latin1_swedish_ci	latin1_swedish_ci
 SHOW PROCEDURE status like 'sp6c';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp6c	PROCEDURE	root@localhost	modified	created	DEFINER	this is a comment
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp6c	PROCEDURE	root@localhost	modified	created	DEFINER	this is a comment	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP PROCEDURE sp6a;
 DROP PROCEDURE sp6b;
 DROP PROCEDURE sp6c;
@@ -20633,8 +22112,8 @@ set @x=i1;
 set @y=@x;
 END//
 SHOW PROCEDURE status like 'sp6';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp6	PROCEDURE	root@localhost	modified	created	DEFINER	
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp6	PROCEDURE	root@localhost	modified	created	DEFINER		latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP PROCEDURE sp6;
 
 Testcase 4.8.3:
@@ -20659,8 +22138,8 @@ set @y=@x;
 return 0;
 END//
 show  function status like 'sp6';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp6	FUNCTION	root@localhost	modified	created	DEFINER	
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp6	FUNCTION	root@localhost	modified	created	DEFINER		latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP FUNCTION sp6;
 
 Testcase 4.8.5:
@@ -20673,7 +22152,7 @@ Testcase 4.8.6:
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp6;
 show  procedure status like 'sp6';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
 
 Testcase 4.8.7:
 --------------------------------------------------------------------------------
@@ -20694,7 +22173,7 @@ BEGIN
 return i1;
 END//
 show  procedure status like 'fn1';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
 DROP FUNCTION fn1;
 
 Testcase 4.8.9:
@@ -20708,8 +22187,8 @@ BEGIN
 return i1;
 END//
 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 fn1;
 
 Testcase 4.8.11:
@@ -20738,7 +22217,7 @@ Testcase 4.8.13:
 --------------------------------------------------------------------------------
 DROP FUNCTION IF EXISTS f1000;
 SHOW FUNCTION STATUS LIKE 'f1000';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
 
 Testcase 4.8.14:
 --------------------------------------------------------------------------------
@@ -20760,7 +22239,7 @@ set @x=i1;
 set @y=@x;
 END//
 show  function status like 'sp6';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
 DROP PROCEDURE sp6;
 
 Testcase 4.8.16:
@@ -20777,8 +22256,8 @@ END//
 alter procedure sp6 sql security invoker;
 alter procedure sp6 comment  'this is a new comment';
 SHOW PROCEDURE status like 'sp6';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp6	PROCEDURE	root@localhost	modified	created	INVOKER	this is a new comment
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp6	PROCEDURE	root@localhost	modified	created	INVOKER	this is a new comment	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP PROCEDURE sp6;
 
 Testcase 4.8.18:
@@ -20790,12 +22269,12 @@ return x;
 END//
 alter function fn1 sql security invoker;
 show  create  function  fn1;
-Function	sql_mode	Create Function
-fn1		CREATE FUNCTION `fn1`(x int) RETURNS int(11)
+Function	sql_mode	Create Function	character_set_client	collation_connection	Database Collation
+fn1		CREATE DEFINER=`root`@`localhost` FUNCTION `fn1`(x int) RETURNS int(11)
     SQL SECURITY INVOKER
 BEGIN
 return x;
-END
+END	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP FUNCTION fn1;
 
 Testcase 4.8.19:
@@ -20808,8 +22287,8 @@ END//
 alter function fn1 sql security invoker;
 alter function fn1 comment 'this is a function 3242#@%$#@';
 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 a function 3242#@%$#@
+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 a function 3242#@%$#@	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP FUNCTION fn1;
 
 Testcase 4.8.20:
@@ -20822,13 +22301,13 @@ set @y=@x;
 END//
 alter procedure sp6 comment 'this is simple';
 show CREATE PROCEDURE sp6;
-Procedure	sql_mode	Create Procedure
-sp6		CREATE PROCEDURE `sp6`(i1 int , i2 int)
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
+sp6		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6`(i1 int , i2 int)
     COMMENT 'this is simple'
 BEGIN
 set @x=i1;
 set @y=@x;
-END
+END	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP PROCEDURE sp6;
 
 Testcase 4.8.21:
@@ -20853,7 +22332,7 @@ set @y=@x;
 END//
 DROP PROCEDURE sp6;
 SHOW PROCEDURE status like 'sp6';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
 
 Testcase 4.8.23:
 --------------------------------------------------------------------------------
@@ -20875,7 +22354,7 @@ return i1;
 END//
 DROP FUNCTION fn1;
 SHOW FUNCTION STATUS LIKE 'fn1';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
 
 Section 3.1.9 - Routine body checks:
 --------------------------------------------------------------------------------
@@ -20894,16 +22373,16 @@ SELECT * from t9 limit 0, 100;
 END//
 CALL sp6 (10, 20, 30, 40, 50);
 f1	f2	f3
--5000	a`	-5000
--4999	aaa	-4999
--4998	abaa	-4998
--4997	acaaa	-4997
--4996	adaaaa	-4996
--4995	aeaaaaa	-4995
--4994	afaaaaaa	-4994
--4993	agaaaaaaa	-4993
--4992	a^aaaaaaaa	-4992
 -4991	a_aaaaaaaaa	-4991
+-4992	a^aaaaaaaa	-4992
+-4993	agaaaaaaa	-4993
+-4994	afaaaaaa	-4994
+-4995	aeaaaaa	-4995
+-4996	adaaaa	-4996
+-4997	acaaa	-4997
+-4998	abaa	-4998
+-4999	aaa	-4999
+-5000	a`	-5000
 DROP PROCEDURE sp6;
 
 Testcase 4.9.2:
@@ -21363,9 +22842,16 @@ until done END repeat;
 SELECT done;
 close cur1;
 END//
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+CALL h1();
+done
+0
+done
+1
+done
+1
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.14:
 --------------------------------------------------------------------------------
@@ -21392,9 +22878,16 @@ until done END repeat;
 SELECT done;
 close cur1;
 END//
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+CALL h1();
+done
+0
+done
+1
+done
+1
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.15:
 --------------------------------------------------------------------------------
@@ -21422,9 +22915,16 @@ until done END repeat;
 SELECT done;
 close cur1;
 END//
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+CALL h1();
+done
+0
+@x=1
+0
+done
+1
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.16:
 --------------------------------------------------------------------------------
@@ -21452,17 +22952,16 @@ until done END repeat;
 SELECT done;
 close cur1;
 END//
-CALL h1()
-# cleanup;
+CALL h1();
 done
 0
 @x=1
 0
 done
 1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.17:
 --------------------------------------------------------------------------------
@@ -21490,9 +22989,9 @@ done
 0
 done
 1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.18:
 --------------------------------------------------------------------------------
@@ -21520,9 +23019,9 @@ done
 0
 done
 1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.19:
 --------------------------------------------------------------------------------
@@ -21550,9 +23049,9 @@ END//
 CALL h1();
 done
 0
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.20:
 --------------------------------------------------------------------------------
@@ -21580,9 +23079,9 @@ END//
 CALL h1();
 done
 0
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.21:
 --------------------------------------------------------------------------------
@@ -21610,9 +23109,9 @@ done
 0
 done
 1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.22:
 --------------------------------------------------------------------------------
@@ -21641,9 +23140,9 @@ done
 0
 done	@x
 1	1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.23:
 --------------------------------------------------------------------------------
@@ -21671,9 +23170,9 @@ END//
 CALL h1();
 done
 0
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.24:
 --------------------------------------------------------------------------------
@@ -21701,9 +23200,9 @@ END//
 CALL h1();
 done
 0
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.25:
 --------------------------------------------------------------------------------
@@ -21728,9 +23227,9 @@ END//
 CALL h1();
 done	@x
 1	1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.26:
 --------------------------------------------------------------------------------
@@ -21755,9 +23254,9 @@ END//
 CALL h1();
 done	@x
 1	1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.27:
 --------------------------------------------------------------------------------
@@ -21780,9 +23279,9 @@ set @x=1;
 SELECT done, @x;
 END//
 CALL h1();
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.28:
 --------------------------------------------------------------------------------
@@ -21805,9 +23304,9 @@ set @x=1;
 SELECT done, @x;
 END//
 CALL h1();
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+drop table IF EXISTS res_t1;
+drop table IF EXISTS res_t2;
 
 Testcase 4.11.29:
 --------------------------------------------------------------------------------
@@ -21835,9 +23334,9 @@ END//
 CALL h1();
 done	@x
 1	1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+drop table IF EXISTS res_t1;
+drop table IF EXISTS res_t2;
 
 Testcase 4.11.30:
 --------------------------------------------------------------------------------
@@ -21865,9 +23364,9 @@ END//
 CALL h1();
 done	@x
 1	1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+drop table IF EXISTS res_t1;
+drop table IF EXISTS res_t2;
 
 Testcase 4.11.31:
 --------------------------------------------------------------------------------
@@ -21893,9 +23392,9 @@ set @x=1;
 SELECT done, @x;
 END//
 CALL h1();
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+drop table IF EXISTS res_t1;
+drop table IF EXISTS res_t2;
 
 Testcase 4.11.32:
 --------------------------------------------------------------------------------
@@ -21921,9 +23420,9 @@ set @x=1;
 SELECT done, @x;
 END//
 CALL h1();
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.33:
 --------------------------------------------------------------------------------
@@ -21948,7 +23447,7 @@ set @x=1;
 SELECT done, @x;
 END//
 ERROR 42000: Duplicate condition: condname
-drop table res_t1;
+DROP TABLE IF EXISTS res_t1;
 
 Testcase 4.11.35:
 --------------------------------------------------------------------------------
@@ -21973,7 +23472,21 @@ insert into res_t1 values (3, 'c');
 END begin2_label;
 END begin1_label//
 ERROR 42000: Bad SQLSTATE: '020'
-drop table res_t1;
+CREATE PROCEDURE h1 ()
+begin1_label:BEGIN
+declare condname1 condition for sqlstate '020';
+declare condname2 condition for sqlstate 'wewe';
+declare condname3 condition for 9999;
+set @var2 = 1;
+insert into res_t1 values (2, 'b');
+begin2_label: BEGIN
+declare continue handler for sqlstate '90000023' set @var3= 1;
+set @var4 = 1;
+insert into res_t1 values (3, 'c');
+END begin2_label;
+END begin1_label//
+ERROR 42000: Bad SQLSTATE: '020'
+DROP TABLE IF EXISTS res_t1;
 
 Testcase 4.11.36:
 --------------------------------------------------------------------------------
@@ -21989,7 +23502,7 @@ set x1 = 2;
 END;
 SELECT @x, x1;
 END//
-DROP PROCEDURE h1;
+DROP PROCEDURE IF EXISTS h1;
 
 Testcase 4.11.40:
 --------------------------------------------------------------------------------
@@ -22010,7 +23523,7 @@ declare exit handler for condname2 set x5 = 1;
 END//
 ERROR 42000: Duplicate handler declared in the same block
 DROP PROCEDURE IF EXISTS h1;
-drop table res_t1;
+DROP TABLE IF EXISTS res_t1;
 
 Testcase 4.11.41:
 --------------------------------------------------------------------------------
@@ -22026,6 +23539,9 @@ set x1 = 2;
 END;
 SELECT @x, x1;
 END//
+CALL h1();
+@x	x1
+0	2
 DROP PROCEDURE IF EXISTS h1;
 
 * Testcase 3.1.2.53 (4.11.42):
@@ -22076,8 +23592,8 @@ CALL h1();
 SELECT @done, @x;
 @done	@x
 1	1
-DROP PROCEDURE h1;
-DROP TABLE res_t1;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
 
 --source suite/funcs_1/storedproc/cleanup_sp_tb.inc
 --------------------------------------------------------------------------------
diff --git a/mysql-test/suite/funcs_1/r/innodb_storedproc_10.result b/mysql-test/suite/funcs_1/r/innodb_storedproc_10.result
index 84ef164b0dc..f8e5cc98691 100755
--- a/mysql-test/suite/funcs_1/r/innodb_storedproc_10.result
+++ b/mysql-test/suite/funcs_1/r/innodb_storedproc_10.result
@@ -58,6 +58,7 @@ load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
 
 Section 3.1.10 - CALL checks:
 --------------------------------------------------------------------------------
+USE db_storedproc;
 
 Testcase 3.1.10.2 + 3.1.10.5:
 -----------------------------
@@ -94,6 +95,7 @@ CALL sp31102();
 ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.sp31102'
 SELECT fn31105( 9 );
 ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.fn31105'
+connection default;
 USE db_storedproc;
 	
 root@localhost	db_storedproc
@@ -114,6 +116,7 @@ a`	a`	1000-01-01	-5000	a`	-5000
 SELECT fn31105( 9 );
 fn31105( 9 )
 81
+connection default;
 USE db_storedproc;
 	
 root@localhost	db_storedproc
@@ -180,6 +183,8 @@ DROP PROCEDURE IF EXISTS sp_ins_1;
 DROP PROCEDURE IF EXISTS sp_ins_3;
 DROP PROCEDURE IF EXISTS sp_upd;
 DROP PROCEDURE IF EXISTS sp_ins_upd;
+DROP PROCEDURE IF EXISTS sp_del;
+DROP PROCEDURE IF EXISTS sp_with_rowcount;
 CREATE TABLE temp(f1 CHAR(20),f2 CHAR(25),f3 DATE,f4 INT,f5 CHAR(25),f6 INT);
 INSERT INTO temp SELECT * FROM t10;
 CREATE PROCEDURE sp_ins_1()
@@ -207,49 +212,72 @@ END;
 SELECT COUNT( f1 ), f1 FROM temp GROUP BY f1;
 UPDATE temp SET temp.f1 = 'updated_2' WHERE temp.f1 ='qwe' AND temp.f2 = 'abc';
 END//
+CREATE PROCEDURE sp_del()
+BEGIN
+DELETE FROM temp WHERE temp.f1 ='qwe' OR temp.f1 = 'updated_2';
+END//
+CREATE PROCEDURE sp_with_rowcount()
+BEGIN
+BEGIN
+INSERT INTO temp VALUES  ('qwe', 'abc', '1989-11-09', 100, 'uvw', 1000),
+('qwe', 'xyz', '1998-03-26', 100, 'uvw', 1000),
+('qwe', 'abc', '2000-11-09', 100, 'uvw', 1000),
+('qwe', 'xyz', '2005-11-07', 100, 'uvw', 1000);
+END;
+SELECT row_count() AS 'row_count() after insert';
+SELECT row_count() AS 'row_count() after select row_count()';
+SELECT f1,f2,f3 FROM temp ORDER BY f1,f2,f3;
+UPDATE temp SET temp.f1 = 'updated_2' WHERE temp.f2 = 'abc';
+SELECT row_count() AS 'row_count() after update';
+SELECT f1,f2,f3 FROM temp ORDER BY f1,f2,f3;
+DELETE FROM temp WHERE temp.f1 = 'updated_2';
+SELECT row_count() AS 'row_count() after delete';
+END//
 CALL sp_ins_1();
 SELECT row_count();
 row_count()
 1
-SELECT * FROM temp ORDER BY f4;
+SELECT * FROM temp;
 f1	f2	f3	f4	f5	f6
+a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
+a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
 abaa	abaa	1000-01-03	-4998	abaa	-4998
+abc	abc	2005-10-03	100	uvw	1000
 acaaa	acaaa	1000-01-04	-4997	acaaa	-4997
 adaaaa	adaaaa	1000-01-05	-4996	adaaaa	-4996
 aeaaaaa	aeaaaaa	1000-01-06	-4995	aeaaaaa	-4995
 afaaaaaa	afaaaaaa	1000-01-07	-4994	afaaaaaa	-4994
 agaaaaaaa	agaaaaaaa	1000-01-08	-4993	agaaaaaaa	-4993
-a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
-a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
-abc	abc	2005-10-03	100	uvw	1000
 CALL sp_ins_3();
 SELECT row_count();
 row_count()
 1
-SELECT * FROM temp ORDER BY f4;
+SELECT * FROM temp;
 f1	f2	f3	f4	f5	f6
+a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
+a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
 abaa	abaa	1000-01-03	-4998	abaa	-4998
+abc	abc	2005-10-03	100	uvw	1000
+abc	xyz	1949-05-23	100	uvw	1000
+abc	xyz	1989-11-09	100	uvw	1000
+abc	xyz	2005-10-24	100	uvw	1000
 acaaa	acaaa	1000-01-04	-4997	acaaa	-4997
 adaaaa	adaaaa	1000-01-05	-4996	adaaaa	-4996
 aeaaaaa	aeaaaaa	1000-01-06	-4995	aeaaaaa	-4995
 afaaaaaa	afaaaaaa	1000-01-07	-4994	afaaaaaa	-4994
 agaaaaaaa	agaaaaaaa	1000-01-08	-4993	agaaaaaaa	-4993
-a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
-a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
-abc	abc	2005-10-03	100	uvw	1000
-abc	xyz	1949-05-23	100	uvw	1000
-abc	xyz	1989-11-09	100	uvw	1000
-abc	xyz	2005-10-24	100	uvw	1000
 CALL sp_upd();
 SELECT row_count();
 row_count()
 4
-SELECT * FROM temp ORDER BY f4;
+SELECT * FROM temp;
 f1	f2	f3	f4	f5	f6
+a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
+a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
 abaa	abaa	1000-01-03	-4998	abaa	-4998
@@ -258,8 +286,6 @@ adaaaa	adaaaa	1000-01-05	-4996	adaaaa	-4996
 aeaaaaa	aeaaaaa	1000-01-06	-4995	aeaaaaa	-4995
 afaaaaaa	afaaaaaa	1000-01-07	-4994	afaaaaaa	-4994
 agaaaaaaa	agaaaaaaa	1000-01-08	-4993	agaaaaaaa	-4993
-a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
-a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
 updated	abc	2005-10-03	100	uvw	1000
 updated	xyz	1949-05-23	100	uvw	1000
 updated	xyz	1989-11-09	100	uvw	1000
@@ -281,8 +307,10 @@ COUNT( f1 )	f1
 SELECT row_count();
 row_count()
 3
-SELECT * FROM temp ORDER BY f4;
+SELECT * FROM temp;
 f1	f2	f3	f4	f5	f6
+a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
+a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
 abaa	abaa	1000-01-03	-4998	abaa	-4998
@@ -291,20 +319,67 @@ adaaaa	adaaaa	1000-01-05	-4996	adaaaa	-4996
 aeaaaaa	aeaaaaa	1000-01-06	-4995	aeaaaaa	-4995
 afaaaaaa	afaaaaaa	1000-01-07	-4994	afaaaaaa	-4994
 agaaaaaaa	agaaaaaaa	1000-01-08	-4993	agaaaaaaa	-4993
-a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
-a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
+qwe	xyz	1998-03-26	100	uvw	1000
 updated	abc	2005-10-03	100	uvw	1000
 updated	xyz	1949-05-23	100	uvw	1000
 updated	xyz	1989-11-09	100	uvw	1000
 updated	xyz	2005-10-24	100	uvw	1000
 updated_2	abc	1989-11-09	100	uvw	1000
-qwe	xyz	1998-03-26	100	uvw	1000
 updated_2	abc	2000-11-09	100	uvw	1000
 updated_2	abc	2005-11-07	100	uvw	1000
+CALL sp_del();
+SELECT row_count();
+row_count()
+4
+SELECT * FROM temp;
+f1	f2	f3	f4	f5	f6
+a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
+a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
+a`	a`	1000-01-01	-5000	a`	-5000
+aaa	aaa	1000-01-02	-4999	aaa	-4999
+abaa	abaa	1000-01-03	-4998	abaa	-4998
+acaaa	acaaa	1000-01-04	-4997	acaaa	-4997
+adaaaa	adaaaa	1000-01-05	-4996	adaaaa	-4996
+aeaaaaa	aeaaaaa	1000-01-06	-4995	aeaaaaa	-4995
+afaaaaaa	afaaaaaa	1000-01-07	-4994	afaaaaaa	-4994
+agaaaaaaa	agaaaaaaa	1000-01-08	-4993	agaaaaaaa	-4993
+updated	abc	2005-10-03	100	uvw	1000
+updated	xyz	1949-05-23	100	uvw	1000
+updated	xyz	1989-11-09	100	uvw	1000
+updated	xyz	2005-10-24	100	uvw	1000
+DELETE FROM temp;
+CALL sp_with_rowcount();
+row_count() after insert
+4
+row_count() after select row_count()
+-1
+f1	f2	f3
+qwe	abc	1989-11-09
+qwe	abc	2000-11-09
+qwe	xyz	1998-03-26
+qwe	xyz	2005-11-07
+row_count() after update
+2
+f1	f2	f3
+qwe	xyz	1998-03-26
+qwe	xyz	2005-11-07
+updated_2	abc	1989-11-09
+updated_2	abc	2000-11-09
+row_count() after delete
+2
+SELECT row_count();
+row_count()
+-1
+SELECT * FROM temp;
+f1	f2	f3	f4	f5	f6
+qwe	xyz	1998-03-26	100	uvw	1000
+qwe	xyz	2005-11-07	100	uvw	1000
 DROP PROCEDURE sp_ins_1;
 DROP PROCEDURE sp_ins_3;
 DROP PROCEDURE sp_upd;
 DROP PROCEDURE sp_ins_upd;
+DROP PROCEDURE sp_del;
+DROP PROCEDURE sp_with_rowcount;
 DROP TABLE temp;
 
 Testcase 3.1.10.8:
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_03.result b/mysql-test/suite/funcs_1/r/innodb_trig_03.result
index c72a792a3a5..f4a47b03e19 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_03.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_03.result
@@ -184,15 +184,14 @@ insert 3.5.3.2-no
 insert 3.5.3.6-no
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
-
-Trigger create disabled - should fail - Bug 8884
-------------------------------------------------
+create trigger trg4a_1 before INSERT on t1 for each row
+set new.f1 = 'trig 3.5.3.7-1a';
 insert into t1 (f1) values ('insert 3.5.3.7-1a');
+ERROR 42000: UPDATE command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 drop trigger trg4a_1;
@@ -210,7 +209,6 @@ select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
@@ -239,29 +237,27 @@ Grants for test_noprivs@localhost
 GRANT USAGE ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
 use priv_db;
-
-Trigger create disabled - should fail - Bug 8884
-------------------------------------------------
+create trigger trg4b_1 before UPDATE on t1 for each row
+set new.f1 = 'trig 3.5.3.7-1b';
 insert into t1 (f1) values ('insert 3.5.3.7-1b');
 select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
 insert 3.5.3.7-1b
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 update t1 set  f1 = 'update 3.5.3.7-1b' where f1 = 'insert 3.5.3.7-1b';
+ERROR 42000: UPDATE command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
+insert 3.5.3.7-1b
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-update 3.5.3.7-1b
 drop trigger trg4b_1;
 show grants;
 Grants for test_yesprivs@localhost
@@ -275,23 +271,21 @@ select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
+insert 3.5.3.7-1b
 insert 3.5.3.7-2b
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-update 3.5.3.7-1b
 update t1 set  f1 = 'update 3.5.3.7-2b' where f1 = 'insert 3.5.3.7-2b';
 select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
+insert 3.5.3.7-1b
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 trig 3.5.3.7-2b
-update 3.5.3.7-1b
 drop trigger trg4b_2;
 
 Testcase 3.5.3.7c
@@ -317,21 +311,19 @@ Grants for test_noprivs@localhost
 GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
-
-Trigger create disabled - should fail - Bug 8884
-------------------------------------------------
+create trigger trg4c_1 before INSERT on t1 for each row
+set new.f1 = 'trig 3.5.3.7-1c';
 insert into t1 (f1) values ('insert 3.5.3.7-1c');
+ERROR 42000: UPDATE command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
-insert 3.5.3.7-1c
+insert 3.5.3.7-1b
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 trig 3.5.3.7-2b
-update 3.5.3.7-1b
 drop trigger trg4c_1;
 show grants;
 Grants for test_yesprivs@localhost
@@ -345,14 +337,12 @@ select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
-insert 3.5.3.7-1c
+insert 3.5.3.7-1b
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 trig 3.5.3.7-2b
 trig 3.5.3.7-2c
-update 3.5.3.7-1b
 drop trigger trg4c_2;
 
 Testcase 3.5.3.7d:
@@ -376,23 +366,20 @@ Grants for test_noprivs@localhost
 GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT (f1), INSERT (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
-
-Trigger create disabled - should fail - Bug 8884
-------------------------------------------------
+create trigger trg4d_1 before INSERT on t1 for each row
+set new.f1 = 'trig 3.5.3.7-1d';
 insert into t1 (f1) values ('insert 3.5.3.7-1d');
+ERROR 42000: UPDATE command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
-insert 3.5.3.7-1c
-insert 3.5.3.7-1d
+insert 3.5.3.7-1b
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 trig 3.5.3.7-2b
 trig 3.5.3.7-2c
-update 3.5.3.7-1b
 drop trigger trg4d_1;
 show grants;
 Grants for test_yesprivs@localhost
@@ -406,16 +393,13 @@ select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
-insert 3.5.3.7-1c
-insert 3.5.3.7-1d
+insert 3.5.3.7-1b
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 trig 3.5.3.7-2b
 trig 3.5.3.7-2c
 trig 3.5.3.7-2d
-update 3.5.3.7-1b
 drop trigger trg4d_2;
 
 Testcase 3.5.3.8a:
@@ -440,14 +424,14 @@ use priv_db;
 show grants;
 Grants for test_noprivs@localhost
 GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-
-Trigger create disabled - should fail - Bug 8887
-------------------------------------------------
+create trigger trg5a_1 before INSERT on t1 for each row
+set @test_var = new.f1;
 set @test_var = 'before trig 3.5.3.8-1a';
 select @test_var;
 @test_var
 before trig 3.5.3.8-1a
 insert into t1 (f1) values ('insert 3.5.3.8-1a');
+ERROR 42000: SELECT command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select @test_var;
 @test_var
 before trig 3.5.3.8-1a
@@ -495,15 +479,15 @@ Grants for test_noprivs@localhost
 GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
 use priv_db;
-
-Trigger create disabled - should fail - Bug 8887
-------------------------------------------------
+create trigger trg5b_1 before UPDATE on t1 for each row
+set @test_var= new.f1;
 set @test_var= 'before trig 3.5.3.8-1b';
 insert into t1 (f1) values ('insert 3.5.3.8-1b');
 select @test_var;
 @test_var
 before trig 3.5.3.8-1b
 update t1 set  f1= 'update 3.5.3.8-1b' where f1 = 'insert 3.5.3.8-1b';
+ERROR 42000: SELECT command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select @test_var;
 @test_var
 before trig 3.5.3.8-1b
@@ -550,11 +534,11 @@ Grants for test_noprivs@localhost
 GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
-
-Trigger create disabled - should fail - Bug 8887
-------------------------------------------------
+create trigger trg5c_1 before INSERT on t1 for each row
+set @test_var= new.f1;
 set @test_var= 'before trig 3.5.3.8-1c';
 insert into t1 (f1) values ('insert 3.5.3.8-1c');
+ERROR 42000: SELECT command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select @test_var;
 @test_var
 before trig 3.5.3.8-1c
@@ -596,11 +580,11 @@ Grants for test_noprivs@localhost
 GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
-
-Trigger create disabled - should fail - Bug 8887
-------------------------------------------------
+create trigger trg5d_1 before INSERT on t1 for each row
+set @test_var= new.f1;
 set @test_var='before trig 3.5.3.8-1d';
 insert into t1 (f1) values ('insert 3.5.3.8-1d');
+ERROR 42000: SELECT command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select @test_var;
 @test_var
 before trig 3.5.3.8-1d
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_08.result b/mysql-test/suite/funcs_1/r/innodb_trig_08.result
index 4388950aba1..dec9557e1e5 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_08.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_08.result
@@ -139,10 +139,10 @@ values ('1', 'Test 3.5.8.4', 222, 23456, 1.05);
 Select f120, f122, f136, f144, f163 from tb3 where f122= 'Test 3.5.8.4';
 f120	f122	f136	f144	f163
 1	Test 3.5.8.4	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_i order by i120;
+select * from db_test.t1_i;
 i120	i136	i144	i163
 1	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_u order by u120;
+select * from db_test.t1_u;
 u120	u136	u144	u163
 a	00111	0000099999	999.990000000000000000000000000000
 b	00222	0000023456	1.050000000000000000000000000000
@@ -150,7 +150,7 @@ c	00333	0000099999	999.990000000000000000000000000000
 d	00222	0000023456	1.050000000000000000000000000000
 e	00222	0000023456	1.050000000000000000000000000000
 f	00333	0000099999	999.990000000000000000000000000000
-select * from db_test.t1_d order by d120;
+select * from db_test.t1_d;
 d120	d136	d144	d163
 a	00111	0000099999	999.990000000000000000000000000000
 c	00333	0000099999	999.990000000000000000000000000000
@@ -343,20 +343,20 @@ set @test_var='Empty';
 Insert into tb3 (f120, f122, f136, f144) 
 values ('a', 'Test 3.5.8.5-case', 5, 7);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	A*seven
 Insert into tb3 (f120, f122, f136, f144) 
 values ('b', 'Test 3.5.8.5-case', 71,16);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	B*0000000016
 B	Test 3.5.8.5-case	00191	0000000016	B*0000000016
 Insert into tb3 (f120, f122, f136, f144) 
 values ('c', 'Test 3.5.8.5-case', 80,1);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	C=one
 B	Test 3.5.8.5-case	00191	0000000016	C=one
@@ -366,7 +366,7 @@ values ('d', 'Test 3.5.8.5-case', 152);
 Warnings:
 Warning	1265	Data truncated for column 'f120' at row 1
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 f120	f122	f136	f144	@test_var
 1	Test 3.5.8.5-case	00152	0000099999	1*0000099999
 A	Test 3.5.8.5-case	00125	0000000007	1*0000099999
@@ -377,7 +377,7 @@ values ('e', 'Test 3.5.8.5-case', 200, 8);
 Warnings:
 Warning	1265	Data truncated for column 'f120' at row 1
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 f120	f122	f136	f144	@test_var
 1	Test 3.5.8.5-case	00152	0000099999	1=eight
 1	Test 3.5.8.5-case	00200	0000000008	1=eight
@@ -387,7 +387,7 @@ C	Test 3.5.8.5-case	00200	0000000001	1=eight
 Insert into tb3 (f120, f122, f136, f144) 
 values ('f', 'Test 3.5.8.5-case', 100, 8);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 f120	f122	f136	f144	@test_var
 1	Test 3.5.8.5-case	00152	0000099999	1=eight
 1	Test 3.5.8.5-case	00200	0000000008	1=eight
@@ -499,9 +499,38 @@ drop trigger trg7;
 
 Testcase 3.5.8.6: (requirement void)
 ------------------------------------
+CREATE PROCEDURE sp_01 () BEGIN set @v1=1; END//
+CREATE TRIGGER trg8_1 BEFORE UPDATE ON tb3 FOR EACH ROW
+BEGIN
+CALL sp_01 ();
+END//
+Insert into tb3 (f120, f122, f136) values ('6', 'Test 3.5.8.6-insert', 101);
+update tb3 set f120='S', f136=111,
+f122='Test 3.5.8.6-tr8_1'
+	       where f122='Test 3.5.8.6-insert';
+select f120, f122
+from tb3 where f122  like 'Test 3.5.8.6%' order by f120;
+f120	f122
+S	Test 3.5.8.6-tr8_1
+DROP TRIGGER trg8_1;
+DROP PROCEDURE sp_01;
 
-Testcase 3.5.8.7: (Disabled as a result of bug _____)
------------------------------------------------------
+Testcase 3.5.8.7
+----------------
+Create trigger trg9_1 before update on tb3 for each row
+BEGIN
+Start transaction;
+Set new.f120='U';
+Commit;
+END//
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+Create trigger trg9_2 before delete on tb3 for each row
+BEGIN
+Start transaction;
+Set @var2=old.f120;
+Rollback;
+END//
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
 drop user test_general@localhost;
 drop user test_general;
 drop user test_super@localhost;
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_09.result b/mysql-test/suite/funcs_1/r/innodb_trig_09.result
index 6ea93683847..942fa94e1a5 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_09.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_09.result
@@ -193,8 +193,9 @@ a	NULL	Test 3.5.9.4	7	999	995.240000000000000000000000000000
 0	0	0	0	0	0
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
-Warnings:
-Warning	1048	Column 'f136' cannot be null
+ERROR 23000: Column 'f136' cannot be null
+Update tb3 Set f122='Test 3.5.9.4-trig', f136=0, f151=DEFAULT, f163=NULL
+where f122='Test 3.5.9.4';
 select f118, f121, f122, f136, f151, f163 from tb3 
 where f122 like 'Test 3.5.9.4-trig' order by f163;
 f118	f121	f122	f136	f151	f163
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result b/mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result
index 6c9c1fb98c0..4ecd3c22999 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result
@@ -294,8 +294,8 @@ drop table t2;
 drop table t3;
 drop table t4;
 
-Testcase y.y.y.4: Recursive trigger/SP references (disabled bug 11889)
-----------------------------------------------------------------------
+Testcase y.y.y.4: Recursive trigger/SP references
+-------------------------------------------------
 set @sql_mode='traditional';
 create table t1_sp (
 count integer,
diff --git a/mysql-test/suite/funcs_1/r/innodb_views.result b/mysql-test/suite/funcs_1/r/innodb_views.result
index b826f2a8449..06e7d065e18 100644
--- a/mysql-test/suite/funcs_1/r/innodb_views.result
+++ b/mysql-test/suite/funcs_1/r/innodb_views.result
@@ -123,11 +123,7 @@ USE test;
 --------------------------------------------------------------------------------
 
 There are some statements where the ps-protocol is switched off.
-Bug#11589: mysqltest, --ps-protocol, strange output, float/double/real with zerofill
---------------------------------------------------------------------------------
-
-! Attention: The file with the expected results suffers from
-Bug#10713: mysqldump includes database in create view and referenced tables
+Bug#32285: mysqltest, --ps-protocol, strange output, float/double/real with zerofill
 --------------------------------------------------------------------------------
 insert into test.tb2 (f59,f60) values (76710,226546);
 insert into test.tb2 (f59,f60) values(2760,985654);
@@ -403,71 +399,3069 @@ f59
 CREATE or REPLACE VIEW v1 AS select *
 FROM test.tb2 WITH LOCAL CHECK OPTION ;
 select * FROM v1 order by f59,f60,f61,f62,f63,f64 limit 0,50;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-1	1	0000000001	0000000000000000000000000000000000000000000000000000000000000001	0000000001	0000000000000000000000000000000000000000000000000000000000000001	-5	0.000000000000000000000000000000	1	0.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549435e-38	1.17549e-38	1.175494352e-38	01.17549e-38	00000001.175494352e-38	01.17549e-38	00000001.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	1970-01-02 00:00:01	1902	1902	1902	2enum	2set
-2	2	0000000002	0000000000000000000000000000000000000000000000000000000000000002	0000000002	0000000000000000000000000000000000000000000000000000000000000002	-4	1.100000000000000000000000000000	2	1.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494349e-38	1.17549e-38	1.175494353e-38	01.17549e-38	00000001.175494353e-38	01.17549e-38	00000001.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	1970-01-03 00:00:02	1903	1903	1903	1enum	1set,2set
-3	3	0000000003	0000000000000000000000000000000000000000000000000000000000000003	0000000003	0000000000000000000000000000000000000000000000000000000000000003	-3	2.200000000000000000000000000000	3	2.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494348e-38	1.17549e-38	1.175494354e-38	01.17549e-38	00000001.175494354e-38	01.17549e-38	00000001.175494354e-38	1000-01-03	838:59:56	1970-01-04 00:00:03	1970-01-04 00:00:03	1904	1904	1904	2enum	1set
-4	4	0000000004	0000000000000000000000000000000000000000000000000000000000000004	0000000004	0000000000000000000000000000000000000000000000000000000000000004	-2	3.300000000000000000000000000000	4	3.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494347e-38	1.17549e-38	1.175494355e-38	01.17549e-38	00000001.175494355e-38	01.17549e-38	00000001.175494355e-38	1000-01-04	838:59:55	1970-01-05 00:00:04	1970-01-05 00:00:04	1905	1905	1905	1enum	2set
-4	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-5	5	0000000005	0000000000000000000000000000000000000000000000000000000000000005	0000000005	0000000000000000000000000000000000000000000000000000000000000005	-1	4.400000000000000000000000000000	5	4.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494346e-38	1.17549e-38	1.175494356e-38	01.17549e-38	00000001.175494356e-38	01.17549e-38	00000001.175494356e-38	1000-01-05	838:59:54	1970-01-06 00:00:05	1970-01-06 00:00:05	1906	1906	1906	2enum	1set,2set
-6	6	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0	5.500000000000000000000000000000	6	5.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494345e-38	1.17549e-38	1.175494357e-38	01.17549e-38	00000001.175494357e-38	01.17549e-38	00000001.175494357e-38	1000-01-06	838:59:53	1970-01-07 00:00:06	1970-01-07 00:00:06	1907	1907	1907	1enum	1set
-7	7	0000000007	0000000000000000000000000000000000000000000000000000000000000007	0000000007	0000000000000000000000000000000000000000000000000000000000000007	1	6.600000000000000000000000000000	7	6.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494344e-38	1.17549e-38	1.175494358e-38	01.17549e-38	00000001.175494358e-38	01.17549e-38	00000001.175494358e-38	1000-01-07	838:59:52	1970-01-08 00:00:07	1970-01-08 00:00:07	1908	1908	1908	2enum	2set
-8	8	0000000008	0000000000000000000000000000000000000000000000000000000000000008	0000000008	0000000000000000000000000000000000000000000000000000000000000008	2	7.700000000000000000000000000000	8	7.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494343e-38	1.17549e-38	1.175494359e-38	01.17549e-38	00000001.175494359e-38	01.17549e-38	00000001.175494359e-38	1000-01-08	838:59:51	1970-01-09 00:00:08	1970-01-09 00:00:08	1909	1909	1909	1enum	1set,2set
-9	9	0000000009	0000000000000000000000000000000000000000000000000000000000000009	0000000009	0000000000000000000000000000000000000000000000000000000000000009	3	8.800000000000000000000000000000	9	8.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494342e-38	1.17549e-38	1.17549436e-38	01.17549e-38	000000001.17549436e-38	01.17549e-38	000000001.17549436e-38	1000-01-09	838:59:50	1970-01-10 00:00:09	1970-01-10 00:00:09	1910	1910	1910	2enum	1set
-10	10	0000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000010	0000000000000000000000000000000000000000000000000000000000000010	4	9.900000000000000000000000000000	10	9.900000000000000000000000000000	0000000010	000000000000000000000000000000009.900000000000000000000000000000	0000000010	000000000000000000000000000000009.900000000000000000000000000000	-1.175494341e-38	1.175494361e-38	00000001.175494361e-38	00000001.175494361e-38	-1.175494341e-38	1.175494361e-38	00000001.175494361e-38	00000001.175494361e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494341e-38	1.17549e-38	1.175494361e-38	01.17549e-38	00000001.175494361e-38	01.17549e-38	00000001.175494361e-38	1000-01-10	838:59:49	1970-01-11 00:00:10	1970-01-11 00:00:10	1911	1911	1911	1enum	2set
-15	87	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-17	15	0000000016	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-19	18	0000000014	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-22	93	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-24	51654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-27	25	0000000026	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-29	28	0000000024	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-34	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-94	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-107	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-107	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-109	108	0000000104	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-109	108	0000000104	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-195	87	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-207	205	0000000206	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-209	208	0000000204	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-242	79	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-250	87895654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-292	93	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-299	899	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-321	NULL	0000000765	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-323	14376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-340	9984376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-394	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-424	89	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-441	16546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-500	NULL	0000000900	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-500	NULL	0000000900	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-500	NULL	0000000900	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-660	876546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-987	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-2550	775654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-2760	985654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-3330	764376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-3410	996546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-7876	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-9112	NULL	0000008771	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-76710	226546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-569300	9114376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+f59	1
+f60	1
+f61	0000000001
+f62	0000000000000000000000000000000000000000000000000000000000000001
+f63	0000000001
+f64	0000000000000000000000000000000000000000000000000000000000000001
+f65	-5
+f66	0.000000000000000000000000000000
+f67	1
+f68	0.000000000000000000000000000000
+f69	0000000001
+f70	000000000000000000000000000000000.000000000000000000000000000000
+f71	0000000001
+f72	000000000000000000000000000000000.000000000000000000000000000000
+f73	-1.17549435e-38
+f74	1.175494352e-38
+f75	00000001.175494352e-38
+f76	00000001.175494352e-38
+f77	-1.17549435e-38
+f78	1.175494352e-38
+f79	00000001.175494352e-38
+f80	00000001.175494352e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.17549435e-38
+f95	1.17549e-38
+f96	1.175494352e-38
+f97	01.17549e-38
+f98	00000001.175494352e-38
+f99	01.17549e-38
+f100	00000001.175494352e-38
+f101	1000-01-01
+f102	838:59:58
+f103	1970-01-02 00:00:01
+f104	1970-01-02 00:00:01
+f105	1902
+f106	1902
+f107	1902
+f108	2enum
+f109	2set
+f59	2
+f60	2
+f61	0000000002
+f62	0000000000000000000000000000000000000000000000000000000000000002
+f63	0000000002
+f64	0000000000000000000000000000000000000000000000000000000000000002
+f65	-4
+f66	1.100000000000000000000000000000
+f67	2
+f68	1.100000000000000000000000000000
+f69	0000000002
+f70	000000000000000000000000000000001.100000000000000000000000000000
+f71	0000000002
+f72	000000000000000000000000000000001.100000000000000000000000000000
+f73	-1.175494349e-38
+f74	1.175494353e-38
+f75	00000001.175494353e-38
+f76	00000001.175494353e-38
+f77	-1.175494349e-38
+f78	1.175494353e-38
+f79	00000001.175494353e-38
+f80	00000001.175494353e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494349e-38
+f95	1.17549e-38
+f96	1.175494353e-38
+f97	01.17549e-38
+f98	00000001.175494353e-38
+f99	01.17549e-38
+f100	00000001.175494353e-38
+f101	1000-01-02
+f102	838:59:57
+f103	1970-01-03 00:00:02
+f104	1970-01-03 00:00:02
+f105	1903
+f106	1903
+f107	1903
+f108	1enum
+f109	1set,2set
+f59	3
+f60	3
+f61	0000000003
+f62	0000000000000000000000000000000000000000000000000000000000000003
+f63	0000000003
+f64	0000000000000000000000000000000000000000000000000000000000000003
+f65	-3
+f66	2.200000000000000000000000000000
+f67	3
+f68	2.200000000000000000000000000000
+f69	0000000003
+f70	000000000000000000000000000000002.200000000000000000000000000000
+f71	0000000003
+f72	000000000000000000000000000000002.200000000000000000000000000000
+f73	-1.175494348e-38
+f74	1.175494354e-38
+f75	00000001.175494354e-38
+f76	00000001.175494354e-38
+f77	-1.175494348e-38
+f78	1.175494354e-38
+f79	00000001.175494354e-38
+f80	00000001.175494354e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494348e-38
+f95	1.17549e-38
+f96	1.175494354e-38
+f97	01.17549e-38
+f98	00000001.175494354e-38
+f99	01.17549e-38
+f100	00000001.175494354e-38
+f101	1000-01-03
+f102	838:59:56
+f103	1970-01-04 00:00:03
+f104	1970-01-04 00:00:03
+f105	1904
+f106	1904
+f107	1904
+f108	2enum
+f109	1set
+f59	4
+f60	4
+f61	0000000004
+f62	0000000000000000000000000000000000000000000000000000000000000004
+f63	0000000004
+f64	0000000000000000000000000000000000000000000000000000000000000004
+f65	-2
+f66	3.300000000000000000000000000000
+f67	4
+f68	3.300000000000000000000000000000
+f69	0000000004
+f70	000000000000000000000000000000003.300000000000000000000000000000
+f71	0000000004
+f72	000000000000000000000000000000003.300000000000000000000000000000
+f73	-1.175494347e-38
+f74	1.175494355e-38
+f75	00000001.175494355e-38
+f76	00000001.175494355e-38
+f77	-1.175494347e-38
+f78	1.175494355e-38
+f79	00000001.175494355e-38
+f80	00000001.175494355e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494347e-38
+f95	1.17549e-38
+f96	1.175494355e-38
+f97	01.17549e-38
+f98	00000001.175494355e-38
+f99	01.17549e-38
+f100	00000001.175494355e-38
+f101	1000-01-04
+f102	838:59:55
+f103	1970-01-05 00:00:04
+f104	1970-01-05 00:00:04
+f105	1905
+f106	1905
+f107	1905
+f108	1enum
+f109	2set
+f59	4
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	5
+f60	5
+f61	0000000005
+f62	0000000000000000000000000000000000000000000000000000000000000005
+f63	0000000005
+f64	0000000000000000000000000000000000000000000000000000000000000005
+f65	-1
+f66	4.400000000000000000000000000000
+f67	5
+f68	4.400000000000000000000000000000
+f69	0000000005
+f70	000000000000000000000000000000004.400000000000000000000000000000
+f71	0000000005
+f72	000000000000000000000000000000004.400000000000000000000000000000
+f73	-1.175494346e-38
+f74	1.175494356e-38
+f75	00000001.175494356e-38
+f76	00000001.175494356e-38
+f77	-1.175494346e-38
+f78	1.175494356e-38
+f79	00000001.175494356e-38
+f80	00000001.175494356e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494346e-38
+f95	1.17549e-38
+f96	1.175494356e-38
+f97	01.17549e-38
+f98	00000001.175494356e-38
+f99	01.17549e-38
+f100	00000001.175494356e-38
+f101	1000-01-05
+f102	838:59:54
+f103	1970-01-06 00:00:05
+f104	1970-01-06 00:00:05
+f105	1906
+f106	1906
+f107	1906
+f108	2enum
+f109	1set,2set
+f59	6
+f60	6
+f61	0000000006
+f62	0000000000000000000000000000000000000000000000000000000000000006
+f63	0000000006
+f64	0000000000000000000000000000000000000000000000000000000000000006
+f65	0
+f66	5.500000000000000000000000000000
+f67	6
+f68	5.500000000000000000000000000000
+f69	0000000006
+f70	000000000000000000000000000000005.500000000000000000000000000000
+f71	0000000006
+f72	000000000000000000000000000000005.500000000000000000000000000000
+f73	-1.175494345e-38
+f74	1.175494357e-38
+f75	00000001.175494357e-38
+f76	00000001.175494357e-38
+f77	-1.175494345e-38
+f78	1.175494357e-38
+f79	00000001.175494357e-38
+f80	00000001.175494357e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494345e-38
+f95	1.17549e-38
+f96	1.175494357e-38
+f97	01.17549e-38
+f98	00000001.175494357e-38
+f99	01.17549e-38
+f100	00000001.175494357e-38
+f101	1000-01-06
+f102	838:59:53
+f103	1970-01-07 00:00:06
+f104	1970-01-07 00:00:06
+f105	1907
+f106	1907
+f107	1907
+f108	1enum
+f109	1set
+f59	7
+f60	7
+f61	0000000007
+f62	0000000000000000000000000000000000000000000000000000000000000007
+f63	0000000007
+f64	0000000000000000000000000000000000000000000000000000000000000007
+f65	1
+f66	6.600000000000000000000000000000
+f67	7
+f68	6.600000000000000000000000000000
+f69	0000000007
+f70	000000000000000000000000000000006.600000000000000000000000000000
+f71	0000000007
+f72	000000000000000000000000000000006.600000000000000000000000000000
+f73	-1.175494344e-38
+f74	1.175494358e-38
+f75	00000001.175494358e-38
+f76	00000001.175494358e-38
+f77	-1.175494344e-38
+f78	1.175494358e-38
+f79	00000001.175494358e-38
+f80	00000001.175494358e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494344e-38
+f95	1.17549e-38
+f96	1.175494358e-38
+f97	01.17549e-38
+f98	00000001.175494358e-38
+f99	01.17549e-38
+f100	00000001.175494358e-38
+f101	1000-01-07
+f102	838:59:52
+f103	1970-01-08 00:00:07
+f104	1970-01-08 00:00:07
+f105	1908
+f106	1908
+f107	1908
+f108	2enum
+f109	2set
+f59	8
+f60	8
+f61	0000000008
+f62	0000000000000000000000000000000000000000000000000000000000000008
+f63	0000000008
+f64	0000000000000000000000000000000000000000000000000000000000000008
+f65	2
+f66	7.700000000000000000000000000000
+f67	8
+f68	7.700000000000000000000000000000
+f69	0000000008
+f70	000000000000000000000000000000007.700000000000000000000000000000
+f71	0000000008
+f72	000000000000000000000000000000007.700000000000000000000000000000
+f73	-1.175494343e-38
+f74	1.175494359e-38
+f75	00000001.175494359e-38
+f76	00000001.175494359e-38
+f77	-1.175494343e-38
+f78	1.175494359e-38
+f79	00000001.175494359e-38
+f80	00000001.175494359e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494343e-38
+f95	1.17549e-38
+f96	1.175494359e-38
+f97	01.17549e-38
+f98	00000001.175494359e-38
+f99	01.17549e-38
+f100	00000001.175494359e-38
+f101	1000-01-08
+f102	838:59:51
+f103	1970-01-09 00:00:08
+f104	1970-01-09 00:00:08
+f105	1909
+f106	1909
+f107	1909
+f108	1enum
+f109	1set,2set
+f59	9
+f60	9
+f61	0000000009
+f62	0000000000000000000000000000000000000000000000000000000000000009
+f63	0000000009
+f64	0000000000000000000000000000000000000000000000000000000000000009
+f65	3
+f66	8.800000000000000000000000000000
+f67	9
+f68	8.800000000000000000000000000000
+f69	0000000009
+f70	000000000000000000000000000000008.800000000000000000000000000000
+f71	0000000009
+f72	000000000000000000000000000000008.800000000000000000000000000000
+f73	-1.175494342e-38
+f74	1.17549436e-38
+f75	000000001.17549436e-38
+f76	000000001.17549436e-38
+f77	-1.175494342e-38
+f78	1.17549436e-38
+f79	000000001.17549436e-38
+f80	000000001.17549436e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494342e-38
+f95	1.17549e-38
+f96	1.17549436e-38
+f97	01.17549e-38
+f98	000000001.17549436e-38
+f99	01.17549e-38
+f100	000000001.17549436e-38
+f101	1000-01-09
+f102	838:59:50
+f103	1970-01-10 00:00:09
+f104	1970-01-10 00:00:09
+f105	1910
+f106	1910
+f107	1910
+f108	2enum
+f109	1set
+f59	10
+f60	10
+f61	0000000010
+f62	0000000000000000000000000000000000000000000000000000000000000010
+f63	0000000010
+f64	0000000000000000000000000000000000000000000000000000000000000010
+f65	4
+f66	9.900000000000000000000000000000
+f67	10
+f68	9.900000000000000000000000000000
+f69	0000000010
+f70	000000000000000000000000000000009.900000000000000000000000000000
+f71	0000000010
+f72	000000000000000000000000000000009.900000000000000000000000000000
+f73	-1.175494341e-38
+f74	1.175494361e-38
+f75	00000001.175494361e-38
+f76	00000001.175494361e-38
+f77	-1.175494341e-38
+f78	1.175494361e-38
+f79	00000001.175494361e-38
+f80	00000001.175494361e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494341e-38
+f95	1.17549e-38
+f96	1.175494361e-38
+f97	01.17549e-38
+f98	00000001.175494361e-38
+f99	01.17549e-38
+f100	00000001.175494361e-38
+f101	1000-01-10
+f102	838:59:49
+f103	1970-01-11 00:00:10
+f104	1970-01-11 00:00:10
+f105	1911
+f106	1911
+f107	1911
+f108	1enum
+f109	2set
+f59	15
+f60	87
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	17
+f60	15
+f61	0000000016
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	19
+f60	18
+f61	0000000014
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	22
+f60	93
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	24
+f60	51654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	27
+f60	25
+f61	0000000026
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	29
+f60	28
+f61	0000000024
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	34
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	94
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	107
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	107
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	109
+f60	108
+f61	0000000104
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	109
+f60	108
+f61	0000000104
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	195
+f60	87
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	207
+f60	205
+f61	0000000206
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	209
+f60	208
+f61	0000000204
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	242
+f60	79
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	250
+f60	87895654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	292
+f60	93
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	299
+f60	899
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	321
+f60	NULL
+f61	0000000765
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	323
+f60	14376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	340
+f60	9984376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	394
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	424
+f60	89
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	441
+f60	16546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	660
+f60	876546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	987
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	2550
+f60	775654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	2760
+f60	985654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	3330
+f60	764376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	3410
+f60	996546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	7876
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	9112
+f60	NULL
+f61	0000008771
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	76710
+f60	226546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	569300
+f60	9114376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 CREATE or REPLACE VIEW v1 AS select *
 FROM test.tb2 WITH CASCADED CHECK OPTION ;
 select * FROM v1 order by f59,f60,f61,f62,f63,f64 limit 0,10;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-1	1	0000000001	0000000000000000000000000000000000000000000000000000000000000001	0000000001	0000000000000000000000000000000000000000000000000000000000000001	-5	0.000000000000000000000000000000	1	0.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549435e-38	1.17549e-38	1.175494352e-38	01.17549e-38	00000001.175494352e-38	01.17549e-38	00000001.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	1970-01-02 00:00:01	1902	1902	1902	2enum	2set
-2	2	0000000002	0000000000000000000000000000000000000000000000000000000000000002	0000000002	0000000000000000000000000000000000000000000000000000000000000002	-4	1.100000000000000000000000000000	2	1.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494349e-38	1.17549e-38	1.175494353e-38	01.17549e-38	00000001.175494353e-38	01.17549e-38	00000001.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	1970-01-03 00:00:02	1903	1903	1903	1enum	1set,2set
-3	3	0000000003	0000000000000000000000000000000000000000000000000000000000000003	0000000003	0000000000000000000000000000000000000000000000000000000000000003	-3	2.200000000000000000000000000000	3	2.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494348e-38	1.17549e-38	1.175494354e-38	01.17549e-38	00000001.175494354e-38	01.17549e-38	00000001.175494354e-38	1000-01-03	838:59:56	1970-01-04 00:00:03	1970-01-04 00:00:03	1904	1904	1904	2enum	1set
-4	4	0000000004	0000000000000000000000000000000000000000000000000000000000000004	0000000004	0000000000000000000000000000000000000000000000000000000000000004	-2	3.300000000000000000000000000000	4	3.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494347e-38	1.17549e-38	1.175494355e-38	01.17549e-38	00000001.175494355e-38	01.17549e-38	00000001.175494355e-38	1000-01-04	838:59:55	1970-01-05 00:00:04	1970-01-05 00:00:04	1905	1905	1905	1enum	2set
-4	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-5	5	0000000005	0000000000000000000000000000000000000000000000000000000000000005	0000000005	0000000000000000000000000000000000000000000000000000000000000005	-1	4.400000000000000000000000000000	5	4.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494346e-38	1.17549e-38	1.175494356e-38	01.17549e-38	00000001.175494356e-38	01.17549e-38	00000001.175494356e-38	1000-01-05	838:59:54	1970-01-06 00:00:05	1970-01-06 00:00:05	1906	1906	1906	2enum	1set,2set
-6	6	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0	5.500000000000000000000000000000	6	5.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494345e-38	1.17549e-38	1.175494357e-38	01.17549e-38	00000001.175494357e-38	01.17549e-38	00000001.175494357e-38	1000-01-06	838:59:53	1970-01-07 00:00:06	1970-01-07 00:00:06	1907	1907	1907	1enum	1set
-7	7	0000000007	0000000000000000000000000000000000000000000000000000000000000007	0000000007	0000000000000000000000000000000000000000000000000000000000000007	1	6.600000000000000000000000000000	7	6.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494344e-38	1.17549e-38	1.175494358e-38	01.17549e-38	00000001.175494358e-38	01.17549e-38	00000001.175494358e-38	1000-01-07	838:59:52	1970-01-08 00:00:07	1970-01-08 00:00:07	1908	1908	1908	2enum	2set
-8	8	0000000008	0000000000000000000000000000000000000000000000000000000000000008	0000000008	0000000000000000000000000000000000000000000000000000000000000008	2	7.700000000000000000000000000000	8	7.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494343e-38	1.17549e-38	1.175494359e-38	01.17549e-38	00000001.175494359e-38	01.17549e-38	00000001.175494359e-38	1000-01-08	838:59:51	1970-01-09 00:00:08	1970-01-09 00:00:08	1909	1909	1909	1enum	1set,2set
-9	9	0000000009	0000000000000000000000000000000000000000000000000000000000000009	0000000009	0000000000000000000000000000000000000000000000000000000000000009	3	8.800000000000000000000000000000	9	8.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494342e-38	1.17549e-38	1.17549436e-38	01.17549e-38	000000001.17549436e-38	01.17549e-38	000000001.17549436e-38	1000-01-09	838:59:50	1970-01-10 00:00:09	1970-01-10 00:00:09	1910	1910	1910	2enum	1set
+f59	1
+f60	1
+f61	0000000001
+f62	0000000000000000000000000000000000000000000000000000000000000001
+f63	0000000001
+f64	0000000000000000000000000000000000000000000000000000000000000001
+f65	-5
+f66	0.000000000000000000000000000000
+f67	1
+f68	0.000000000000000000000000000000
+f69	0000000001
+f70	000000000000000000000000000000000.000000000000000000000000000000
+f71	0000000001
+f72	000000000000000000000000000000000.000000000000000000000000000000
+f73	-1.17549435e-38
+f74	1.175494352e-38
+f75	00000001.175494352e-38
+f76	00000001.175494352e-38
+f77	-1.17549435e-38
+f78	1.175494352e-38
+f79	00000001.175494352e-38
+f80	00000001.175494352e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.17549435e-38
+f95	1.17549e-38
+f96	1.175494352e-38
+f97	01.17549e-38
+f98	00000001.175494352e-38
+f99	01.17549e-38
+f100	00000001.175494352e-38
+f101	1000-01-01
+f102	838:59:58
+f103	1970-01-02 00:00:01
+f104	1970-01-02 00:00:01
+f105	1902
+f106	1902
+f107	1902
+f108	2enum
+f109	2set
+f59	2
+f60	2
+f61	0000000002
+f62	0000000000000000000000000000000000000000000000000000000000000002
+f63	0000000002
+f64	0000000000000000000000000000000000000000000000000000000000000002
+f65	-4
+f66	1.100000000000000000000000000000
+f67	2
+f68	1.100000000000000000000000000000
+f69	0000000002
+f70	000000000000000000000000000000001.100000000000000000000000000000
+f71	0000000002
+f72	000000000000000000000000000000001.100000000000000000000000000000
+f73	-1.175494349e-38
+f74	1.175494353e-38
+f75	00000001.175494353e-38
+f76	00000001.175494353e-38
+f77	-1.175494349e-38
+f78	1.175494353e-38
+f79	00000001.175494353e-38
+f80	00000001.175494353e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494349e-38
+f95	1.17549e-38
+f96	1.175494353e-38
+f97	01.17549e-38
+f98	00000001.175494353e-38
+f99	01.17549e-38
+f100	00000001.175494353e-38
+f101	1000-01-02
+f102	838:59:57
+f103	1970-01-03 00:00:02
+f104	1970-01-03 00:00:02
+f105	1903
+f106	1903
+f107	1903
+f108	1enum
+f109	1set,2set
+f59	3
+f60	3
+f61	0000000003
+f62	0000000000000000000000000000000000000000000000000000000000000003
+f63	0000000003
+f64	0000000000000000000000000000000000000000000000000000000000000003
+f65	-3
+f66	2.200000000000000000000000000000
+f67	3
+f68	2.200000000000000000000000000000
+f69	0000000003
+f70	000000000000000000000000000000002.200000000000000000000000000000
+f71	0000000003
+f72	000000000000000000000000000000002.200000000000000000000000000000
+f73	-1.175494348e-38
+f74	1.175494354e-38
+f75	00000001.175494354e-38
+f76	00000001.175494354e-38
+f77	-1.175494348e-38
+f78	1.175494354e-38
+f79	00000001.175494354e-38
+f80	00000001.175494354e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494348e-38
+f95	1.17549e-38
+f96	1.175494354e-38
+f97	01.17549e-38
+f98	00000001.175494354e-38
+f99	01.17549e-38
+f100	00000001.175494354e-38
+f101	1000-01-03
+f102	838:59:56
+f103	1970-01-04 00:00:03
+f104	1970-01-04 00:00:03
+f105	1904
+f106	1904
+f107	1904
+f108	2enum
+f109	1set
+f59	4
+f60	4
+f61	0000000004
+f62	0000000000000000000000000000000000000000000000000000000000000004
+f63	0000000004
+f64	0000000000000000000000000000000000000000000000000000000000000004
+f65	-2
+f66	3.300000000000000000000000000000
+f67	4
+f68	3.300000000000000000000000000000
+f69	0000000004
+f70	000000000000000000000000000000003.300000000000000000000000000000
+f71	0000000004
+f72	000000000000000000000000000000003.300000000000000000000000000000
+f73	-1.175494347e-38
+f74	1.175494355e-38
+f75	00000001.175494355e-38
+f76	00000001.175494355e-38
+f77	-1.175494347e-38
+f78	1.175494355e-38
+f79	00000001.175494355e-38
+f80	00000001.175494355e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494347e-38
+f95	1.17549e-38
+f96	1.175494355e-38
+f97	01.17549e-38
+f98	00000001.175494355e-38
+f99	01.17549e-38
+f100	00000001.175494355e-38
+f101	1000-01-04
+f102	838:59:55
+f103	1970-01-05 00:00:04
+f104	1970-01-05 00:00:04
+f105	1905
+f106	1905
+f107	1905
+f108	1enum
+f109	2set
+f59	4
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	5
+f60	5
+f61	0000000005
+f62	0000000000000000000000000000000000000000000000000000000000000005
+f63	0000000005
+f64	0000000000000000000000000000000000000000000000000000000000000005
+f65	-1
+f66	4.400000000000000000000000000000
+f67	5
+f68	4.400000000000000000000000000000
+f69	0000000005
+f70	000000000000000000000000000000004.400000000000000000000000000000
+f71	0000000005
+f72	000000000000000000000000000000004.400000000000000000000000000000
+f73	-1.175494346e-38
+f74	1.175494356e-38
+f75	00000001.175494356e-38
+f76	00000001.175494356e-38
+f77	-1.175494346e-38
+f78	1.175494356e-38
+f79	00000001.175494356e-38
+f80	00000001.175494356e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494346e-38
+f95	1.17549e-38
+f96	1.175494356e-38
+f97	01.17549e-38
+f98	00000001.175494356e-38
+f99	01.17549e-38
+f100	00000001.175494356e-38
+f101	1000-01-05
+f102	838:59:54
+f103	1970-01-06 00:00:05
+f104	1970-01-06 00:00:05
+f105	1906
+f106	1906
+f107	1906
+f108	2enum
+f109	1set,2set
+f59	6
+f60	6
+f61	0000000006
+f62	0000000000000000000000000000000000000000000000000000000000000006
+f63	0000000006
+f64	0000000000000000000000000000000000000000000000000000000000000006
+f65	0
+f66	5.500000000000000000000000000000
+f67	6
+f68	5.500000000000000000000000000000
+f69	0000000006
+f70	000000000000000000000000000000005.500000000000000000000000000000
+f71	0000000006
+f72	000000000000000000000000000000005.500000000000000000000000000000
+f73	-1.175494345e-38
+f74	1.175494357e-38
+f75	00000001.175494357e-38
+f76	00000001.175494357e-38
+f77	-1.175494345e-38
+f78	1.175494357e-38
+f79	00000001.175494357e-38
+f80	00000001.175494357e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494345e-38
+f95	1.17549e-38
+f96	1.175494357e-38
+f97	01.17549e-38
+f98	00000001.175494357e-38
+f99	01.17549e-38
+f100	00000001.175494357e-38
+f101	1000-01-06
+f102	838:59:53
+f103	1970-01-07 00:00:06
+f104	1970-01-07 00:00:06
+f105	1907
+f106	1907
+f107	1907
+f108	1enum
+f109	1set
+f59	7
+f60	7
+f61	0000000007
+f62	0000000000000000000000000000000000000000000000000000000000000007
+f63	0000000007
+f64	0000000000000000000000000000000000000000000000000000000000000007
+f65	1
+f66	6.600000000000000000000000000000
+f67	7
+f68	6.600000000000000000000000000000
+f69	0000000007
+f70	000000000000000000000000000000006.600000000000000000000000000000
+f71	0000000007
+f72	000000000000000000000000000000006.600000000000000000000000000000
+f73	-1.175494344e-38
+f74	1.175494358e-38
+f75	00000001.175494358e-38
+f76	00000001.175494358e-38
+f77	-1.175494344e-38
+f78	1.175494358e-38
+f79	00000001.175494358e-38
+f80	00000001.175494358e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494344e-38
+f95	1.17549e-38
+f96	1.175494358e-38
+f97	01.17549e-38
+f98	00000001.175494358e-38
+f99	01.17549e-38
+f100	00000001.175494358e-38
+f101	1000-01-07
+f102	838:59:52
+f103	1970-01-08 00:00:07
+f104	1970-01-08 00:00:07
+f105	1908
+f106	1908
+f107	1908
+f108	2enum
+f109	2set
+f59	8
+f60	8
+f61	0000000008
+f62	0000000000000000000000000000000000000000000000000000000000000008
+f63	0000000008
+f64	0000000000000000000000000000000000000000000000000000000000000008
+f65	2
+f66	7.700000000000000000000000000000
+f67	8
+f68	7.700000000000000000000000000000
+f69	0000000008
+f70	000000000000000000000000000000007.700000000000000000000000000000
+f71	0000000008
+f72	000000000000000000000000000000007.700000000000000000000000000000
+f73	-1.175494343e-38
+f74	1.175494359e-38
+f75	00000001.175494359e-38
+f76	00000001.175494359e-38
+f77	-1.175494343e-38
+f78	1.175494359e-38
+f79	00000001.175494359e-38
+f80	00000001.175494359e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494343e-38
+f95	1.17549e-38
+f96	1.175494359e-38
+f97	01.17549e-38
+f98	00000001.175494359e-38
+f99	01.17549e-38
+f100	00000001.175494359e-38
+f101	1000-01-08
+f102	838:59:51
+f103	1970-01-09 00:00:08
+f104	1970-01-09 00:00:08
+f105	1909
+f106	1909
+f107	1909
+f108	1enum
+f109	1set,2set
+f59	9
+f60	9
+f61	0000000009
+f62	0000000000000000000000000000000000000000000000000000000000000009
+f63	0000000009
+f64	0000000000000000000000000000000000000000000000000000000000000009
+f65	3
+f66	8.800000000000000000000000000000
+f67	9
+f68	8.800000000000000000000000000000
+f69	0000000009
+f70	000000000000000000000000000000008.800000000000000000000000000000
+f71	0000000009
+f72	000000000000000000000000000000008.800000000000000000000000000000
+f73	-1.175494342e-38
+f74	1.17549436e-38
+f75	000000001.17549436e-38
+f76	000000001.17549436e-38
+f77	-1.175494342e-38
+f78	1.17549436e-38
+f79	000000001.17549436e-38
+f80	000000001.17549436e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494342e-38
+f95	1.17549e-38
+f96	1.17549436e-38
+f97	01.17549e-38
+f98	000000001.17549436e-38
+f99	01.17549e-38
+f100	000000001.17549436e-38
+f101	1000-01-09
+f102	838:59:50
+f103	1970-01-10 00:00:09
+f104	1970-01-10 00:00:09
+f105	1910
+f106	1910
+f107	1910
+f108	2enum
+f109	1set
 CREATE OR REPLACE VIEW v1 AS SELECT F59, F60
 FROM test.tb2 WITH CASCADED CHECK OPTION;
 SELECT * FROM v1 order by f59,f60 limit 0,10;
@@ -931,9 +3925,108 @@ SHOW CREATE VIEW test.v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `tb2`.`f59` AS `f59`,`tb2`.`f60` AS `f60`,`tb2`.`f61` AS `f61`,`tb2`.`f62` AS `f62`,`tb2`.`f63` AS `f63`,`tb2`.`f64` AS `f64`,`tb2`.`f65` AS `f65`,`tb2`.`f66` AS `f66`,`tb2`.`f67` AS `f67`,`tb2`.`f68` AS `f68`,`tb2`.`f69` AS `f69`,`tb2`.`f70` AS `f70`,`tb2`.`f71` AS `f71`,`tb2`.`f72` AS `f72`,`tb2`.`f73` AS `f73`,`tb2`.`f74` AS `f74`,`tb2`.`f75` AS `f75`,`tb2`.`f76` AS `f76`,`tb2`.`f77` AS `f77`,`tb2`.`f78` AS `f78`,`tb2`.`f79` AS `f79`,`tb2`.`f80` AS `f80`,`tb2`.`f81` AS `f81`,`tb2`.`f82` AS `f82`,`tb2`.`f83` AS `f83`,`tb2`.`f84` AS `f84`,`tb2`.`f85` AS `f85`,`tb2`.`f86` AS `f86`,`tb2`.`f87` AS `f87`,`tb2`.`f88` AS `f88`,`tb2`.`f89` AS `f89`,`tb2`.`f90` AS `f90`,`tb2`.`f91` AS `f91`,`tb2`.`f92` AS `f92`,`tb2`.`f93` AS `f93`,`tb2`.`f94` AS `f94`,`tb2`.`f95` AS `f95`,`tb2`.`f96` AS `f96`,`tb2`.`f97` AS `f97`,`tb2`.`f98` AS `f98`,`tb2`.`f99` AS `f99`,`tb2`.`f100` AS `f100`,`tb2`.`f101` AS `f101`,`tb2`.`f102` AS `f102`,`tb2`.`f103` AS `f103`,`tb2`.`f104` AS `f104`,`tb2`.`f105` AS `f105`,`tb2`.`f106` AS `f106`,`tb2`.`f107` AS `f107`,`tb2`.`f108` AS `f108`,`tb2`.`f109` AS `f109` from `tb2` order by `tb2`.`f59` limit 2	latin1	latin1_swedish_ci
 SELECT * FROM test.v1 order by f59,f60,f61,f62,f63,f64,f65;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-1	1	0000000001	0000000000000000000000000000000000000000000000000000000000000001	0000000001	0000000000000000000000000000000000000000000000000000000000000001	-5	0.000000000000000000000000000000	1	0.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549435e-38	1.17549e-38	1.175494352e-38	01.17549e-38	00000001.175494352e-38	01.17549e-38	00000001.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	1970-01-02 00:00:01	1902	1902	1902	2enum	2set
-2	2	0000000002	0000000000000000000000000000000000000000000000000000000000000002	0000000002	0000000000000000000000000000000000000000000000000000000000000002	-4	1.100000000000000000000000000000	2	1.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494349e-38	1.17549e-38	1.175494353e-38	01.17549e-38	00000001.175494353e-38	01.17549e-38	00000001.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	1970-01-03 00:00:02	1903	1903	1903	1enum	1set,2set
+f59	1
+f60	1
+f61	0000000001
+f62	0000000000000000000000000000000000000000000000000000000000000001
+f63	0000000001
+f64	0000000000000000000000000000000000000000000000000000000000000001
+f65	-5
+f66	0.000000000000000000000000000000
+f67	1
+f68	0.000000000000000000000000000000
+f69	0000000001
+f70	000000000000000000000000000000000.000000000000000000000000000000
+f71	0000000001
+f72	000000000000000000000000000000000.000000000000000000000000000000
+f73	-1.17549435e-38
+f74	1.175494352e-38
+f75	00000001.175494352e-38
+f76	00000001.175494352e-38
+f77	-1.17549435e-38
+f78	1.175494352e-38
+f79	00000001.175494352e-38
+f80	00000001.175494352e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.17549435e-38
+f95	1.17549e-38
+f96	1.175494352e-38
+f97	01.17549e-38
+f98	00000001.175494352e-38
+f99	01.17549e-38
+f100	00000001.175494352e-38
+f101	1000-01-01
+f102	838:59:58
+f103	1970-01-02 00:00:01
+f104	1970-01-02 00:00:01
+f105	1902
+f106	1902
+f107	1902
+f108	2enum
+f109	2set
+f59	2
+f60	2
+f61	0000000002
+f62	0000000000000000000000000000000000000000000000000000000000000002
+f63	0000000002
+f64	0000000000000000000000000000000000000000000000000000000000000002
+f65	-4
+f66	1.100000000000000000000000000000
+f67	2
+f68	1.100000000000000000000000000000
+f69	0000000002
+f70	000000000000000000000000000000001.100000000000000000000000000000
+f71	0000000002
+f72	000000000000000000000000000000001.100000000000000000000000000000
+f73	-1.175494349e-38
+f74	1.175494353e-38
+f75	00000001.175494353e-38
+f76	00000001.175494353e-38
+f77	-1.175494349e-38
+f78	1.175494353e-38
+f79	00000001.175494353e-38
+f80	00000001.175494353e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494349e-38
+f95	1.17549e-38
+f96	1.175494353e-38
+f97	01.17549e-38
+f98	00000001.175494353e-38
+f99	01.17549e-38
+f100	00000001.175494353e-38
+f101	1000-01-02
+f102	838:59:57
+f103	1970-01-03 00:00:02
+f104	1970-01-03 00:00:02
+f105	1903
+f106	1903
+f107	1903
+f108	1enum
+f109	1set,2set
 CREATE OR REPLACE VIEW test.v1 AS SELECT F59 FROM tb2;
 SHOW CREATE VIEW test.v1;
 View	Create View	character_set_client	collation_connection
@@ -994,10 +4087,58 @@ Testcase 3.3.1.15
 --------------------------------------------------------------------------------
 Drop table if exists test.v1 ;
 CREATE OR REPLACE view test.v1 as select * from tb2;
-SELECT * FROM test.v1 ORDER BY f59,f60,f61 LIMIT 2;
+SELECT * FROM test.v1;
 f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
 1	1	0000000001	0000000000000000000000000000000000000000000000000000000000000001	0000000001	0000000000000000000000000000000000000000000000000000000000000001	-5	0.000000000000000000000000000000	1	0.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549435e-38	1.17549e-38	1.175494352e-38	01.17549e-38	00000001.175494352e-38	01.17549e-38	00000001.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	1970-01-02 00:00:01	1902	1902	1902	2enum	2set
+10	10	0000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000010	0000000000000000000000000000000000000000000000000000000000000010	4	9.900000000000000000000000000000	10	9.900000000000000000000000000000	0000000010	000000000000000000000000000000009.900000000000000000000000000000	0000000010	000000000000000000000000000000009.900000000000000000000000000000	-1.175494341e-38	1.175494361e-38	00000001.175494361e-38	00000001.175494361e-38	-1.175494341e-38	1.175494361e-38	00000001.175494361e-38	00000001.175494361e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494341e-38	1.17549e-38	1.175494361e-38	01.17549e-38	00000001.175494361e-38	01.17549e-38	00000001.175494361e-38	1000-01-10	838:59:49	1970-01-11 00:00:10	1970-01-11 00:00:10	1911	1911	1911	1enum	2set
+107	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+107	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+109	108	0000000104	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+109	108	0000000104	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+15	87	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+17	15	0000000016	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+19	18	0000000014	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+195	87	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 2	2	0000000002	0000000000000000000000000000000000000000000000000000000000000002	0000000002	0000000000000000000000000000000000000000000000000000000000000002	-4	1.100000000000000000000000000000	2	1.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494349e-38	1.17549e-38	1.175494353e-38	01.17549e-38	00000001.175494353e-38	01.17549e-38	00000001.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	1970-01-03 00:00:02	1903	1903	1903	1enum	1set,2set
+207	205	0000000206	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+209	208	0000000204	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+22	93	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+24	51654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+242	79	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+250	87895654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+2550	775654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+27	25	0000000026	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+2760	985654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+29	28	0000000024	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+292	93	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+299	899	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+3	3	0000000003	0000000000000000000000000000000000000000000000000000000000000003	0000000003	0000000000000000000000000000000000000000000000000000000000000003	-3	2.200000000000000000000000000000	3	2.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494348e-38	1.17549e-38	1.175494354e-38	01.17549e-38	00000001.175494354e-38	01.17549e-38	00000001.175494354e-38	1000-01-03	838:59:56	1970-01-04 00:00:03	1970-01-04 00:00:03	1904	1904	1904	2enum	1set
+321	NULL	0000000765	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+323	14376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+3330	764376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+34	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+340	9984376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+3410	996546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+394	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+4	4	0000000004	0000000000000000000000000000000000000000000000000000000000000004	0000000004	0000000000000000000000000000000000000000000000000000000000000004	-2	3.300000000000000000000000000000	4	3.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494347e-38	1.17549e-38	1.175494355e-38	01.17549e-38	00000001.175494355e-38	01.17549e-38	00000001.175494355e-38	1000-01-04	838:59:55	1970-01-05 00:00:04	1970-01-05 00:00:04	1905	1905	1905	1enum	2set
+4	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+424	89	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+441	16546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+5	5	0000000005	0000000000000000000000000000000000000000000000000000000000000005	0000000005	0000000000000000000000000000000000000000000000000000000000000005	-1	4.400000000000000000000000000000	5	4.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494346e-38	1.17549e-38	1.175494356e-38	01.17549e-38	00000001.175494356e-38	01.17549e-38	00000001.175494356e-38	1000-01-05	838:59:54	1970-01-06 00:00:05	1970-01-06 00:00:05	1906	1906	1906	2enum	1set,2set
+500	NULL	0000000900	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+500	NULL	0000000900	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+500	NULL	0000000900	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+569300	9114376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+6	6	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0	5.500000000000000000000000000000	6	5.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494345e-38	1.17549e-38	1.175494357e-38	01.17549e-38	00000001.175494357e-38	01.17549e-38	00000001.175494357e-38	1000-01-06	838:59:53	1970-01-07 00:00:06	1970-01-07 00:00:06	1907	1907	1907	1enum	1set
+660	876546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+7	7	0000000007	0000000000000000000000000000000000000000000000000000000000000007	0000000007	0000000000000000000000000000000000000000000000000000000000000007	1	6.600000000000000000000000000000	7	6.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494344e-38	1.17549e-38	1.175494358e-38	01.17549e-38	00000001.175494358e-38	01.17549e-38	00000001.175494358e-38	1000-01-07	838:59:52	1970-01-08 00:00:07	1970-01-08 00:00:07	1908	1908	1908	2enum	2set
+76710	226546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+7876	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+8	8	0000000008	0000000000000000000000000000000000000000000000000000000000000008	0000000008	0000000000000000000000000000000000000000000000000000000000000008	2	7.700000000000000000000000000000	8	7.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494343e-38	1.17549e-38	1.175494359e-38	01.17549e-38	00000001.175494359e-38	01.17549e-38	00000001.175494359e-38	1000-01-08	838:59:51	1970-01-09 00:00:08	1970-01-09 00:00:08	1909	1909	1909	1enum	1set,2set
+9	9	0000000009	0000000000000000000000000000000000000000000000000000000000000009	0000000009	0000000000000000000000000000000000000000000000000000000000000009	3	8.800000000000000000000000000000	9	8.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494342e-38	1.17549e-38	1.17549436e-38	01.17549e-38	000000001.17549436e-38	01.17549e-38	000000001.17549436e-38	1000-01-09	838:59:50	1970-01-10 00:00:09	1970-01-10 00:00:09	1910	1910	1910	2enum	1set
+9112	NULL	0000008771	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+94	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+987	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 Drop view test.v1 ;
 
 Testcase 3.3.1.16 + 3.3.1.17 
@@ -1140,17 +4281,17 @@ Drop view if exists test.v1 ;
 Testcase 3.3.1.22 
 --------------------------------------------------------------------------------
 DROP VIEW  IF EXISTS v1;
-CREATE VIEW test.v1( product ) AS SELECT f59*f60 From tb2;
-SELECT * FROM test.v1 WHERE product IS NOT NULL ORDER BY product LIMIT 2;
+CREATE VIEW test.v1( product ) AS SELECT f59*f60 From tb2 WHERE f59 < 3;
+SELECT * FROM test.v1;
 product
 1
 4
 CREATE OR REPLACE VIEW test.v1( product ) AS SELECT 1*2;
-SELECT * FROM test.v1 LIMIT 2;
+SELECT * FROM test.v1;
 product
 2
 CREATE OR REPLACE VIEW test.v1( product ) AS SELECT USER();
-SELECT * FROM test.v1 LIMIT 2;
+SELECT * FROM test.v1;
 product
 root@localhost
 Drop view if exists test.v1 ;
@@ -1228,84 +4369,2631 @@ Testcase 3.3.1.26
 --------------------------------------------------------------------------------
 DROP VIEW  IF EXISTS v1;
 Create view test.v1 AS Select * from test.tb2;
-Select * from test.v1 order by f59, f60, f61 limit 2;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-1	1	0000000001	0000000000000000000000000000000000000000000000000000000000000001	0000000001	0000000000000000000000000000000000000000000000000000000000000001	-5	0.000000000000000000000000000000	1	0.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549435e-38	1.17549e-38	1.175494352e-38	01.17549e-38	00000001.175494352e-38	01.17549e-38	00000001.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	1970-01-02 00:00:01	1902	1902	1902	2enum	2set
-2	2	0000000002	0000000000000000000000000000000000000000000000000000000000000002	0000000002	0000000000000000000000000000000000000000000000000000000000000002	-4	1.100000000000000000000000000000	2	1.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494349e-38	1.17549e-38	1.175494353e-38	01.17549e-38	00000001.175494353e-38	01.17549e-38	00000001.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	1970-01-03 00:00:02	1903	1903	1903	1enum	1set,2set
-Drop view test.v1 ;
-
-Testcase 3.3.1.27 
---------------------------------------------------------------------------------
-DROP VIEW  IF EXISTS test.v1;
-Drop VIEW  IF EXISTS test.v1_1 ;
-Create view test.v1 AS Select * from test.tb2;
-Create view test.v1_1 AS Select F59 from test.v1 ;
-Select * from test.v1_1 order by F59 limit 2;
-F59
-1
-2
-Drop view test.v1 ;
-Drop view test.v1_1 ;
-
-Testcase 3.3.1.28 
---------------------------------------------------------------------------------
-Drop database if exists test2 ;
-create database test2 ;
-Create view test2.v2 AS Select * from test.tb2 limit 50,50;
-use test2 ;
-Create view v1 AS Select * from test.tb2 limit 50 ;
-Select * from v1 order by f59,f60,f61,f62,f63,f64,f65;
+Select * from test.v1;
 f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
 1	1	0000000001	0000000000000000000000000000000000000000000000000000000000000001	0000000001	0000000000000000000000000000000000000000000000000000000000000001	-5	0.000000000000000000000000000000	1	0.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549435e-38	1.17549e-38	1.175494352e-38	01.17549e-38	00000001.175494352e-38	01.17549e-38	00000001.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	1970-01-02 00:00:01	1902	1902	1902	2enum	2set
-2	2	0000000002	0000000000000000000000000000000000000000000000000000000000000002	0000000002	0000000000000000000000000000000000000000000000000000000000000002	-4	1.100000000000000000000000000000	2	1.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494349e-38	1.17549e-38	1.175494353e-38	01.17549e-38	00000001.175494353e-38	01.17549e-38	00000001.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	1970-01-03 00:00:02	1903	1903	1903	1enum	1set,2set
-3	3	0000000003	0000000000000000000000000000000000000000000000000000000000000003	0000000003	0000000000000000000000000000000000000000000000000000000000000003	-3	2.200000000000000000000000000000	3	2.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494348e-38	1.17549e-38	1.175494354e-38	01.17549e-38	00000001.175494354e-38	01.17549e-38	00000001.175494354e-38	1000-01-03	838:59:56	1970-01-04 00:00:03	1970-01-04 00:00:03	1904	1904	1904	2enum	1set
-4	4	0000000004	0000000000000000000000000000000000000000000000000000000000000004	0000000004	0000000000000000000000000000000000000000000000000000000000000004	-2	3.300000000000000000000000000000	4	3.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494347e-38	1.17549e-38	1.175494355e-38	01.17549e-38	00000001.175494355e-38	01.17549e-38	00000001.175494355e-38	1000-01-04	838:59:55	1970-01-05 00:00:04	1970-01-05 00:00:04	1905	1905	1905	1enum	2set
-4	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-5	5	0000000005	0000000000000000000000000000000000000000000000000000000000000005	0000000005	0000000000000000000000000000000000000000000000000000000000000005	-1	4.400000000000000000000000000000	5	4.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494346e-38	1.17549e-38	1.175494356e-38	01.17549e-38	00000001.175494356e-38	01.17549e-38	00000001.175494356e-38	1000-01-05	838:59:54	1970-01-06 00:00:05	1970-01-06 00:00:05	1906	1906	1906	2enum	1set,2set
-6	6	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0	5.500000000000000000000000000000	6	5.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494345e-38	1.17549e-38	1.175494357e-38	01.17549e-38	00000001.175494357e-38	01.17549e-38	00000001.175494357e-38	1000-01-06	838:59:53	1970-01-07 00:00:06	1970-01-07 00:00:06	1907	1907	1907	1enum	1set
-7	7	0000000007	0000000000000000000000000000000000000000000000000000000000000007	0000000007	0000000000000000000000000000000000000000000000000000000000000007	1	6.600000000000000000000000000000	7	6.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494344e-38	1.17549e-38	1.175494358e-38	01.17549e-38	00000001.175494358e-38	01.17549e-38	00000001.175494358e-38	1000-01-07	838:59:52	1970-01-08 00:00:07	1970-01-08 00:00:07	1908	1908	1908	2enum	2set
-8	8	0000000008	0000000000000000000000000000000000000000000000000000000000000008	0000000008	0000000000000000000000000000000000000000000000000000000000000008	2	7.700000000000000000000000000000	8	7.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494343e-38	1.17549e-38	1.175494359e-38	01.17549e-38	00000001.175494359e-38	01.17549e-38	00000001.175494359e-38	1000-01-08	838:59:51	1970-01-09 00:00:08	1970-01-09 00:00:08	1909	1909	1909	1enum	1set,2set
-9	9	0000000009	0000000000000000000000000000000000000000000000000000000000000009	0000000009	0000000000000000000000000000000000000000000000000000000000000009	3	8.800000000000000000000000000000	9	8.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494342e-38	1.17549e-38	1.17549436e-38	01.17549e-38	000000001.17549436e-38	01.17549e-38	000000001.17549436e-38	1000-01-09	838:59:50	1970-01-10 00:00:09	1970-01-10 00:00:09	1910	1910	1910	2enum	1set
 10	10	0000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000010	0000000000000000000000000000000000000000000000000000000000000010	4	9.900000000000000000000000000000	10	9.900000000000000000000000000000	0000000010	000000000000000000000000000000009.900000000000000000000000000000	0000000010	000000000000000000000000000000009.900000000000000000000000000000	-1.175494341e-38	1.175494361e-38	00000001.175494361e-38	00000001.175494361e-38	-1.175494341e-38	1.175494361e-38	00000001.175494361e-38	00000001.175494361e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494341e-38	1.17549e-38	1.175494361e-38	01.17549e-38	00000001.175494361e-38	01.17549e-38	00000001.175494361e-38	1000-01-10	838:59:49	1970-01-11 00:00:10	1970-01-11 00:00:10	1911	1911	1911	1enum	2set
-15	87	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-17	15	0000000016	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-19	18	0000000014	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-22	93	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-24	51654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-27	25	0000000026	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-29	28	0000000024	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-34	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-94	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 107	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 107	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 109	108	0000000104	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 109	108	0000000104	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+15	87	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+17	15	0000000016	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+19	18	0000000014	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 195	87	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+2	2	0000000002	0000000000000000000000000000000000000000000000000000000000000002	0000000002	0000000000000000000000000000000000000000000000000000000000000002	-4	1.100000000000000000000000000000	2	1.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494349e-38	1.17549e-38	1.175494353e-38	01.17549e-38	00000001.175494353e-38	01.17549e-38	00000001.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	1970-01-03 00:00:02	1903	1903	1903	1enum	1set,2set
 207	205	0000000206	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 209	208	0000000204	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+22	93	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+24	51654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 242	79	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 250	87895654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+2550	775654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+27	25	0000000026	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+2760	985654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+29	28	0000000024	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 292	93	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 299	899	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+3	3	0000000003	0000000000000000000000000000000000000000000000000000000000000003	0000000003	0000000000000000000000000000000000000000000000000000000000000003	-3	2.200000000000000000000000000000	3	2.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494348e-38	1.17549e-38	1.175494354e-38	01.17549e-38	00000001.175494354e-38	01.17549e-38	00000001.175494354e-38	1000-01-03	838:59:56	1970-01-04 00:00:03	1970-01-04 00:00:03	1904	1904	1904	2enum	1set
 321	NULL	0000000765	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 323	14376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+3330	764376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+34	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 340	9984376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+3410	996546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 394	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+4	4	0000000004	0000000000000000000000000000000000000000000000000000000000000004	0000000004	0000000000000000000000000000000000000000000000000000000000000004	-2	3.300000000000000000000000000000	4	3.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494347e-38	1.17549e-38	1.175494355e-38	01.17549e-38	00000001.175494355e-38	01.17549e-38	00000001.175494355e-38	1000-01-04	838:59:55	1970-01-05 00:00:04	1970-01-05 00:00:04	1905	1905	1905	1enum	2set
+4	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 424	89	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 441	16546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+5	5	0000000005	0000000000000000000000000000000000000000000000000000000000000005	0000000005	0000000000000000000000000000000000000000000000000000000000000005	-1	4.400000000000000000000000000000	5	4.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494346e-38	1.17549e-38	1.175494356e-38	01.17549e-38	00000001.175494356e-38	01.17549e-38	00000001.175494356e-38	1000-01-05	838:59:54	1970-01-06 00:00:05	1970-01-06 00:00:05	1906	1906	1906	2enum	1set,2set
 500	NULL	0000000900	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 500	NULL	0000000900	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 500	NULL	0000000900	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+569300	9114376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+6	6	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0	5.500000000000000000000000000000	6	5.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494345e-38	1.17549e-38	1.175494357e-38	01.17549e-38	00000001.175494357e-38	01.17549e-38	00000001.175494357e-38	1000-01-06	838:59:53	1970-01-07 00:00:06	1970-01-07 00:00:06	1907	1907	1907	1enum	1set
 660	876546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-987	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-2550	775654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-2760	985654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-3330	764376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-3410	996546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+7	7	0000000007	0000000000000000000000000000000000000000000000000000000000000007	0000000007	0000000000000000000000000000000000000000000000000000000000000007	1	6.600000000000000000000000000000	7	6.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494344e-38	1.17549e-38	1.175494358e-38	01.17549e-38	00000001.175494358e-38	01.17549e-38	00000001.175494358e-38	1000-01-07	838:59:52	1970-01-08 00:00:07	1970-01-08 00:00:07	1908	1908	1908	2enum	2set
+76710	226546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 7876	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+8	8	0000000008	0000000000000000000000000000000000000000000000000000000000000008	0000000008	0000000000000000000000000000000000000000000000000000000000000008	2	7.700000000000000000000000000000	8	7.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494343e-38	1.17549e-38	1.175494359e-38	01.17549e-38	00000001.175494359e-38	01.17549e-38	00000001.175494359e-38	1000-01-08	838:59:51	1970-01-09 00:00:08	1970-01-09 00:00:08	1909	1909	1909	1enum	1set,2set
+9	9	0000000009	0000000000000000000000000000000000000000000000000000000000000009	0000000009	0000000000000000000000000000000000000000000000000000000000000009	3	8.800000000000000000000000000000	9	8.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494342e-38	1.17549e-38	1.17549436e-38	01.17549e-38	000000001.17549436e-38	01.17549e-38	000000001.17549436e-38	1000-01-09	838:59:50	1970-01-10 00:00:09	1970-01-10 00:00:09	1910	1910	1910	2enum	1set
 9112	NULL	0000008771	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-76710	226546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-569300	9114376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+94	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+987	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+Drop view test.v1 ;
+
+Testcase 3.3.1.27 
+--------------------------------------------------------------------------------
+DROP VIEW  IF EXISTS test.v1;
+Drop VIEW  IF EXISTS test.v1_1 ;
+Create view test.v1 AS Select * from test.tb2;
+Create view test.v1_1 AS Select F59 from test.v1 ;
+Select * from test.v1_1 order by F59 limit 2;
+F59
+1
+2
+Drop view test.v1 ;
+Drop view test.v1_1 ;
+
+Testcase 3.3.1.28 
+--------------------------------------------------------------------------------
+Drop database if exists test2 ;
+create database test2 ;
+Create view test2.v2 AS Select * from test.tb2 limit 50,50;
+use test2 ;
+Create view v1 AS Select * from test.tb2 limit 50 ;
+Select * from v1 order by f59,f60,f61,f62,f63,f64,f65;
+f59	1
+f60	1
+f61	0000000001
+f62	0000000000000000000000000000000000000000000000000000000000000001
+f63	0000000001
+f64	0000000000000000000000000000000000000000000000000000000000000001
+f65	-5
+f66	0.000000000000000000000000000000
+f67	1
+f68	0.000000000000000000000000000000
+f69	0000000001
+f70	000000000000000000000000000000000.000000000000000000000000000000
+f71	0000000001
+f72	000000000000000000000000000000000.000000000000000000000000000000
+f73	-1.17549435e-38
+f74	1.175494352e-38
+f75	00000001.175494352e-38
+f76	00000001.175494352e-38
+f77	-1.17549435e-38
+f78	1.175494352e-38
+f79	00000001.175494352e-38
+f80	00000001.175494352e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.17549435e-38
+f95	1.17549e-38
+f96	1.175494352e-38
+f97	01.17549e-38
+f98	00000001.175494352e-38
+f99	01.17549e-38
+f100	00000001.175494352e-38
+f101	1000-01-01
+f102	838:59:58
+f103	1970-01-02 00:00:01
+f104	1970-01-02 00:00:01
+f105	1902
+f106	1902
+f107	1902
+f108	2enum
+f109	2set
+f59	2
+f60	2
+f61	0000000002
+f62	0000000000000000000000000000000000000000000000000000000000000002
+f63	0000000002
+f64	0000000000000000000000000000000000000000000000000000000000000002
+f65	-4
+f66	1.100000000000000000000000000000
+f67	2
+f68	1.100000000000000000000000000000
+f69	0000000002
+f70	000000000000000000000000000000001.100000000000000000000000000000
+f71	0000000002
+f72	000000000000000000000000000000001.100000000000000000000000000000
+f73	-1.175494349e-38
+f74	1.175494353e-38
+f75	00000001.175494353e-38
+f76	00000001.175494353e-38
+f77	-1.175494349e-38
+f78	1.175494353e-38
+f79	00000001.175494353e-38
+f80	00000001.175494353e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494349e-38
+f95	1.17549e-38
+f96	1.175494353e-38
+f97	01.17549e-38
+f98	00000001.175494353e-38
+f99	01.17549e-38
+f100	00000001.175494353e-38
+f101	1000-01-02
+f102	838:59:57
+f103	1970-01-03 00:00:02
+f104	1970-01-03 00:00:02
+f105	1903
+f106	1903
+f107	1903
+f108	1enum
+f109	1set,2set
+f59	3
+f60	3
+f61	0000000003
+f62	0000000000000000000000000000000000000000000000000000000000000003
+f63	0000000003
+f64	0000000000000000000000000000000000000000000000000000000000000003
+f65	-3
+f66	2.200000000000000000000000000000
+f67	3
+f68	2.200000000000000000000000000000
+f69	0000000003
+f70	000000000000000000000000000000002.200000000000000000000000000000
+f71	0000000003
+f72	000000000000000000000000000000002.200000000000000000000000000000
+f73	-1.175494348e-38
+f74	1.175494354e-38
+f75	00000001.175494354e-38
+f76	00000001.175494354e-38
+f77	-1.175494348e-38
+f78	1.175494354e-38
+f79	00000001.175494354e-38
+f80	00000001.175494354e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494348e-38
+f95	1.17549e-38
+f96	1.175494354e-38
+f97	01.17549e-38
+f98	00000001.175494354e-38
+f99	01.17549e-38
+f100	00000001.175494354e-38
+f101	1000-01-03
+f102	838:59:56
+f103	1970-01-04 00:00:03
+f104	1970-01-04 00:00:03
+f105	1904
+f106	1904
+f107	1904
+f108	2enum
+f109	1set
+f59	4
+f60	4
+f61	0000000004
+f62	0000000000000000000000000000000000000000000000000000000000000004
+f63	0000000004
+f64	0000000000000000000000000000000000000000000000000000000000000004
+f65	-2
+f66	3.300000000000000000000000000000
+f67	4
+f68	3.300000000000000000000000000000
+f69	0000000004
+f70	000000000000000000000000000000003.300000000000000000000000000000
+f71	0000000004
+f72	000000000000000000000000000000003.300000000000000000000000000000
+f73	-1.175494347e-38
+f74	1.175494355e-38
+f75	00000001.175494355e-38
+f76	00000001.175494355e-38
+f77	-1.175494347e-38
+f78	1.175494355e-38
+f79	00000001.175494355e-38
+f80	00000001.175494355e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494347e-38
+f95	1.17549e-38
+f96	1.175494355e-38
+f97	01.17549e-38
+f98	00000001.175494355e-38
+f99	01.17549e-38
+f100	00000001.175494355e-38
+f101	1000-01-04
+f102	838:59:55
+f103	1970-01-05 00:00:04
+f104	1970-01-05 00:00:04
+f105	1905
+f106	1905
+f107	1905
+f108	1enum
+f109	2set
+f59	4
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	5
+f60	5
+f61	0000000005
+f62	0000000000000000000000000000000000000000000000000000000000000005
+f63	0000000005
+f64	0000000000000000000000000000000000000000000000000000000000000005
+f65	-1
+f66	4.400000000000000000000000000000
+f67	5
+f68	4.400000000000000000000000000000
+f69	0000000005
+f70	000000000000000000000000000000004.400000000000000000000000000000
+f71	0000000005
+f72	000000000000000000000000000000004.400000000000000000000000000000
+f73	-1.175494346e-38
+f74	1.175494356e-38
+f75	00000001.175494356e-38
+f76	00000001.175494356e-38
+f77	-1.175494346e-38
+f78	1.175494356e-38
+f79	00000001.175494356e-38
+f80	00000001.175494356e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494346e-38
+f95	1.17549e-38
+f96	1.175494356e-38
+f97	01.17549e-38
+f98	00000001.175494356e-38
+f99	01.17549e-38
+f100	00000001.175494356e-38
+f101	1000-01-05
+f102	838:59:54
+f103	1970-01-06 00:00:05
+f104	1970-01-06 00:00:05
+f105	1906
+f106	1906
+f107	1906
+f108	2enum
+f109	1set,2set
+f59	6
+f60	6
+f61	0000000006
+f62	0000000000000000000000000000000000000000000000000000000000000006
+f63	0000000006
+f64	0000000000000000000000000000000000000000000000000000000000000006
+f65	0
+f66	5.500000000000000000000000000000
+f67	6
+f68	5.500000000000000000000000000000
+f69	0000000006
+f70	000000000000000000000000000000005.500000000000000000000000000000
+f71	0000000006
+f72	000000000000000000000000000000005.500000000000000000000000000000
+f73	-1.175494345e-38
+f74	1.175494357e-38
+f75	00000001.175494357e-38
+f76	00000001.175494357e-38
+f77	-1.175494345e-38
+f78	1.175494357e-38
+f79	00000001.175494357e-38
+f80	00000001.175494357e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494345e-38
+f95	1.17549e-38
+f96	1.175494357e-38
+f97	01.17549e-38
+f98	00000001.175494357e-38
+f99	01.17549e-38
+f100	00000001.175494357e-38
+f101	1000-01-06
+f102	838:59:53
+f103	1970-01-07 00:00:06
+f104	1970-01-07 00:00:06
+f105	1907
+f106	1907
+f107	1907
+f108	1enum
+f109	1set
+f59	7
+f60	7
+f61	0000000007
+f62	0000000000000000000000000000000000000000000000000000000000000007
+f63	0000000007
+f64	0000000000000000000000000000000000000000000000000000000000000007
+f65	1
+f66	6.600000000000000000000000000000
+f67	7
+f68	6.600000000000000000000000000000
+f69	0000000007
+f70	000000000000000000000000000000006.600000000000000000000000000000
+f71	0000000007
+f72	000000000000000000000000000000006.600000000000000000000000000000
+f73	-1.175494344e-38
+f74	1.175494358e-38
+f75	00000001.175494358e-38
+f76	00000001.175494358e-38
+f77	-1.175494344e-38
+f78	1.175494358e-38
+f79	00000001.175494358e-38
+f80	00000001.175494358e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494344e-38
+f95	1.17549e-38
+f96	1.175494358e-38
+f97	01.17549e-38
+f98	00000001.175494358e-38
+f99	01.17549e-38
+f100	00000001.175494358e-38
+f101	1000-01-07
+f102	838:59:52
+f103	1970-01-08 00:00:07
+f104	1970-01-08 00:00:07
+f105	1908
+f106	1908
+f107	1908
+f108	2enum
+f109	2set
+f59	8
+f60	8
+f61	0000000008
+f62	0000000000000000000000000000000000000000000000000000000000000008
+f63	0000000008
+f64	0000000000000000000000000000000000000000000000000000000000000008
+f65	2
+f66	7.700000000000000000000000000000
+f67	8
+f68	7.700000000000000000000000000000
+f69	0000000008
+f70	000000000000000000000000000000007.700000000000000000000000000000
+f71	0000000008
+f72	000000000000000000000000000000007.700000000000000000000000000000
+f73	-1.175494343e-38
+f74	1.175494359e-38
+f75	00000001.175494359e-38
+f76	00000001.175494359e-38
+f77	-1.175494343e-38
+f78	1.175494359e-38
+f79	00000001.175494359e-38
+f80	00000001.175494359e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494343e-38
+f95	1.17549e-38
+f96	1.175494359e-38
+f97	01.17549e-38
+f98	00000001.175494359e-38
+f99	01.17549e-38
+f100	00000001.175494359e-38
+f101	1000-01-08
+f102	838:59:51
+f103	1970-01-09 00:00:08
+f104	1970-01-09 00:00:08
+f105	1909
+f106	1909
+f107	1909
+f108	1enum
+f109	1set,2set
+f59	9
+f60	9
+f61	0000000009
+f62	0000000000000000000000000000000000000000000000000000000000000009
+f63	0000000009
+f64	0000000000000000000000000000000000000000000000000000000000000009
+f65	3
+f66	8.800000000000000000000000000000
+f67	9
+f68	8.800000000000000000000000000000
+f69	0000000009
+f70	000000000000000000000000000000008.800000000000000000000000000000
+f71	0000000009
+f72	000000000000000000000000000000008.800000000000000000000000000000
+f73	-1.175494342e-38
+f74	1.17549436e-38
+f75	000000001.17549436e-38
+f76	000000001.17549436e-38
+f77	-1.175494342e-38
+f78	1.17549436e-38
+f79	000000001.17549436e-38
+f80	000000001.17549436e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494342e-38
+f95	1.17549e-38
+f96	1.17549436e-38
+f97	01.17549e-38
+f98	000000001.17549436e-38
+f99	01.17549e-38
+f100	000000001.17549436e-38
+f101	1000-01-09
+f102	838:59:50
+f103	1970-01-10 00:00:09
+f104	1970-01-10 00:00:09
+f105	1910
+f106	1910
+f107	1910
+f108	2enum
+f109	1set
+f59	10
+f60	10
+f61	0000000010
+f62	0000000000000000000000000000000000000000000000000000000000000010
+f63	0000000010
+f64	0000000000000000000000000000000000000000000000000000000000000010
+f65	4
+f66	9.900000000000000000000000000000
+f67	10
+f68	9.900000000000000000000000000000
+f69	0000000010
+f70	000000000000000000000000000000009.900000000000000000000000000000
+f71	0000000010
+f72	000000000000000000000000000000009.900000000000000000000000000000
+f73	-1.175494341e-38
+f74	1.175494361e-38
+f75	00000001.175494361e-38
+f76	00000001.175494361e-38
+f77	-1.175494341e-38
+f78	1.175494361e-38
+f79	00000001.175494361e-38
+f80	00000001.175494361e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494341e-38
+f95	1.17549e-38
+f96	1.175494361e-38
+f97	01.17549e-38
+f98	00000001.175494361e-38
+f99	01.17549e-38
+f100	00000001.175494361e-38
+f101	1000-01-10
+f102	838:59:49
+f103	1970-01-11 00:00:10
+f104	1970-01-11 00:00:10
+f105	1911
+f106	1911
+f107	1911
+f108	1enum
+f109	2set
+f59	15
+f60	87
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	17
+f60	15
+f61	0000000016
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	19
+f60	18
+f61	0000000014
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	22
+f60	93
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	24
+f60	51654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	27
+f60	25
+f61	0000000026
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	29
+f60	28
+f61	0000000024
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	34
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	94
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	107
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	107
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	109
+f60	108
+f61	0000000104
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	109
+f60	108
+f61	0000000104
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	195
+f60	87
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	207
+f60	205
+f61	0000000206
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	209
+f60	208
+f61	0000000204
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	242
+f60	79
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	250
+f60	87895654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	292
+f60	93
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	299
+f60	899
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	321
+f60	NULL
+f61	0000000765
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	323
+f60	14376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	340
+f60	9984376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	394
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	424
+f60	89
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	441
+f60	16546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	660
+f60	876546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	987
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	2550
+f60	775654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	2760
+f60	985654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	3330
+f60	764376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	3410
+f60	996546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	7876
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	9112
+f60	NULL
+f61	0000008771
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	76710
+f60	226546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	569300
+f60	9114376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 Select * from test2.v2 ;
 f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
 Drop view if exists test2.v1 ;
@@ -1896,12 +7584,110 @@ Drop view if exists test.v1 ;
 CREATE VIEW test.v1 AS SELECT f59,f60 FROM test.tb2;
 INSERT INTO test.v1 values(122,432);
 SELECT * FROM test.tb2 where f59 = 122 and f60 = 432 limit 0,20;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-122	432	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+f59	122
+f60	432
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 UPDATE test.v1 SET f59 = 3000 WHERE test.v1.f59 = 122 ;
 SELECT * FROM test.tb2  where f59 = 3000 limit 0,20;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-3000	432	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+f59	3000
+f60	432
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 DELETE FROM test.v1
 where test.v1.f59 = 3000 and test.v1.f60 = 432;
 SELECT * FROM test.tb2 where f59 = 3000 and f60 = 432;
@@ -1926,16 +7712,214 @@ info: Rows matched: 2  Changed: 2  Warnings: 0
 SELECT * FROM test.v1   where f59 = 30 order by f59;
 f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
 SELECT * FROM test.tb2        where f59 = 30 ;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-30	4	0000000004	0000000000000000000000000000000000000000000000000000000000000004	0000000004	0000000000000000000000000000000000000000000000000000000000000004	-2	3.300000000000000000000000000000	4	3.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494347e-38	1.17549e-38	1.175494355e-38	01.17549e-38	00000001.175494355e-38	01.17549e-38	00000001.175494355e-38	1000-01-04	838:59:55	1970-01-05 00:00:04	1970-01-05 00:00:04	1905	1905	1905	1enum	2set
-30	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+f59	30
+f60	4
+f61	0000000004
+f62	0000000000000000000000000000000000000000000000000000000000000004
+f63	0000000004
+f64	0000000000000000000000000000000000000000000000000000000000000004
+f65	-2
+f66	3.300000000000000000000000000000
+f67	4
+f68	3.300000000000000000000000000000
+f69	0000000004
+f70	000000000000000000000000000000003.300000000000000000000000000000
+f71	0000000004
+f72	000000000000000000000000000000003.300000000000000000000000000000
+f73	-1.175494347e-38
+f74	1.175494355e-38
+f75	00000001.175494355e-38
+f76	00000001.175494355e-38
+f77	-1.175494347e-38
+f78	1.175494355e-38
+f79	00000001.175494355e-38
+f80	00000001.175494355e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494347e-38
+f95	1.17549e-38
+f96	1.175494355e-38
+f97	01.17549e-38
+f98	00000001.175494355e-38
+f99	01.17549e-38
+f100	00000001.175494355e-38
+f101	1000-01-04
+f102	838:59:55
+f103	1970-01-05 00:00:04
+f104	1970-01-05 00:00:04
+f105	1905
+f106	1905
+f107	1905
+f108	1enum
+f109	2set
+f59	30
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 UPDATE tb2 SET f59 = 100 where f59 = 30 ;
 affected rows: 2
 info: Rows matched: 2  Changed: 2  Warnings: 0
 SELECT * FROM tb2 where f59 = 100 ;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-100	4	0000000004	0000000000000000000000000000000000000000000000000000000000000004	0000000004	0000000000000000000000000000000000000000000000000000000000000004	-2	3.300000000000000000000000000000	4	3.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494347e-38	1.17549e-38	1.175494355e-38	01.17549e-38	00000001.175494355e-38	01.17549e-38	00000001.175494355e-38	1000-01-04	838:59:55	1970-01-05 00:00:04	1970-01-05 00:00:04	1905	1905	1905	1enum	2set
-100	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+f59	100
+f60	4
+f61	0000000004
+f62	0000000000000000000000000000000000000000000000000000000000000004
+f63	0000000004
+f64	0000000000000000000000000000000000000000000000000000000000000004
+f65	-2
+f66	3.300000000000000000000000000000
+f67	4
+f68	3.300000000000000000000000000000
+f69	0000000004
+f70	000000000000000000000000000000003.300000000000000000000000000000
+f71	0000000004
+f72	000000000000000000000000000000003.300000000000000000000000000000
+f73	-1.175494347e-38
+f74	1.175494355e-38
+f75	00000001.175494355e-38
+f76	00000001.175494355e-38
+f77	-1.175494347e-38
+f78	1.175494355e-38
+f79	00000001.175494355e-38
+f80	00000001.175494355e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494347e-38
+f95	1.17549e-38
+f96	1.175494355e-38
+f97	01.17549e-38
+f98	00000001.175494355e-38
+f99	01.17549e-38
+f100	00000001.175494355e-38
+f101	1000-01-04
+f102	838:59:55
+f103	1970-01-05 00:00:04
+f104	1970-01-05 00:00:04
+f105	1905
+f106	1905
+f107	1905
+f108	1enum
+f109	2set
+f59	100
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 SELECT * FROM test.v1 order by f59 ;
 f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
 drop view if exists test.v1 ;
@@ -9721,13 +15705,2557 @@ Testcase 3.3.1.50 - 3.3.1.53
 --------------------------------------------------------------------------------
 DROP VIEW  IF EXISTS test.v1;
 CREATE VIEW test.v1 AS SELECT * FROM test.tb2;
-SELECT * FROM test.v1 order by f59 limit 5;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-1	1	0000000001	0000000000000000000000000000000000000000000000000000000000000001	0000000001	0000000000000000000000000000000000000000000000000000000000000001	-5	0.000000000000000000000000000000	1	0.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549435e-38	1.17549e-38	1.175494352e-38	01.17549e-38	00000001.175494352e-38	01.17549e-38	00000001.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	1970-01-02 00:00:01	1902	1902	1902	2enum	2set
-2	2	0000000002	0000000000000000000000000000000000000000000000000000000000000002	0000000002	0000000000000000000000000000000000000000000000000000000000000002	-4	1.100000000000000000000000000000	2	1.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494349e-38	1.17549e-38	1.175494353e-38	01.17549e-38	00000001.175494353e-38	01.17549e-38	00000001.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	1970-01-03 00:00:02	1903	1903	1903	1enum	1set,2set
-3	3	0000000003	0000000000000000000000000000000000000000000000000000000000000003	0000000003	0000000000000000000000000000000000000000000000000000000000000003	-3	2.200000000000000000000000000000	3	2.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494348e-38	1.17549e-38	1.175494354e-38	01.17549e-38	00000001.175494354e-38	01.17549e-38	00000001.175494354e-38	1000-01-03	838:59:56	1970-01-04 00:00:03	1970-01-04 00:00:03	1904	1904	1904	2enum	1set
-5	5	0000000005	0000000000000000000000000000000000000000000000000000000000000005	0000000005	0000000000000000000000000000000000000000000000000000000000000005	-1	4.400000000000000000000000000000	5	4.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494346e-38	1.17549e-38	1.175494356e-38	01.17549e-38	00000001.175494356e-38	01.17549e-38	00000001.175494356e-38	1000-01-05	838:59:54	1970-01-06 00:00:05	1970-01-06 00:00:05	1906	1906	1906	2enum	1set,2set
-6	6	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0	5.500000000000000000000000000000	6	5.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494345e-38	1.17549e-38	1.175494357e-38	01.17549e-38	00000001.175494357e-38	01.17549e-38	00000001.175494357e-38	1000-01-06	838:59:53	1970-01-07 00:00:06	1970-01-07 00:00:06	1907	1907	1907	1enum	1set
+SELECT * FROM test.v1 order by f59,f60,f61 ;
+f59	1
+f60	1
+f61	0000000001
+f62	0000000000000000000000000000000000000000000000000000000000000001
+f63	0000000001
+f64	0000000000000000000000000000000000000000000000000000000000000001
+f65	-5
+f66	0.000000000000000000000000000000
+f67	1
+f68	0.000000000000000000000000000000
+f69	0000000001
+f70	000000000000000000000000000000000.000000000000000000000000000000
+f71	0000000001
+f72	000000000000000000000000000000000.000000000000000000000000000000
+f73	-1.17549435e-38
+f74	1.175494352e-38
+f75	00000001.175494352e-38
+f76	00000001.175494352e-38
+f77	-1.17549435e-38
+f78	1.175494352e-38
+f79	00000001.175494352e-38
+f80	00000001.175494352e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.17549435e-38
+f95	1.17549e-38
+f96	1.175494352e-38
+f97	01.17549e-38
+f98	00000001.175494352e-38
+f99	01.17549e-38
+f100	00000001.175494352e-38
+f101	1000-01-01
+f102	838:59:58
+f103	1970-01-02 00:00:01
+f104	1970-01-02 00:00:01
+f105	1902
+f106	1902
+f107	1902
+f108	2enum
+f109	2set
+f59	2
+f60	2
+f61	0000000002
+f62	0000000000000000000000000000000000000000000000000000000000000002
+f63	0000000002
+f64	0000000000000000000000000000000000000000000000000000000000000002
+f65	-4
+f66	1.100000000000000000000000000000
+f67	2
+f68	1.100000000000000000000000000000
+f69	0000000002
+f70	000000000000000000000000000000001.100000000000000000000000000000
+f71	0000000002
+f72	000000000000000000000000000000001.100000000000000000000000000000
+f73	-1.175494349e-38
+f74	1.175494353e-38
+f75	00000001.175494353e-38
+f76	00000001.175494353e-38
+f77	-1.175494349e-38
+f78	1.175494353e-38
+f79	00000001.175494353e-38
+f80	00000001.175494353e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494349e-38
+f95	1.17549e-38
+f96	1.175494353e-38
+f97	01.17549e-38
+f98	00000001.175494353e-38
+f99	01.17549e-38
+f100	00000001.175494353e-38
+f101	1000-01-02
+f102	838:59:57
+f103	1970-01-03 00:00:02
+f104	1970-01-03 00:00:02
+f105	1903
+f106	1903
+f107	1903
+f108	1enum
+f109	1set,2set
+f59	3
+f60	3
+f61	0000000003
+f62	0000000000000000000000000000000000000000000000000000000000000003
+f63	0000000003
+f64	0000000000000000000000000000000000000000000000000000000000000003
+f65	-3
+f66	2.200000000000000000000000000000
+f67	3
+f68	2.200000000000000000000000000000
+f69	0000000003
+f70	000000000000000000000000000000002.200000000000000000000000000000
+f71	0000000003
+f72	000000000000000000000000000000002.200000000000000000000000000000
+f73	-1.175494348e-38
+f74	1.175494354e-38
+f75	00000001.175494354e-38
+f76	00000001.175494354e-38
+f77	-1.175494348e-38
+f78	1.175494354e-38
+f79	00000001.175494354e-38
+f80	00000001.175494354e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494348e-38
+f95	1.17549e-38
+f96	1.175494354e-38
+f97	01.17549e-38
+f98	00000001.175494354e-38
+f99	01.17549e-38
+f100	00000001.175494354e-38
+f101	1000-01-03
+f102	838:59:56
+f103	1970-01-04 00:00:03
+f104	1970-01-04 00:00:03
+f105	1904
+f106	1904
+f107	1904
+f108	2enum
+f109	1set
+f59	5
+f60	5
+f61	0000000005
+f62	0000000000000000000000000000000000000000000000000000000000000005
+f63	0000000005
+f64	0000000000000000000000000000000000000000000000000000000000000005
+f65	-1
+f66	4.400000000000000000000000000000
+f67	5
+f68	4.400000000000000000000000000000
+f69	0000000005
+f70	000000000000000000000000000000004.400000000000000000000000000000
+f71	0000000005
+f72	000000000000000000000000000000004.400000000000000000000000000000
+f73	-1.175494346e-38
+f74	1.175494356e-38
+f75	00000001.175494356e-38
+f76	00000001.175494356e-38
+f77	-1.175494346e-38
+f78	1.175494356e-38
+f79	00000001.175494356e-38
+f80	00000001.175494356e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494346e-38
+f95	1.17549e-38
+f96	1.175494356e-38
+f97	01.17549e-38
+f98	00000001.175494356e-38
+f99	01.17549e-38
+f100	00000001.175494356e-38
+f101	1000-01-05
+f102	838:59:54
+f103	1970-01-06 00:00:05
+f104	1970-01-06 00:00:05
+f105	1906
+f106	1906
+f107	1906
+f108	2enum
+f109	1set,2set
+f59	6
+f60	6
+f61	0000000006
+f62	0000000000000000000000000000000000000000000000000000000000000006
+f63	0000000006
+f64	0000000000000000000000000000000000000000000000000000000000000006
+f65	0
+f66	5.500000000000000000000000000000
+f67	6
+f68	5.500000000000000000000000000000
+f69	0000000006
+f70	000000000000000000000000000000005.500000000000000000000000000000
+f71	0000000006
+f72	000000000000000000000000000000005.500000000000000000000000000000
+f73	-1.175494345e-38
+f74	1.175494357e-38
+f75	00000001.175494357e-38
+f76	00000001.175494357e-38
+f77	-1.175494345e-38
+f78	1.175494357e-38
+f79	00000001.175494357e-38
+f80	00000001.175494357e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494345e-38
+f95	1.17549e-38
+f96	1.175494357e-38
+f97	01.17549e-38
+f98	00000001.175494357e-38
+f99	01.17549e-38
+f100	00000001.175494357e-38
+f101	1000-01-06
+f102	838:59:53
+f103	1970-01-07 00:00:06
+f104	1970-01-07 00:00:06
+f105	1907
+f106	1907
+f107	1907
+f108	1enum
+f109	1set
+f59	7
+f60	7
+f61	0000000007
+f62	0000000000000000000000000000000000000000000000000000000000000007
+f63	0000000007
+f64	0000000000000000000000000000000000000000000000000000000000000007
+f65	1
+f66	6.600000000000000000000000000000
+f67	7
+f68	6.600000000000000000000000000000
+f69	0000000007
+f70	000000000000000000000000000000006.600000000000000000000000000000
+f71	0000000007
+f72	000000000000000000000000000000006.600000000000000000000000000000
+f73	-1.175494344e-38
+f74	1.175494358e-38
+f75	00000001.175494358e-38
+f76	00000001.175494358e-38
+f77	-1.175494344e-38
+f78	1.175494358e-38
+f79	00000001.175494358e-38
+f80	00000001.175494358e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494344e-38
+f95	1.17549e-38
+f96	1.175494358e-38
+f97	01.17549e-38
+f98	00000001.175494358e-38
+f99	01.17549e-38
+f100	00000001.175494358e-38
+f101	1000-01-07
+f102	838:59:52
+f103	1970-01-08 00:00:07
+f104	1970-01-08 00:00:07
+f105	1908
+f106	1908
+f107	1908
+f108	2enum
+f109	2set
+f59	8
+f60	8
+f61	0000000008
+f62	0000000000000000000000000000000000000000000000000000000000000008
+f63	0000000008
+f64	0000000000000000000000000000000000000000000000000000000000000008
+f65	2
+f66	7.700000000000000000000000000000
+f67	8
+f68	7.700000000000000000000000000000
+f69	0000000008
+f70	000000000000000000000000000000007.700000000000000000000000000000
+f71	0000000008
+f72	000000000000000000000000000000007.700000000000000000000000000000
+f73	-1.175494343e-38
+f74	1.175494359e-38
+f75	00000001.175494359e-38
+f76	00000001.175494359e-38
+f77	-1.175494343e-38
+f78	1.175494359e-38
+f79	00000001.175494359e-38
+f80	00000001.175494359e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494343e-38
+f95	1.17549e-38
+f96	1.175494359e-38
+f97	01.17549e-38
+f98	00000001.175494359e-38
+f99	01.17549e-38
+f100	00000001.175494359e-38
+f101	1000-01-08
+f102	838:59:51
+f103	1970-01-09 00:00:08
+f104	1970-01-09 00:00:08
+f105	1909
+f106	1909
+f107	1909
+f108	1enum
+f109	1set,2set
+f59	9
+f60	9
+f61	0000000009
+f62	0000000000000000000000000000000000000000000000000000000000000009
+f63	0000000009
+f64	0000000000000000000000000000000000000000000000000000000000000009
+f65	3
+f66	8.800000000000000000000000000000
+f67	9
+f68	8.800000000000000000000000000000
+f69	0000000009
+f70	000000000000000000000000000000008.800000000000000000000000000000
+f71	0000000009
+f72	000000000000000000000000000000008.800000000000000000000000000000
+f73	-1.175494342e-38
+f74	1.17549436e-38
+f75	000000001.17549436e-38
+f76	000000001.17549436e-38
+f77	-1.175494342e-38
+f78	1.17549436e-38
+f79	000000001.17549436e-38
+f80	000000001.17549436e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494342e-38
+f95	1.17549e-38
+f96	1.17549436e-38
+f97	01.17549e-38
+f98	000000001.17549436e-38
+f99	01.17549e-38
+f100	000000001.17549436e-38
+f101	1000-01-09
+f102	838:59:50
+f103	1970-01-10 00:00:09
+f104	1970-01-10 00:00:09
+f105	1910
+f106	1910
+f107	1910
+f108	2enum
+f109	1set
+f59	10
+f60	10
+f61	0000000010
+f62	0000000000000000000000000000000000000000000000000000000000000010
+f63	0000000010
+f64	0000000000000000000000000000000000000000000000000000000000000010
+f65	4
+f66	9.900000000000000000000000000000
+f67	10
+f68	9.900000000000000000000000000000
+f69	0000000010
+f70	000000000000000000000000000000009.900000000000000000000000000000
+f71	0000000010
+f72	000000000000000000000000000000009.900000000000000000000000000000
+f73	-1.175494341e-38
+f74	1.175494361e-38
+f75	00000001.175494361e-38
+f76	00000001.175494361e-38
+f77	-1.175494341e-38
+f78	1.175494361e-38
+f79	00000001.175494361e-38
+f80	00000001.175494361e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494341e-38
+f95	1.17549e-38
+f96	1.175494361e-38
+f97	01.17549e-38
+f98	00000001.175494361e-38
+f99	01.17549e-38
+f100	00000001.175494361e-38
+f101	1000-01-10
+f102	838:59:49
+f103	1970-01-11 00:00:10
+f104	1970-01-11 00:00:10
+f105	1911
+f106	1911
+f107	1911
+f108	1enum
+f109	2set
+f59	15
+f60	87
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	17
+f60	15
+f61	0000000016
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	19
+f60	18
+f61	0000000014
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	22
+f60	93
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	24
+f60	51654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	27
+f60	25
+f61	0000000026
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	29
+f60	28
+f61	0000000024
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	34
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	94
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	100
+f60	4
+f61	0000000004
+f62	0000000000000000000000000000000000000000000000000000000000000004
+f63	0000000004
+f64	0000000000000000000000000000000000000000000000000000000000000004
+f65	-2
+f66	3.300000000000000000000000000000
+f67	4
+f68	3.300000000000000000000000000000
+f69	0000000004
+f70	000000000000000000000000000000003.300000000000000000000000000000
+f71	0000000004
+f72	000000000000000000000000000000003.300000000000000000000000000000
+f73	-1.175494347e-38
+f74	1.175494355e-38
+f75	00000001.175494355e-38
+f76	00000001.175494355e-38
+f77	-1.175494347e-38
+f78	1.175494355e-38
+f79	00000001.175494355e-38
+f80	00000001.175494355e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494347e-38
+f95	1.17549e-38
+f96	1.175494355e-38
+f97	01.17549e-38
+f98	00000001.175494355e-38
+f99	01.17549e-38
+f100	00000001.175494355e-38
+f101	1000-01-04
+f102	838:59:55
+f103	1970-01-05 00:00:04
+f104	1970-01-05 00:00:04
+f105	1905
+f106	1905
+f107	1905
+f108	1enum
+f109	2set
+f59	100
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	107
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	107
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	109
+f60	108
+f61	0000000104
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	109
+f60	108
+f61	0000000104
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	195
+f60	87
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	207
+f60	205
+f61	0000000206
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	209
+f60	208
+f61	0000000204
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	242
+f60	79
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	250
+f60	87895654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	292
+f60	93
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	299
+f60	899
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	321
+f60	NULL
+f61	0000000765
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	323
+f60	14376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	340
+f60	9984376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	394
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	424
+f60	89
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	441
+f60	16546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	660
+f60	876546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	987
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	2550
+f60	775654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	2760
+f60	985654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	3330
+f60	764376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	3410
+f60	996546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	7876
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	9112
+f60	NULL
+f61	0000008771
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	76710
+f60	226546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	569300
+f60	9114376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 drop view test.v1 ;
 CREATE VIEW test.v1 AS SELECT F59,F61 FROM test.tb2;
 SELECT * FROM test.v1 order by F59, F61 limit 50;
@@ -9784,28 +18312,2557 @@ F59	F61
 569300	NULL
 drop view test.v1 ;
 CREATE VIEW test.v1 AS SELECT * FROM test.tb2 order by f59, f60, f61;
-SELECT * FROM test.v1 order by f59,f60,f61 limit 20;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-1	1	0000000001	0000000000000000000000000000000000000000000000000000000000000001	0000000001	0000000000000000000000000000000000000000000000000000000000000001	-5	0.000000000000000000000000000000	1	0.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549435e-38	1.17549e-38	1.175494352e-38	01.17549e-38	00000001.175494352e-38	01.17549e-38	00000001.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	1970-01-02 00:00:01	1902	1902	1902	2enum	2set
-2	2	0000000002	0000000000000000000000000000000000000000000000000000000000000002	0000000002	0000000000000000000000000000000000000000000000000000000000000002	-4	1.100000000000000000000000000000	2	1.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494349e-38	1.17549e-38	1.175494353e-38	01.17549e-38	00000001.175494353e-38	01.17549e-38	00000001.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	1970-01-03 00:00:02	1903	1903	1903	1enum	1set,2set
-3	3	0000000003	0000000000000000000000000000000000000000000000000000000000000003	0000000003	0000000000000000000000000000000000000000000000000000000000000003	-3	2.200000000000000000000000000000	3	2.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494348e-38	1.17549e-38	1.175494354e-38	01.17549e-38	00000001.175494354e-38	01.17549e-38	00000001.175494354e-38	1000-01-03	838:59:56	1970-01-04 00:00:03	1970-01-04 00:00:03	1904	1904	1904	2enum	1set
-5	5	0000000005	0000000000000000000000000000000000000000000000000000000000000005	0000000005	0000000000000000000000000000000000000000000000000000000000000005	-1	4.400000000000000000000000000000	5	4.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494346e-38	1.17549e-38	1.175494356e-38	01.17549e-38	00000001.175494356e-38	01.17549e-38	00000001.175494356e-38	1000-01-05	838:59:54	1970-01-06 00:00:05	1970-01-06 00:00:05	1906	1906	1906	2enum	1set,2set
-6	6	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0	5.500000000000000000000000000000	6	5.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494345e-38	1.17549e-38	1.175494357e-38	01.17549e-38	00000001.175494357e-38	01.17549e-38	00000001.175494357e-38	1000-01-06	838:59:53	1970-01-07 00:00:06	1970-01-07 00:00:06	1907	1907	1907	1enum	1set
-7	7	0000000007	0000000000000000000000000000000000000000000000000000000000000007	0000000007	0000000000000000000000000000000000000000000000000000000000000007	1	6.600000000000000000000000000000	7	6.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494344e-38	1.17549e-38	1.175494358e-38	01.17549e-38	00000001.175494358e-38	01.17549e-38	00000001.175494358e-38	1000-01-07	838:59:52	1970-01-08 00:00:07	1970-01-08 00:00:07	1908	1908	1908	2enum	2set
-8	8	0000000008	0000000000000000000000000000000000000000000000000000000000000008	0000000008	0000000000000000000000000000000000000000000000000000000000000008	2	7.700000000000000000000000000000	8	7.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494343e-38	1.17549e-38	1.175494359e-38	01.17549e-38	00000001.175494359e-38	01.17549e-38	00000001.175494359e-38	1000-01-08	838:59:51	1970-01-09 00:00:08	1970-01-09 00:00:08	1909	1909	1909	1enum	1set,2set
-9	9	0000000009	0000000000000000000000000000000000000000000000000000000000000009	0000000009	0000000000000000000000000000000000000000000000000000000000000009	3	8.800000000000000000000000000000	9	8.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494342e-38	1.17549e-38	1.17549436e-38	01.17549e-38	000000001.17549436e-38	01.17549e-38	000000001.17549436e-38	1000-01-09	838:59:50	1970-01-10 00:00:09	1970-01-10 00:00:09	1910	1910	1910	2enum	1set
-10	10	0000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000010	0000000000000000000000000000000000000000000000000000000000000010	4	9.900000000000000000000000000000	10	9.900000000000000000000000000000	0000000010	000000000000000000000000000000009.900000000000000000000000000000	0000000010	000000000000000000000000000000009.900000000000000000000000000000	-1.175494341e-38	1.175494361e-38	00000001.175494361e-38	00000001.175494361e-38	-1.175494341e-38	1.175494361e-38	00000001.175494361e-38	00000001.175494361e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494341e-38	1.17549e-38	1.175494361e-38	01.17549e-38	00000001.175494361e-38	01.17549e-38	00000001.175494361e-38	1000-01-10	838:59:49	1970-01-11 00:00:10	1970-01-11 00:00:10	1911	1911	1911	1enum	2set
-15	87	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-17	15	0000000016	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-19	18	0000000014	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-22	93	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-24	51654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-27	25	0000000026	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-29	28	0000000024	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-34	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-94	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-100	4	0000000004	0000000000000000000000000000000000000000000000000000000000000004	0000000004	0000000000000000000000000000000000000000000000000000000000000004	-2	3.300000000000000000000000000000	4	3.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494347e-38	1.17549e-38	1.175494355e-38	01.17549e-38	00000001.175494355e-38	01.17549e-38	00000001.175494355e-38	1000-01-04	838:59:55	1970-01-05 00:00:04	1970-01-05 00:00:04	1905	1905	1905	1enum	2set
-100	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+SELECT * FROM test.v1 order by f59,f60,f61 ;
+f59	1
+f60	1
+f61	0000000001
+f62	0000000000000000000000000000000000000000000000000000000000000001
+f63	0000000001
+f64	0000000000000000000000000000000000000000000000000000000000000001
+f65	-5
+f66	0.000000000000000000000000000000
+f67	1
+f68	0.000000000000000000000000000000
+f69	0000000001
+f70	000000000000000000000000000000000.000000000000000000000000000000
+f71	0000000001
+f72	000000000000000000000000000000000.000000000000000000000000000000
+f73	-1.17549435e-38
+f74	1.175494352e-38
+f75	00000001.175494352e-38
+f76	00000001.175494352e-38
+f77	-1.17549435e-38
+f78	1.175494352e-38
+f79	00000001.175494352e-38
+f80	00000001.175494352e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.17549435e-38
+f95	1.17549e-38
+f96	1.175494352e-38
+f97	01.17549e-38
+f98	00000001.175494352e-38
+f99	01.17549e-38
+f100	00000001.175494352e-38
+f101	1000-01-01
+f102	838:59:58
+f103	1970-01-02 00:00:01
+f104	1970-01-02 00:00:01
+f105	1902
+f106	1902
+f107	1902
+f108	2enum
+f109	2set
+f59	2
+f60	2
+f61	0000000002
+f62	0000000000000000000000000000000000000000000000000000000000000002
+f63	0000000002
+f64	0000000000000000000000000000000000000000000000000000000000000002
+f65	-4
+f66	1.100000000000000000000000000000
+f67	2
+f68	1.100000000000000000000000000000
+f69	0000000002
+f70	000000000000000000000000000000001.100000000000000000000000000000
+f71	0000000002
+f72	000000000000000000000000000000001.100000000000000000000000000000
+f73	-1.175494349e-38
+f74	1.175494353e-38
+f75	00000001.175494353e-38
+f76	00000001.175494353e-38
+f77	-1.175494349e-38
+f78	1.175494353e-38
+f79	00000001.175494353e-38
+f80	00000001.175494353e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494349e-38
+f95	1.17549e-38
+f96	1.175494353e-38
+f97	01.17549e-38
+f98	00000001.175494353e-38
+f99	01.17549e-38
+f100	00000001.175494353e-38
+f101	1000-01-02
+f102	838:59:57
+f103	1970-01-03 00:00:02
+f104	1970-01-03 00:00:02
+f105	1903
+f106	1903
+f107	1903
+f108	1enum
+f109	1set,2set
+f59	3
+f60	3
+f61	0000000003
+f62	0000000000000000000000000000000000000000000000000000000000000003
+f63	0000000003
+f64	0000000000000000000000000000000000000000000000000000000000000003
+f65	-3
+f66	2.200000000000000000000000000000
+f67	3
+f68	2.200000000000000000000000000000
+f69	0000000003
+f70	000000000000000000000000000000002.200000000000000000000000000000
+f71	0000000003
+f72	000000000000000000000000000000002.200000000000000000000000000000
+f73	-1.175494348e-38
+f74	1.175494354e-38
+f75	00000001.175494354e-38
+f76	00000001.175494354e-38
+f77	-1.175494348e-38
+f78	1.175494354e-38
+f79	00000001.175494354e-38
+f80	00000001.175494354e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494348e-38
+f95	1.17549e-38
+f96	1.175494354e-38
+f97	01.17549e-38
+f98	00000001.175494354e-38
+f99	01.17549e-38
+f100	00000001.175494354e-38
+f101	1000-01-03
+f102	838:59:56
+f103	1970-01-04 00:00:03
+f104	1970-01-04 00:00:03
+f105	1904
+f106	1904
+f107	1904
+f108	2enum
+f109	1set
+f59	5
+f60	5
+f61	0000000005
+f62	0000000000000000000000000000000000000000000000000000000000000005
+f63	0000000005
+f64	0000000000000000000000000000000000000000000000000000000000000005
+f65	-1
+f66	4.400000000000000000000000000000
+f67	5
+f68	4.400000000000000000000000000000
+f69	0000000005
+f70	000000000000000000000000000000004.400000000000000000000000000000
+f71	0000000005
+f72	000000000000000000000000000000004.400000000000000000000000000000
+f73	-1.175494346e-38
+f74	1.175494356e-38
+f75	00000001.175494356e-38
+f76	00000001.175494356e-38
+f77	-1.175494346e-38
+f78	1.175494356e-38
+f79	00000001.175494356e-38
+f80	00000001.175494356e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494346e-38
+f95	1.17549e-38
+f96	1.175494356e-38
+f97	01.17549e-38
+f98	00000001.175494356e-38
+f99	01.17549e-38
+f100	00000001.175494356e-38
+f101	1000-01-05
+f102	838:59:54
+f103	1970-01-06 00:00:05
+f104	1970-01-06 00:00:05
+f105	1906
+f106	1906
+f107	1906
+f108	2enum
+f109	1set,2set
+f59	6
+f60	6
+f61	0000000006
+f62	0000000000000000000000000000000000000000000000000000000000000006
+f63	0000000006
+f64	0000000000000000000000000000000000000000000000000000000000000006
+f65	0
+f66	5.500000000000000000000000000000
+f67	6
+f68	5.500000000000000000000000000000
+f69	0000000006
+f70	000000000000000000000000000000005.500000000000000000000000000000
+f71	0000000006
+f72	000000000000000000000000000000005.500000000000000000000000000000
+f73	-1.175494345e-38
+f74	1.175494357e-38
+f75	00000001.175494357e-38
+f76	00000001.175494357e-38
+f77	-1.175494345e-38
+f78	1.175494357e-38
+f79	00000001.175494357e-38
+f80	00000001.175494357e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494345e-38
+f95	1.17549e-38
+f96	1.175494357e-38
+f97	01.17549e-38
+f98	00000001.175494357e-38
+f99	01.17549e-38
+f100	00000001.175494357e-38
+f101	1000-01-06
+f102	838:59:53
+f103	1970-01-07 00:00:06
+f104	1970-01-07 00:00:06
+f105	1907
+f106	1907
+f107	1907
+f108	1enum
+f109	1set
+f59	7
+f60	7
+f61	0000000007
+f62	0000000000000000000000000000000000000000000000000000000000000007
+f63	0000000007
+f64	0000000000000000000000000000000000000000000000000000000000000007
+f65	1
+f66	6.600000000000000000000000000000
+f67	7
+f68	6.600000000000000000000000000000
+f69	0000000007
+f70	000000000000000000000000000000006.600000000000000000000000000000
+f71	0000000007
+f72	000000000000000000000000000000006.600000000000000000000000000000
+f73	-1.175494344e-38
+f74	1.175494358e-38
+f75	00000001.175494358e-38
+f76	00000001.175494358e-38
+f77	-1.175494344e-38
+f78	1.175494358e-38
+f79	00000001.175494358e-38
+f80	00000001.175494358e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494344e-38
+f95	1.17549e-38
+f96	1.175494358e-38
+f97	01.17549e-38
+f98	00000001.175494358e-38
+f99	01.17549e-38
+f100	00000001.175494358e-38
+f101	1000-01-07
+f102	838:59:52
+f103	1970-01-08 00:00:07
+f104	1970-01-08 00:00:07
+f105	1908
+f106	1908
+f107	1908
+f108	2enum
+f109	2set
+f59	8
+f60	8
+f61	0000000008
+f62	0000000000000000000000000000000000000000000000000000000000000008
+f63	0000000008
+f64	0000000000000000000000000000000000000000000000000000000000000008
+f65	2
+f66	7.700000000000000000000000000000
+f67	8
+f68	7.700000000000000000000000000000
+f69	0000000008
+f70	000000000000000000000000000000007.700000000000000000000000000000
+f71	0000000008
+f72	000000000000000000000000000000007.700000000000000000000000000000
+f73	-1.175494343e-38
+f74	1.175494359e-38
+f75	00000001.175494359e-38
+f76	00000001.175494359e-38
+f77	-1.175494343e-38
+f78	1.175494359e-38
+f79	00000001.175494359e-38
+f80	00000001.175494359e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494343e-38
+f95	1.17549e-38
+f96	1.175494359e-38
+f97	01.17549e-38
+f98	00000001.175494359e-38
+f99	01.17549e-38
+f100	00000001.175494359e-38
+f101	1000-01-08
+f102	838:59:51
+f103	1970-01-09 00:00:08
+f104	1970-01-09 00:00:08
+f105	1909
+f106	1909
+f107	1909
+f108	1enum
+f109	1set,2set
+f59	9
+f60	9
+f61	0000000009
+f62	0000000000000000000000000000000000000000000000000000000000000009
+f63	0000000009
+f64	0000000000000000000000000000000000000000000000000000000000000009
+f65	3
+f66	8.800000000000000000000000000000
+f67	9
+f68	8.800000000000000000000000000000
+f69	0000000009
+f70	000000000000000000000000000000008.800000000000000000000000000000
+f71	0000000009
+f72	000000000000000000000000000000008.800000000000000000000000000000
+f73	-1.175494342e-38
+f74	1.17549436e-38
+f75	000000001.17549436e-38
+f76	000000001.17549436e-38
+f77	-1.175494342e-38
+f78	1.17549436e-38
+f79	000000001.17549436e-38
+f80	000000001.17549436e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494342e-38
+f95	1.17549e-38
+f96	1.17549436e-38
+f97	01.17549e-38
+f98	000000001.17549436e-38
+f99	01.17549e-38
+f100	000000001.17549436e-38
+f101	1000-01-09
+f102	838:59:50
+f103	1970-01-10 00:00:09
+f104	1970-01-10 00:00:09
+f105	1910
+f106	1910
+f107	1910
+f108	2enum
+f109	1set
+f59	10
+f60	10
+f61	0000000010
+f62	0000000000000000000000000000000000000000000000000000000000000010
+f63	0000000010
+f64	0000000000000000000000000000000000000000000000000000000000000010
+f65	4
+f66	9.900000000000000000000000000000
+f67	10
+f68	9.900000000000000000000000000000
+f69	0000000010
+f70	000000000000000000000000000000009.900000000000000000000000000000
+f71	0000000010
+f72	000000000000000000000000000000009.900000000000000000000000000000
+f73	-1.175494341e-38
+f74	1.175494361e-38
+f75	00000001.175494361e-38
+f76	00000001.175494361e-38
+f77	-1.175494341e-38
+f78	1.175494361e-38
+f79	00000001.175494361e-38
+f80	00000001.175494361e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494341e-38
+f95	1.17549e-38
+f96	1.175494361e-38
+f97	01.17549e-38
+f98	00000001.175494361e-38
+f99	01.17549e-38
+f100	00000001.175494361e-38
+f101	1000-01-10
+f102	838:59:49
+f103	1970-01-11 00:00:10
+f104	1970-01-11 00:00:10
+f105	1911
+f106	1911
+f107	1911
+f108	1enum
+f109	2set
+f59	15
+f60	87
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	17
+f60	15
+f61	0000000016
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	19
+f60	18
+f61	0000000014
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	22
+f60	93
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	24
+f60	51654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	27
+f60	25
+f61	0000000026
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	29
+f60	28
+f61	0000000024
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	34
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	94
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	100
+f60	4
+f61	0000000004
+f62	0000000000000000000000000000000000000000000000000000000000000004
+f63	0000000004
+f64	0000000000000000000000000000000000000000000000000000000000000004
+f65	-2
+f66	3.300000000000000000000000000000
+f67	4
+f68	3.300000000000000000000000000000
+f69	0000000004
+f70	000000000000000000000000000000003.300000000000000000000000000000
+f71	0000000004
+f72	000000000000000000000000000000003.300000000000000000000000000000
+f73	-1.175494347e-38
+f74	1.175494355e-38
+f75	00000001.175494355e-38
+f76	00000001.175494355e-38
+f77	-1.175494347e-38
+f78	1.175494355e-38
+f79	00000001.175494355e-38
+f80	00000001.175494355e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494347e-38
+f95	1.17549e-38
+f96	1.175494355e-38
+f97	01.17549e-38
+f98	00000001.175494355e-38
+f99	01.17549e-38
+f100	00000001.175494355e-38
+f101	1000-01-04
+f102	838:59:55
+f103	1970-01-05 00:00:04
+f104	1970-01-05 00:00:04
+f105	1905
+f106	1905
+f107	1905
+f108	1enum
+f109	2set
+f59	100
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	107
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	107
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	109
+f60	108
+f61	0000000104
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	109
+f60	108
+f61	0000000104
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	195
+f60	87
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	207
+f60	205
+f61	0000000206
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	209
+f60	208
+f61	0000000204
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	242
+f60	79
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	250
+f60	87895654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	292
+f60	93
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	299
+f60	899
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	321
+f60	NULL
+f61	0000000765
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	323
+f60	14376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	340
+f60	9984376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	394
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	424
+f60	89
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	441
+f60	16546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	660
+f60	876546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	987
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	2550
+f60	775654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	2760
+f60	985654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	3330
+f60	764376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	3410
+f60	996546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	7876
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	9112
+f60	NULL
+f61	0000008771
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	76710
+f60	226546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	569300
+f60	9114376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 drop view test.v1 ;
 CREATE VIEW test.v1 AS SELECT F59,f61 FROM test.tb2;
 SELECT * FROM test.v1 order by f59,f61 desc limit 20;
@@ -10180,8 +21237,57 @@ F59
 ALTER VIEW test.v1 AS  SELECT *
 FROM test.tb2 WHERE test.tb2.f59 = 242 ;
 SELECT * FROM test.v1 order by f59 limit 0,10;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-242	79	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+f59	242
+f60	79
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 Drop view test.v1 ;
 
 Testcase 3.3.1.65, 3.3.1.A4, 3.3.1.66, 3.3.1.67 
@@ -10544,8 +21650,57 @@ Create view test.v1 AS SELECT f59,f60,f61 FROM tb2  ;
 INSERT INTO test.v1 ( f59 , f60 ) values (2005,0101) ;
 affected rows: 1
 SELECT * FROM tb2 where f59 = 2005 and f60 = 0101 ;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-2005	101	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+f59	2005
+f60	101
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 SELECT f59,f60 FROM test.v1 where f59 = 2005 and f60 = 0101 ;
 f59	f60
 2005	101
@@ -10561,8 +21716,57 @@ UPDATE test.v1 SET f59 = 8 WHERE f59 = 780 and f60 = 105;
 affected rows: 1
 info: Rows matched: 1  Changed: 1  Warnings: 0
 SELECT * FROM tb2 where f59 = 8 and f60 = 105;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-8	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+f59	8
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 SELECT f59,f60 FROM test.v1 where f59 = 8 and f60 = 105 ;
 f59	f60
 8	105
@@ -10577,11 +21781,210 @@ UPDATE test.v1 SET f59 = 891 WHERE f60 = 105 ;
 affected rows: 4
 info: Rows matched: 4  Changed: 4  Warnings: 0
 SELECT * FROM tb2 where f59 = 891 and f60 = 105;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-891	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-891	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-891	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-891	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+f59	891
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	891
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	891
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	891
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 SELECT f59,f60 FROM test.v1 where f59 = 891 and f60 = 105 ;
 f59	f60
 891	105
@@ -10930,10 +22333,6 @@ SET @variant4= 'CREATE VIEW v1 AS SELECT f61 FROM t1 GROUP BY f61';
 SET @variant5= 'CREATE VIEW v1 AS SELECT f61 FROM t1 HAVING f61 > 0';
 SET @variant6= 'CREATE VIEW v1 AS SELECT (SELECT f60 FROM t2 WHERE f59=19) AS f61 FROM t1';
 SET @variant7= 'CREATE VIEW v1 AS SELECT f61 FROM v2';
-
-Some server responses suffer from
-Bug#10773 Incorrect message is displayed while updating a view
---------------------------------------------------------------------------------
 SET @variant8= 'CREATE VIEW v1 AS SELECT f59 AS f61 FROM t1 WHERE f60 IN (SELECT f59 FROM t1)';
 SET @variant9= 'CREATE ALGORITHM = TEMPTABLE VIEW v1 (f61) AS select f60 from t1';
 CREATE ALGORITHM = TEMPTABLE VIEW v1 (f61) AS select f60 from t1;
@@ -11465,21 +22864,24 @@ ABC	0
 ABC	1.7320508075689
 CREATE TABLE t2 AS SELECT f1, SQRT(f2) my_sqrt FROM t1;
 SELECT * FROM t2 order by 2;
-f1	my_sqrt
-ABC	0
-ABC	1.73205080756888
+f1	ABC
+my_sqrt	0
+f1	ABC
+my_sqrt	1.73205080756888
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v1;
 SELECT * FROM t2 order by 2;
-f1	my_sqrt
-ABC	0
-ABC	1.73205080756888
+f1	ABC
+my_sqrt	0
+f1	ABC
+my_sqrt	1.73205080756888
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v2;
 SELECT * FROM t2 order by 2;
-f1	my_sqrt
-ABC	0
-ABC	1.73205080756888
+f1	ABC
+my_sqrt	0
+f1	ABC
+my_sqrt	1.73205080756888
 DROP TABLE t1;
 DROP TABLE t2;
 DROP VIEW  v1;
diff --git a/mysql-test/suite/funcs_1/r/memory__datadict.result b/mysql-test/suite/funcs_1/r/memory__datadict.result
index 0a7c7f20437..fc7f53f0d22 100644
--- a/mysql-test/suite/funcs_1/r/memory__datadict.result
+++ b/mysql-test/suite/funcs_1/r/memory__datadict.result
@@ -453,6 +453,7 @@ KEY_COLUMN_USAGE
 PARTITIONS
 PLUGINS
 PROCESSLIST
+PROFILING
 REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
@@ -772,6 +773,27 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	PROFILING
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+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	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	REFERENTIAL_CONSTRAINTS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
@@ -1885,6 +1907,7 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
@@ -1953,6 +1976,7 @@ NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
@@ -2021,6 +2045,7 @@ NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
@@ -2089,6 +2114,7 @@ NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
@@ -2157,6 +2183,7 @@ NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
@@ -2225,6 +2252,7 @@ NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
@@ -2403,6 +2431,24 @@ NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	u
 NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
 NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PROFILING	QUERY_ID	1	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SEQ	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	STATE	3		NO	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	DURATION	4	0.000000	NO	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_USER	5	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_SYSTEM	6	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CONTEXT_VOLUNTARY	7	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	CONTEXT_INVOLUNTARY	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_IN	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_OUT	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_SENT	11	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_RECEIVED	12	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MAJOR	13	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MINOR	14	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SWAPS	15	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SOURCE_FUNCTION	16	NULL	YES	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	SOURCE_FILE	17	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PROFILING	SOURCE_LINE	18	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -3421,6 +3467,7 @@ Table or view 'KEY_COLUMN_USAGE' is associated with the database 'information_sc
 Table or view 'PARTITIONS' is associated with the database 'information_schema'.
 Table or view 'PLUGINS' is associated with the database 'information_schema'.
 Table or view 'PROCESSLIST' is associated with the database 'information_schema'.
+Table or view 'PROFILING' is associated with the database 'information_schema'.
 Table or view 'REFERENTIAL_CONSTRAINTS' is associated with the database 'information_schema'.
 Table or view 'ROUTINES' is associated with the database 'information_schema'.
 Table or view 'SCHEMATA' is associated with the database 'information_schema'.
@@ -3539,6 +3586,7 @@ PLUGINS	10
 proc	20
 PROCESSLIST	8
 procs_priv	8
+PROFILING	18
 REFERENTIAL_CONSTRAINTS	11
 ROUTINES	23
 SCHEMATA	5
@@ -4012,6 +4060,27 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	PROFILING
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+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	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	REFERENTIAL_CONSTRAINTS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
@@ -5125,6 +5194,7 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
@@ -5193,6 +5263,7 @@ NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
@@ -5261,6 +5332,7 @@ NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
@@ -5329,6 +5401,7 @@ NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
@@ -5397,6 +5470,7 @@ NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
@@ -5465,6 +5539,7 @@ NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
@@ -5572,10 +5647,10 @@ COUNT(*)
 6
 SELECT COUNT(*) FROM information_schema. tables                                ;
 COUNT(*)
-68
+69
 SELECT COUNT(*) FROM information_schema. columns                               ;
 COUNT(*)
-846
+864
 SELECT COUNT(*) FROM information_schema. character_sets                        ;
 COUNT(*)
 36
@@ -5637,10 +5712,10 @@ NULL	test1	latin1
 NULL	test4	latin1
 select count(*) as tot_tabs from tables;
 tot_tabs
-65
+66
 select count(*) as the_cols from columns;
 the_cols
-821
+839
 select max(maxlen) as the_max from character_sets;
 the_max
 3
@@ -5687,6 +5762,7 @@ information_schema, KEY_COLUMN_USAGE
 information_schema, PARTITIONS
 information_schema, PLUGINS
 information_schema, PROCESSLIST
+information_schema, PROFILING
 information_schema, REFERENTIAL_CONSTRAINTS
 information_schema, ROUTINES
 information_schema, SCHEMATA
@@ -8345,6 +8421,7 @@ information_schema	KEY_COLUMN_USAGE	MEMORY
 information_schema	PARTITIONS	MyISAM
 information_schema	PLUGINS	MyISAM
 information_schema	PROCESSLIST	MyISAM
+information_schema	PROFILING	MEMORY
 information_schema	REFERENTIAL_CONSTRAINTS	MEMORY
 information_schema	ROUTINES	MyISAM
 information_schema	SCHEMATA	MEMORY
@@ -8388,6 +8465,7 @@ KEY_COLUMN_USAGE
 PARTITIONS
 PLUGINS
 PROCESSLIST
+PROFILING
 REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
@@ -8429,6 +8507,7 @@ KEY_COLUMN_USAGE
 PARTITIONS
 PLUGINS
 PROCESSLIST
+PROFILING
 REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
@@ -8614,6 +8693,7 @@ KEY_COLUMN_USAGE
 PARTITIONS
 PLUGINS
 PROCESSLIST
+PROFILING
 REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
@@ -8807,6 +8887,24 @@ PROCESSLIST	COMMAND	varchar(16)
 PROCESSLIST	TIME	bigint(7)
 PROCESSLIST	STATE	varchar(64)
 PROCESSLIST	INFO	longtext
+PROFILING	QUERY_ID	int(20)
+PROFILING	SEQ	int(20)
+PROFILING	STATE	varchar(30)
+PROFILING	DURATION	decimal(9,6)
+PROFILING	CPU_USER	decimal(9,6)
+PROFILING	CPU_SYSTEM	decimal(9,6)
+PROFILING	CONTEXT_VOLUNTARY	int(20)
+PROFILING	CONTEXT_INVOLUNTARY	int(20)
+PROFILING	BLOCK_OPS_IN	int(20)
+PROFILING	BLOCK_OPS_OUT	int(20)
+PROFILING	MESSAGES_SENT	int(20)
+PROFILING	MESSAGES_RECEIVED	int(20)
+PROFILING	PAGE_FAULTS_MAJOR	int(20)
+PROFILING	PAGE_FAULTS_MINOR	int(20)
+PROFILING	SWAPS	int(20)
+PROFILING	SOURCE_FUNCTION	varchar(30)
+PROFILING	SOURCE_FILE	varchar(20)
+PROFILING	SOURCE_LINE	int(20)
 REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	varchar(4096)
 REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	varchar(64)
 REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	varchar(64)
@@ -10319,6 +10417,24 @@ NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	u
 NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
 NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PROFILING	QUERY_ID	1	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SEQ	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	STATE	3		NO	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	DURATION	4	0.000000	NO	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_USER	5	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_SYSTEM	6	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CONTEXT_VOLUNTARY	7	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	CONTEXT_INVOLUNTARY	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_IN	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_OUT	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_SENT	11	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_RECEIVED	12	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MAJOR	13	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MINOR	14	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SWAPS	15	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SOURCE_FUNCTION	16	NULL	YES	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	SOURCE_FILE	17	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PROFILING	SOURCE_LINE	18	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -11146,6 +11262,24 @@ NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	u
 NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
 NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PROFILING	QUERY_ID	1	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SEQ	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	STATE	3		NO	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	DURATION	4	0.000000	NO	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_USER	5	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_SYSTEM	6	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CONTEXT_VOLUNTARY	7	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	CONTEXT_INVOLUNTARY	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_IN	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_OUT	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_SENT	11	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_RECEIVED	12	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MAJOR	13	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MINOR	14	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SWAPS	15	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SOURCE_FUNCTION	16	NULL	YES	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	SOURCE_FILE	17	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PROFILING	SOURCE_LINE	18	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -11703,6 +11837,24 @@ NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	u
 NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
 NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PROFILING	QUERY_ID	1	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SEQ	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	STATE	3		NO	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	DURATION	4	0.000000	NO	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_USER	5	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_SYSTEM	6	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CONTEXT_VOLUNTARY	7	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	CONTEXT_INVOLUNTARY	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_IN	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_OUT	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_SENT	11	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_RECEIVED	12	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MAJOR	13	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MINOR	14	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SWAPS	15	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SOURCE_FUNCTION	16	NULL	YES	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	SOURCE_FILE	17	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PROFILING	SOURCE_LINE	18	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -12348,6 +12500,24 @@ NULL	information_schema	PROCESSLIST	ID	bigint	NULL	NULL	NULL	NULL	bigint(4)
 NULL	information_schema	PROCESSLIST	TIME	bigint	NULL	NULL	NULL	NULL	bigint(7)
 3.0000	information_schema	PROCESSLIST	STATE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 1.0000	information_schema	PROCESSLIST	INFO	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+NULL	information_schema	PROFILING	QUERY_ID	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	SEQ	int	NULL	NULL	NULL	NULL	int(20)
+3.0000	information_schema	PROFILING	STATE	varchar	30	90	utf8	utf8_general_ci	varchar(30)
+NULL	information_schema	PROFILING	DURATION	decimal	NULL	NULL	NULL	NULL	decimal(9,6)
+NULL	information_schema	PROFILING	CPU_USER	decimal	NULL	NULL	NULL	NULL	decimal(9,6)
+NULL	information_schema	PROFILING	CPU_SYSTEM	decimal	NULL	NULL	NULL	NULL	decimal(9,6)
+NULL	information_schema	PROFILING	CONTEXT_VOLUNTARY	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	CONTEXT_INVOLUNTARY	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	BLOCK_OPS_IN	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	BLOCK_OPS_OUT	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	MESSAGES_SENT	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	MESSAGES_RECEIVED	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	PAGE_FAULTS_MAJOR	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	PAGE_FAULTS_MINOR	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	SWAPS	int	NULL	NULL	NULL	NULL	int(20)
+3.0000	information_schema	PROFILING	SOURCE_FUNCTION	varchar	30	90	utf8	utf8_general_ci	varchar(30)
+3.0000	information_schema	PROFILING	SOURCE_FILE	varchar	20	60	utf8	utf8_general_ci	varchar(20)
+NULL	information_schema	PROFILING	SOURCE_LINE	int	NULL	NULL	NULL	NULL	int(20)
 3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
 3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
@@ -13927,6 +14097,7 @@ NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#
 NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROFILING	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
@@ -13978,6 +14149,7 @@ NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#
 NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROFILING	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
@@ -14027,6 +14199,7 @@ NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#
 NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROFILING	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
@@ -14077,6 +14250,7 @@ NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#
 NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROFILING	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
diff --git a/mysql-test/suite/funcs_1/r/memory_func_view.result b/mysql-test/suite/funcs_1/r/memory_func_view.result
index 02ef728fad5..14568643665 100644
--- a/mysql-test/suite/funcs_1/r/memory_func_view.result
+++ b/mysql-test/suite/funcs_1/r/memory_func_view.result
@@ -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 = @select_id,
 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 = @select_id,
 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 = @select_id,
 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 = @select_id,
 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 = @select_id,
 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	collation_connection
 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_varbinary_1000),
 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_30),
 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_varchar_1000),
 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_30),
 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_varbinary_1000),
 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_30),
 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_varchar_1000),
 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_30),
 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('-', ' - -ABC', my_decimal),
 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('-', ' - -ABC', my_double),
 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('-', ' - -ABC', my_bigint),
 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_varbinary_1000, 3),
 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_binary_30, 3),
 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_varchar_1000, 3),
 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_char_30, 3),
 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_varbinary_1000, my_binary_30 ),
 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_varbinary_1000, my_varchar_1000 ),
 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_varbinary_1000, my_char_30 ),
 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_varbinary_1000, my_varbinary_1000 ),
 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_binary_30, my_varbinary_1000 ),
 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_binary_30, my_varchar_1000 ),
 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_binary_30, my_char_30 ),
 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_binary_30, my_binary_30 ),
 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_varchar_1000, my_varbinary_1000 ),
 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_varchar_1000, my_binary_30 ),
 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_varchar_1000, my_char_30 ),
 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_varchar_1000, my_varchar_1000 ),
 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_30, my_varbinary_1000 ),
 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_30, my_binary_30 ),
 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_30, my_varchar_1000 ),
 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_30, my_char_30 ),
 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),
 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),
 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),
 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),
 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	collation_connection
 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_varbinary_1000),
 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_binary_30),
 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_varchar_1000),
 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_30),
 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	collation_connection
 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 value: ''
 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	collation_connection
 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	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_binary_30`,2) AS `LEFT(my_binary_30, 2)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
 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	collation_connection
 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	collation_connection
 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_varchar_1000),
 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_30, 'char'),
 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_varbinary_1000),
 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	collation_connection
 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_binary_30),
 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	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_binary_30`) AS `BIT_LENGTH(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
 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_varchar_1000),
 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	collation_connection
 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_char_30),
 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	collation_connection
 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,'IS_NULL'),
 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	collation_connection
 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,'IS_NULL'),
 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	collation_connection
 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_timestamp,'IS_NULL'),
 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	collation_connection
 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,'IS_NULL'),
 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	collation_connection
 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_datetime,'IS_NULL'),
 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	collation_connection
 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_double,'IS_NULL'),
 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	collation_connection
 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_decimal,'IS_NULL'),
 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	collation_connection
 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_bigint,'IS_NULL'),
 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	collation_connection
 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_varbinary_1000,'IS_NULL'),
 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	collation_connection
 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_binary_30,'IS_NULL'),
 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	collation_connection
 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_varchar_1000,'IS_NULL'),
 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	collation_connection
 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_30,'IS_NULL'),
 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	collation_connection
 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 NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 IS NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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_1000 IS NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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_1000 IS NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 IS NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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_1000, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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_1000, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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_varbinary_1000 USING koi8r),
 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	collation_connection
 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_binary_30 USING koi8r),
 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	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using koi8r) AS `CONVERT(my_binary_30 USING koi8r)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
 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_varchar_1000 USING koi8r),
 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	collation_connection
 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_30 USING koi8r),
 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	collation_connection
 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_varbinary_1000 USING utf8),
 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	collation_connection
 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_binary_30 USING utf8),
 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	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using utf8) AS `CONVERT(my_binary_30 USING utf8)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
 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_varchar_1000 USING utf8),
 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	collation_connection
 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_30 USING utf8),
 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	collation_connection
 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 UNSIGNED INTEGER),
 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	collation_connection
 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 UNSIGNED INTEGER),
 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	collation_connection
 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_timestamp AS UNSIGNED INTEGER),
 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	collation_connection
 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 UNSIGNED INTEGER),
 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	collation_connection
 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_datetime AS UNSIGNED INTEGER),
 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,7 +2528,7 @@ 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_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
@@ -2482,6 +2538,38 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
+CREATE VIEW v1 AS SELECT CAST(my_double AS UNSIGNED INTEGER),
+my_double, id FROM t1_values;
+SELECT CAST(my_double AS UNSIGNED INTEGER),
+my_double, id FROM t1_values
+WHERE select_id = 89 OR select_id IS NULL order by id;
+CAST(my_double AS UNSIGNED INTEGER)	my_double	id
+NULL	NULL	1
+9223372036854775808	-1.7976931348623e+308	2
+9223372036854775807	1.7976931348623e+308	3
+0	0	4
+18446744073709551615	-1	5
+Warnings:
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+SHOW CREATE VIEW v1;
+View	Create View	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;
+
+
 CREATE VIEW v1 AS SELECT CAST(my_decimal AS UNSIGNED INTEGER),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS UNSIGNED INTEGER),
diff --git a/mysql-test/suite/funcs_1/r/memory_storedproc.result b/mysql-test/suite/funcs_1/r/memory_storedproc.result
index 402b527241f..667b85e9867 100644
--- a/mysql-test/suite/funcs_1/r/memory_storedproc.result
+++ b/mysql-test/suite/funcs_1/r/memory_storedproc.result
@@ -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@1.1975.1.2, 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 b char(20))
 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,MYSQL_PORT,MYSQL_SOCK);
 	
 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 1
 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 comment 'this is a function';
 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()
+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 'float4:BEGIN
+SELECT @x;
+END' at line 2
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
-float:BEGIN
+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 '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 '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, conditions, and handlers declared for
 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 '23000' set @x2 = 1;
 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 declare multiple variables both separately
 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';
-declare exit handler for tables set @var2 = 1;
-END//
-DROP PROCEDURE IF EXISTS sp1;
-CREATE PROCEDURE sp1( )
-BEGIN
 declare terminated condition for sqlstate '02000';
 declare exit handler for terminated set @var2 = 1;
 END//
@@ -10144,10 +11240,10 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare USE condition for sqlstate '02000';
+declare use condition for sqlstate '02000';
 declare exit handler for USE 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 'USE 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 'use condition for sqlstate '02000';
 declare exit handler for USE set @var2 = 1;
 ' at line 3
 DROP PROCEDURE IF EXISTS sp1;
@@ -10409,6 +11505,15 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare accessible handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare add handler for sqlstate '02000' 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 'add handler for sqlstate '02000' set @var2 = 1;
@@ -10544,9 +11649,9 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare CALL handler for sqlstate '02000' set @var2 = 1;
+declare call handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'call handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
@@ -10625,15 +11730,6 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare columns handler for sqlstate '02000' 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 'handler for sqlstate '02000' set @var2 = 1;
-END' at line 3
-DROP PROCEDURE IF EXISTS sp1;
-Warnings:
-Note	1305	PROCEDURE sp1 does not exist
-CREATE PROCEDURE sp1( )
-BEGIN
 declare condition handler for sqlstate '02000' 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 'condition handler for sqlstate '02000' set @var2 = 1;
@@ -10643,22 +11739,18 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare connection handler for sqlstate '02000' set @var2 = 1;
+declare constraint handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'constraint handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare constraint handler for sqlstate '02000' set @var2 = 1;
+declare continue handler for sqlstate '02000' 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 'constraint handler for sqlstate '02000' set @var2 = 1;
-END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
-Warnings:
-Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare convert handler for sqlstate '02000' set @var2 = 1;
@@ -10976,6 +12068,11 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare exit handler for sqlstate '02000' set @var2 = 1;
+END//
+DROP PROCEDURE IF EXISTS sp1;
+CREATE PROCEDURE sp1( )
+BEGIN
 declare explain handler for sqlstate '02000' 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 'explain handler for sqlstate '02000' set @var2 = 1;
@@ -11003,54 +12100,54 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare fields handler for sqlstate '02000' set @var2 = 1;
+declare float handler for sqlstate '02000' 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 'handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare float handler for sqlstate '02000' set @var2 = 1;
+declare float4 handler for sqlstate '02000' 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 'float handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float4 handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare for handler for sqlstate '02000' set @var2 = 1;
+declare float8 handler for sqlstate '02000' 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 'for handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float8 handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare force handler for sqlstate '02000' set @var2 = 1;
+declare for handler for sqlstate '02000' 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 'force handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'for handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare foreign handler for sqlstate '02000' set @var2 = 1;
+declare force handler for sqlstate '02000' 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 'foreign handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'force handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare found handler for sqlstate '02000' set @var2 = 1;
+declare foreign handler for sqlstate '02000' 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 'handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'foreign handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
@@ -11075,15 +12172,6 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare goto handler for sqlstate '02000' 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 'handler for sqlstate '02000' set @var2 = 1;
-END' at line 3
-DROP PROCEDURE IF EXISTS sp1;
-Warnings:
-Note	1305	PROCEDURE sp1 does not exist
-CREATE PROCEDURE sp1( )
-BEGIN
 declare grant handler for sqlstate '02000' 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 'grant handler for sqlstate '02000' set @var2 = 1;
@@ -11237,6 +12325,51 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare int1 handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
+declare int2 handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
+declare int3 handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
+declare int4 handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
+declare int8 handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare integer handler for sqlstate '02000' 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 'integer handler for sqlstate '02000' set @var2 = 1;
@@ -11363,6 +12496,15 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare linear handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare lines handler for sqlstate '02000' 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 'lines handler for sqlstate '02000' set @var2 = 1;
@@ -11453,6 +12595,15 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare master_ssl_verify_server_cert handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare match handler for sqlstate '02000' 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 'match handler for sqlstate '02000' set @var2 = 1;
@@ -11705,6 +12856,15 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare range handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare read handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
@@ -11723,6 +12883,24 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare read_only handler for sqlstate '02000' 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 'handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
+declare read_write handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare real handler for sqlstate '02000' 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 'real handler for sqlstate '02000' set @var2 = 1;
@@ -11750,6 +12928,15 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare release handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare rename handler for sqlstate '02000' 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 'rename handler for sqlstate '02000' set @var2 = 1;
@@ -11858,9 +13045,9 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare SELECT handler for sqlstate '02000' set @var2 = 1;
+declare select handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'select handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
@@ -11912,15 +13099,6 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare soname handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
-END' at line 3
-DROP PROCEDURE IF EXISTS sp1;
-Warnings:
-Note	1305	PROCEDURE sp1 does not exist
-CREATE PROCEDURE sp1( )
-BEGIN
 declare spatial handler for sqlstate '02000' 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 'spatial handler for sqlstate '02000' set @var2 = 1;
@@ -12038,15 +13216,6 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare tables handler for sqlstate '02000' 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 'handler for sqlstate '02000' set @var2 = 1;
-END' at line 3
-DROP PROCEDURE IF EXISTS sp1;
-Warnings:
-Note	1305	PROCEDURE sp1 does not exist
-CREATE PROCEDURE sp1( )
-BEGIN
 declare terminated handler for sqlstate '02000' 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 'terminated handler for sqlstate '02000' set @var2 = 1;
@@ -12191,9 +13360,9 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare USE handler for sqlstate '02000' set @var2 = 1;
+declare use handler for sqlstate '02000' 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 'USE handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'use handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
@@ -12384,10 +13553,13 @@ set @v2 = y;
 END//
 CALL sp1();
 x	y	@x
-NULL	abaa	3
+NULL	a	3
+Warnings:
+Warning	1265	Data truncated for column 'y' at row 3
+Warning	1265	Data truncated for column 'y' at row 1
 SELECT @v1, @v2;
 @v1	@v2
-4	a`
+4	a
 DROP PROCEDURE sp1;
 
 Testcase 4.2.28:
@@ -12454,7 +13626,7 @@ CALL sp1();
 @xx
 0
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: 'asd'
+Warning	1366	Incorrect integer value: 'asd' for column 'xx' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12481,9 +13653,11 @@ set xx = 'temp';
 set @xx = xx;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'xx' at row 1
 SELECT @xx;
 @xx
-temp
+t
 DROP PROCEDURE sp1;
 
 Testcase 4.2.31 - b:
@@ -12501,7 +13675,7 @@ CALL sp1();
 xx
 0
 Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: 'asd'
+Warning	1265	Data truncated for column 'xx' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12527,7 +13701,9 @@ SELECT xx;
 END//
 CALL sp1();
 xx
-asd
+0000-00-00 00:00:00
+Warnings:
+Warning	1264	Out of range value for column 'xx' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12571,7 +13747,7 @@ CALL sp1();
 xx
 0
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: 'asd'
+Warning	1366	Incorrect integer value: 'asd' for column 'xx' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12602,6 +13778,8 @@ declare x char ascii;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12665,6 +13843,8 @@ declare x binary;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12812,8 +13992,6 @@ declare x decimal;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12821,8 +13999,6 @@ declare x decimal unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12830,8 +14006,6 @@ declare x decimal zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12839,8 +14013,6 @@ declare x decimal unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12848,8 +14020,6 @@ declare x numeric;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12857,8 +14027,6 @@ declare x numeric unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12866,8 +14034,6 @@ declare x numeric zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12875,8 +14041,6 @@ declare x numeric unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13254,7 +14418,7 @@ declare continue handler for sqlstate '02000' set done = 1;
 BEGIN
 open cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newlf1, newf3, newsal;
 set count = count - 1;
 END while;
@@ -13279,7 +14443,7 @@ declare continue handler for sqlstate '02000' set done = 1;
 BEGIN
 open cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newlf1, newf3, newsal;
 set count = count - 1;
 END while;
@@ -13306,7 +14470,7 @@ declare continue handler for sqlstate '02000' set done = 1;
 BEGIN
 open cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
 set count = count - 1;
 END while;
@@ -13330,7 +14494,7 @@ open cur1;
 BEGIN
 open cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf3, newf4;
 set count = count - 1;
 END while;
@@ -13358,7 +14522,7 @@ BEGIN
 open cur1;
 open cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
 set count = count - 1;
 END while;
@@ -13388,7 +14552,7 @@ declare continue handler for sqlstate '02000' set done = 1;
 BEGIN
 open cur2;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
 set count = count - 1;
 END while;
@@ -13416,7 +14580,7 @@ declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 limit 20, 10;
 declare continue handler for sqlstate '02000' set done = 1;
 BEGIN
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
 set count = count - 1;
 END while;
@@ -13430,7 +14594,7 @@ DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
 declare done int default 0;
-declare count integer default 0;
+declare count integer default 10;
 declare newf1 char(20);
 declare newf2 char(20);
 declare newf3 char(20);
@@ -13441,7 +14605,7 @@ open cur1;
 BEGIN
 declare cur1 cursor for SELECT f1, f2, f3, f4 from t2;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf3, newf4;
 set count = count - 1;
 END while;
@@ -13473,7 +14637,7 @@ BEGIN
 open cur1;
 close cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
 set count = count - 1;
 END while;
@@ -13485,7 +14649,7 @@ DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
 declare done int default 0;
-declare count integer default 0;
+declare count integer default 20;
 declare newf1 char(20);
 declare newf2 char(20);
 declare newf3 char(20);
@@ -13514,13 +14678,13 @@ BEGIN
 declare done int default 0;
 declare count integer default 20;
 declare newf2 char(20);
-declare newf1 date;
+declare newf1 int1;
 declare cur1 cursor for SELECT f1, f3 from t2 limit 20, 10;
 declare continue handler for sqlstate '02000' set done = 1;
 BEGIN
 open cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2;
 set @x = newf1;
 set @y = newf2;
@@ -13590,7 +14754,7 @@ BEGIN
 close cur1;
 open cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
 set count = count - 1;
 END while;
@@ -13643,7 +14807,7 @@ fetch cur1 into newf1, newf2, newf4, newf3;
 END;
 END//
 CALL sp1();
-ERROR 02000: No data to FETCH
+ERROR 02000: No data - zero rows fetched, selected, or processed
 DROP PROCEDURE sp1;
 
 Testcase 4.2.65:
@@ -13669,7 +14833,7 @@ commit;
 END;
 END//
 CALL sp1();
-ERROR 02000: No data to FETCH
+ERROR 02000: No data - zero rows fetched, selected, or processed
 DROP PROCEDURE sp1;
 
 Testcase 4.2.66:
@@ -13690,7 +14854,7 @@ declare continue handler for sqlstate '02000' set done = 1;
 BEGIN
 open cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
 set count = count - 1;
 END while;
@@ -13719,12 +14883,13 @@ declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 limit 20, 10;
 declare continue handler for sqlstate '02000' set done = 1;
 BEGIN
 open cur1;
-set count = count - 1;
-while count <> 0 do
+#      set count = count - 1;
+#      while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
-set count = count - 1;
-END while;
+#        set count = count - 1;
+#      END while;
 END;
+fetch cur1 into newf1, newf2, newf4, newf3;
 END//
 CALL sp1();
 DROP PROCEDURE sp1;
@@ -13756,7 +14921,7 @@ BEGIN
 set count = 10;
 BEGIN
 open cur2;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
 set count = count - 1;
 END while;
@@ -13765,7 +14930,8 @@ insert into temp1 values(newf1, newf2, newf4, newf3);
 close cur1;
 END;
 BEGIN
-while count <> 0 do
+set count = 10;
+while count > 0 do
 fetch cur2 into newf21, newf22, newf24, newf23;
 set count = count - 1;
 END while;
@@ -13774,9 +14940,9 @@ insert into temp2 values(newf21, newf22, newf24, newf23);
 close cur2;
 END//
 CALL sp1();
-SELECT * from temp1;
-f1	f2	f3	f4
-agaaaaaaa	agaaaaaaa	-4993	agaaaaaaa
+SELECT count(*) from temp1;
+count(*)
+1
 SELECT * from temp2;
 f1	f2	f3	f4
 NULL	NULL	NULL	NULL
@@ -13797,9 +14963,11 @@ CREATE TABLE res_t3_itisalongname_1381742_itsaverylongname_1381742(
 middleinitial CHAR,
 lastname VARCHAR(50),
 age_averylongfieldname_averylongname_1234569 int,
-COMMENT TEXT) ENGINE=innodb;
+COMMENT TEXT) ENGINE=memory;
+ERROR 42000: The used table type doesn't support BLOB/TEXT columns
 INSERT INTO res_t3_itisalongname_1381742_itsaverylongname_1381742
 VALUES('a', 'aaaaaaaaaabbbbbbbbc', 0, 'default');
+ERROR 42S02: Table 'db_storedproc.res_t3_itisalongname_1381742_itsaverylongname_1381742' doesn't exist
 CREATE PROCEDURE sp1(a int)
 BEGIN
 declare itisjustaverylargevariablename_xxxxxxxxxxxxxxxxxxxxx char;
@@ -13834,46 +15002,22 @@ iterate label1;
 END loop label1;
 END//
 CALL sp1(101);
+ERROR 42S02: Table 'db_storedproc.res_t3_itisalongname_1381742_itsaverylongname_1381742' doesn't exist
 CALL sp1(100);
+ERROR 42S02: Table 'db_storedproc.res_t3_itisalongname_1381742_itsaverylongname_1381742' doesn't exist
 CALL sp1(75);
+ERROR 42S02: Table 'db_storedproc.res_t3_itisalongname_1381742_itsaverylongname_1381742' doesn't exist
 CALL sp1(40);
+ERROR 42S02: Table 'db_storedproc.res_t3_itisalongname_1381742_itsaverylongname_1381742' doesn't exist
 CALL sp1(20);
+ERROR 42S02: Table 'db_storedproc.res_t3_itisalongname_1381742_itsaverylongname_1381742' doesn't exist
 CALL sp1(-1);
+ERROR 42S02: Table 'db_storedproc.res_t3_itisalongname_1381742_itsaverylongname_1381742' doesn't exist
 SELECT * from res_t3_itisalongname_1381742_itsaverylongname_1381742
 ORDER BY middleinitial, lastname, age_averylongfieldname_averylongname_1234569;
-middleinitial	lastname	age_averylongfieldname_averylongname_1234569	COMMENT
-a	aaaaaaaaaabbbbbbbbc	0	default
-b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  -1	-1	value of a is less than 50
-b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  -1	-1	value of a is less than 50
-b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  -1	-1	value of a is less than 50
-b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  -1	-1	value of a is less than 50
-b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  -1	-1	value of a is less than 50
-b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  100	100	value of a is 100
-b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  100	100	value of a is 100
-b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  100	100	value of a is 100
-b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  100	100	value of a is 100
-b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  100	100	value of a is 100
-b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  101	101	value of a is greater than 100
-b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  101	101	value of a is greater than 100
-b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  101	101	value of a is greater than 100
-b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  101	101	value of a is greater than 100
-b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  101	101	value of a is greater than 100
-b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  20	20	value of a is less than 50
-b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  20	20	value of a is less than 50
-b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  20	20	value of a is less than 50
-b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  20	20	value of a is less than 50
-b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  20	20	value of a is less than 50
-b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  40	40	value of a is less than 50
-b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  40	40	value of a is less than 50
-b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  40	40	value of a is less than 50
-b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  40	40	value of a is less than 50
-b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  40	40	value of a is less than 50
-b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  75	75	value of a is greater than 50 and less than 100
-b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  75	75	value of a is greater than 50 and less than 100
-b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  75	75	value of a is greater than 50 and less than 100
-b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  75	75	value of a is greater than 50 and less than 100
-b	oldmacdonalds)(*&(^^%$&^%$&^%*^)(*^#@$@%  75	75	value of a is greater than 50 and less than 100
+ERROR 42S02: Table 'db_storedproc.res_t3_itisalongname_1381742_itsaverylongname_1381742' doesn't exist
 drop table res_t3_itisalongname_1381742_itsaverylongname_1381742;
+ERROR 42S02: Unknown table 'res_t3_itisalongname_1381742_itsaverylongname_1381742'
 DROP PROCEDURE sp1;
 
 Testcase 4.3.2:
@@ -13924,23 +15068,23 @@ CALL sp2( 'insert' );
 SELECT * from t3 where f3 <=5 && f3 >= 0;
 f1	f2	f3
 f1	address	1
-f1	address	2
-f1	address	3
-f1	address	4
-f1	address	5
 f1	address	1
-f1	address	2
-f1	address	3
-f1	address	4
-f1	address	5
 f1	address	1
-f1	address	2
-f1	address	3
-f1	address	4
 f1	address	1
 f1	address	2
+f1	address	2
+f1	address	2
+f1	address	2
 f1	address	3
+f1	address	3
+f1	address	3
+f1	address	3
+f1	address	4
 f1	address	4
+f1	address	4
+f1	address	4
+f1	address	5
+f1	address	5
 SELECT count(*) from t3;
 count(*)
 28
@@ -14023,7 +15167,7 @@ delete from res_t3_itisalongname_1381742_itsaverylongname_1381742;
 END case;
 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 'when 'delete'  then
-delete from res_t3_itisalongname_1381742_itsaverylongname_13' at line 10
+delete from res_t3_itisalongname_1381742_itsaverylongname_13' at line 11
 DROP PROCEDURE IF EXISTS sp3;
 CREATE PROCEDURE sp3( action char(20) )
 BEGIN
@@ -14041,8 +15185,9 @@ label2: while count < 10 do
 BEGIN
 insert into res_t3_itisalongname_1381742_itsaverylongname_1381742
 values('xxxxxxxxxxxxxxxxxxx', '1231230981(*&(*&)(*&(', count);
-if done=1 then
-set count=10;
+set count = count + 1;
+if count= 10 then
+set done=1;
 END if;
 END;
 END while label2;
@@ -14056,6 +15201,19 @@ END if;
 END loop label1;
 SELECT count, done;
 END//
+CALL sp3('insert');
+count	done
+10	1
+Warnings:
+Warning	1265	Data truncated for column 'name' at row 1
+Warning	1265	Data truncated for column 'name' at row 2
+Warning	1265	Data truncated for column 'name' at row 3
+Warning	1265	Data truncated for column 'name' at row 4
+Warning	1265	Data truncated for column 'name' at row 5
+Warning	1265	Data truncated for column 'name' at row 6
+Warning	1265	Data truncated for column 'name' at row 7
+Warning	1265	Data truncated for column 'name' at row 8
+Warning	1265	Data truncated for column 'name' at row 9
 DROP PROCEDURE sp3;
 drop table res_t3_itisalongname_1381742_itsaverylongname_1381742;
 
@@ -14330,11 +15488,14 @@ CREATE PROCEDURE sp6()
 BEGIN
 declare count1 integer default 1;
 label1: repeat
-set count1 = count1;
+set count1 = count1-1;
 until count1 < 0
 END repeat label1;
 SELECT count1;
 END//
+CALL sp6();
+count1
+-1
 DROP PROCEDURE sp6;
 
 Testcase 4.3.7:
@@ -14403,7 +15564,7 @@ do v1 > 0 while
 set v1 = v1 - 1;
 END while;
 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 'do v1 > 0 while
+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 'while
 set v1 = v1 - 1;
 END while;
 END' at line 4
@@ -14442,7 +15603,7 @@ set count1 = count1 + 1;
 iterate label1;
 END loop label2;
 END//
-ERROR 42000: End-label label2 without match
+ERROR 42000: End-label label1 without match
 drop table res_t3_itisalongname_1381742_itsaverylongname_1381742;
 
 Testcase 4.3.13:
@@ -14606,7 +15767,7 @@ until count1 < 3
 END repeat label1;
 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 'label1;
-END' at line 7
+END' at line 8
 
 Testcase 4.3.21:
 --------------------------------------------------------------------------------
@@ -14789,15 +15950,15 @@ insert into t43 values('abcde', 'a!@#$%^&*(');
 CREATE PROCEDURE d1.sp4()
 SELECT * from d1.t43;
 SELECT * from mysql.proc where specific_name = 'sp4';
-db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment
-d1	sp4	PROCEDURE	sp4	SQL	CONTAINS_SQL	NO	DEFINER			SELECT * from d1.t43	root@localhost	modified	created		
+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
+d1	sp4	PROCEDURE	sp4	SQL	CONTAINS_SQL	NO	DEFINER			SELECT * from d1.t43	root@localhost	modified	created			latin1	latin1_swedish_ci	latin1_swedish_ci	SELECT * from d1.t43
 USE db_storedproc;
 DROP DATABASE d1;
 CREATE DATABASE d1;
 USE d1;
 create table t44(a char(5), b char(10));
 SELECT * from mysql.proc where specific_name = 'sp4';
-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
 USE db_storedproc;
 DROP DATABASE d1;
 
@@ -14839,8 +16000,8 @@ CREATE PROCEDURE sp8 ( n char(20) ) sql security definer comment 'initial'
 USE d2;
 alter procedure d1.sp8 sql security definer comment 'updated';
 SELECT * from mysql.proc where specific_name='sp8' and db='d1';
-db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment
-d1	sp8	PROCEDURE	sp8	SQL	CONTAINS_SQL	NO	DEFINER	 n char(20) 		SELECT * from t1 where t1.f1 = n	root@localhost	modified	created		updated
+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
+d1	sp8	PROCEDURE	sp8	SQL	CONTAINS_SQL	NO	DEFINER	 n char(20) 		SELECT * from t1 where t1.f1 = n	root@localhost	modified	created		updated	latin1	latin1_swedish_ci	latin1_swedish_ci	SELECT * from t1 where t1.f1 = n
 
 Testcase 4.4.9:
 --------------------------------------------------------------------------------
@@ -14856,12 +16017,16 @@ END//
 USE d2;
 alter function d1.fn2 sql security definer comment 'updated';
 SELECT * from mysql.proc where specific_name='fn2' and db='d1';
-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
 d1	fn2	FUNCTION	fn2	SQL	CONTAINS_SQL	NO	DEFINER	n int	int(11)	BEGIN
 declare a int;
 set a = 0.9 * n;
 return a;
-END	root@localhost	modified	created		updated
+END	root@localhost	modified	created		updated	latin1	latin1_swedish_ci	latin1_swedish_ci	BEGIN
+declare a int;
+set a = 0.9 * n;
+return a;
+END
 
 Testcase 4.4.10:
 --------------------------------------------------------------------------------
@@ -14871,7 +16036,7 @@ SELECT * from t1 where t1.f1 = n;
 USE d2;
 DROP PROCEDURE d1.sp9;
 SELECT * from mysql.proc where specific_name='sp9' and db='d1';
-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.4.11:
 --------------------------------------------------------------------------------
@@ -14885,7 +16050,7 @@ END//
 USE d2;
 DROP FUNCTION d1.fn3;
 SELECT * from mysql.proc where specific_name='fn3' and db='d1';
-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
 USE db_storedproc;
 DROP DATABASE d1;
 DROP DATABASE d2;
@@ -14893,19 +16058,6 @@ DROP DATABASE d2;
 Section 3.1.5 - Parameter use checks:
 Functions with all data types
 --------------------------------------------------------------------------------
-SELECT 1 as 'bug_dec_num';
-bug_dec_num
-1
-
-.
-FIXME:  There are differences with datatypes DECIMAL and NUMERIC if large
-FIXME:  exponent values are used. The diffs are shown only on some machines like
-FIXME:  AIX52 and HPUX11. Until this has been solved we use numbers that
-FIXME:  *should* be equal to the exponent representation but have no exponents
-FIXME:  and use the specified count of *0*s instead.
-FIXME:  In the source file these tests are marked with the comment  hpux11
-.
---------------------------------------------------------------------------------
 DROP DATABASE IF EXISTS d1;
 CREATE DATABASE d1;
 USE d1;
@@ -14926,7 +16078,7 @@ return f1;
 END//
 SELECT fn2(1.84e+19);
 fn2(1.84e+19)
-0
+18400000000000000000
 DROP FUNCTION IF EXISTS fn3;
 CREATE FUNCTION fn3( f1 bigint unsigned zerofill) returns bigint unsigned zerofill
 BEGIN
@@ -14945,6 +16097,8 @@ END//
 SELECT fn4(-9.22e+15);
 fn4(-9.22e+15)
 0
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn5;
 CREATE FUNCTION fn5( f1 decimal) returns decimal
 BEGIN
@@ -14972,6 +16126,10 @@ END//
 SELECT fn7(99999999999);
 fn7(99999999999)
 9999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn8;
 CREATE FUNCTION fn8( f1 decimal (0) unsigned zerofill) returns decimal (0) unsigned zerofill
 BEGIN
@@ -14980,7 +16138,9 @@ return f1;
 END//
 SELECT fn8(999999999);
 fn8(999999999)
-0999999999
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn9;
 CREATE FUNCTION fn9( f1 decimal (0) zerofill) returns decimal (0) zerofill
 BEGIN
@@ -14989,7 +16149,10 @@ return f1;
 END//
 SELECT fn9(-1.00e+09);
 fn9(-1.00e+09)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn10;
 CREATE FUNCTION fn10( f1 decimal (0, 0)) returns decimal (0, 0)
 BEGIN
@@ -15008,6 +16171,10 @@ END//
 SELECT fn11(99999999999);
 fn11(99999999999)
 9999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn12;
 CREATE FUNCTION fn12( f1 decimal (0, 0) unsigned zerofill) returns decimal (0, 0) unsigned zerofill
 BEGIN
@@ -15016,7 +16183,9 @@ return f1;
 END//
 SELECT fn12(999999999);
 fn12(999999999)
-0999999999
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn13;
 CREATE FUNCTION fn13( f1 decimal (0, 0) zerofill) returns decimal (0, 0) zerofill
 BEGIN
@@ -15025,7 +16194,10 @@ return f1;
 END//
 SELECT fn13(-1.00e+09);
 fn13(-1.00e+09)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn14;
 CREATE FUNCTION fn14( f1 decimal (63, 30)) returns decimal (63, 30)
 BEGIN
@@ -15061,7 +16233,10 @@ return f1;
 END//
 SELECT fn17(-1.00e+21);
 fn17(-1.00e+21)
-000000000000000000000000000000000.000000000000000000000000000000
+000000000000000000000000000000010.000000000000000000000000000000
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn18_d;
 CREATE FUNCTION fn18_d( f1 decimal (64)) returns decimal (64)
 BEGIN
@@ -15097,7 +16272,10 @@ return f1;
 END//
 SELECT fn21_d_z(1.00e+00);
 fn21_d_z(1.00e+00)
-0000000000000000000000000000000000000000000000000000000000000001
+0000000000000000000000000000000000000000000000000000000000000010
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn22;
 CREATE FUNCTION fn22( f1 decimal unsigned) returns decimal unsigned
 BEGIN
@@ -15106,7 +16284,10 @@ return f1;
 END//
 SELECT fn22(1.00e+00);
 fn22(1.00e+00)
-1
+10
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn23;
 CREATE FUNCTION fn23( f1 decimal unsigned zerofill) returns decimal unsigned zerofill
 BEGIN
@@ -15115,7 +16296,10 @@ return f1;
 END//
 SELECT fn23(1.00e+00);
 fn23(1.00e+00)
-0000000001
+0000000010
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn24;
 CREATE FUNCTION fn24( f1 decimal zerofill) returns decimal zerofill
 BEGIN
@@ -15124,7 +16308,10 @@ return f1;
 END//
 SELECT fn24(-1.00e+09);
 fn24(-1.00e+09)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn25;
 CREATE FUNCTION fn25( f1 double) returns double
 BEGIN
@@ -15142,7 +16329,9 @@ return f1;
 END//
 SELECT fn26(1.00e+00);
 fn26(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn27;
 CREATE FUNCTION fn27( f1 double unsigned zerofill) returns double unsigned zerofill
 BEGIN
@@ -15151,7 +16340,9 @@ return f1;
 END//
 SELECT fn27(1.00e+00);
 fn27(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn28;
 CREATE FUNCTION fn28( f1 double zerofill) returns double zerofill
 BEGIN
@@ -15160,7 +16351,9 @@ return f1;
 END//
 SELECT fn28(1.00e+00);
 fn28(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn29;
 CREATE FUNCTION fn29( f1 float) returns float
 BEGIN
@@ -15178,7 +16371,9 @@ return f1;
 END//
 SELECT fn30(1.00e+00);
 fn30(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn31;
 CREATE FUNCTION fn31( f1 float unsigned zerofill) returns float unsigned zerofill
 BEGIN
@@ -15187,7 +16382,9 @@ return f1;
 END//
 SELECT fn31(1.00e+00);
 fn31(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn32;
 CREATE FUNCTION fn32( f1 float zerofill) returns float zerofill
 BEGIN
@@ -15196,7 +16393,9 @@ return f1;
 END//
 SELECT fn32(1.00e+00);
 fn32(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn33;
 CREATE FUNCTION fn33( f1 float(0)) returns float(0)
 BEGIN
@@ -15214,7 +16413,9 @@ return f1;
 END//
 SELECT fn34(1.00e+00);
 fn34(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn35;
 CREATE FUNCTION fn35( f1 float(0) unsigned zerofill) returns float(0) unsigned zerofill
 BEGIN
@@ -15223,7 +16424,9 @@ return f1;
 END//
 SELECT fn35(1.00e+00);
 fn35(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn36;
 CREATE FUNCTION fn36( f1 float(0) zerofill) returns float(0) zerofill
 BEGIN
@@ -15232,7 +16435,9 @@ return f1;
 END//
 SELECT fn36(1.00e+00);
 fn36(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn37;
 CREATE FUNCTION fn37( f1 float(23)) returns float(23)
 BEGIN
@@ -15250,7 +16455,9 @@ return f1;
 END//
 SELECT fn38(1.00e+00);
 fn38(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn39;
 CREATE FUNCTION fn39( f1 float(23) unsigned zerofill) returns float(23) unsigned zerofill
 BEGIN
@@ -15259,7 +16466,9 @@ return f1;
 END//
 SELECT fn39(1.00e+00);
 fn39(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn40;
 CREATE FUNCTION fn40( f1 float(23) zerofill) returns float(23) zerofill
 BEGIN
@@ -15268,7 +16477,9 @@ return f1;
 END//
 SELECT fn40(1.00e+00);
 fn40(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn41;
 CREATE FUNCTION fn41( f1 float(24)) returns float(24)
 BEGIN
@@ -15286,7 +16497,9 @@ return f1;
 END//
 SELECT fn42(1.00e+00);
 fn42(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn43;
 CREATE FUNCTION fn43( f1 float(24) unsigned zerofill) returns float(24) unsigned zerofill
 BEGIN
@@ -15295,7 +16508,9 @@ return f1;
 END//
 SELECT fn43(1.00e+00);
 fn43(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn44;
 CREATE FUNCTION fn44( f1 float(24) zerofill) returns float(24) zerofill
 BEGIN
@@ -15304,7 +16519,9 @@ return f1;
 END//
 SELECT fn44(1.00e+00);
 fn44(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn45;
 CREATE FUNCTION fn45( f1 float(53)) returns float(53)
 BEGIN
@@ -15322,7 +16539,9 @@ return f1;
 END//
 SELECT fn46(1.00e+00);
 fn46(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn47;
 CREATE FUNCTION fn47( f1 float(53) unsigned zerofill) returns float(53) unsigned zerofill
 BEGIN
@@ -15331,7 +16550,9 @@ return f1;
 END//
 SELECT fn47(1.00e+00);
 fn47(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn48;
 CREATE FUNCTION fn48( f1 float(53) zerofill) returns float(53) zerofill
 BEGIN
@@ -15340,7 +16561,9 @@ return f1;
 END//
 SELECT fn48(1.00e+00);
 fn48(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn49;
 CREATE FUNCTION fn49( f1 int) returns int
 BEGIN
@@ -15349,7 +16572,10 @@ return f1;
 END//
 SELECT fn49(-2.15e+09);
 fn49(-2.15e+09)
--2147483648
+-2147483638
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn50;
 CREATE FUNCTION fn50( f1 int unsigned) returns int unsigned
 BEGIN
@@ -15385,7 +16611,9 @@ return f1;
 END//
 SELECT fn53(-8388600);
 fn53(-8388600)
--8388600
+-8388598
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn54;
 CREATE FUNCTION fn54( f1 mediumint unsigned) returns mediumint unsigned
 BEGIN
@@ -15412,7 +16640,11 @@ return f1;
 END//
 SELECT fn56(-8388601);
 fn56(-8388601)
-0
+16777215
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn57;
 CREATE FUNCTION fn57( f1 numeric) returns numeric
 BEGIN
@@ -15421,7 +16653,9 @@ return f1;
 END//
 SELECT fn57(-999999999);
 fn57(-999999999)
--999999999
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn58;
 CREATE FUNCTION fn58( f1 numeric (0)) returns numeric (0)
 BEGIN
@@ -15430,7 +16664,9 @@ return f1;
 END//
 SELECT fn58(-999999999);
 fn58(-999999999)
--999999999
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn59;
 CREATE FUNCTION fn59( f1 numeric (0) unsigned) returns numeric (0) unsigned
 BEGIN
@@ -15440,6 +16676,9 @@ END//
 SELECT fn59(9999999999);
 fn59(9999999999)
 9999999999
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn60;
 CREATE FUNCTION fn60( f1 numeric (0) unsigned zerofill) returns numeric (0) unsigned zerofill
 BEGIN
@@ -15448,7 +16687,9 @@ return f1;
 END//
 SELECT fn60(99999999);
 fn60(99999999)
-0099999999
+0100000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn61;
 CREATE FUNCTION fn61( f1 numeric (0) zerofill) returns numeric (0) zerofill
 BEGIN
@@ -15457,7 +16698,10 @@ return f1;
 END//
 SELECT fn61(-99999999);
 fn61(-99999999)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn62;
 CREATE FUNCTION fn62( f1 numeric (0, 0)) returns numeric (0, 0)
 BEGIN
@@ -15466,7 +16710,9 @@ return f1;
 END//
 SELECT fn62(-999999999);
 fn62(-999999999)
--999999999
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn63;
 CREATE FUNCTION fn63( f1 numeric (0, 0) unsigned) returns numeric (0, 0) unsigned
 BEGIN
@@ -15476,6 +16722,9 @@ END//
 SELECT fn63(9999999999);
 fn63(9999999999)
 9999999999
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn64;
 CREATE FUNCTION fn64( f1 numeric (0, 0) unsigned zerofill) returns numeric (0, 0) unsigned zerofill
 BEGIN
@@ -15484,7 +16733,9 @@ return f1;
 END//
 SELECT fn64(99999999);
 fn64(99999999)
-0099999999
+0100000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn65;
 CREATE FUNCTION fn65( f1 numeric (0, 0) zerofill) returns numeric (0, 0) zerofill
 BEGIN
@@ -15493,7 +16744,10 @@ return f1;
 END//
 SELECT fn65(-99999999);
 fn65(-99999999)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn66;
 CREATE FUNCTION fn66( f1 numeric (63, 30)) returns numeric (63, 30)
 BEGIN
@@ -15502,7 +16756,12 @@ return f1;
 END//
 SELECT fn66(-1e+36);
 fn66(-1e+36)
--999999999999999999999999999999999.999999999999999999999999999999
+-999999999999999999999999999999989.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn67;
 CREATE FUNCTION fn67( f1 numeric (63, 30) unsigned) returns numeric (63, 30) unsigned
 BEGIN
@@ -15512,6 +16771,10 @@ END//
 SELECT fn67(1e+36);
 fn67(1e+36)
 999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn68;
 CREATE FUNCTION fn68( f1 numeric (63, 30) unsigned zerofill) returns numeric (63, 30) unsigned zerofill
 BEGIN
@@ -15521,6 +16784,10 @@ END//
 SELECT fn68(1e+36);
 fn68(1e+36)
 999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn69;
 CREATE FUNCTION fn69( f1 numeric (63, 30) zerofill) returns numeric (63, 30) zerofill
 BEGIN
@@ -15529,7 +16796,10 @@ return f1;
 END//
 SELECT fn69(-1e+36);
 fn69(-1e+36)
-000000000000000000000000000000000.000000000000000000000000000000
+000000000000000000000000000000010.000000000000000000000000000000
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn70_n;
 CREATE FUNCTION fn70_n( f1 numeric (64)) returns numeric (64)
 BEGIN
@@ -15577,7 +16847,9 @@ return f1;
 END//
 SELECT fn74(999999999);
 fn74(999999999)
-999999999
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn75;
 CREATE FUNCTION fn75( f1 numeric unsigned zerofill) returns numeric unsigned zerofill
 BEGIN
@@ -15586,7 +16858,9 @@ return f1;
 END//
 SELECT fn75(999999999);
 fn75(999999999)
-0999999999
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn76;
 CREATE FUNCTION fn76( f1 numeric zerofill) returns numeric zerofill
 BEGIN
@@ -15595,7 +16869,10 @@ return f1;
 END//
 SELECT fn76(-999999999);
 fn76(-999999999)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn77;
 CREATE FUNCTION fn77( f1 real) returns real
 BEGIN
@@ -15613,7 +16890,9 @@ return f1;
 END//
 SELECT fn78(1.1);
 fn78(1.1)
-1.1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn79;
 CREATE FUNCTION fn79( f1 real unsigned zerofill) returns real unsigned zerofill
 BEGIN
@@ -15622,7 +16901,9 @@ return f1;
 END//
 SELECT fn79(1.1);
 fn79(1.1)
-1.1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn80;
 CREATE FUNCTION fn80( f1 real zerofill) returns real zerofill
 BEGIN
@@ -15631,7 +16912,9 @@ return f1;
 END//
 SELECT fn80(1.1);
 fn80(1.1)
-1.1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn81;
 CREATE FUNCTION fn81( f1 smallint) returns smallint
 BEGIN
@@ -15667,7 +16950,11 @@ return f1;
 END//
 SELECT fn84(-32601);
 fn84(-32601)
-0
+65535
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn85;
 CREATE FUNCTION fn85( f1 tinyint) returns tinyint
 BEGIN
@@ -15703,45 +16990,37 @@ return f1;
 END//
 SELECT fn88(-101);
 fn88(-101)
-0
+255
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn89;
 CREATE FUNCTION fn89( f1 enum('1enum', '2enum')) returns enum('1enum', '2enum')
 BEGIN
-if f1 eq "1enum" then
-set f1 = '2enum';
-else
-set f1 = '1enum';
-END if;
-return f1;
+IF f1 = '1enum' THEN
+SET f1 = '2enum';
+ELSE
+SET f1 = '1enum';
+END IF;
+RETURN f1;
 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 'eq "1enum" then
-set f1 = '2enum';
-else
-set f1 = '1enum';
-END if;
-return f1;
-END' at line 3
 SELECT fn89( '1enum');
-ERROR 42000: FUNCTION d1.fn89 does not exist
+fn89( '1enum')
+2enum
 DROP FUNCTION IF EXISTS fn90;
-CREATE FUNCTION fn90( f1 set("1set", "2set")) returns set("1set", "2set")
+CREATE FUNCTION fn90( f1 set('1set', '2set')) returns set('1set', '2set')
 BEGIN
-if(f1 == "1set") then
-set f1 = "2set";
-else
-set f1 = "1set";
-END if;
-return f1;
+IF f1 = '1set' THEN
+SET f1 = '2set';
+ELSE
+SET f1 = '1set';
+END IF;
+RETURN f1;
 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 '== "1set") then
-set f1 = "2set";
-else
-set f1 = "1set";
-END if;
-return f1;
-END' at line 3
 SELECT fn90( '1set');
-ERROR 42000: FUNCTION d1.fn90 does not exist
+fn90( '1set')
+2set
 DROP FUNCTION IF EXISTS fn91;
 CREATE FUNCTION fn91( f1 date) returns date
 BEGIN
@@ -15759,7 +17038,7 @@ return f1;
 END//
 SELECT fn92( '23:59:59.999999');
 fn92( '23:59:59.999999')
-26:00:00
+25:59:59
 DROP FUNCTION IF EXISTS fn93;
 CREATE FUNCTION fn93( f1 datetime) returns datetime
 BEGIN
@@ -15768,7 +17047,7 @@ return f1;
 END//
 SELECT fn93('1997-12-31 23:59:59.999999');
 fn93('1997-12-31 23:59:59.999999')
-1998-01-02 01:01:01
+1998-01-02 01:01:00
 DROP FUNCTION IF EXISTS fn94;
 CREATE FUNCTION fn94( f1 char) returns char
 BEGIN
@@ -15778,6 +17057,8 @@ END//
 SELECT fn94( 'h');
 fn94( 'h')
 a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn95;
 CREATE FUNCTION fn95( f1 char ascii) returns char ascii
 BEGIN
@@ -15787,15 +17068,19 @@ END//
 SELECT fn95('h');
 fn95('h')
 a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn96;
-CREATE FUNCTION fn96( f1 char binary) returns char binary
+CREATE FUNCTION fn96( f1 binary) returns binary(2)
 BEGIN
 set f1 = concat('a', f1);
 return f1;
 END//
 SELECT fn96( 'h');
 fn96( 'h')
-a
+a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn97;
 CREATE FUNCTION fn97( f1 longtext) returns longtext
 BEGIN
@@ -15917,7 +17202,7 @@ SELECT f1;
 END//
 CALL sp2(1.84e+19);
 f1
--9223372036854775808
+18400000000000000000
 DROP PROCEDURE IF EXISTS sp3;
 CREATE PROCEDURE sp3( f1 bigint unsigned zerofill)
 BEGIN
@@ -15926,7 +17211,7 @@ SELECT f1;
 END//
 CALL sp3(1.84e+17);
 f1
-184000000000000000
+00184000000000000000
 DROP PROCEDURE IF EXISTS sp4;
 CREATE PROCEDURE sp4( f1 bigint zerofill)
 BEGIN
@@ -15935,31 +17220,27 @@ SELECT f1;
 END//
 CALL sp4(-9.22e+15);
 f1
--9220000000000000
+00000000000000000000
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp5;
 CREATE PROCEDURE sp5( f1 decimal)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: default (10) for DECIMAL not checked, decimal digits shown although not defined
 CALL sp5(-1.00e+09);
 f1
--1000000000.000000000
+-1000000000
 DROP PROCEDURE IF EXISTS sp6;
 CREATE PROCEDURE sp6( f1 decimal (0))
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp6(-1.00e+09);
 f1
--1000000000.000000000
+-1000000000
 DROP PROCEDURE IF EXISTS sp7;
 CREATE PROCEDURE sp7( f1 decimal (0) unsigned)
 BEGIN
@@ -15968,7 +17249,11 @@ SELECT f1;
 END//
 CALL sp7(99999999999);
 f1
-99999999999.000000000
+9999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp8;
 CREATE PROCEDURE sp8( f1 decimal (0) unsigned zerofill)
 BEGIN
@@ -15977,199 +17262,201 @@ SELECT f1;
 END//
 CALL sp8(999999999);
 f1
-999999999.000000000
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp9;
 CREATE PROCEDURE sp9( f1 decimal (0) zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp9(-1.00e+09);
 f1
--1000000000.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp10;
 CREATE PROCEDURE sp10( f1 decimal (0, 0))
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp10(-1.00e+09);
 f1
--1000000000.000000000
+-1000000000
 DROP PROCEDURE IF EXISTS sp11;
 CREATE PROCEDURE sp11( f1 decimal (0, 0) unsigned)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp11(99999999999);
 f1
-99999999999.000000000
+9999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp12;
 CREATE PROCEDURE sp12( f1 decimal (0, 0) unsigned zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp12(999999999);
 f1
-999999999.000000000
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp13;
 CREATE PROCEDURE sp13( f1 decimal (0, 0) zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp13(-1.00e+09);
 f1
--1000000000.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp14;
 CREATE PROCEDURE sp14( f1 decimal (63, 30))
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: wrong number of decimal digits shown
 CALL sp14(-1.00e+21);
 f1
--1000000000000000000000.000000000
+-1000000000000000000000.000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp15;
 CREATE PROCEDURE sp15( f1 decimal (63, 30) unsigned)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: wrong number of decimal digits shown
 CALL sp15(1.00e+16);
 f1
-10000000000000000.000000000
+10000000000000000.000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp16;
 CREATE PROCEDURE sp16( f1 decimal (63, 30) unsigned zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: wrong number of decimal digits shown
 CALL sp16(1.00e+16);
 f1
-10000000000000000.000000000
+000000000000000010000000000000000.000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp17;
 CREATE PROCEDURE sp17( f1 decimal (63, 30) zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: wrong number of decimal digits shown
 CALL sp17(-1.00e+21);
 f1
--1000000000000000000000.000000000
+000000000000000000000000000000010.000000000000000000000000000000
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp18_d;
 CREATE PROCEDURE sp18_d( f1 decimal (64))
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp18_d(-1.00e+30);
+f1
+-1000000000000000000000000000000
 CALL sp18_d( -1000000000000000000000000000000 );
 f1
--1000000000000000000000000000000.000000000
+-1000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp19_du;
 CREATE PROCEDURE sp19_du( f1 decimal (64) unsigned)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp19_du(1.00e+20);
+f1
+100000000000000000000
 CALL sp19_du( 100000000000000000000 );
 f1
-100000000000000000000.000000000
+100000000000000000000
+CALL sp19_du(1.00e+24);
+f1
+1000000000000000000000000
 CALL sp19_du( 1000000000000000000000000 );
 f1
-1000000000000000000000000.000000000
+1000000000000000000000000
 DROP PROCEDURE IF EXISTS sp20_duz;
 CREATE PROCEDURE sp20_duz( f1 decimal (64) unsigned zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
+CALL sp20_duz(1.00e+20);
+f1
+0000000000000000000000000000000000000000000100000000000000000000
 CALL sp20_duz( 100000000000000000000 );
 f1
-100000000000000000000.000000000
+0000000000000000000000000000000000000000000100000000000000000000
+CALL sp20_duz(1.00e+24);
+f1
+0000000000000000000000000000000000000001000000000000000000000000
 CALL sp20_duz( 1000000000000000000000000 );
 f1
-1000000000000000000000000.000000000
+0000000000000000000000000000000000000001000000000000000000000000
 DROP PROCEDURE IF EXISTS sp21;
 CREATE PROCEDURE sp21( f1 decimal (64) zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp21(1.00e+00);
 f1
-1.000000000
+0000000000000000000000000000000000000000000000000000000000000010
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp22;
 CREATE PROCEDURE sp22( f1 decimal unsigned)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp22(1.00e+00);
 f1
-1.000000000
+10
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp23;
 CREATE PROCEDURE sp23( f1 decimal unsigned zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp23(1.00e+00);
 f1
-1.000000000
+0000000010
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp24;
 CREATE PROCEDURE sp24( f1 decimal zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp24(-1.00e+09);
 f1
--1000000000.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp25;
 CREATE PROCEDURE sp25( f1 double)
 BEGIN
@@ -16187,7 +17474,9 @@ SELECT f1;
 END//
 CALL sp26(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp27;
 CREATE PROCEDURE sp27( f1 double unsigned zerofill)
 BEGIN
@@ -16196,7 +17485,9 @@ SELECT f1;
 END//
 CALL sp27(1.00e+00);
 f1
-1
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp28;
 CREATE PROCEDURE sp28( f1 double zerofill)
 BEGIN
@@ -16205,7 +17496,9 @@ SELECT f1;
 END//
 CALL sp28(1.00e+00);
 f1
-1
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp29;
 CREATE PROCEDURE sp29( f1 float)
 BEGIN
@@ -16223,7 +17516,9 @@ SELECT f1;
 END//
 CALL sp30(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp31;
 CREATE PROCEDURE sp31( f1 float unsigned zerofill)
 BEGIN
@@ -16232,7 +17527,9 @@ SELECT f1;
 END//
 CALL sp31(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp32;
 CREATE PROCEDURE sp32( f1 float zerofill)
 BEGIN
@@ -16241,7 +17538,9 @@ SELECT f1;
 END//
 CALL sp32(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp33;
 CREATE PROCEDURE sp33( f1 float(0))
 BEGIN
@@ -16259,7 +17558,9 @@ SELECT f1;
 END//
 CALL sp34(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp35;
 CREATE PROCEDURE sp35( f1 float(0) unsigned zerofill)
 BEGIN
@@ -16268,7 +17569,9 @@ SELECT f1;
 END//
 CALL sp35(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp36;
 CREATE PROCEDURE sp36( f1 float(0) zerofill)
 BEGIN
@@ -16277,7 +17580,9 @@ SELECT f1;
 END//
 CALL sp36(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp37;
 CREATE PROCEDURE sp37( f1 float(23))
 BEGIN
@@ -16295,7 +17600,9 @@ SELECT f1;
 END//
 CALL sp38(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp39;
 CREATE PROCEDURE sp39( f1 float(23) unsigned zerofill)
 BEGIN
@@ -16304,7 +17611,9 @@ SELECT f1;
 END//
 CALL sp39(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp40;
 CREATE PROCEDURE sp40( f1 float(23) zerofill)
 BEGIN
@@ -16313,7 +17622,9 @@ SELECT f1;
 END//
 CALL sp40(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp41;
 CREATE PROCEDURE sp41( f1 float(24))
 BEGIN
@@ -16331,7 +17642,9 @@ SELECT f1;
 END//
 CALL sp42(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp43;
 CREATE PROCEDURE sp43( f1 float(24) unsigned zerofill)
 BEGIN
@@ -16340,7 +17653,9 @@ SELECT f1;
 END//
 CALL sp43(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp44;
 CREATE PROCEDURE sp44( f1 float(24) zerofill)
 BEGIN
@@ -16349,7 +17664,9 @@ SELECT f1;
 END//
 CALL sp44(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp45;
 CREATE PROCEDURE sp45( f1 float(53))
 BEGIN
@@ -16367,7 +17684,9 @@ SELECT f1;
 END//
 CALL sp46(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp47;
 CREATE PROCEDURE sp47( f1 float(53) unsigned zerofill)
 BEGIN
@@ -16376,7 +17695,9 @@ SELECT f1;
 END//
 CALL sp47(1.00e+00);
 f1
-1
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp48;
 CREATE PROCEDURE sp48( f1 float(53) zerofill)
 BEGIN
@@ -16385,7 +17706,9 @@ SELECT f1;
 END//
 CALL sp48(1.00e+00);
 f1
-1
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp49;
 CREATE PROCEDURE sp49( f1 int)
 BEGIN
@@ -16394,7 +17717,10 @@ SELECT f1;
 END//
 CALL sp49(-2.15e+09);
 f1
--2150000000
+-2147483638
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp50;
 CREATE PROCEDURE sp50( f1 int unsigned)
 BEGIN
@@ -16421,7 +17747,7 @@ SELECT f1;
 END//
 CALL sp52(2.15e+08);
 f1
-215000000
+0215000000
 DROP PROCEDURE IF EXISTS sp53;
 CREATE PROCEDURE sp53( f1 mediumint)
 BEGIN
@@ -16430,7 +17756,9 @@ SELECT f1;
 END//
 CALL sp53(-8388600);
 f1
--8388600
+-8388598
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp54;
 CREATE PROCEDURE sp54( f1 mediumint unsigned)
 BEGIN
@@ -16457,7 +17785,11 @@ SELECT f1;
 END//
 CALL sp56(-8388601);
 f1
--8388602
+16777215
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp57;
 CREATE PROCEDURE sp57( f1 numeric)
 BEGIN
@@ -16466,7 +17798,9 @@ SELECT f1;
 END//
 CALL sp57(-999999999);
 f1
--999999999.000000000
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp58;
 CREATE PROCEDURE sp58( f1 numeric (0))
 BEGIN
@@ -16475,7 +17809,9 @@ SELECT f1;
 END//
 CALL sp58(-999999999);
 f1
--999999999.000000000
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp59;
 CREATE PROCEDURE sp59( f1 numeric (0) unsigned)
 BEGIN
@@ -16484,7 +17820,10 @@ SELECT f1;
 END//
 CALL sp59(9999999999);
 f1
-9999999999.000000000
+9999999999
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp60;
 CREATE PROCEDURE sp60( f1 numeric (0) unsigned zerofill)
 BEGIN
@@ -16493,7 +17832,9 @@ SELECT f1;
 END//
 CALL sp60(99999999);
 f1
-99999999.000000000
+0100000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp61;
 CREATE PROCEDURE sp61( f1 numeric (0) zerofill)
 BEGIN
@@ -16502,7 +17843,10 @@ SELECT f1;
 END//
 CALL sp61(-99999999);
 f1
--99999999.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp62;
 CREATE PROCEDURE sp62( f1 numeric (0, 0))
 BEGIN
@@ -16511,7 +17855,9 @@ SELECT f1;
 END//
 CALL sp62(-999999999);
 f1
--999999999.000000000
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp63;
 CREATE PROCEDURE sp63( f1 numeric (0, 0) unsigned)
 BEGIN
@@ -16520,7 +17866,10 @@ SELECT f1;
 END//
 CALL sp63(9999999999);
 f1
-9999999999.000000000
+9999999999
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp64;
 CREATE PROCEDURE sp64( f1 numeric (0, 0) unsigned zerofill)
 BEGIN
@@ -16529,7 +17878,9 @@ SELECT f1;
 END//
 CALL sp64(99999999);
 f1
-99999999.000000000
+0100000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp65;
 CREATE PROCEDURE sp65( f1 numeric (0, 0) zerofill)
 BEGIN
@@ -16538,79 +17889,146 @@ SELECT f1;
 END//
 CALL sp65(-99999999);
 f1
--99999999.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp66_n;
 CREATE PROCEDURE sp66_n( f1 numeric (63, 30))
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp66_n(-1e+36);
+f1
+-999999999999999999999999999999989.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 CALL sp66_n( -1000000000000000000000000000000000000 );
 f1
--1000000000000000000000000000000000000.000000000
+-999999999999999999999999999999989.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp67_nu;
 CREATE PROCEDURE sp67_nu( f1 numeric (63, 30) unsigned)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp67_nu(1e+36);
+f1
+999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 CALL sp67_nu( 1000000000000000000000000000000000000 );
 f1
-1000000000000000000000000000000000000.000000000
+999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp68_nuz;
 CREATE PROCEDURE sp68_nuz( f1 numeric (63, 30) unsigned zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp68_nuz(1e+36);
+f1
+999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 CALL sp68_nuz( 1000000000000000000000000000000000000 );
 f1
-1000000000000000000000000000000000000.000000000
+999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp69_n_z;
 CREATE PROCEDURE sp69_n_z( f1 numeric (63, 30) zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp69_n_z(-1e+36);
+f1
+000000000000000000000000000000010.000000000000000000000000000000
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 CALL sp69_n_z( -1000000000000000000000000000000000000 );
 f1
--1000000000000000000000000000000000000.000000000
+000000000000000000000000000000010.000000000000000000000000000000
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp70_n;
 CREATE PROCEDURE sp70_n( f1 numeric (64))
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp70_n(-1e+40);
+f1
+-10000000000000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 CALL sp70_n( -10000000000000000000000000000000000000000 );
 f1
--10000000000000000000000000000000000000000.000000000
+-10000000000000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp71_nu;
 CREATE PROCEDURE sp71_nu( f1 numeric (64) unsigned)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp71_nu(1.00e+40);
+f1
+10000000000000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 CALL sp71_nu( 10000000000000000000000000000000000000000 );
 f1
-10000000000000000000000000000000000000000.000000000
+10000000000000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp72_nuz;
 CREATE PROCEDURE sp72_nuz( f1 numeric (64) unsigned zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp72_nuz(1.00e+40);
+f1
+0000000000000000000000010000000000000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 CALL sp72_nuz( 10000000000000000000000000000000000000000 );
 f1
-10000000000000000000000000000000000000000.000000000
+0000000000000000000000010000000000000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp73_n_z;
 CREATE PROCEDURE sp73_n_z( f1 numeric (64) zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp73_n_z(1.00e+40);
+f1
+0000000000000000000000010000000000000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 CALL sp73_n_z( 10000000000000000000000000000000000000000 );
 f1
-10000000000000000000000000000000000000000.000000000
+0000000000000000000000010000000000000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp74;
 CREATE PROCEDURE sp74( f1 numeric unsigned)
 BEGIN
@@ -16619,7 +18037,9 @@ SELECT f1;
 END//
 CALL sp74(999999999);
 f1
-999999999.000000000
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp75;
 CREATE PROCEDURE sp75( f1 numeric unsigned zerofill)
 BEGIN
@@ -16628,7 +18048,9 @@ SELECT f1;
 END//
 CALL sp75(999999999);
 f1
-999999999.000000000
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp76;
 CREATE PROCEDURE sp76( f1 numeric zerofill)
 BEGIN
@@ -16637,7 +18059,10 @@ SELECT f1;
 END//
 CALL sp76(-999999999);
 f1
--999999999.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp77;
 CREATE PROCEDURE sp77( f1 real)
 BEGIN
@@ -16646,7 +18071,7 @@ SELECT f1;
 END//
 CALL sp77(1.1);
 f1
-1.10000
+1.1
 DROP PROCEDURE IF EXISTS sp78;
 CREATE PROCEDURE sp78( f1 real unsigned)
 BEGIN
@@ -16655,7 +18080,9 @@ SELECT f1;
 END//
 CALL sp78(1.1);
 f1
-1.10000
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp79;
 CREATE PROCEDURE sp79( f1 real unsigned zerofill)
 BEGIN
@@ -16664,7 +18091,9 @@ SELECT f1;
 END//
 CALL sp79(1.1);
 f1
-1.10000
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp80;
 CREATE PROCEDURE sp80( f1 real zerofill)
 BEGIN
@@ -16673,7 +18102,9 @@ SELECT f1;
 END//
 CALL sp80(1.1);
 f1
-1.10000
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp81;
 CREATE PROCEDURE sp81( f1 smallint)
 BEGIN
@@ -16709,7 +18140,11 @@ SELECT f1;
 END//
 CALL sp84(-32601);
 f1
--32602
+65535
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp85;
 CREATE PROCEDURE sp85( f1 tinyint)
 BEGIN
@@ -16745,9 +18180,23 @@ SELECT f1;
 END//
 CALL sp88(-101);
 f1
--102
+255
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp89;
+CREATE PROCEDURE sp89( f1 enum('1enum', '2enum'))
+BEGIN
+IF f1 = '1enum' THEN set f1 = '2enum'; ELSE  set f1 = '1enum'; END IF;
+END//
+CALL sp89( '1enum');
 DROP PROCEDURE IF EXISTS sp90;
+CREATE PROCEDURE sp90( f1 set('1set', '2set'))
+BEGIN
+IF f1 = '1set' THEN  set f1 = '2set';  ELSE set f1 = '1set'; END IF;
+END//
+CALL sp90( '1set');
 DROP PROCEDURE IF EXISTS sp91;
 CREATE PROCEDURE sp91( f1 date)
 BEGIN
@@ -16765,7 +18214,7 @@ SELECT f1;
 END//
 CALL sp92( '23:59:59.999999');
 f1
-26:00:00.999997
+25:59:59
 DROP PROCEDURE IF EXISTS sp93;
 CREATE PROCEDURE sp93( f1 datetime)
 BEGIN
@@ -16774,7 +18223,7 @@ SELECT f1;
 END//
 CALL sp93('1997-12-31 23:59:59.999999');
 f1
-1998-01-02 01:01:01.000001
+1998-01-02 01:01:00
 DROP PROCEDURE IF EXISTS sp94;
 CREATE PROCEDURE sp94( f1 char)
 BEGIN
@@ -16783,7 +18232,9 @@ SELECT f1;
 END//
 CALL sp94( 'h');
 f1
-ah
+a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp95;
 CREATE PROCEDURE sp95( f1 char ascii)
 BEGIN
@@ -16792,7 +18243,9 @@ SELECT f1;
 END//
 CALL sp95( 'h');
 f1
-ah
+a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp96;
 CREATE PROCEDURE sp96( f1 char binary)
 BEGIN
@@ -16801,7 +18254,9 @@ SELECT f1;
 END//
 CALL sp96( 'h');
 f1
-ah
+a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp97;
 CREATE PROCEDURE sp97( f1 longtext)
 BEGIN
@@ -16846,7 +18301,7 @@ SELECT f1;
 END//
 CALL sp101(51);
 f1
-61
+2061
 DROP PROCEDURE IF EXISTS sp102;
 CREATE PROCEDURE sp102( f1 year(4))
 BEGIN
@@ -16901,6 +18356,8 @@ END//
 CALL sp107(2.00e+13);
 f1
 returned
+Warnings:
+returned	1265	Data truncated for column 'f1' at row 1
 USE db_storedproc;
 DROP DATABASE db1;
 DROP DATABASE IF EXISTS db1;
@@ -16937,9 +18394,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute01();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-61	61	71	61	61	71	2033	2033	2084	2033	2033	2084
+2061	2061	2071	2061	2061	2071	2033	2033	2084	2033	2033	2084
 var1	var2	var3	var4	var5	var6	var7	var8
-61	71	61	71	2033	2084	2033	2084
+2061	2071	2061	2071	2033	2084	2033	2084
 DROP PROCEDURE spexecute01;
 DROP PROCEDURE sp1;
 DROP PROCEDURE IF EXISTS sp2;
@@ -17010,9 +18467,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute03();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-ah	ah	aah	ah	ah	aah	helloworld	helloworld	NULL	helloworld	helloworld	hellohelloworld
+a	a	a	a	a	a	helloworld	helloworld	NULL	helloworld	helloworld	hellohelloworld
 var1	var2	var3	var4	var5	var6	var7	var8
-ah	aah	ah	aah	helloworld	NULL	helloworld	hellohelloworld
+a	a	a	a	helloworld	NULL	helloworld	hellohelloworld
 DROP PROCEDURE spexecute03;
 DROP PROCEDURE sp3;
 DROP PROCEDURE IF EXISTS sp4;
@@ -17155,7 +18612,7 @@ SELECT var7, var8;
 END//
 CALL spexecute07();
 var1	var2
-9223372036854775807	NULL
+18400000000000000000	NULL
 var3	var4
 -9220000000000000000	NULL
 var5	var6
@@ -17163,7 +18620,7 @@ var5	var6
 var7	var8
 -9220000000000000000	NULL
 f1	f2	f3
-9223372036854775807	9223372036854775807	NULL
+18400000000000000000	18400000000000000000	NULL
 f4	f5	f6
 -9220000000000000000	-9220000000000000000	NULL
 f7	f8	f9
@@ -17171,7 +18628,7 @@ f7	f8	f9
 f10	f11	f12
 -9220000000000000000	-9220000000000000000	NULL
 f1	f2	f3
--2	-2	-2
+18353255926290448384	18353255926290448384	18353255926290448384
 f4	f5	f6
 -9220000000000000000	6744073709551616	6744073709551616
 f7	f8	f9
@@ -17179,7 +18636,7 @@ f7	f8	f9
 f10	f11	f12
 -9220000000000000000	6744073709551616	6744073709551616
 var1	var2
--2	-2
+18353255926290448384	18353255926290448384
 var3	var4
 6744073709551616	6744073709551616
 var5	var6
@@ -17237,9 +18694,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute08();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-368000000000000000	368000000000000000	368000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+00368000000000000000	00368000000000000000	00368000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-368000000000000000	368000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+00368000000000000000	00368000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute08;
 DROP PROCEDURE sp8;
 DROP PROCEDURE IF EXISTS sp9;
@@ -17291,9 +18748,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute09();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--18440000000000000	-18440000000000000	-18439999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+00000000000000000000	00000000000000000000	00000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--18440000000000000	-18439999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+00000000000000000000	00000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute09;
 DROP PROCEDURE sp9;
 DROP PROCEDURE IF EXISTS sp10;
@@ -17337,9 +18794,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute10();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute10;
 DROP PROCEDURE sp10;
 DROP PROCEDURE IF EXISTS sp11;
@@ -17372,9 +18829,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute11();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1000000000.000000000	1000000000.000000000	1000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1000000000	1000000000	1000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1000000000.000000000	1000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1000000000	1000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute11;
 DROP PROCEDURE sp11;
 DROP PROCEDURE IF EXISTS sp12;
@@ -17407,9 +18864,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute12();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-99999999999.000000000	99999999999.000000000	100000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-99999999999.000000000	100000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute12;
 DROP PROCEDURE sp12;
 DROP PROCEDURE IF EXISTS sp13;
@@ -17442,9 +18899,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute13();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute13;
 DROP PROCEDURE sp13;
 DROP PROCEDURE IF EXISTS sp14;
@@ -17477,9 +18934,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute14();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000000000000000.000000000	-1000000000000000000000.000000000	-999999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000000000000000.000000000000000000000000000000	-1000000000000000000000.000000000000000000000000000000	-999999999999999999990.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000000000000000.000000000	-999999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000000000000000.000000000000000000000000000000	-999999999999999999990.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute14;
 DROP PROCEDURE sp14;
 DROP PROCEDURE IF EXISTS sp15;
@@ -17545,9 +19002,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute16();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute16;
 DROP PROCEDURE sp16;
 DROP PROCEDURE IF EXISTS sp17;
@@ -17579,9 +19036,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute17();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute17;
 DROP PROCEDURE sp17;
 DROP PROCEDURE IF EXISTS sp18;
@@ -17613,9 +19070,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute18();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute18;
 DROP PROCEDURE sp18;
 DROP PROCEDURE IF EXISTS sp19;
@@ -17647,9 +19104,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute19();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute19;
 DROP PROCEDURE sp19;
 DROP PROCEDURE IF EXISTS sp20;
@@ -17681,9 +19138,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute20();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute20;
 DROP PROCEDURE sp20;
 DROP PROCEDURE IF EXISTS sp21;
@@ -17715,9 +19172,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute21();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute21;
 DROP PROCEDURE sp21;
 DROP PROCEDURE IF EXISTS sp22;
@@ -17783,9 +19240,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute23();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute23;
 DROP PROCEDURE sp23;
 DROP PROCEDURE IF EXISTS sp24;
@@ -17817,9 +19274,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute24();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.1	1.1	11.1	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.1	11.1	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute24;
 DROP PROCEDURE sp24;
 DROP PROCEDURE IF EXISTS sp25;
@@ -17851,9 +19308,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute25();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--65402	-65402	-65392	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-32758	-32758	-32748	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--65402	-65392	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-32758	-32748	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute25;
 DROP PROCEDURE sp25;
 DROP PROCEDURE IF EXISTS sp26;
@@ -17919,9 +19376,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute27();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-26:00:00.999997	26:00:00.999997	28:00:01.999995	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+25:59:59	25:59:59	27:59:59	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-26:00:00.999997	28:00:01.999995	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+25:59:59	27:59:59	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute27;
 DROP PROCEDURE sp27;
 DROP PROCEDURE IF EXISTS sp28;
@@ -17953,9 +19410,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute28();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1998-01-02 01:01:01.000001	1998-01-02 01:01:01.000001	1998-01-03 02:02:02.000003	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1998-01-02 01:01:00	1998-01-02 01:01:00	1998-01-03 02:02:01	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1998-01-02 01:01:01.000001	1998-01-03 02:02:02.000003	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1998-01-02 01:01:00	1998-01-03 02:02:01	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute28;
 DROP PROCEDURE sp28;
 DROP PROCEDURE IF EXISTS sp29;
@@ -17987,9 +19444,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute29();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute29;
 DROP PROCEDURE sp29;
 DROP PROCEDURE IF EXISTS sp30;
@@ -18021,9 +19478,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute30();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute30;
 DROP PROCEDURE sp30;
 DROP PROCEDURE IF EXISTS sp31;
@@ -18089,9 +19546,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute32();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute32;
 DROP PROCEDURE sp32;
 DROP PROCEDURE IF EXISTS sp33;
@@ -18123,9 +19580,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute33();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute33;
 DROP PROCEDURE sp33;
 DROP PROCEDURE IF EXISTS sp34;
@@ -18191,9 +19648,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute35();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute35;
 DROP PROCEDURE sp35;
 DROP PROCEDURE IF EXISTS sp36;
@@ -18225,9 +19682,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute36();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute36;
 DROP PROCEDURE sp36;
 DROP PROCEDURE IF EXISTS sp37;
@@ -18293,9 +19750,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute38();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute38;
 DROP PROCEDURE sp38;
 DROP PROCEDURE IF EXISTS sp39;
@@ -18327,9 +19784,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute39();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute39;
 DROP PROCEDURE sp39;
 DROP PROCEDURE IF EXISTS sp40;
@@ -18361,9 +19818,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute40();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute40;
 DROP PROCEDURE sp40;
 DROP PROCEDURE IF EXISTS sp41;
@@ -18395,9 +19852,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute41();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute41;
 DROP PROCEDURE sp41;
 DROP PROCEDURE IF EXISTS sp42;
@@ -18429,9 +19886,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute42();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute42;
 DROP PROCEDURE sp42;
 DROP PROCEDURE IF EXISTS sp43;
@@ -18463,9 +19920,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute43();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute43;
 DROP PROCEDURE sp43;
 DROP PROCEDURE IF EXISTS sp44;
@@ -18497,9 +19954,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute44();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute44;
 DROP PROCEDURE sp44;
 DROP PROCEDURE IF EXISTS sp45;
@@ -18531,9 +19988,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute45();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute45;
 DROP PROCEDURE sp45;
 DROP PROCEDURE IF EXISTS sp46;
@@ -18565,9 +20022,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute46();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute46;
 DROP PROCEDURE sp46;
 DROP PROCEDURE IF EXISTS sp47;
@@ -18599,9 +20056,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute47();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute47;
 DROP PROCEDURE sp47;
 DROP PROCEDURE IF EXISTS sp48;
@@ -18633,9 +20090,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute48();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute48;
 DROP PROCEDURE sp48;
 DROP PROCEDURE IF EXISTS sp49;
@@ -18667,9 +20124,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute49();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute49;
 DROP PROCEDURE sp49;
 DROP PROCEDURE IF EXISTS sp50;
@@ -18701,9 +20158,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute50();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute50;
 DROP PROCEDURE sp50;
 DROP PROCEDURE IF EXISTS sp51;
@@ -18735,9 +20192,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute51();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute51;
 DROP PROCEDURE sp51;
 DROP PROCEDURE IF EXISTS sp52;
@@ -18769,9 +20226,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute52();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000000000000000000000000	-10000000000000000000000.000000000000000000000000000000	-99999999999999999990.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000000000000000000000000	-99999999999999999990.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute52;
 DROP PROCEDURE sp52;
 DROP PROCEDURE IF EXISTS sp53;
@@ -18803,9 +20260,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute53();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000	-10000000000000000000000	-99999999999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000	-99999999999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute53;
 DROP PROCEDURE sp53;
 DROP PROCEDURE IF EXISTS sp54;
@@ -18837,9 +20294,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute54();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000	10000000000000000000000	100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000	100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute54;
 DROP PROCEDURE sp54;
 DROP PROCEDURE IF EXISTS sp55;
@@ -18871,9 +20328,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute55();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute55;
 DROP PROCEDURE sp55;
 DROP PROCEDURE IF EXISTS sp56;
@@ -18905,9 +20362,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute56();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-61	61	71	61	61	71	61	61	71	61	61	71
+2061	2061	2071	2061	2061	2071	2061	2061	2071	2061	2061	2071
 var1	var2	var3	var4	var5	var6	var7	var8
-61	71	61	71	61	71	61	71
+2061	2071	2061	2071	2061	2071	2061	2071
 DROP PROCEDURE spexecute56;
 DROP PROCEDURE sp56;
 DROP PROCEDURE IF EXISTS sp57;
@@ -19041,9 +20498,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute60();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-ah	ah	aah	ah	ah	aah	ah	ah	aah	ah	ah	aah
+a	a	a	a	a	a	a	a	a	a	a	a
 var1	var2	var3	var4	var5	var6	var7	var8
-ah	aah	ah	aah	ah	aah	ah	aah
+a	a	a	a	a	a	a	a
 DROP PROCEDURE spexecute60;
 DROP PROCEDURE sp60;
 DROP PROCEDURE IF EXISTS sp61;
@@ -19075,9 +20532,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute61();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-ah	ah	aah	ah	ah	aah	ah	ah	NULL	ah	ah	aah
+a	a	a	a	a	a	a	a	NULL	a	a	a
 var1	var2	var3	var4	var5	var6	var7	var8
-ah	aah	ah	aah	ah	NULL	ah	aah
+a	a	a	a	a	NULL	a	a
 DROP PROCEDURE spexecute61;
 DROP PROCEDURE sp61;
 DROP PROCEDURE IF EXISTS sp62;
@@ -19177,9 +20634,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute64();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000
+1000000000	1000000000	1000000010	1000000000	1000000000	1000000010	1000000000	1000000000	1000000010	1000000000	1000000000	1000000010
 var1	var2	var3	var4	var5	var6	var7	var8
-1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000
+1000000000	1000000010	1000000000	1000000010	1000000000	1000000010	1000000000	1000000010
 DROP PROCEDURE spexecute64;
 DROP PROCEDURE sp64;
 DROP PROCEDURE IF EXISTS sp65;
@@ -19211,9 +20668,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute65();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-999999999.000000000	999999999.000000000	1000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1000000000	1000000000	1000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-999999999.000000000	1000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1000000000	1000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute65;
 DROP PROCEDURE sp65;
 DROP PROCEDURE IF EXISTS sp66;
@@ -19245,9 +20702,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute66();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10000000000000000.000000000	10000000000000000.000000000	10000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10000000000000000.000000000000000000000000000000	10000000000000000.000000000000000000000000000000	10000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000.000000000	10000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000.000000000000000000000000000000	10000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute66;
 DROP PROCEDURE sp66;
 DROP PROCEDURE IF EXISTS sp67;
@@ -19279,9 +20736,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute67();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10000000000000000.000000000	10000000000000000.000000000	10000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000.000000000	10000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute67;
 DROP PROCEDURE sp67;
 DROP PROCEDURE IF EXISTS sp68;
@@ -19313,9 +20770,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute68();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000000000000000.000000000	-1000000000000000000000.000000000	-999999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000000000000000.000000000	-999999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute68;
 DROP PROCEDURE sp68;
 DROP PROCEDURE IF EXISTS sp69;
@@ -19347,9 +20804,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute69();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000	-10000000000000000000000	-99999999999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000	-99999999999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute69;
 DROP PROCEDURE sp69;
 DROP PROCEDURE IF EXISTS sp70;
@@ -19381,9 +20838,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute70();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000	10000000000000000000000	100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000	100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute70;
 DROP PROCEDURE sp70;
 DROP PROCEDURE IF EXISTS sp71;
@@ -19415,9 +20872,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute71();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000100000000000000000000	0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute71;
 DROP PROCEDURE sp71;
 DROP PROCEDURE IF EXISTS sp72;
@@ -19449,9 +20906,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute72();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute72;
 DROP PROCEDURE sp72;
 DROP PROCEDURE IF EXISTS sp73;
@@ -19483,9 +20940,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute73();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute73;
 DROP PROCEDURE sp73;
 DROP PROCEDURE IF EXISTS sp74;
@@ -19517,9 +20974,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute74();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute74;
 DROP PROCEDURE sp74;
 DROP PROCEDURE IF EXISTS sp75;
@@ -19551,9 +21008,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute75();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute75;
 DROP PROCEDURE sp75;
 DROP PROCEDURE IF EXISTS sp76;
@@ -19585,9 +21042,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute76();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute76;
 DROP PROCEDURE sp76;
 DROP PROCEDURE IF EXISTS sp77;
@@ -19619,9 +21076,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute77();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute77;
 DROP PROCEDURE sp77;
 DROP PROCEDURE IF EXISTS sp78;
@@ -19653,9 +21110,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute78();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute78;
 DROP PROCEDURE sp78;
 DROP PROCEDURE IF EXISTS sp79;
@@ -19687,9 +21144,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute79();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute79;
 DROP PROCEDURE sp79;
 DROP PROCEDURE IF EXISTS sp80;
@@ -19721,9 +21178,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute80();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--2150000000	-2150000000	-2149999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-2147483638	-2147483638	-2147483628	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--2150000000	-2149999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-2147483638	-2147483628	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute80;
 DROP PROCEDURE sp80;
 DROP PROCEDURE IF EXISTS sp81;
@@ -19823,9 +21280,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute83();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-215000000	215000000	215000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0215000000	0215000000	0215000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-215000000	215000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0215000000	0215000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute83;
 DROP PROCEDURE sp83;
 DROP PROCEDURE IF EXISTS sp84;
@@ -19857,9 +21314,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute84();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--8388600	-8388600	-8388590	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-8388598	-8388598	-8388588	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--8388600	-8388590	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-8388598	-8388588	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute84;
 DROP PROCEDURE sp84;
 DROP PROCEDURE IF EXISTS sp85;
@@ -19925,9 +21382,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute86();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-16777210	16777210	16777220	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+16777210	16777210	16777215	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-16777210	16777220	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+16777210	16777215	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute86;
 DROP PROCEDURE sp86;
 DROP PROCEDURE IF EXISTS sp87;
@@ -19959,9 +21416,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute87();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--8388602	-8388602	-8388592	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+16777215	16777215	16777215	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--8388602	-8388592	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+16777215	16777215	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute87;
 DROP PROCEDURE sp87;
 DROP PROCEDURE IF EXISTS sp88;
@@ -19993,9 +21450,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute88();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-99999999.000000000	99999999.000000000	100000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0100000000	0100000000	0100000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-99999999.000000000	100000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0100000000	0100000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute88;
 DROP PROCEDURE sp88;
 DROP PROCEDURE IF EXISTS sp89;
@@ -20027,9 +21484,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute89();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-99999999.000000000	99999999.000000000	100000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0100000000	0100000000	0100000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-99999999.000000000	100000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0100000000	0100000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute89;
 DROP PROCEDURE sp89;
 DROP PROCEDURE IF EXISTS sp90;
@@ -20061,9 +21518,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute90();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000000000000000000000000	10000000000000000000000.000000000000000000000000000000	100000000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000000000000000000000000	100000000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute90;
 DROP PROCEDURE sp90;
 DROP PROCEDURE IF EXISTS sp91;
@@ -20095,9 +21552,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute91();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000000100000000000000000000.000000000000000000000000000000	000000000010000000000000000000000.000000000000000000000000000000	000000000000100000000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010000000000000000000000.000000000000000000000000000000	000000000000100000000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute91;
 DROP PROCEDURE sp91;
 DROP PROCEDURE IF EXISTS sp92;
@@ -20129,9 +21586,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute92();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute92;
 DROP PROCEDURE sp92;
 DROP PROCEDURE IF EXISTS sp93;
@@ -20163,9 +21620,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute93();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000100000000000000000000	0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute93;
 DROP PROCEDURE sp93;
 DROP PROCEDURE IF EXISTS sp94;
@@ -20231,9 +21688,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute95();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-65532	65532	65542	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+65532	65532	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-65532	65542	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+65532	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute95;
 DROP PROCEDURE sp95;
 DROP PROCEDURE IF EXISTS sp96;
@@ -20265,9 +21722,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute96();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-65532	65532	65542	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+65532	65532	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-65532	65542	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+65532	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute96;
 DROP PROCEDURE sp96;
 DROP PROCEDURE IF EXISTS sp97;
@@ -20299,9 +21756,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute97();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--32602	-32602	-32592	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+65535	65535	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--32602	-32592	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+65535	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute97;
 DROP PROCEDURE sp97;
 DROP PROCEDURE IF EXISTS sp98;
@@ -20367,9 +21824,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute99();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-252	252	262	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+252	252	255	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-252	262	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+252	255	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute99;
 DROP PROCEDURE sp99;
 DROP PROCEDURE IF EXISTS sp100;
@@ -20435,9 +21892,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute101();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--102	-102	-92	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+255	255	255	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--102	-92	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+255	255	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute101;
 DROP PROCEDURE sp101;
 USE db_storedproc;
@@ -20462,13 +21919,13 @@ set a = '2005-03-14 01:01:02';
 insert into temp_table values(a);
 END//
 show CREATE PROCEDURE sp2;
-Procedure	sql_mode	Create Procedure
-sp2	ALLOW_INVALID_DATES	CREATE PROCEDURE `sp2`()
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
+sp2	ALLOW_INVALID_DATES	CREATE DEFINER=`root`@`localhost` PROCEDURE `sp2`()
 BEGIN
 declare a datetime;
 set a = '2005-03-14 01:01:02';
 insert into temp_table values(a);
-END
+END	latin1	latin1_swedish_ci	latin1_swedish_ci
 set @@sql_mode = 'traditional';
 CALL sp2 ();
 SELECT * from temp_table;
@@ -20498,15 +21955,15 @@ set b = 5;
 SELECT not 1 between a and b;
 END//
 show CREATE PROCEDURE sp3;
-Procedure	sql_mode	Create Procedure
-sp3	HIGH_NOT_PRECEDENCE	CREATE PROCEDURE `sp3`()
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
+sp3	HIGH_NOT_PRECEDENCE	CREATE DEFINER=`root`@`localhost` PROCEDURE `sp3`()
 BEGIN
 declare a int signed;
 declare b int unsigned;
 set a = -5;
 set b = 5;
 SELECT not 1 between a and b;
-END
+END	latin1	latin1_swedish_ci	latin1_swedish_ci
 set @@sql_mode='';
 CALL sp3();
 not 1 between a and b
@@ -20541,8 +21998,8 @@ set c = b/a;
 show warnings;
 END//
 show CREATE PROCEDURE sp4;
-Procedure	sql_mode	Create Procedure
-sp4	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI,ERROR_FOR_DIVISION_BY_ZERO	CREATE PROCEDURE "sp4"()
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
+sp4	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI,ERROR_FOR_DIVISION_BY_ZERO	CREATE DEFINER="root"@"localhost" PROCEDURE "sp4"()
 BEGIN
 declare a int;
 declare b int;
@@ -20551,7 +22008,7 @@ set a = 0;
 set b = 1;
 set c = b/a;
 show warnings;
-END
+END	latin1	latin1_swedish_ci	latin1_swedish_ci
 set @@sql_mode='';
 CALL sp4();
 Level	Code	Message
@@ -20589,37 +22046,37 @@ set @x=i1;
 set @y=@x;
 END//
 show CREATE PROCEDURE sp6a;
-Procedure	sql_mode	Create Procedure
-sp6a		CREATE PROCEDURE `sp6a`(i1 longtext, out i2 mediumint , inout i3 longblob, in i4 year, out i5 real)
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
+sp6a		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6a`(i1 longtext, out i2 mediumint , inout i3 longblob, in i4 year, out i5 real)
 BEGIN
 set @x=i1;
 set @y=@x;
-END
+END	latin1	latin1_swedish_ci	latin1_swedish_ci
 show CREATE PROCEDURE sp6b;
-Procedure	sql_mode	Create Procedure
-sp6b		CREATE PROCEDURE `sp6b`(out i1 longtext, out i2 mediumint , out i3 longblob, out i4 year, out i5 real)
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
+sp6b		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6b`(out i1 longtext, out i2 mediumint , out i3 longblob, out i4 year, out i5 real)
     DETERMINISTIC
 BEGIN
 set @x=i1;
 set @y=@x;
-END
+END	latin1	latin1_swedish_ci	latin1_swedish_ci
 show CREATE PROCEDURE sp6c;
-Procedure	sql_mode	Create Procedure
-sp6c		CREATE PROCEDURE `sp6c`(inout i1 longtext, inout  i2 mediumint , inout i3 longblob, inout  i4 year, inout  i5 real)
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
+sp6c		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6c`(inout i1 longtext, inout  i2 mediumint , inout i3 longblob, inout  i4 year, inout  i5 real)
     COMMENT 'this is a comment'
 BEGIN
 set @x=i1;
 set @y=@x;
-END
+END	latin1	latin1_swedish_ci	latin1_swedish_ci
 SHOW PROCEDURE status like 'sp6a';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp6a	PROCEDURE	root@localhost	modified	created	DEFINER	
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp6a	PROCEDURE	root@localhost	modified	created	DEFINER		latin1	latin1_swedish_ci	latin1_swedish_ci
 SHOW PROCEDURE status like 'sp6b';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp6b	PROCEDURE	root@localhost	modified	created	DEFINER	
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp6b	PROCEDURE	root@localhost	modified	created	DEFINER		latin1	latin1_swedish_ci	latin1_swedish_ci
 SHOW PROCEDURE status like 'sp6c';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp6c	PROCEDURE	root@localhost	modified	created	DEFINER	this is a comment
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp6c	PROCEDURE	root@localhost	modified	created	DEFINER	this is a comment	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP PROCEDURE sp6a;
 DROP PROCEDURE sp6b;
 DROP PROCEDURE sp6c;
@@ -20633,8 +22090,8 @@ set @x=i1;
 set @y=@x;
 END//
 SHOW PROCEDURE status like 'sp6';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp6	PROCEDURE	root@localhost	modified	created	DEFINER	
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp6	PROCEDURE	root@localhost	modified	created	DEFINER		latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP PROCEDURE sp6;
 
 Testcase 4.8.3:
@@ -20659,8 +22116,8 @@ set @y=@x;
 return 0;
 END//
 show  function status like 'sp6';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp6	FUNCTION	root@localhost	modified	created	DEFINER	
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp6	FUNCTION	root@localhost	modified	created	DEFINER		latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP FUNCTION sp6;
 
 Testcase 4.8.5:
@@ -20673,7 +22130,7 @@ Testcase 4.8.6:
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp6;
 show  procedure status like 'sp6';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
 
 Testcase 4.8.7:
 --------------------------------------------------------------------------------
@@ -20694,7 +22151,7 @@ BEGIN
 return i1;
 END//
 show  procedure status like 'fn1';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
 DROP FUNCTION fn1;
 
 Testcase 4.8.9:
@@ -20708,8 +22165,8 @@ BEGIN
 return i1;
 END//
 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 fn1;
 
 Testcase 4.8.11:
@@ -20738,7 +22195,7 @@ Testcase 4.8.13:
 --------------------------------------------------------------------------------
 DROP FUNCTION IF EXISTS f1000;
 SHOW FUNCTION STATUS LIKE 'f1000';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
 
 Testcase 4.8.14:
 --------------------------------------------------------------------------------
@@ -20760,7 +22217,7 @@ set @x=i1;
 set @y=@x;
 END//
 show  function status like 'sp6';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
 DROP PROCEDURE sp6;
 
 Testcase 4.8.16:
@@ -20777,8 +22234,8 @@ END//
 alter procedure sp6 sql security invoker;
 alter procedure sp6 comment  'this is a new comment';
 SHOW PROCEDURE status like 'sp6';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp6	PROCEDURE	root@localhost	modified	created	INVOKER	this is a new comment
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp6	PROCEDURE	root@localhost	modified	created	INVOKER	this is a new comment	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP PROCEDURE sp6;
 
 Testcase 4.8.18:
@@ -20790,12 +22247,12 @@ return x;
 END//
 alter function fn1 sql security invoker;
 show  create  function  fn1;
-Function	sql_mode	Create Function
-fn1		CREATE FUNCTION `fn1`(x int) RETURNS int(11)
+Function	sql_mode	Create Function	character_set_client	collation_connection	Database Collation
+fn1		CREATE DEFINER=`root`@`localhost` FUNCTION `fn1`(x int) RETURNS int(11)
     SQL SECURITY INVOKER
 BEGIN
 return x;
-END
+END	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP FUNCTION fn1;
 
 Testcase 4.8.19:
@@ -20808,8 +22265,8 @@ END//
 alter function fn1 sql security invoker;
 alter function fn1 comment 'this is a function 3242#@%$#@';
 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 a function 3242#@%$#@
+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 a function 3242#@%$#@	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP FUNCTION fn1;
 
 Testcase 4.8.20:
@@ -20822,13 +22279,13 @@ set @y=@x;
 END//
 alter procedure sp6 comment 'this is simple';
 show CREATE PROCEDURE sp6;
-Procedure	sql_mode	Create Procedure
-sp6		CREATE PROCEDURE `sp6`(i1 int , i2 int)
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
+sp6		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6`(i1 int , i2 int)
     COMMENT 'this is simple'
 BEGIN
 set @x=i1;
 set @y=@x;
-END
+END	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP PROCEDURE sp6;
 
 Testcase 4.8.21:
@@ -20853,7 +22310,7 @@ set @y=@x;
 END//
 DROP PROCEDURE sp6;
 SHOW PROCEDURE status like 'sp6';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
 
 Testcase 4.8.23:
 --------------------------------------------------------------------------------
@@ -20875,7 +22332,7 @@ return i1;
 END//
 DROP FUNCTION fn1;
 SHOW FUNCTION STATUS LIKE 'fn1';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
 
 Section 3.1.9 - Routine body checks:
 --------------------------------------------------------------------------------
@@ -20894,16 +22351,16 @@ SELECT * from t9 limit 0, 100;
 END//
 CALL sp6 (10, 20, 30, 40, 50);
 f1	f2	f3
--5000	a`	-5000
--4999	aaa	-4999
--4998	abaa	-4998
--4997	acaaa	-4997
--4996	adaaaa	-4996
--4995	aeaaaaa	-4995
--4994	afaaaaaa	-4994
--4993	agaaaaaaa	-4993
--4992	a^aaaaaaaa	-4992
 -4991	a_aaaaaaaaa	-4991
+-4992	a^aaaaaaaa	-4992
+-4993	agaaaaaaa	-4993
+-4994	afaaaaaa	-4994
+-4995	aeaaaaa	-4995
+-4996	adaaaa	-4996
+-4997	acaaa	-4997
+-4998	abaa	-4998
+-4999	aaa	-4999
+-5000	a`	-5000
 DROP PROCEDURE sp6;
 
 Testcase 4.9.2:
@@ -21363,9 +22820,16 @@ until done END repeat;
 SELECT done;
 close cur1;
 END//
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+CALL h1();
+done
+0
+done
+1
+done
+1
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.14:
 --------------------------------------------------------------------------------
@@ -21392,9 +22856,16 @@ until done END repeat;
 SELECT done;
 close cur1;
 END//
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+CALL h1();
+done
+0
+done
+1
+done
+1
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.15:
 --------------------------------------------------------------------------------
@@ -21422,9 +22893,16 @@ until done END repeat;
 SELECT done;
 close cur1;
 END//
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+CALL h1();
+done
+0
+@x=1
+0
+done
+1
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.16:
 --------------------------------------------------------------------------------
@@ -21452,17 +22930,16 @@ until done END repeat;
 SELECT done;
 close cur1;
 END//
-CALL h1()
-# cleanup;
+CALL h1();
 done
 0
 @x=1
 0
 done
 1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.17:
 --------------------------------------------------------------------------------
@@ -21490,9 +22967,9 @@ done
 0
 done
 1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.18:
 --------------------------------------------------------------------------------
@@ -21520,9 +22997,9 @@ done
 0
 done
 1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.19:
 --------------------------------------------------------------------------------
@@ -21550,9 +23027,9 @@ END//
 CALL h1();
 done
 0
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.20:
 --------------------------------------------------------------------------------
@@ -21580,9 +23057,9 @@ END//
 CALL h1();
 done
 0
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.21:
 --------------------------------------------------------------------------------
@@ -21610,9 +23087,9 @@ done
 0
 done
 1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.22:
 --------------------------------------------------------------------------------
@@ -21641,9 +23118,9 @@ done
 0
 done	@x
 1	1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.23:
 --------------------------------------------------------------------------------
@@ -21671,9 +23148,9 @@ END//
 CALL h1();
 done
 0
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.24:
 --------------------------------------------------------------------------------
@@ -21701,9 +23178,9 @@ END//
 CALL h1();
 done
 0
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.25:
 --------------------------------------------------------------------------------
@@ -21728,9 +23205,9 @@ END//
 CALL h1();
 done	@x
 1	1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.26:
 --------------------------------------------------------------------------------
@@ -21755,9 +23232,9 @@ END//
 CALL h1();
 done	@x
 1	1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.27:
 --------------------------------------------------------------------------------
@@ -21780,9 +23257,9 @@ set @x=1;
 SELECT done, @x;
 END//
 CALL h1();
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.28:
 --------------------------------------------------------------------------------
@@ -21805,9 +23282,9 @@ set @x=1;
 SELECT done, @x;
 END//
 CALL h1();
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+drop table IF EXISTS res_t1;
+drop table IF EXISTS res_t2;
 
 Testcase 4.11.29:
 --------------------------------------------------------------------------------
@@ -21835,9 +23312,9 @@ END//
 CALL h1();
 done	@x
 1	1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+drop table IF EXISTS res_t1;
+drop table IF EXISTS res_t2;
 
 Testcase 4.11.30:
 --------------------------------------------------------------------------------
@@ -21865,9 +23342,9 @@ END//
 CALL h1();
 done	@x
 1	1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+drop table IF EXISTS res_t1;
+drop table IF EXISTS res_t2;
 
 Testcase 4.11.31:
 --------------------------------------------------------------------------------
@@ -21893,9 +23370,9 @@ set @x=1;
 SELECT done, @x;
 END//
 CALL h1();
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+drop table IF EXISTS res_t1;
+drop table IF EXISTS res_t2;
 
 Testcase 4.11.32:
 --------------------------------------------------------------------------------
@@ -21921,9 +23398,9 @@ set @x=1;
 SELECT done, @x;
 END//
 CALL h1();
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.33:
 --------------------------------------------------------------------------------
@@ -21948,7 +23425,7 @@ set @x=1;
 SELECT done, @x;
 END//
 ERROR 42000: Duplicate condition: condname
-drop table res_t1;
+DROP TABLE IF EXISTS res_t1;
 
 Testcase 4.11.35:
 --------------------------------------------------------------------------------
@@ -21973,7 +23450,21 @@ insert into res_t1 values (3, 'c');
 END begin2_label;
 END begin1_label//
 ERROR 42000: Bad SQLSTATE: '020'
-drop table res_t1;
+CREATE PROCEDURE h1 ()
+begin1_label:BEGIN
+declare condname1 condition for sqlstate '020';
+declare condname2 condition for sqlstate 'wewe';
+declare condname3 condition for 9999;
+set @var2 = 1;
+insert into res_t1 values (2, 'b');
+begin2_label: BEGIN
+declare continue handler for sqlstate '90000023' set @var3= 1;
+set @var4 = 1;
+insert into res_t1 values (3, 'c');
+END begin2_label;
+END begin1_label//
+ERROR 42000: Bad SQLSTATE: '020'
+DROP TABLE IF EXISTS res_t1;
 
 Testcase 4.11.36:
 --------------------------------------------------------------------------------
@@ -21989,7 +23480,7 @@ set x1 = 2;
 END;
 SELECT @x, x1;
 END//
-DROP PROCEDURE h1;
+DROP PROCEDURE IF EXISTS h1;
 
 Testcase 4.11.40:
 --------------------------------------------------------------------------------
@@ -22010,7 +23501,7 @@ declare exit handler for condname2 set x5 = 1;
 END//
 ERROR 42000: Duplicate handler declared in the same block
 DROP PROCEDURE IF EXISTS h1;
-drop table res_t1;
+DROP TABLE IF EXISTS res_t1;
 
 Testcase 4.11.41:
 --------------------------------------------------------------------------------
@@ -22026,6 +23517,9 @@ set x1 = 2;
 END;
 SELECT @x, x1;
 END//
+CALL h1();
+@x	x1
+0	2
 DROP PROCEDURE IF EXISTS h1;
 
 * Testcase 3.1.2.53 (4.11.42):
@@ -22076,8 +23570,8 @@ CALL h1();
 SELECT @done, @x;
 @done	@x
 1	1
-DROP PROCEDURE h1;
-DROP TABLE res_t1;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
 
 --source suite/funcs_1/storedproc/cleanup_sp_tb.inc
 --------------------------------------------------------------------------------
diff --git a/mysql-test/suite/funcs_1/r/memory_storedproc_10.result b/mysql-test/suite/funcs_1/r/memory_storedproc_10.result
index c316ce36dde..b5c70ec1c95 100755
--- a/mysql-test/suite/funcs_1/r/memory_storedproc_10.result
+++ b/mysql-test/suite/funcs_1/r/memory_storedproc_10.result
@@ -58,6 +58,7 @@ load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
 
 Section 3.1.10 - CALL checks:
 --------------------------------------------------------------------------------
+USE db_storedproc;
 
 Testcase 3.1.10.2 + 3.1.10.5:
 -----------------------------
@@ -94,6 +95,7 @@ CALL sp31102();
 ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.sp31102'
 SELECT fn31105( 9 );
 ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.fn31105'
+connection default;
 USE db_storedproc;
 	
 root@localhost	db_storedproc
@@ -114,6 +116,7 @@ a`	a`	1000-01-01	-5000	a`	-5000
 SELECT fn31105( 9 );
 fn31105( 9 )
 81
+connection default;
 USE db_storedproc;
 	
 root@localhost	db_storedproc
@@ -180,6 +183,8 @@ DROP PROCEDURE IF EXISTS sp_ins_1;
 DROP PROCEDURE IF EXISTS sp_ins_3;
 DROP PROCEDURE IF EXISTS sp_upd;
 DROP PROCEDURE IF EXISTS sp_ins_upd;
+DROP PROCEDURE IF EXISTS sp_del;
+DROP PROCEDURE IF EXISTS sp_with_rowcount;
 CREATE TABLE temp(f1 CHAR(20),f2 CHAR(25),f3 DATE,f4 INT,f5 CHAR(25),f6 INT);
 INSERT INTO temp SELECT * FROM t10;
 CREATE PROCEDURE sp_ins_1()
@@ -207,49 +212,72 @@ END;
 SELECT COUNT( f1 ), f1 FROM temp GROUP BY f1;
 UPDATE temp SET temp.f1 = 'updated_2' WHERE temp.f1 ='qwe' AND temp.f2 = 'abc';
 END//
+CREATE PROCEDURE sp_del()
+BEGIN
+DELETE FROM temp WHERE temp.f1 ='qwe' OR temp.f1 = 'updated_2';
+END//
+CREATE PROCEDURE sp_with_rowcount()
+BEGIN
+BEGIN
+INSERT INTO temp VALUES  ('qwe', 'abc', '1989-11-09', 100, 'uvw', 1000),
+('qwe', 'xyz', '1998-03-26', 100, 'uvw', 1000),
+('qwe', 'abc', '2000-11-09', 100, 'uvw', 1000),
+('qwe', 'xyz', '2005-11-07', 100, 'uvw', 1000);
+END;
+SELECT row_count() AS 'row_count() after insert';
+SELECT row_count() AS 'row_count() after select row_count()';
+SELECT f1,f2,f3 FROM temp ORDER BY f1,f2,f3;
+UPDATE temp SET temp.f1 = 'updated_2' WHERE temp.f2 = 'abc';
+SELECT row_count() AS 'row_count() after update';
+SELECT f1,f2,f3 FROM temp ORDER BY f1,f2,f3;
+DELETE FROM temp WHERE temp.f1 = 'updated_2';
+SELECT row_count() AS 'row_count() after delete';
+END//
 CALL sp_ins_1();
 SELECT row_count();
 row_count()
 1
-SELECT * FROM temp ORDER BY f4;
+SELECT * FROM temp;
 f1	f2	f3	f4	f5	f6
+a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
+a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
 abaa	abaa	1000-01-03	-4998	abaa	-4998
+abc	abc	2005-10-03	100	uvw	1000
 acaaa	acaaa	1000-01-04	-4997	acaaa	-4997
 adaaaa	adaaaa	1000-01-05	-4996	adaaaa	-4996
 aeaaaaa	aeaaaaa	1000-01-06	-4995	aeaaaaa	-4995
 afaaaaaa	afaaaaaa	1000-01-07	-4994	afaaaaaa	-4994
 agaaaaaaa	agaaaaaaa	1000-01-08	-4993	agaaaaaaa	-4993
-a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
-a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
-abc	abc	2005-10-03	100	uvw	1000
 CALL sp_ins_3();
 SELECT row_count();
 row_count()
 1
-SELECT * FROM temp ORDER BY f4;
+SELECT * FROM temp;
 f1	f2	f3	f4	f5	f6
+a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
+a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
 abaa	abaa	1000-01-03	-4998	abaa	-4998
+abc	abc	2005-10-03	100	uvw	1000
+abc	xyz	1949-05-23	100	uvw	1000
+abc	xyz	1989-11-09	100	uvw	1000
+abc	xyz	2005-10-24	100	uvw	1000
 acaaa	acaaa	1000-01-04	-4997	acaaa	-4997
 adaaaa	adaaaa	1000-01-05	-4996	adaaaa	-4996
 aeaaaaa	aeaaaaa	1000-01-06	-4995	aeaaaaa	-4995
 afaaaaaa	afaaaaaa	1000-01-07	-4994	afaaaaaa	-4994
 agaaaaaaa	agaaaaaaa	1000-01-08	-4993	agaaaaaaa	-4993
-a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
-a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
-abc	abc	2005-10-03	100	uvw	1000
-abc	xyz	1949-05-23	100	uvw	1000
-abc	xyz	1989-11-09	100	uvw	1000
-abc	xyz	2005-10-24	100	uvw	1000
 CALL sp_upd();
 SELECT row_count();
 row_count()
 4
-SELECT * FROM temp ORDER BY f4;
+SELECT * FROM temp;
 f1	f2	f3	f4	f5	f6
+a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
+a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
 abaa	abaa	1000-01-03	-4998	abaa	-4998
@@ -258,8 +286,6 @@ adaaaa	adaaaa	1000-01-05	-4996	adaaaa	-4996
 aeaaaaa	aeaaaaa	1000-01-06	-4995	aeaaaaa	-4995
 afaaaaaa	afaaaaaa	1000-01-07	-4994	afaaaaaa	-4994
 agaaaaaaa	agaaaaaaa	1000-01-08	-4993	agaaaaaaa	-4993
-a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
-a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
 updated	abc	2005-10-03	100	uvw	1000
 updated	xyz	1949-05-23	100	uvw	1000
 updated	xyz	1989-11-09	100	uvw	1000
@@ -281,8 +307,10 @@ COUNT( f1 )	f1
 SELECT row_count();
 row_count()
 3
-SELECT * FROM temp ORDER BY f4;
+SELECT * FROM temp;
 f1	f2	f3	f4	f5	f6
+a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
+a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
 abaa	abaa	1000-01-03	-4998	abaa	-4998
@@ -291,20 +319,67 @@ adaaaa	adaaaa	1000-01-05	-4996	adaaaa	-4996
 aeaaaaa	aeaaaaa	1000-01-06	-4995	aeaaaaa	-4995
 afaaaaaa	afaaaaaa	1000-01-07	-4994	afaaaaaa	-4994
 agaaaaaaa	agaaaaaaa	1000-01-08	-4993	agaaaaaaa	-4993
-a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
-a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
+qwe	xyz	1998-03-26	100	uvw	1000
 updated	abc	2005-10-03	100	uvw	1000
 updated	xyz	1949-05-23	100	uvw	1000
 updated	xyz	1989-11-09	100	uvw	1000
 updated	xyz	2005-10-24	100	uvw	1000
 updated_2	abc	1989-11-09	100	uvw	1000
-qwe	xyz	1998-03-26	100	uvw	1000
 updated_2	abc	2000-11-09	100	uvw	1000
 updated_2	abc	2005-11-07	100	uvw	1000
+CALL sp_del();
+SELECT row_count();
+row_count()
+4
+SELECT * FROM temp;
+f1	f2	f3	f4	f5	f6
+a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
+a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
+a`	a`	1000-01-01	-5000	a`	-5000
+aaa	aaa	1000-01-02	-4999	aaa	-4999
+abaa	abaa	1000-01-03	-4998	abaa	-4998
+acaaa	acaaa	1000-01-04	-4997	acaaa	-4997
+adaaaa	adaaaa	1000-01-05	-4996	adaaaa	-4996
+aeaaaaa	aeaaaaa	1000-01-06	-4995	aeaaaaa	-4995
+afaaaaaa	afaaaaaa	1000-01-07	-4994	afaaaaaa	-4994
+agaaaaaaa	agaaaaaaa	1000-01-08	-4993	agaaaaaaa	-4993
+updated	abc	2005-10-03	100	uvw	1000
+updated	xyz	1949-05-23	100	uvw	1000
+updated	xyz	1989-11-09	100	uvw	1000
+updated	xyz	2005-10-24	100	uvw	1000
+DELETE FROM temp;
+CALL sp_with_rowcount();
+row_count() after insert
+4
+row_count() after select row_count()
+-1
+f1	f2	f3
+qwe	abc	1989-11-09
+qwe	abc	2000-11-09
+qwe	xyz	1998-03-26
+qwe	xyz	2005-11-07
+row_count() after update
+2
+f1	f2	f3
+qwe	xyz	1998-03-26
+qwe	xyz	2005-11-07
+updated_2	abc	1989-11-09
+updated_2	abc	2000-11-09
+row_count() after delete
+2
+SELECT row_count();
+row_count()
+-1
+SELECT * FROM temp;
+f1	f2	f3	f4	f5	f6
+qwe	xyz	1998-03-26	100	uvw	1000
+qwe	xyz	2005-11-07	100	uvw	1000
 DROP PROCEDURE sp_ins_1;
 DROP PROCEDURE sp_ins_3;
 DROP PROCEDURE sp_upd;
 DROP PROCEDURE sp_ins_upd;
+DROP PROCEDURE sp_del;
+DROP PROCEDURE sp_with_rowcount;
 DROP TABLE temp;
 
 Testcase 3.1.10.8:
diff --git a/mysql-test/suite/funcs_1/r/memory_trig_03.result b/mysql-test/suite/funcs_1/r/memory_trig_03.result
index ae7b83f820d..072237f55de 100644
--- a/mysql-test/suite/funcs_1/r/memory_trig_03.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_03.result
@@ -180,15 +180,14 @@ insert 3.5.3.2-no
 insert 3.5.3.6-no
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
-
-Trigger create disabled - should fail - Bug 8884
-------------------------------------------------
+create trigger trg4a_1 before INSERT on t1 for each row
+set new.f1 = 'trig 3.5.3.7-1a';
 insert into t1 (f1) values ('insert 3.5.3.7-1a');
+ERROR 42000: UPDATE command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 drop trigger trg4a_1;
@@ -206,7 +205,6 @@ select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
@@ -235,29 +233,27 @@ Grants for test_noprivs@localhost
 GRANT USAGE ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
 use priv_db;
-
-Trigger create disabled - should fail - Bug 8884
-------------------------------------------------
+create trigger trg4b_1 before UPDATE on t1 for each row
+set new.f1 = 'trig 3.5.3.7-1b';
 insert into t1 (f1) values ('insert 3.5.3.7-1b');
 select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
 insert 3.5.3.7-1b
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 update t1 set  f1 = 'update 3.5.3.7-1b' where f1 = 'insert 3.5.3.7-1b';
+ERROR 42000: UPDATE command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
+insert 3.5.3.7-1b
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-update 3.5.3.7-1b
 drop trigger trg4b_1;
 show grants;
 Grants for test_yesprivs@localhost
@@ -271,23 +267,21 @@ select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
+insert 3.5.3.7-1b
 insert 3.5.3.7-2b
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-update 3.5.3.7-1b
 update t1 set  f1 = 'update 3.5.3.7-2b' where f1 = 'insert 3.5.3.7-2b';
 select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
+insert 3.5.3.7-1b
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 trig 3.5.3.7-2b
-update 3.5.3.7-1b
 drop trigger trg4b_2;
 
 Testcase 3.5.3.7c
@@ -313,21 +307,19 @@ Grants for test_noprivs@localhost
 GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
-
-Trigger create disabled - should fail - Bug 8884
-------------------------------------------------
+create trigger trg4c_1 before INSERT on t1 for each row
+set new.f1 = 'trig 3.5.3.7-1c';
 insert into t1 (f1) values ('insert 3.5.3.7-1c');
+ERROR 42000: UPDATE command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
-insert 3.5.3.7-1c
+insert 3.5.3.7-1b
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 trig 3.5.3.7-2b
-update 3.5.3.7-1b
 drop trigger trg4c_1;
 show grants;
 Grants for test_yesprivs@localhost
@@ -341,14 +333,12 @@ select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
-insert 3.5.3.7-1c
+insert 3.5.3.7-1b
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 trig 3.5.3.7-2b
 trig 3.5.3.7-2c
-update 3.5.3.7-1b
 drop trigger trg4c_2;
 
 Testcase 3.5.3.7d:
@@ -372,23 +362,20 @@ Grants for test_noprivs@localhost
 GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT (f1), INSERT (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
-
-Trigger create disabled - should fail - Bug 8884
-------------------------------------------------
+create trigger trg4d_1 before INSERT on t1 for each row
+set new.f1 = 'trig 3.5.3.7-1d';
 insert into t1 (f1) values ('insert 3.5.3.7-1d');
+ERROR 42000: UPDATE command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
-insert 3.5.3.7-1c
-insert 3.5.3.7-1d
+insert 3.5.3.7-1b
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 trig 3.5.3.7-2b
 trig 3.5.3.7-2c
-update 3.5.3.7-1b
 drop trigger trg4d_1;
 show grants;
 Grants for test_yesprivs@localhost
@@ -402,16 +389,13 @@ select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
-insert 3.5.3.7-1c
-insert 3.5.3.7-1d
+insert 3.5.3.7-1b
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 trig 3.5.3.7-2b
 trig 3.5.3.7-2c
 trig 3.5.3.7-2d
-update 3.5.3.7-1b
 drop trigger trg4d_2;
 
 Testcase 3.5.3.8a:
@@ -436,14 +420,14 @@ use priv_db;
 show grants;
 Grants for test_noprivs@localhost
 GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-
-Trigger create disabled - should fail - Bug 8887
-------------------------------------------------
+create trigger trg5a_1 before INSERT on t1 for each row
+set @test_var = new.f1;
 set @test_var = 'before trig 3.5.3.8-1a';
 select @test_var;
 @test_var
 before trig 3.5.3.8-1a
 insert into t1 (f1) values ('insert 3.5.3.8-1a');
+ERROR 42000: SELECT command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select @test_var;
 @test_var
 before trig 3.5.3.8-1a
@@ -491,15 +475,15 @@ Grants for test_noprivs@localhost
 GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
 use priv_db;
-
-Trigger create disabled - should fail - Bug 8887
-------------------------------------------------
+create trigger trg5b_1 before UPDATE on t1 for each row
+set @test_var= new.f1;
 set @test_var= 'before trig 3.5.3.8-1b';
 insert into t1 (f1) values ('insert 3.5.3.8-1b');
 select @test_var;
 @test_var
 before trig 3.5.3.8-1b
 update t1 set  f1= 'update 3.5.3.8-1b' where f1 = 'insert 3.5.3.8-1b';
+ERROR 42000: SELECT command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select @test_var;
 @test_var
 before trig 3.5.3.8-1b
@@ -546,11 +530,11 @@ Grants for test_noprivs@localhost
 GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
-
-Trigger create disabled - should fail - Bug 8887
-------------------------------------------------
+create trigger trg5c_1 before INSERT on t1 for each row
+set @test_var= new.f1;
 set @test_var= 'before trig 3.5.3.8-1c';
 insert into t1 (f1) values ('insert 3.5.3.8-1c');
+ERROR 42000: SELECT command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select @test_var;
 @test_var
 before trig 3.5.3.8-1c
@@ -592,11 +576,11 @@ Grants for test_noprivs@localhost
 GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
-
-Trigger create disabled - should fail - Bug 8887
-------------------------------------------------
+create trigger trg5d_1 before INSERT on t1 for each row
+set @test_var= new.f1;
 set @test_var='before trig 3.5.3.8-1d';
 insert into t1 (f1) values ('insert 3.5.3.8-1d');
+ERROR 42000: SELECT command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select @test_var;
 @test_var
 before trig 3.5.3.8-1d
diff --git a/mysql-test/suite/funcs_1/r/memory_trig_08.result b/mysql-test/suite/funcs_1/r/memory_trig_08.result
index c445f03a2c0..f1ef5e5211a 100644
--- a/mysql-test/suite/funcs_1/r/memory_trig_08.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_08.result
@@ -135,10 +135,10 @@ values ('1', 'Test 3.5.8.4', 222, 23456, 1.05);
 Select f120, f122, f136, f144, f163 from tb3 where f122= 'Test 3.5.8.4';
 f120	f122	f136	f144	f163
 1	Test 3.5.8.4	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_i order by i120;
+select * from db_test.t1_i;
 i120	i136	i144	i163
 1	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_u order by u120;
+select * from db_test.t1_u;
 u120	u136	u144	u163
 a	00111	0000099999	999.990000000000000000000000000000
 b	00222	0000023456	1.050000000000000000000000000000
@@ -146,7 +146,7 @@ c	00333	0000099999	999.990000000000000000000000000000
 d	00222	0000023456	1.050000000000000000000000000000
 e	00222	0000023456	1.050000000000000000000000000000
 f	00333	0000099999	999.990000000000000000000000000000
-select * from db_test.t1_d order by d120;
+select * from db_test.t1_d;
 d120	d136	d144	d163
 a	00111	0000099999	999.990000000000000000000000000000
 c	00333	0000099999	999.990000000000000000000000000000
@@ -339,20 +339,20 @@ set @test_var='Empty';
 Insert into tb3 (f120, f122, f136, f144) 
 values ('a', 'Test 3.5.8.5-case', 5, 7);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	A*seven
 Insert into tb3 (f120, f122, f136, f144) 
 values ('b', 'Test 3.5.8.5-case', 71,16);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	B*0000000016
 B	Test 3.5.8.5-case	00191	0000000016	B*0000000016
 Insert into tb3 (f120, f122, f136, f144) 
 values ('c', 'Test 3.5.8.5-case', 80,1);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	C=one
 B	Test 3.5.8.5-case	00191	0000000016	C=one
@@ -362,7 +362,7 @@ values ('d', 'Test 3.5.8.5-case', 152);
 Warnings:
 Warning	1265	Data truncated for column 'f120' at row 1
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 f120	f122	f136	f144	@test_var
 1	Test 3.5.8.5-case	00152	0000099999	1*0000099999
 A	Test 3.5.8.5-case	00125	0000000007	1*0000099999
@@ -373,7 +373,7 @@ values ('e', 'Test 3.5.8.5-case', 200, 8);
 Warnings:
 Warning	1265	Data truncated for column 'f120' at row 1
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 f120	f122	f136	f144	@test_var
 1	Test 3.5.8.5-case	00152	0000099999	1=eight
 1	Test 3.5.8.5-case	00200	0000000008	1=eight
@@ -383,7 +383,7 @@ C	Test 3.5.8.5-case	00200	0000000001	1=eight
 Insert into tb3 (f120, f122, f136, f144) 
 values ('f', 'Test 3.5.8.5-case', 100, 8);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 f120	f122	f136	f144	@test_var
 1	Test 3.5.8.5-case	00152	0000099999	1=eight
 1	Test 3.5.8.5-case	00200	0000000008	1=eight
@@ -495,9 +495,38 @@ drop trigger trg7;
 
 Testcase 3.5.8.6: (requirement void)
 ------------------------------------
+CREATE PROCEDURE sp_01 () BEGIN set @v1=1; END//
+CREATE TRIGGER trg8_1 BEFORE UPDATE ON tb3 FOR EACH ROW
+BEGIN
+CALL sp_01 ();
+END//
+Insert into tb3 (f120, f122, f136) values ('6', 'Test 3.5.8.6-insert', 101);
+update tb3 set f120='S', f136=111,
+f122='Test 3.5.8.6-tr8_1'
+	       where f122='Test 3.5.8.6-insert';
+select f120, f122
+from tb3 where f122  like 'Test 3.5.8.6%' order by f120;
+f120	f122
+S	Test 3.5.8.6-tr8_1
+DROP TRIGGER trg8_1;
+DROP PROCEDURE sp_01;
 
-Testcase 3.5.8.7: (Disabled as a result of bug _____)
------------------------------------------------------
+Testcase 3.5.8.7
+----------------
+Create trigger trg9_1 before update on tb3 for each row
+BEGIN
+Start transaction;
+Set new.f120='U';
+Commit;
+END//
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+Create trigger trg9_2 before delete on tb3 for each row
+BEGIN
+Start transaction;
+Set @var2=old.f120;
+Rollback;
+END//
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
 drop user test_general@localhost;
 drop user test_general;
 drop user test_super@localhost;
diff --git a/mysql-test/suite/funcs_1/r/memory_trig_09.result b/mysql-test/suite/funcs_1/r/memory_trig_09.result
index 0a25dbfc1ca..afd261e950a 100644
--- a/mysql-test/suite/funcs_1/r/memory_trig_09.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_09.result
@@ -189,8 +189,9 @@ a	NULL	Test 3.5.9.4	7	999	995.240000000000000000000000000000
 0	0	0	0	0	0
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
-Warnings:
-Warning	1048	Column 'f136' cannot be null
+ERROR 23000: Column 'f136' cannot be null
+Update tb3 Set f122='Test 3.5.9.4-trig', f136=0, f151=DEFAULT, f163=NULL
+where f122='Test 3.5.9.4';
 select f118, f121, f122, f136, f151, f163 from tb3 
 where f122 like 'Test 3.5.9.4-trig' order by f163;
 f118	f121	f122	f136	f151	f163
diff --git a/mysql-test/suite/funcs_1/r/memory_trig_1011ext.result b/mysql-test/suite/funcs_1/r/memory_trig_1011ext.result
index 451041575af..c0a7009737a 100644
--- a/mysql-test/suite/funcs_1/r/memory_trig_1011ext.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_1011ext.result
@@ -294,8 +294,8 @@ drop table t2;
 drop table t3;
 drop table t4;
 
-Testcase y.y.y.4: Recursive trigger/SP references (disabled bug 11889)
-----------------------------------------------------------------------
+Testcase y.y.y.4: Recursive trigger/SP references
+-------------------------------------------------
 set @sql_mode='traditional';
 create table t1_sp (
 count integer,
diff --git a/mysql-test/suite/funcs_1/r/memory_views.result b/mysql-test/suite/funcs_1/r/memory_views.result
index 7d045e3412a..602f4de0264 100644
--- a/mysql-test/suite/funcs_1/r/memory_views.result
+++ b/mysql-test/suite/funcs_1/r/memory_views.result
@@ -127,11 +127,7 @@ USE test;
 --------------------------------------------------------------------------------
 
 There are some statements where the ps-protocol is switched off.
-Bug#11589: mysqltest, --ps-protocol, strange output, float/double/real with zerofill
---------------------------------------------------------------------------------
-
-! Attention: The file with the expected results suffers from
-Bug#10713: mysqldump includes database in create view and referenced tables
+Bug#32285: mysqltest, --ps-protocol, strange output, float/double/real with zerofill
 --------------------------------------------------------------------------------
 insert into test.tb2 (f59,f60) values (76710,226546);
 insert into test.tb2 (f59,f60) values(2760,985654);
@@ -407,71 +403,3069 @@ f59
 CREATE or REPLACE VIEW v1 AS select *
 FROM test.tb2 WITH LOCAL CHECK OPTION ;
 select * FROM v1 order by f59,f60,f61,f62,f63,f64 limit 0,50;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-1	1	0000000001	0000000000000000000000000000000000000000000000000000000000000001	0000000001	0000000000000000000000000000000000000000000000000000000000000001	-5	0.000000000000000000000000000000	1	0.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549435e-38	1.17549e-38	1.175494352e-38	01.17549e-38	00000001.175494352e-38	01.17549e-38	00000001.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	1970-01-02 00:00:01	1902	1902	1902	2enum	2set
-2	2	0000000002	0000000000000000000000000000000000000000000000000000000000000002	0000000002	0000000000000000000000000000000000000000000000000000000000000002	-4	1.100000000000000000000000000000	2	1.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494349e-38	1.17549e-38	1.175494353e-38	01.17549e-38	00000001.175494353e-38	01.17549e-38	00000001.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	1970-01-03 00:00:02	1903	1903	1903	1enum	1set,2set
-3	3	0000000003	0000000000000000000000000000000000000000000000000000000000000003	0000000003	0000000000000000000000000000000000000000000000000000000000000003	-3	2.200000000000000000000000000000	3	2.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494348e-38	1.17549e-38	1.175494354e-38	01.17549e-38	00000001.175494354e-38	01.17549e-38	00000001.175494354e-38	1000-01-03	838:59:56	1970-01-04 00:00:03	1970-01-04 00:00:03	1904	1904	1904	2enum	1set
-4	4	0000000004	0000000000000000000000000000000000000000000000000000000000000004	0000000004	0000000000000000000000000000000000000000000000000000000000000004	-2	3.300000000000000000000000000000	4	3.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494347e-38	1.17549e-38	1.175494355e-38	01.17549e-38	00000001.175494355e-38	01.17549e-38	00000001.175494355e-38	1000-01-04	838:59:55	1970-01-05 00:00:04	1970-01-05 00:00:04	1905	1905	1905	1enum	2set
-4	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-5	5	0000000005	0000000000000000000000000000000000000000000000000000000000000005	0000000005	0000000000000000000000000000000000000000000000000000000000000005	-1	4.400000000000000000000000000000	5	4.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494346e-38	1.17549e-38	1.175494356e-38	01.17549e-38	00000001.175494356e-38	01.17549e-38	00000001.175494356e-38	1000-01-05	838:59:54	1970-01-06 00:00:05	1970-01-06 00:00:05	1906	1906	1906	2enum	1set,2set
-6	6	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0	5.500000000000000000000000000000	6	5.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494345e-38	1.17549e-38	1.175494357e-38	01.17549e-38	00000001.175494357e-38	01.17549e-38	00000001.175494357e-38	1000-01-06	838:59:53	1970-01-07 00:00:06	1970-01-07 00:00:06	1907	1907	1907	1enum	1set
-7	7	0000000007	0000000000000000000000000000000000000000000000000000000000000007	0000000007	0000000000000000000000000000000000000000000000000000000000000007	1	6.600000000000000000000000000000	7	6.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494344e-38	1.17549e-38	1.175494358e-38	01.17549e-38	00000001.175494358e-38	01.17549e-38	00000001.175494358e-38	1000-01-07	838:59:52	1970-01-08 00:00:07	1970-01-08 00:00:07	1908	1908	1908	2enum	2set
-8	8	0000000008	0000000000000000000000000000000000000000000000000000000000000008	0000000008	0000000000000000000000000000000000000000000000000000000000000008	2	7.700000000000000000000000000000	8	7.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494343e-38	1.17549e-38	1.175494359e-38	01.17549e-38	00000001.175494359e-38	01.17549e-38	00000001.175494359e-38	1000-01-08	838:59:51	1970-01-09 00:00:08	1970-01-09 00:00:08	1909	1909	1909	1enum	1set,2set
-9	9	0000000009	0000000000000000000000000000000000000000000000000000000000000009	0000000009	0000000000000000000000000000000000000000000000000000000000000009	3	8.800000000000000000000000000000	9	8.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494342e-38	1.17549e-38	1.17549436e-38	01.17549e-38	000000001.17549436e-38	01.17549e-38	000000001.17549436e-38	1000-01-09	838:59:50	1970-01-10 00:00:09	1970-01-10 00:00:09	1910	1910	1910	2enum	1set
-10	10	0000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000010	0000000000000000000000000000000000000000000000000000000000000010	4	9.900000000000000000000000000000	10	9.900000000000000000000000000000	0000000010	000000000000000000000000000000009.900000000000000000000000000000	0000000010	000000000000000000000000000000009.900000000000000000000000000000	-1.175494341e-38	1.175494361e-38	00000001.175494361e-38	00000001.175494361e-38	-1.175494341e-38	1.175494361e-38	00000001.175494361e-38	00000001.175494361e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494341e-38	1.17549e-38	1.175494361e-38	01.17549e-38	00000001.175494361e-38	01.17549e-38	00000001.175494361e-38	1000-01-10	838:59:49	1970-01-11 00:00:10	1970-01-11 00:00:10	1911	1911	1911	1enum	2set
-15	87	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-17	15	0000000016	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-19	18	0000000014	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-22	93	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-24	51654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-27	25	0000000026	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-29	28	0000000024	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-34	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-94	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-107	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-107	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-109	108	0000000104	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-109	108	0000000104	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-195	87	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-207	205	0000000206	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-209	208	0000000204	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-242	79	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-250	87895654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-292	93	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-299	899	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-321	NULL	0000000765	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-323	14376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-340	9984376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-394	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-424	89	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-441	16546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-500	NULL	0000000900	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-500	NULL	0000000900	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-500	NULL	0000000900	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-660	876546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-987	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-2550	775654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-2760	985654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-3330	764376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-3410	996546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-7876	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-9112	NULL	0000008771	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-76710	226546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-569300	9114376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+f59	1
+f60	1
+f61	0000000001
+f62	0000000000000000000000000000000000000000000000000000000000000001
+f63	0000000001
+f64	0000000000000000000000000000000000000000000000000000000000000001
+f65	-5
+f66	0.000000000000000000000000000000
+f67	1
+f68	0.000000000000000000000000000000
+f69	0000000001
+f70	000000000000000000000000000000000.000000000000000000000000000000
+f71	0000000001
+f72	000000000000000000000000000000000.000000000000000000000000000000
+f73	-1.17549435e-38
+f74	1.175494352e-38
+f75	00000001.175494352e-38
+f76	00000001.175494352e-38
+f77	-1.17549435e-38
+f78	1.175494352e-38
+f79	00000001.175494352e-38
+f80	00000001.175494352e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.17549435e-38
+f95	1.17549e-38
+f96	1.175494352e-38
+f97	01.17549e-38
+f98	00000001.175494352e-38
+f99	01.17549e-38
+f100	00000001.175494352e-38
+f101	1000-01-01
+f102	838:59:58
+f103	1970-01-02 00:00:01
+f104	1970-01-02 00:00:01
+f105	1902
+f106	1902
+f107	1902
+f108	2enum
+f109	2set
+f59	2
+f60	2
+f61	0000000002
+f62	0000000000000000000000000000000000000000000000000000000000000002
+f63	0000000002
+f64	0000000000000000000000000000000000000000000000000000000000000002
+f65	-4
+f66	1.100000000000000000000000000000
+f67	2
+f68	1.100000000000000000000000000000
+f69	0000000002
+f70	000000000000000000000000000000001.100000000000000000000000000000
+f71	0000000002
+f72	000000000000000000000000000000001.100000000000000000000000000000
+f73	-1.175494349e-38
+f74	1.175494353e-38
+f75	00000001.175494353e-38
+f76	00000001.175494353e-38
+f77	-1.175494349e-38
+f78	1.175494353e-38
+f79	00000001.175494353e-38
+f80	00000001.175494353e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494349e-38
+f95	1.17549e-38
+f96	1.175494353e-38
+f97	01.17549e-38
+f98	00000001.175494353e-38
+f99	01.17549e-38
+f100	00000001.175494353e-38
+f101	1000-01-02
+f102	838:59:57
+f103	1970-01-03 00:00:02
+f104	1970-01-03 00:00:02
+f105	1903
+f106	1903
+f107	1903
+f108	1enum
+f109	1set,2set
+f59	3
+f60	3
+f61	0000000003
+f62	0000000000000000000000000000000000000000000000000000000000000003
+f63	0000000003
+f64	0000000000000000000000000000000000000000000000000000000000000003
+f65	-3
+f66	2.200000000000000000000000000000
+f67	3
+f68	2.200000000000000000000000000000
+f69	0000000003
+f70	000000000000000000000000000000002.200000000000000000000000000000
+f71	0000000003
+f72	000000000000000000000000000000002.200000000000000000000000000000
+f73	-1.175494348e-38
+f74	1.175494354e-38
+f75	00000001.175494354e-38
+f76	00000001.175494354e-38
+f77	-1.175494348e-38
+f78	1.175494354e-38
+f79	00000001.175494354e-38
+f80	00000001.175494354e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494348e-38
+f95	1.17549e-38
+f96	1.175494354e-38
+f97	01.17549e-38
+f98	00000001.175494354e-38
+f99	01.17549e-38
+f100	00000001.175494354e-38
+f101	1000-01-03
+f102	838:59:56
+f103	1970-01-04 00:00:03
+f104	1970-01-04 00:00:03
+f105	1904
+f106	1904
+f107	1904
+f108	2enum
+f109	1set
+f59	4
+f60	4
+f61	0000000004
+f62	0000000000000000000000000000000000000000000000000000000000000004
+f63	0000000004
+f64	0000000000000000000000000000000000000000000000000000000000000004
+f65	-2
+f66	3.300000000000000000000000000000
+f67	4
+f68	3.300000000000000000000000000000
+f69	0000000004
+f70	000000000000000000000000000000003.300000000000000000000000000000
+f71	0000000004
+f72	000000000000000000000000000000003.300000000000000000000000000000
+f73	-1.175494347e-38
+f74	1.175494355e-38
+f75	00000001.175494355e-38
+f76	00000001.175494355e-38
+f77	-1.175494347e-38
+f78	1.175494355e-38
+f79	00000001.175494355e-38
+f80	00000001.175494355e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494347e-38
+f95	1.17549e-38
+f96	1.175494355e-38
+f97	01.17549e-38
+f98	00000001.175494355e-38
+f99	01.17549e-38
+f100	00000001.175494355e-38
+f101	1000-01-04
+f102	838:59:55
+f103	1970-01-05 00:00:04
+f104	1970-01-05 00:00:04
+f105	1905
+f106	1905
+f107	1905
+f108	1enum
+f109	2set
+f59	4
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	5
+f60	5
+f61	0000000005
+f62	0000000000000000000000000000000000000000000000000000000000000005
+f63	0000000005
+f64	0000000000000000000000000000000000000000000000000000000000000005
+f65	-1
+f66	4.400000000000000000000000000000
+f67	5
+f68	4.400000000000000000000000000000
+f69	0000000005
+f70	000000000000000000000000000000004.400000000000000000000000000000
+f71	0000000005
+f72	000000000000000000000000000000004.400000000000000000000000000000
+f73	-1.175494346e-38
+f74	1.175494356e-38
+f75	00000001.175494356e-38
+f76	00000001.175494356e-38
+f77	-1.175494346e-38
+f78	1.175494356e-38
+f79	00000001.175494356e-38
+f80	00000001.175494356e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494346e-38
+f95	1.17549e-38
+f96	1.175494356e-38
+f97	01.17549e-38
+f98	00000001.175494356e-38
+f99	01.17549e-38
+f100	00000001.175494356e-38
+f101	1000-01-05
+f102	838:59:54
+f103	1970-01-06 00:00:05
+f104	1970-01-06 00:00:05
+f105	1906
+f106	1906
+f107	1906
+f108	2enum
+f109	1set,2set
+f59	6
+f60	6
+f61	0000000006
+f62	0000000000000000000000000000000000000000000000000000000000000006
+f63	0000000006
+f64	0000000000000000000000000000000000000000000000000000000000000006
+f65	0
+f66	5.500000000000000000000000000000
+f67	6
+f68	5.500000000000000000000000000000
+f69	0000000006
+f70	000000000000000000000000000000005.500000000000000000000000000000
+f71	0000000006
+f72	000000000000000000000000000000005.500000000000000000000000000000
+f73	-1.175494345e-38
+f74	1.175494357e-38
+f75	00000001.175494357e-38
+f76	00000001.175494357e-38
+f77	-1.175494345e-38
+f78	1.175494357e-38
+f79	00000001.175494357e-38
+f80	00000001.175494357e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494345e-38
+f95	1.17549e-38
+f96	1.175494357e-38
+f97	01.17549e-38
+f98	00000001.175494357e-38
+f99	01.17549e-38
+f100	00000001.175494357e-38
+f101	1000-01-06
+f102	838:59:53
+f103	1970-01-07 00:00:06
+f104	1970-01-07 00:00:06
+f105	1907
+f106	1907
+f107	1907
+f108	1enum
+f109	1set
+f59	7
+f60	7
+f61	0000000007
+f62	0000000000000000000000000000000000000000000000000000000000000007
+f63	0000000007
+f64	0000000000000000000000000000000000000000000000000000000000000007
+f65	1
+f66	6.600000000000000000000000000000
+f67	7
+f68	6.600000000000000000000000000000
+f69	0000000007
+f70	000000000000000000000000000000006.600000000000000000000000000000
+f71	0000000007
+f72	000000000000000000000000000000006.600000000000000000000000000000
+f73	-1.175494344e-38
+f74	1.175494358e-38
+f75	00000001.175494358e-38
+f76	00000001.175494358e-38
+f77	-1.175494344e-38
+f78	1.175494358e-38
+f79	00000001.175494358e-38
+f80	00000001.175494358e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494344e-38
+f95	1.17549e-38
+f96	1.175494358e-38
+f97	01.17549e-38
+f98	00000001.175494358e-38
+f99	01.17549e-38
+f100	00000001.175494358e-38
+f101	1000-01-07
+f102	838:59:52
+f103	1970-01-08 00:00:07
+f104	1970-01-08 00:00:07
+f105	1908
+f106	1908
+f107	1908
+f108	2enum
+f109	2set
+f59	8
+f60	8
+f61	0000000008
+f62	0000000000000000000000000000000000000000000000000000000000000008
+f63	0000000008
+f64	0000000000000000000000000000000000000000000000000000000000000008
+f65	2
+f66	7.700000000000000000000000000000
+f67	8
+f68	7.700000000000000000000000000000
+f69	0000000008
+f70	000000000000000000000000000000007.700000000000000000000000000000
+f71	0000000008
+f72	000000000000000000000000000000007.700000000000000000000000000000
+f73	-1.175494343e-38
+f74	1.175494359e-38
+f75	00000001.175494359e-38
+f76	00000001.175494359e-38
+f77	-1.175494343e-38
+f78	1.175494359e-38
+f79	00000001.175494359e-38
+f80	00000001.175494359e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494343e-38
+f95	1.17549e-38
+f96	1.175494359e-38
+f97	01.17549e-38
+f98	00000001.175494359e-38
+f99	01.17549e-38
+f100	00000001.175494359e-38
+f101	1000-01-08
+f102	838:59:51
+f103	1970-01-09 00:00:08
+f104	1970-01-09 00:00:08
+f105	1909
+f106	1909
+f107	1909
+f108	1enum
+f109	1set,2set
+f59	9
+f60	9
+f61	0000000009
+f62	0000000000000000000000000000000000000000000000000000000000000009
+f63	0000000009
+f64	0000000000000000000000000000000000000000000000000000000000000009
+f65	3
+f66	8.800000000000000000000000000000
+f67	9
+f68	8.800000000000000000000000000000
+f69	0000000009
+f70	000000000000000000000000000000008.800000000000000000000000000000
+f71	0000000009
+f72	000000000000000000000000000000008.800000000000000000000000000000
+f73	-1.175494342e-38
+f74	1.17549436e-38
+f75	000000001.17549436e-38
+f76	000000001.17549436e-38
+f77	-1.175494342e-38
+f78	1.17549436e-38
+f79	000000001.17549436e-38
+f80	000000001.17549436e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494342e-38
+f95	1.17549e-38
+f96	1.17549436e-38
+f97	01.17549e-38
+f98	000000001.17549436e-38
+f99	01.17549e-38
+f100	000000001.17549436e-38
+f101	1000-01-09
+f102	838:59:50
+f103	1970-01-10 00:00:09
+f104	1970-01-10 00:00:09
+f105	1910
+f106	1910
+f107	1910
+f108	2enum
+f109	1set
+f59	10
+f60	10
+f61	0000000010
+f62	0000000000000000000000000000000000000000000000000000000000000010
+f63	0000000010
+f64	0000000000000000000000000000000000000000000000000000000000000010
+f65	4
+f66	9.900000000000000000000000000000
+f67	10
+f68	9.900000000000000000000000000000
+f69	0000000010
+f70	000000000000000000000000000000009.900000000000000000000000000000
+f71	0000000010
+f72	000000000000000000000000000000009.900000000000000000000000000000
+f73	-1.175494341e-38
+f74	1.175494361e-38
+f75	00000001.175494361e-38
+f76	00000001.175494361e-38
+f77	-1.175494341e-38
+f78	1.175494361e-38
+f79	00000001.175494361e-38
+f80	00000001.175494361e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494341e-38
+f95	1.17549e-38
+f96	1.175494361e-38
+f97	01.17549e-38
+f98	00000001.175494361e-38
+f99	01.17549e-38
+f100	00000001.175494361e-38
+f101	1000-01-10
+f102	838:59:49
+f103	1970-01-11 00:00:10
+f104	1970-01-11 00:00:10
+f105	1911
+f106	1911
+f107	1911
+f108	1enum
+f109	2set
+f59	15
+f60	87
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	17
+f60	15
+f61	0000000016
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	19
+f60	18
+f61	0000000014
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	22
+f60	93
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	24
+f60	51654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	27
+f60	25
+f61	0000000026
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	29
+f60	28
+f61	0000000024
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	34
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	94
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	107
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	107
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	109
+f60	108
+f61	0000000104
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	109
+f60	108
+f61	0000000104
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	195
+f60	87
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	207
+f60	205
+f61	0000000206
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	209
+f60	208
+f61	0000000204
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	242
+f60	79
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	250
+f60	87895654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	292
+f60	93
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	299
+f60	899
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	321
+f60	NULL
+f61	0000000765
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	323
+f60	14376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	340
+f60	9984376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	394
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	424
+f60	89
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	441
+f60	16546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	660
+f60	876546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	987
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	2550
+f60	775654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	2760
+f60	985654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	3330
+f60	764376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	3410
+f60	996546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	7876
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	9112
+f60	NULL
+f61	0000008771
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	76710
+f60	226546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	569300
+f60	9114376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 CREATE or REPLACE VIEW v1 AS select *
 FROM test.tb2 WITH CASCADED CHECK OPTION ;
 select * FROM v1 order by f59,f60,f61,f62,f63,f64 limit 0,10;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-1	1	0000000001	0000000000000000000000000000000000000000000000000000000000000001	0000000001	0000000000000000000000000000000000000000000000000000000000000001	-5	0.000000000000000000000000000000	1	0.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549435e-38	1.17549e-38	1.175494352e-38	01.17549e-38	00000001.175494352e-38	01.17549e-38	00000001.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	1970-01-02 00:00:01	1902	1902	1902	2enum	2set
-2	2	0000000002	0000000000000000000000000000000000000000000000000000000000000002	0000000002	0000000000000000000000000000000000000000000000000000000000000002	-4	1.100000000000000000000000000000	2	1.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494349e-38	1.17549e-38	1.175494353e-38	01.17549e-38	00000001.175494353e-38	01.17549e-38	00000001.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	1970-01-03 00:00:02	1903	1903	1903	1enum	1set,2set
-3	3	0000000003	0000000000000000000000000000000000000000000000000000000000000003	0000000003	0000000000000000000000000000000000000000000000000000000000000003	-3	2.200000000000000000000000000000	3	2.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494348e-38	1.17549e-38	1.175494354e-38	01.17549e-38	00000001.175494354e-38	01.17549e-38	00000001.175494354e-38	1000-01-03	838:59:56	1970-01-04 00:00:03	1970-01-04 00:00:03	1904	1904	1904	2enum	1set
-4	4	0000000004	0000000000000000000000000000000000000000000000000000000000000004	0000000004	0000000000000000000000000000000000000000000000000000000000000004	-2	3.300000000000000000000000000000	4	3.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494347e-38	1.17549e-38	1.175494355e-38	01.17549e-38	00000001.175494355e-38	01.17549e-38	00000001.175494355e-38	1000-01-04	838:59:55	1970-01-05 00:00:04	1970-01-05 00:00:04	1905	1905	1905	1enum	2set
-4	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-5	5	0000000005	0000000000000000000000000000000000000000000000000000000000000005	0000000005	0000000000000000000000000000000000000000000000000000000000000005	-1	4.400000000000000000000000000000	5	4.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494346e-38	1.17549e-38	1.175494356e-38	01.17549e-38	00000001.175494356e-38	01.17549e-38	00000001.175494356e-38	1000-01-05	838:59:54	1970-01-06 00:00:05	1970-01-06 00:00:05	1906	1906	1906	2enum	1set,2set
-6	6	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0	5.500000000000000000000000000000	6	5.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494345e-38	1.17549e-38	1.175494357e-38	01.17549e-38	00000001.175494357e-38	01.17549e-38	00000001.175494357e-38	1000-01-06	838:59:53	1970-01-07 00:00:06	1970-01-07 00:00:06	1907	1907	1907	1enum	1set
-7	7	0000000007	0000000000000000000000000000000000000000000000000000000000000007	0000000007	0000000000000000000000000000000000000000000000000000000000000007	1	6.600000000000000000000000000000	7	6.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494344e-38	1.17549e-38	1.175494358e-38	01.17549e-38	00000001.175494358e-38	01.17549e-38	00000001.175494358e-38	1000-01-07	838:59:52	1970-01-08 00:00:07	1970-01-08 00:00:07	1908	1908	1908	2enum	2set
-8	8	0000000008	0000000000000000000000000000000000000000000000000000000000000008	0000000008	0000000000000000000000000000000000000000000000000000000000000008	2	7.700000000000000000000000000000	8	7.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494343e-38	1.17549e-38	1.175494359e-38	01.17549e-38	00000001.175494359e-38	01.17549e-38	00000001.175494359e-38	1000-01-08	838:59:51	1970-01-09 00:00:08	1970-01-09 00:00:08	1909	1909	1909	1enum	1set,2set
-9	9	0000000009	0000000000000000000000000000000000000000000000000000000000000009	0000000009	0000000000000000000000000000000000000000000000000000000000000009	3	8.800000000000000000000000000000	9	8.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494342e-38	1.17549e-38	1.17549436e-38	01.17549e-38	000000001.17549436e-38	01.17549e-38	000000001.17549436e-38	1000-01-09	838:59:50	1970-01-10 00:00:09	1970-01-10 00:00:09	1910	1910	1910	2enum	1set
+f59	1
+f60	1
+f61	0000000001
+f62	0000000000000000000000000000000000000000000000000000000000000001
+f63	0000000001
+f64	0000000000000000000000000000000000000000000000000000000000000001
+f65	-5
+f66	0.000000000000000000000000000000
+f67	1
+f68	0.000000000000000000000000000000
+f69	0000000001
+f70	000000000000000000000000000000000.000000000000000000000000000000
+f71	0000000001
+f72	000000000000000000000000000000000.000000000000000000000000000000
+f73	-1.17549435e-38
+f74	1.175494352e-38
+f75	00000001.175494352e-38
+f76	00000001.175494352e-38
+f77	-1.17549435e-38
+f78	1.175494352e-38
+f79	00000001.175494352e-38
+f80	00000001.175494352e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.17549435e-38
+f95	1.17549e-38
+f96	1.175494352e-38
+f97	01.17549e-38
+f98	00000001.175494352e-38
+f99	01.17549e-38
+f100	00000001.175494352e-38
+f101	1000-01-01
+f102	838:59:58
+f103	1970-01-02 00:00:01
+f104	1970-01-02 00:00:01
+f105	1902
+f106	1902
+f107	1902
+f108	2enum
+f109	2set
+f59	2
+f60	2
+f61	0000000002
+f62	0000000000000000000000000000000000000000000000000000000000000002
+f63	0000000002
+f64	0000000000000000000000000000000000000000000000000000000000000002
+f65	-4
+f66	1.100000000000000000000000000000
+f67	2
+f68	1.100000000000000000000000000000
+f69	0000000002
+f70	000000000000000000000000000000001.100000000000000000000000000000
+f71	0000000002
+f72	000000000000000000000000000000001.100000000000000000000000000000
+f73	-1.175494349e-38
+f74	1.175494353e-38
+f75	00000001.175494353e-38
+f76	00000001.175494353e-38
+f77	-1.175494349e-38
+f78	1.175494353e-38
+f79	00000001.175494353e-38
+f80	00000001.175494353e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494349e-38
+f95	1.17549e-38
+f96	1.175494353e-38
+f97	01.17549e-38
+f98	00000001.175494353e-38
+f99	01.17549e-38
+f100	00000001.175494353e-38
+f101	1000-01-02
+f102	838:59:57
+f103	1970-01-03 00:00:02
+f104	1970-01-03 00:00:02
+f105	1903
+f106	1903
+f107	1903
+f108	1enum
+f109	1set,2set
+f59	3
+f60	3
+f61	0000000003
+f62	0000000000000000000000000000000000000000000000000000000000000003
+f63	0000000003
+f64	0000000000000000000000000000000000000000000000000000000000000003
+f65	-3
+f66	2.200000000000000000000000000000
+f67	3
+f68	2.200000000000000000000000000000
+f69	0000000003
+f70	000000000000000000000000000000002.200000000000000000000000000000
+f71	0000000003
+f72	000000000000000000000000000000002.200000000000000000000000000000
+f73	-1.175494348e-38
+f74	1.175494354e-38
+f75	00000001.175494354e-38
+f76	00000001.175494354e-38
+f77	-1.175494348e-38
+f78	1.175494354e-38
+f79	00000001.175494354e-38
+f80	00000001.175494354e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494348e-38
+f95	1.17549e-38
+f96	1.175494354e-38
+f97	01.17549e-38
+f98	00000001.175494354e-38
+f99	01.17549e-38
+f100	00000001.175494354e-38
+f101	1000-01-03
+f102	838:59:56
+f103	1970-01-04 00:00:03
+f104	1970-01-04 00:00:03
+f105	1904
+f106	1904
+f107	1904
+f108	2enum
+f109	1set
+f59	4
+f60	4
+f61	0000000004
+f62	0000000000000000000000000000000000000000000000000000000000000004
+f63	0000000004
+f64	0000000000000000000000000000000000000000000000000000000000000004
+f65	-2
+f66	3.300000000000000000000000000000
+f67	4
+f68	3.300000000000000000000000000000
+f69	0000000004
+f70	000000000000000000000000000000003.300000000000000000000000000000
+f71	0000000004
+f72	000000000000000000000000000000003.300000000000000000000000000000
+f73	-1.175494347e-38
+f74	1.175494355e-38
+f75	00000001.175494355e-38
+f76	00000001.175494355e-38
+f77	-1.175494347e-38
+f78	1.175494355e-38
+f79	00000001.175494355e-38
+f80	00000001.175494355e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494347e-38
+f95	1.17549e-38
+f96	1.175494355e-38
+f97	01.17549e-38
+f98	00000001.175494355e-38
+f99	01.17549e-38
+f100	00000001.175494355e-38
+f101	1000-01-04
+f102	838:59:55
+f103	1970-01-05 00:00:04
+f104	1970-01-05 00:00:04
+f105	1905
+f106	1905
+f107	1905
+f108	1enum
+f109	2set
+f59	4
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	5
+f60	5
+f61	0000000005
+f62	0000000000000000000000000000000000000000000000000000000000000005
+f63	0000000005
+f64	0000000000000000000000000000000000000000000000000000000000000005
+f65	-1
+f66	4.400000000000000000000000000000
+f67	5
+f68	4.400000000000000000000000000000
+f69	0000000005
+f70	000000000000000000000000000000004.400000000000000000000000000000
+f71	0000000005
+f72	000000000000000000000000000000004.400000000000000000000000000000
+f73	-1.175494346e-38
+f74	1.175494356e-38
+f75	00000001.175494356e-38
+f76	00000001.175494356e-38
+f77	-1.175494346e-38
+f78	1.175494356e-38
+f79	00000001.175494356e-38
+f80	00000001.175494356e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494346e-38
+f95	1.17549e-38
+f96	1.175494356e-38
+f97	01.17549e-38
+f98	00000001.175494356e-38
+f99	01.17549e-38
+f100	00000001.175494356e-38
+f101	1000-01-05
+f102	838:59:54
+f103	1970-01-06 00:00:05
+f104	1970-01-06 00:00:05
+f105	1906
+f106	1906
+f107	1906
+f108	2enum
+f109	1set,2set
+f59	6
+f60	6
+f61	0000000006
+f62	0000000000000000000000000000000000000000000000000000000000000006
+f63	0000000006
+f64	0000000000000000000000000000000000000000000000000000000000000006
+f65	0
+f66	5.500000000000000000000000000000
+f67	6
+f68	5.500000000000000000000000000000
+f69	0000000006
+f70	000000000000000000000000000000005.500000000000000000000000000000
+f71	0000000006
+f72	000000000000000000000000000000005.500000000000000000000000000000
+f73	-1.175494345e-38
+f74	1.175494357e-38
+f75	00000001.175494357e-38
+f76	00000001.175494357e-38
+f77	-1.175494345e-38
+f78	1.175494357e-38
+f79	00000001.175494357e-38
+f80	00000001.175494357e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494345e-38
+f95	1.17549e-38
+f96	1.175494357e-38
+f97	01.17549e-38
+f98	00000001.175494357e-38
+f99	01.17549e-38
+f100	00000001.175494357e-38
+f101	1000-01-06
+f102	838:59:53
+f103	1970-01-07 00:00:06
+f104	1970-01-07 00:00:06
+f105	1907
+f106	1907
+f107	1907
+f108	1enum
+f109	1set
+f59	7
+f60	7
+f61	0000000007
+f62	0000000000000000000000000000000000000000000000000000000000000007
+f63	0000000007
+f64	0000000000000000000000000000000000000000000000000000000000000007
+f65	1
+f66	6.600000000000000000000000000000
+f67	7
+f68	6.600000000000000000000000000000
+f69	0000000007
+f70	000000000000000000000000000000006.600000000000000000000000000000
+f71	0000000007
+f72	000000000000000000000000000000006.600000000000000000000000000000
+f73	-1.175494344e-38
+f74	1.175494358e-38
+f75	00000001.175494358e-38
+f76	00000001.175494358e-38
+f77	-1.175494344e-38
+f78	1.175494358e-38
+f79	00000001.175494358e-38
+f80	00000001.175494358e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494344e-38
+f95	1.17549e-38
+f96	1.175494358e-38
+f97	01.17549e-38
+f98	00000001.175494358e-38
+f99	01.17549e-38
+f100	00000001.175494358e-38
+f101	1000-01-07
+f102	838:59:52
+f103	1970-01-08 00:00:07
+f104	1970-01-08 00:00:07
+f105	1908
+f106	1908
+f107	1908
+f108	2enum
+f109	2set
+f59	8
+f60	8
+f61	0000000008
+f62	0000000000000000000000000000000000000000000000000000000000000008
+f63	0000000008
+f64	0000000000000000000000000000000000000000000000000000000000000008
+f65	2
+f66	7.700000000000000000000000000000
+f67	8
+f68	7.700000000000000000000000000000
+f69	0000000008
+f70	000000000000000000000000000000007.700000000000000000000000000000
+f71	0000000008
+f72	000000000000000000000000000000007.700000000000000000000000000000
+f73	-1.175494343e-38
+f74	1.175494359e-38
+f75	00000001.175494359e-38
+f76	00000001.175494359e-38
+f77	-1.175494343e-38
+f78	1.175494359e-38
+f79	00000001.175494359e-38
+f80	00000001.175494359e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494343e-38
+f95	1.17549e-38
+f96	1.175494359e-38
+f97	01.17549e-38
+f98	00000001.175494359e-38
+f99	01.17549e-38
+f100	00000001.175494359e-38
+f101	1000-01-08
+f102	838:59:51
+f103	1970-01-09 00:00:08
+f104	1970-01-09 00:00:08
+f105	1909
+f106	1909
+f107	1909
+f108	1enum
+f109	1set,2set
+f59	9
+f60	9
+f61	0000000009
+f62	0000000000000000000000000000000000000000000000000000000000000009
+f63	0000000009
+f64	0000000000000000000000000000000000000000000000000000000000000009
+f65	3
+f66	8.800000000000000000000000000000
+f67	9
+f68	8.800000000000000000000000000000
+f69	0000000009
+f70	000000000000000000000000000000008.800000000000000000000000000000
+f71	0000000009
+f72	000000000000000000000000000000008.800000000000000000000000000000
+f73	-1.175494342e-38
+f74	1.17549436e-38
+f75	000000001.17549436e-38
+f76	000000001.17549436e-38
+f77	-1.175494342e-38
+f78	1.17549436e-38
+f79	000000001.17549436e-38
+f80	000000001.17549436e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494342e-38
+f95	1.17549e-38
+f96	1.17549436e-38
+f97	01.17549e-38
+f98	000000001.17549436e-38
+f99	01.17549e-38
+f100	000000001.17549436e-38
+f101	1000-01-09
+f102	838:59:50
+f103	1970-01-10 00:00:09
+f104	1970-01-10 00:00:09
+f105	1910
+f106	1910
+f107	1910
+f108	2enum
+f109	1set
 CREATE OR REPLACE VIEW v1 AS SELECT F59, F60
 FROM test.tb2 WITH CASCADED CHECK OPTION;
 SELECT * FROM v1 order by f59,f60 limit 0,10;
@@ -935,9 +3929,108 @@ SHOW CREATE VIEW test.v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `tb2`.`f59` AS `f59`,`tb2`.`f60` AS `f60`,`tb2`.`f61` AS `f61`,`tb2`.`f62` AS `f62`,`tb2`.`f63` AS `f63`,`tb2`.`f64` AS `f64`,`tb2`.`f65` AS `f65`,`tb2`.`f66` AS `f66`,`tb2`.`f67` AS `f67`,`tb2`.`f68` AS `f68`,`tb2`.`f69` AS `f69`,`tb2`.`f70` AS `f70`,`tb2`.`f71` AS `f71`,`tb2`.`f72` AS `f72`,`tb2`.`f73` AS `f73`,`tb2`.`f74` AS `f74`,`tb2`.`f75` AS `f75`,`tb2`.`f76` AS `f76`,`tb2`.`f77` AS `f77`,`tb2`.`f78` AS `f78`,`tb2`.`f79` AS `f79`,`tb2`.`f80` AS `f80`,`tb2`.`f81` AS `f81`,`tb2`.`f82` AS `f82`,`tb2`.`f83` AS `f83`,`tb2`.`f84` AS `f84`,`tb2`.`f85` AS `f85`,`tb2`.`f86` AS `f86`,`tb2`.`f87` AS `f87`,`tb2`.`f88` AS `f88`,`tb2`.`f89` AS `f89`,`tb2`.`f90` AS `f90`,`tb2`.`f91` AS `f91`,`tb2`.`f92` AS `f92`,`tb2`.`f93` AS `f93`,`tb2`.`f94` AS `f94`,`tb2`.`f95` AS `f95`,`tb2`.`f96` AS `f96`,`tb2`.`f97` AS `f97`,`tb2`.`f98` AS `f98`,`tb2`.`f99` AS `f99`,`tb2`.`f100` AS `f100`,`tb2`.`f101` AS `f101`,`tb2`.`f102` AS `f102`,`tb2`.`f103` AS `f103`,`tb2`.`f104` AS `f104`,`tb2`.`f105` AS `f105`,`tb2`.`f106` AS `f106`,`tb2`.`f107` AS `f107`,`tb2`.`f108` AS `f108`,`tb2`.`f109` AS `f109` from `tb2` order by `tb2`.`f59` limit 2	latin1	latin1_swedish_ci
 SELECT * FROM test.v1 order by f59,f60,f61,f62,f63,f64,f65;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-1	1	0000000001	0000000000000000000000000000000000000000000000000000000000000001	0000000001	0000000000000000000000000000000000000000000000000000000000000001	-5	0.000000000000000000000000000000	1	0.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549435e-38	1.17549e-38	1.175494352e-38	01.17549e-38	00000001.175494352e-38	01.17549e-38	00000001.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	1970-01-02 00:00:01	1902	1902	1902	2enum	2set
-2	2	0000000002	0000000000000000000000000000000000000000000000000000000000000002	0000000002	0000000000000000000000000000000000000000000000000000000000000002	-4	1.100000000000000000000000000000	2	1.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494349e-38	1.17549e-38	1.175494353e-38	01.17549e-38	00000001.175494353e-38	01.17549e-38	00000001.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	1970-01-03 00:00:02	1903	1903	1903	1enum	1set,2set
+f59	1
+f60	1
+f61	0000000001
+f62	0000000000000000000000000000000000000000000000000000000000000001
+f63	0000000001
+f64	0000000000000000000000000000000000000000000000000000000000000001
+f65	-5
+f66	0.000000000000000000000000000000
+f67	1
+f68	0.000000000000000000000000000000
+f69	0000000001
+f70	000000000000000000000000000000000.000000000000000000000000000000
+f71	0000000001
+f72	000000000000000000000000000000000.000000000000000000000000000000
+f73	-1.17549435e-38
+f74	1.175494352e-38
+f75	00000001.175494352e-38
+f76	00000001.175494352e-38
+f77	-1.17549435e-38
+f78	1.175494352e-38
+f79	00000001.175494352e-38
+f80	00000001.175494352e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.17549435e-38
+f95	1.17549e-38
+f96	1.175494352e-38
+f97	01.17549e-38
+f98	00000001.175494352e-38
+f99	01.17549e-38
+f100	00000001.175494352e-38
+f101	1000-01-01
+f102	838:59:58
+f103	1970-01-02 00:00:01
+f104	1970-01-02 00:00:01
+f105	1902
+f106	1902
+f107	1902
+f108	2enum
+f109	2set
+f59	2
+f60	2
+f61	0000000002
+f62	0000000000000000000000000000000000000000000000000000000000000002
+f63	0000000002
+f64	0000000000000000000000000000000000000000000000000000000000000002
+f65	-4
+f66	1.100000000000000000000000000000
+f67	2
+f68	1.100000000000000000000000000000
+f69	0000000002
+f70	000000000000000000000000000000001.100000000000000000000000000000
+f71	0000000002
+f72	000000000000000000000000000000001.100000000000000000000000000000
+f73	-1.175494349e-38
+f74	1.175494353e-38
+f75	00000001.175494353e-38
+f76	00000001.175494353e-38
+f77	-1.175494349e-38
+f78	1.175494353e-38
+f79	00000001.175494353e-38
+f80	00000001.175494353e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494349e-38
+f95	1.17549e-38
+f96	1.175494353e-38
+f97	01.17549e-38
+f98	00000001.175494353e-38
+f99	01.17549e-38
+f100	00000001.175494353e-38
+f101	1000-01-02
+f102	838:59:57
+f103	1970-01-03 00:00:02
+f104	1970-01-03 00:00:02
+f105	1903
+f106	1903
+f107	1903
+f108	1enum
+f109	1set,2set
 CREATE OR REPLACE VIEW test.v1 AS SELECT F59 FROM tb2;
 SHOW CREATE VIEW test.v1;
 View	Create View	character_set_client	collation_connection
@@ -998,10 +4091,58 @@ Testcase 3.3.1.15
 --------------------------------------------------------------------------------
 Drop table if exists test.v1 ;
 CREATE OR REPLACE view test.v1 as select * from tb2;
-SELECT * FROM test.v1 ORDER BY f59,f60,f61 LIMIT 2;
+SELECT * FROM test.v1;
 f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
 1	1	0000000001	0000000000000000000000000000000000000000000000000000000000000001	0000000001	0000000000000000000000000000000000000000000000000000000000000001	-5	0.000000000000000000000000000000	1	0.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549435e-38	1.17549e-38	1.175494352e-38	01.17549e-38	00000001.175494352e-38	01.17549e-38	00000001.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	1970-01-02 00:00:01	1902	1902	1902	2enum	2set
+10	10	0000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000010	0000000000000000000000000000000000000000000000000000000000000010	4	9.900000000000000000000000000000	10	9.900000000000000000000000000000	0000000010	000000000000000000000000000000009.900000000000000000000000000000	0000000010	000000000000000000000000000000009.900000000000000000000000000000	-1.175494341e-38	1.175494361e-38	00000001.175494361e-38	00000001.175494361e-38	-1.175494341e-38	1.175494361e-38	00000001.175494361e-38	00000001.175494361e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494341e-38	1.17549e-38	1.175494361e-38	01.17549e-38	00000001.175494361e-38	01.17549e-38	00000001.175494361e-38	1000-01-10	838:59:49	1970-01-11 00:00:10	1970-01-11 00:00:10	1911	1911	1911	1enum	2set
+107	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+107	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+109	108	0000000104	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+109	108	0000000104	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+15	87	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+17	15	0000000016	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+19	18	0000000014	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+195	87	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 2	2	0000000002	0000000000000000000000000000000000000000000000000000000000000002	0000000002	0000000000000000000000000000000000000000000000000000000000000002	-4	1.100000000000000000000000000000	2	1.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494349e-38	1.17549e-38	1.175494353e-38	01.17549e-38	00000001.175494353e-38	01.17549e-38	00000001.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	1970-01-03 00:00:02	1903	1903	1903	1enum	1set,2set
+207	205	0000000206	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+209	208	0000000204	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+22	93	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+24	51654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+242	79	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+250	87895654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+2550	775654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+27	25	0000000026	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+2760	985654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+29	28	0000000024	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+292	93	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+299	899	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+3	3	0000000003	0000000000000000000000000000000000000000000000000000000000000003	0000000003	0000000000000000000000000000000000000000000000000000000000000003	-3	2.200000000000000000000000000000	3	2.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494348e-38	1.17549e-38	1.175494354e-38	01.17549e-38	00000001.175494354e-38	01.17549e-38	00000001.175494354e-38	1000-01-03	838:59:56	1970-01-04 00:00:03	1970-01-04 00:00:03	1904	1904	1904	2enum	1set
+321	NULL	0000000765	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+323	14376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+3330	764376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+34	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+340	9984376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+3410	996546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+394	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+4	4	0000000004	0000000000000000000000000000000000000000000000000000000000000004	0000000004	0000000000000000000000000000000000000000000000000000000000000004	-2	3.300000000000000000000000000000	4	3.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494347e-38	1.17549e-38	1.175494355e-38	01.17549e-38	00000001.175494355e-38	01.17549e-38	00000001.175494355e-38	1000-01-04	838:59:55	1970-01-05 00:00:04	1970-01-05 00:00:04	1905	1905	1905	1enum	2set
+4	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+424	89	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+441	16546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+5	5	0000000005	0000000000000000000000000000000000000000000000000000000000000005	0000000005	0000000000000000000000000000000000000000000000000000000000000005	-1	4.400000000000000000000000000000	5	4.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494346e-38	1.17549e-38	1.175494356e-38	01.17549e-38	00000001.175494356e-38	01.17549e-38	00000001.175494356e-38	1000-01-05	838:59:54	1970-01-06 00:00:05	1970-01-06 00:00:05	1906	1906	1906	2enum	1set,2set
+500	NULL	0000000900	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+500	NULL	0000000900	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+500	NULL	0000000900	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+569300	9114376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+6	6	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0	5.500000000000000000000000000000	6	5.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494345e-38	1.17549e-38	1.175494357e-38	01.17549e-38	00000001.175494357e-38	01.17549e-38	00000001.175494357e-38	1000-01-06	838:59:53	1970-01-07 00:00:06	1970-01-07 00:00:06	1907	1907	1907	1enum	1set
+660	876546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+7	7	0000000007	0000000000000000000000000000000000000000000000000000000000000007	0000000007	0000000000000000000000000000000000000000000000000000000000000007	1	6.600000000000000000000000000000	7	6.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494344e-38	1.17549e-38	1.175494358e-38	01.17549e-38	00000001.175494358e-38	01.17549e-38	00000001.175494358e-38	1000-01-07	838:59:52	1970-01-08 00:00:07	1970-01-08 00:00:07	1908	1908	1908	2enum	2set
+76710	226546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+7876	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+8	8	0000000008	0000000000000000000000000000000000000000000000000000000000000008	0000000008	0000000000000000000000000000000000000000000000000000000000000008	2	7.700000000000000000000000000000	8	7.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494343e-38	1.17549e-38	1.175494359e-38	01.17549e-38	00000001.175494359e-38	01.17549e-38	00000001.175494359e-38	1000-01-08	838:59:51	1970-01-09 00:00:08	1970-01-09 00:00:08	1909	1909	1909	1enum	1set,2set
+9	9	0000000009	0000000000000000000000000000000000000000000000000000000000000009	0000000009	0000000000000000000000000000000000000000000000000000000000000009	3	8.800000000000000000000000000000	9	8.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494342e-38	1.17549e-38	1.17549436e-38	01.17549e-38	000000001.17549436e-38	01.17549e-38	000000001.17549436e-38	1000-01-09	838:59:50	1970-01-10 00:00:09	1970-01-10 00:00:09	1910	1910	1910	2enum	1set
+9112	NULL	0000008771	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+94	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+987	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 Drop view test.v1 ;
 
 Testcase 3.3.1.16 + 3.3.1.17 
@@ -1144,17 +4285,17 @@ Drop view if exists test.v1 ;
 Testcase 3.3.1.22 
 --------------------------------------------------------------------------------
 DROP VIEW  IF EXISTS v1;
-CREATE VIEW test.v1( product ) AS SELECT f59*f60 From tb2;
-SELECT * FROM test.v1 WHERE product IS NOT NULL ORDER BY product LIMIT 2;
+CREATE VIEW test.v1( product ) AS SELECT f59*f60 From tb2 WHERE f59 < 3;
+SELECT * FROM test.v1;
 product
 1
 4
 CREATE OR REPLACE VIEW test.v1( product ) AS SELECT 1*2;
-SELECT * FROM test.v1 LIMIT 2;
+SELECT * FROM test.v1;
 product
 2
 CREATE OR REPLACE VIEW test.v1( product ) AS SELECT USER();
-SELECT * FROM test.v1 LIMIT 2;
+SELECT * FROM test.v1;
 product
 root@localhost
 Drop view if exists test.v1 ;
@@ -1232,84 +4373,2631 @@ Testcase 3.3.1.26
 --------------------------------------------------------------------------------
 DROP VIEW  IF EXISTS v1;
 Create view test.v1 AS Select * from test.tb2;
-Select * from test.v1 order by f59, f60, f61 limit 2;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-1	1	0000000001	0000000000000000000000000000000000000000000000000000000000000001	0000000001	0000000000000000000000000000000000000000000000000000000000000001	-5	0.000000000000000000000000000000	1	0.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549435e-38	1.17549e-38	1.175494352e-38	01.17549e-38	00000001.175494352e-38	01.17549e-38	00000001.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	1970-01-02 00:00:01	1902	1902	1902	2enum	2set
-2	2	0000000002	0000000000000000000000000000000000000000000000000000000000000002	0000000002	0000000000000000000000000000000000000000000000000000000000000002	-4	1.100000000000000000000000000000	2	1.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494349e-38	1.17549e-38	1.175494353e-38	01.17549e-38	00000001.175494353e-38	01.17549e-38	00000001.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	1970-01-03 00:00:02	1903	1903	1903	1enum	1set,2set
-Drop view test.v1 ;
-
-Testcase 3.3.1.27 
---------------------------------------------------------------------------------
-DROP VIEW  IF EXISTS test.v1;
-Drop VIEW  IF EXISTS test.v1_1 ;
-Create view test.v1 AS Select * from test.tb2;
-Create view test.v1_1 AS Select F59 from test.v1 ;
-Select * from test.v1_1 order by F59 limit 2;
-F59
-1
-2
-Drop view test.v1 ;
-Drop view test.v1_1 ;
-
-Testcase 3.3.1.28 
---------------------------------------------------------------------------------
-Drop database if exists test2 ;
-create database test2 ;
-Create view test2.v2 AS Select * from test.tb2 limit 50,50;
-use test2 ;
-Create view v1 AS Select * from test.tb2 limit 50 ;
-Select * from v1 order by f59,f60,f61,f62,f63,f64,f65;
+Select * from test.v1;
 f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
 1	1	0000000001	0000000000000000000000000000000000000000000000000000000000000001	0000000001	0000000000000000000000000000000000000000000000000000000000000001	-5	0.000000000000000000000000000000	1	0.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549435e-38	1.17549e-38	1.175494352e-38	01.17549e-38	00000001.175494352e-38	01.17549e-38	00000001.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	1970-01-02 00:00:01	1902	1902	1902	2enum	2set
-2	2	0000000002	0000000000000000000000000000000000000000000000000000000000000002	0000000002	0000000000000000000000000000000000000000000000000000000000000002	-4	1.100000000000000000000000000000	2	1.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494349e-38	1.17549e-38	1.175494353e-38	01.17549e-38	00000001.175494353e-38	01.17549e-38	00000001.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	1970-01-03 00:00:02	1903	1903	1903	1enum	1set,2set
-3	3	0000000003	0000000000000000000000000000000000000000000000000000000000000003	0000000003	0000000000000000000000000000000000000000000000000000000000000003	-3	2.200000000000000000000000000000	3	2.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494348e-38	1.17549e-38	1.175494354e-38	01.17549e-38	00000001.175494354e-38	01.17549e-38	00000001.175494354e-38	1000-01-03	838:59:56	1970-01-04 00:00:03	1970-01-04 00:00:03	1904	1904	1904	2enum	1set
-4	4	0000000004	0000000000000000000000000000000000000000000000000000000000000004	0000000004	0000000000000000000000000000000000000000000000000000000000000004	-2	3.300000000000000000000000000000	4	3.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494347e-38	1.17549e-38	1.175494355e-38	01.17549e-38	00000001.175494355e-38	01.17549e-38	00000001.175494355e-38	1000-01-04	838:59:55	1970-01-05 00:00:04	1970-01-05 00:00:04	1905	1905	1905	1enum	2set
-4	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-5	5	0000000005	0000000000000000000000000000000000000000000000000000000000000005	0000000005	0000000000000000000000000000000000000000000000000000000000000005	-1	4.400000000000000000000000000000	5	4.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494346e-38	1.17549e-38	1.175494356e-38	01.17549e-38	00000001.175494356e-38	01.17549e-38	00000001.175494356e-38	1000-01-05	838:59:54	1970-01-06 00:00:05	1970-01-06 00:00:05	1906	1906	1906	2enum	1set,2set
-6	6	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0	5.500000000000000000000000000000	6	5.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494345e-38	1.17549e-38	1.175494357e-38	01.17549e-38	00000001.175494357e-38	01.17549e-38	00000001.175494357e-38	1000-01-06	838:59:53	1970-01-07 00:00:06	1970-01-07 00:00:06	1907	1907	1907	1enum	1set
-7	7	0000000007	0000000000000000000000000000000000000000000000000000000000000007	0000000007	0000000000000000000000000000000000000000000000000000000000000007	1	6.600000000000000000000000000000	7	6.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494344e-38	1.17549e-38	1.175494358e-38	01.17549e-38	00000001.175494358e-38	01.17549e-38	00000001.175494358e-38	1000-01-07	838:59:52	1970-01-08 00:00:07	1970-01-08 00:00:07	1908	1908	1908	2enum	2set
-8	8	0000000008	0000000000000000000000000000000000000000000000000000000000000008	0000000008	0000000000000000000000000000000000000000000000000000000000000008	2	7.700000000000000000000000000000	8	7.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494343e-38	1.17549e-38	1.175494359e-38	01.17549e-38	00000001.175494359e-38	01.17549e-38	00000001.175494359e-38	1000-01-08	838:59:51	1970-01-09 00:00:08	1970-01-09 00:00:08	1909	1909	1909	1enum	1set,2set
-9	9	0000000009	0000000000000000000000000000000000000000000000000000000000000009	0000000009	0000000000000000000000000000000000000000000000000000000000000009	3	8.800000000000000000000000000000	9	8.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494342e-38	1.17549e-38	1.17549436e-38	01.17549e-38	000000001.17549436e-38	01.17549e-38	000000001.17549436e-38	1000-01-09	838:59:50	1970-01-10 00:00:09	1970-01-10 00:00:09	1910	1910	1910	2enum	1set
 10	10	0000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000010	0000000000000000000000000000000000000000000000000000000000000010	4	9.900000000000000000000000000000	10	9.900000000000000000000000000000	0000000010	000000000000000000000000000000009.900000000000000000000000000000	0000000010	000000000000000000000000000000009.900000000000000000000000000000	-1.175494341e-38	1.175494361e-38	00000001.175494361e-38	00000001.175494361e-38	-1.175494341e-38	1.175494361e-38	00000001.175494361e-38	00000001.175494361e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494341e-38	1.17549e-38	1.175494361e-38	01.17549e-38	00000001.175494361e-38	01.17549e-38	00000001.175494361e-38	1000-01-10	838:59:49	1970-01-11 00:00:10	1970-01-11 00:00:10	1911	1911	1911	1enum	2set
-15	87	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-17	15	0000000016	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-19	18	0000000014	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-22	93	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-24	51654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-27	25	0000000026	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-29	28	0000000024	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-34	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-94	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 107	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 107	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 109	108	0000000104	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 109	108	0000000104	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+15	87	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+17	15	0000000016	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+19	18	0000000014	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 195	87	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+2	2	0000000002	0000000000000000000000000000000000000000000000000000000000000002	0000000002	0000000000000000000000000000000000000000000000000000000000000002	-4	1.100000000000000000000000000000	2	1.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494349e-38	1.17549e-38	1.175494353e-38	01.17549e-38	00000001.175494353e-38	01.17549e-38	00000001.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	1970-01-03 00:00:02	1903	1903	1903	1enum	1set,2set
 207	205	0000000206	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 209	208	0000000204	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+22	93	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+24	51654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 242	79	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 250	87895654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+2550	775654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+27	25	0000000026	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+2760	985654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+29	28	0000000024	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 292	93	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 299	899	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+3	3	0000000003	0000000000000000000000000000000000000000000000000000000000000003	0000000003	0000000000000000000000000000000000000000000000000000000000000003	-3	2.200000000000000000000000000000	3	2.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494348e-38	1.17549e-38	1.175494354e-38	01.17549e-38	00000001.175494354e-38	01.17549e-38	00000001.175494354e-38	1000-01-03	838:59:56	1970-01-04 00:00:03	1970-01-04 00:00:03	1904	1904	1904	2enum	1set
 321	NULL	0000000765	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 323	14376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+3330	764376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+34	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 340	9984376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+3410	996546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 394	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+4	4	0000000004	0000000000000000000000000000000000000000000000000000000000000004	0000000004	0000000000000000000000000000000000000000000000000000000000000004	-2	3.300000000000000000000000000000	4	3.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494347e-38	1.17549e-38	1.175494355e-38	01.17549e-38	00000001.175494355e-38	01.17549e-38	00000001.175494355e-38	1000-01-04	838:59:55	1970-01-05 00:00:04	1970-01-05 00:00:04	1905	1905	1905	1enum	2set
+4	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 424	89	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 441	16546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+5	5	0000000005	0000000000000000000000000000000000000000000000000000000000000005	0000000005	0000000000000000000000000000000000000000000000000000000000000005	-1	4.400000000000000000000000000000	5	4.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494346e-38	1.17549e-38	1.175494356e-38	01.17549e-38	00000001.175494356e-38	01.17549e-38	00000001.175494356e-38	1000-01-05	838:59:54	1970-01-06 00:00:05	1970-01-06 00:00:05	1906	1906	1906	2enum	1set,2set
 500	NULL	0000000900	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 500	NULL	0000000900	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 500	NULL	0000000900	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+569300	9114376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+6	6	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0	5.500000000000000000000000000000	6	5.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494345e-38	1.17549e-38	1.175494357e-38	01.17549e-38	00000001.175494357e-38	01.17549e-38	00000001.175494357e-38	1000-01-06	838:59:53	1970-01-07 00:00:06	1970-01-07 00:00:06	1907	1907	1907	1enum	1set
 660	876546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-987	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-2550	775654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-2760	985654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-3330	764376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-3410	996546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+7	7	0000000007	0000000000000000000000000000000000000000000000000000000000000007	0000000007	0000000000000000000000000000000000000000000000000000000000000007	1	6.600000000000000000000000000000	7	6.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494344e-38	1.17549e-38	1.175494358e-38	01.17549e-38	00000001.175494358e-38	01.17549e-38	00000001.175494358e-38	1000-01-07	838:59:52	1970-01-08 00:00:07	1970-01-08 00:00:07	1908	1908	1908	2enum	2set
+76710	226546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 7876	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+8	8	0000000008	0000000000000000000000000000000000000000000000000000000000000008	0000000008	0000000000000000000000000000000000000000000000000000000000000008	2	7.700000000000000000000000000000	8	7.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494343e-38	1.17549e-38	1.175494359e-38	01.17549e-38	00000001.175494359e-38	01.17549e-38	00000001.175494359e-38	1000-01-08	838:59:51	1970-01-09 00:00:08	1970-01-09 00:00:08	1909	1909	1909	1enum	1set,2set
+9	9	0000000009	0000000000000000000000000000000000000000000000000000000000000009	0000000009	0000000000000000000000000000000000000000000000000000000000000009	3	8.800000000000000000000000000000	9	8.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494342e-38	1.17549e-38	1.17549436e-38	01.17549e-38	000000001.17549436e-38	01.17549e-38	000000001.17549436e-38	1000-01-09	838:59:50	1970-01-10 00:00:09	1970-01-10 00:00:09	1910	1910	1910	2enum	1set
 9112	NULL	0000008771	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-76710	226546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-569300	9114376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+94	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+987	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+Drop view test.v1 ;
+
+Testcase 3.3.1.27 
+--------------------------------------------------------------------------------
+DROP VIEW  IF EXISTS test.v1;
+Drop VIEW  IF EXISTS test.v1_1 ;
+Create view test.v1 AS Select * from test.tb2;
+Create view test.v1_1 AS Select F59 from test.v1 ;
+Select * from test.v1_1 order by F59 limit 2;
+F59
+1
+2
+Drop view test.v1 ;
+Drop view test.v1_1 ;
+
+Testcase 3.3.1.28 
+--------------------------------------------------------------------------------
+Drop database if exists test2 ;
+create database test2 ;
+Create view test2.v2 AS Select * from test.tb2 limit 50,50;
+use test2 ;
+Create view v1 AS Select * from test.tb2 limit 50 ;
+Select * from v1 order by f59,f60,f61,f62,f63,f64,f65;
+f59	1
+f60	1
+f61	0000000001
+f62	0000000000000000000000000000000000000000000000000000000000000001
+f63	0000000001
+f64	0000000000000000000000000000000000000000000000000000000000000001
+f65	-5
+f66	0.000000000000000000000000000000
+f67	1
+f68	0.000000000000000000000000000000
+f69	0000000001
+f70	000000000000000000000000000000000.000000000000000000000000000000
+f71	0000000001
+f72	000000000000000000000000000000000.000000000000000000000000000000
+f73	-1.17549435e-38
+f74	1.175494352e-38
+f75	00000001.175494352e-38
+f76	00000001.175494352e-38
+f77	-1.17549435e-38
+f78	1.175494352e-38
+f79	00000001.175494352e-38
+f80	00000001.175494352e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.17549435e-38
+f95	1.17549e-38
+f96	1.175494352e-38
+f97	01.17549e-38
+f98	00000001.175494352e-38
+f99	01.17549e-38
+f100	00000001.175494352e-38
+f101	1000-01-01
+f102	838:59:58
+f103	1970-01-02 00:00:01
+f104	1970-01-02 00:00:01
+f105	1902
+f106	1902
+f107	1902
+f108	2enum
+f109	2set
+f59	2
+f60	2
+f61	0000000002
+f62	0000000000000000000000000000000000000000000000000000000000000002
+f63	0000000002
+f64	0000000000000000000000000000000000000000000000000000000000000002
+f65	-4
+f66	1.100000000000000000000000000000
+f67	2
+f68	1.100000000000000000000000000000
+f69	0000000002
+f70	000000000000000000000000000000001.100000000000000000000000000000
+f71	0000000002
+f72	000000000000000000000000000000001.100000000000000000000000000000
+f73	-1.175494349e-38
+f74	1.175494353e-38
+f75	00000001.175494353e-38
+f76	00000001.175494353e-38
+f77	-1.175494349e-38
+f78	1.175494353e-38
+f79	00000001.175494353e-38
+f80	00000001.175494353e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494349e-38
+f95	1.17549e-38
+f96	1.175494353e-38
+f97	01.17549e-38
+f98	00000001.175494353e-38
+f99	01.17549e-38
+f100	00000001.175494353e-38
+f101	1000-01-02
+f102	838:59:57
+f103	1970-01-03 00:00:02
+f104	1970-01-03 00:00:02
+f105	1903
+f106	1903
+f107	1903
+f108	1enum
+f109	1set,2set
+f59	3
+f60	3
+f61	0000000003
+f62	0000000000000000000000000000000000000000000000000000000000000003
+f63	0000000003
+f64	0000000000000000000000000000000000000000000000000000000000000003
+f65	-3
+f66	2.200000000000000000000000000000
+f67	3
+f68	2.200000000000000000000000000000
+f69	0000000003
+f70	000000000000000000000000000000002.200000000000000000000000000000
+f71	0000000003
+f72	000000000000000000000000000000002.200000000000000000000000000000
+f73	-1.175494348e-38
+f74	1.175494354e-38
+f75	00000001.175494354e-38
+f76	00000001.175494354e-38
+f77	-1.175494348e-38
+f78	1.175494354e-38
+f79	00000001.175494354e-38
+f80	00000001.175494354e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494348e-38
+f95	1.17549e-38
+f96	1.175494354e-38
+f97	01.17549e-38
+f98	00000001.175494354e-38
+f99	01.17549e-38
+f100	00000001.175494354e-38
+f101	1000-01-03
+f102	838:59:56
+f103	1970-01-04 00:00:03
+f104	1970-01-04 00:00:03
+f105	1904
+f106	1904
+f107	1904
+f108	2enum
+f109	1set
+f59	4
+f60	4
+f61	0000000004
+f62	0000000000000000000000000000000000000000000000000000000000000004
+f63	0000000004
+f64	0000000000000000000000000000000000000000000000000000000000000004
+f65	-2
+f66	3.300000000000000000000000000000
+f67	4
+f68	3.300000000000000000000000000000
+f69	0000000004
+f70	000000000000000000000000000000003.300000000000000000000000000000
+f71	0000000004
+f72	000000000000000000000000000000003.300000000000000000000000000000
+f73	-1.175494347e-38
+f74	1.175494355e-38
+f75	00000001.175494355e-38
+f76	00000001.175494355e-38
+f77	-1.175494347e-38
+f78	1.175494355e-38
+f79	00000001.175494355e-38
+f80	00000001.175494355e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494347e-38
+f95	1.17549e-38
+f96	1.175494355e-38
+f97	01.17549e-38
+f98	00000001.175494355e-38
+f99	01.17549e-38
+f100	00000001.175494355e-38
+f101	1000-01-04
+f102	838:59:55
+f103	1970-01-05 00:00:04
+f104	1970-01-05 00:00:04
+f105	1905
+f106	1905
+f107	1905
+f108	1enum
+f109	2set
+f59	4
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	5
+f60	5
+f61	0000000005
+f62	0000000000000000000000000000000000000000000000000000000000000005
+f63	0000000005
+f64	0000000000000000000000000000000000000000000000000000000000000005
+f65	-1
+f66	4.400000000000000000000000000000
+f67	5
+f68	4.400000000000000000000000000000
+f69	0000000005
+f70	000000000000000000000000000000004.400000000000000000000000000000
+f71	0000000005
+f72	000000000000000000000000000000004.400000000000000000000000000000
+f73	-1.175494346e-38
+f74	1.175494356e-38
+f75	00000001.175494356e-38
+f76	00000001.175494356e-38
+f77	-1.175494346e-38
+f78	1.175494356e-38
+f79	00000001.175494356e-38
+f80	00000001.175494356e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494346e-38
+f95	1.17549e-38
+f96	1.175494356e-38
+f97	01.17549e-38
+f98	00000001.175494356e-38
+f99	01.17549e-38
+f100	00000001.175494356e-38
+f101	1000-01-05
+f102	838:59:54
+f103	1970-01-06 00:00:05
+f104	1970-01-06 00:00:05
+f105	1906
+f106	1906
+f107	1906
+f108	2enum
+f109	1set,2set
+f59	6
+f60	6
+f61	0000000006
+f62	0000000000000000000000000000000000000000000000000000000000000006
+f63	0000000006
+f64	0000000000000000000000000000000000000000000000000000000000000006
+f65	0
+f66	5.500000000000000000000000000000
+f67	6
+f68	5.500000000000000000000000000000
+f69	0000000006
+f70	000000000000000000000000000000005.500000000000000000000000000000
+f71	0000000006
+f72	000000000000000000000000000000005.500000000000000000000000000000
+f73	-1.175494345e-38
+f74	1.175494357e-38
+f75	00000001.175494357e-38
+f76	00000001.175494357e-38
+f77	-1.175494345e-38
+f78	1.175494357e-38
+f79	00000001.175494357e-38
+f80	00000001.175494357e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494345e-38
+f95	1.17549e-38
+f96	1.175494357e-38
+f97	01.17549e-38
+f98	00000001.175494357e-38
+f99	01.17549e-38
+f100	00000001.175494357e-38
+f101	1000-01-06
+f102	838:59:53
+f103	1970-01-07 00:00:06
+f104	1970-01-07 00:00:06
+f105	1907
+f106	1907
+f107	1907
+f108	1enum
+f109	1set
+f59	7
+f60	7
+f61	0000000007
+f62	0000000000000000000000000000000000000000000000000000000000000007
+f63	0000000007
+f64	0000000000000000000000000000000000000000000000000000000000000007
+f65	1
+f66	6.600000000000000000000000000000
+f67	7
+f68	6.600000000000000000000000000000
+f69	0000000007
+f70	000000000000000000000000000000006.600000000000000000000000000000
+f71	0000000007
+f72	000000000000000000000000000000006.600000000000000000000000000000
+f73	-1.175494344e-38
+f74	1.175494358e-38
+f75	00000001.175494358e-38
+f76	00000001.175494358e-38
+f77	-1.175494344e-38
+f78	1.175494358e-38
+f79	00000001.175494358e-38
+f80	00000001.175494358e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494344e-38
+f95	1.17549e-38
+f96	1.175494358e-38
+f97	01.17549e-38
+f98	00000001.175494358e-38
+f99	01.17549e-38
+f100	00000001.175494358e-38
+f101	1000-01-07
+f102	838:59:52
+f103	1970-01-08 00:00:07
+f104	1970-01-08 00:00:07
+f105	1908
+f106	1908
+f107	1908
+f108	2enum
+f109	2set
+f59	8
+f60	8
+f61	0000000008
+f62	0000000000000000000000000000000000000000000000000000000000000008
+f63	0000000008
+f64	0000000000000000000000000000000000000000000000000000000000000008
+f65	2
+f66	7.700000000000000000000000000000
+f67	8
+f68	7.700000000000000000000000000000
+f69	0000000008
+f70	000000000000000000000000000000007.700000000000000000000000000000
+f71	0000000008
+f72	000000000000000000000000000000007.700000000000000000000000000000
+f73	-1.175494343e-38
+f74	1.175494359e-38
+f75	00000001.175494359e-38
+f76	00000001.175494359e-38
+f77	-1.175494343e-38
+f78	1.175494359e-38
+f79	00000001.175494359e-38
+f80	00000001.175494359e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494343e-38
+f95	1.17549e-38
+f96	1.175494359e-38
+f97	01.17549e-38
+f98	00000001.175494359e-38
+f99	01.17549e-38
+f100	00000001.175494359e-38
+f101	1000-01-08
+f102	838:59:51
+f103	1970-01-09 00:00:08
+f104	1970-01-09 00:00:08
+f105	1909
+f106	1909
+f107	1909
+f108	1enum
+f109	1set,2set
+f59	9
+f60	9
+f61	0000000009
+f62	0000000000000000000000000000000000000000000000000000000000000009
+f63	0000000009
+f64	0000000000000000000000000000000000000000000000000000000000000009
+f65	3
+f66	8.800000000000000000000000000000
+f67	9
+f68	8.800000000000000000000000000000
+f69	0000000009
+f70	000000000000000000000000000000008.800000000000000000000000000000
+f71	0000000009
+f72	000000000000000000000000000000008.800000000000000000000000000000
+f73	-1.175494342e-38
+f74	1.17549436e-38
+f75	000000001.17549436e-38
+f76	000000001.17549436e-38
+f77	-1.175494342e-38
+f78	1.17549436e-38
+f79	000000001.17549436e-38
+f80	000000001.17549436e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494342e-38
+f95	1.17549e-38
+f96	1.17549436e-38
+f97	01.17549e-38
+f98	000000001.17549436e-38
+f99	01.17549e-38
+f100	000000001.17549436e-38
+f101	1000-01-09
+f102	838:59:50
+f103	1970-01-10 00:00:09
+f104	1970-01-10 00:00:09
+f105	1910
+f106	1910
+f107	1910
+f108	2enum
+f109	1set
+f59	10
+f60	10
+f61	0000000010
+f62	0000000000000000000000000000000000000000000000000000000000000010
+f63	0000000010
+f64	0000000000000000000000000000000000000000000000000000000000000010
+f65	4
+f66	9.900000000000000000000000000000
+f67	10
+f68	9.900000000000000000000000000000
+f69	0000000010
+f70	000000000000000000000000000000009.900000000000000000000000000000
+f71	0000000010
+f72	000000000000000000000000000000009.900000000000000000000000000000
+f73	-1.175494341e-38
+f74	1.175494361e-38
+f75	00000001.175494361e-38
+f76	00000001.175494361e-38
+f77	-1.175494341e-38
+f78	1.175494361e-38
+f79	00000001.175494361e-38
+f80	00000001.175494361e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494341e-38
+f95	1.17549e-38
+f96	1.175494361e-38
+f97	01.17549e-38
+f98	00000001.175494361e-38
+f99	01.17549e-38
+f100	00000001.175494361e-38
+f101	1000-01-10
+f102	838:59:49
+f103	1970-01-11 00:00:10
+f104	1970-01-11 00:00:10
+f105	1911
+f106	1911
+f107	1911
+f108	1enum
+f109	2set
+f59	15
+f60	87
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	17
+f60	15
+f61	0000000016
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	19
+f60	18
+f61	0000000014
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	22
+f60	93
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	24
+f60	51654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	27
+f60	25
+f61	0000000026
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	29
+f60	28
+f61	0000000024
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	34
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	94
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	107
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	107
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	109
+f60	108
+f61	0000000104
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	109
+f60	108
+f61	0000000104
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	195
+f60	87
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	207
+f60	205
+f61	0000000206
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	209
+f60	208
+f61	0000000204
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	242
+f60	79
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	250
+f60	87895654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	292
+f60	93
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	299
+f60	899
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	321
+f60	NULL
+f61	0000000765
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	323
+f60	14376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	340
+f60	9984376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	394
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	424
+f60	89
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	441
+f60	16546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	660
+f60	876546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	987
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	2550
+f60	775654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	2760
+f60	985654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	3330
+f60	764376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	3410
+f60	996546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	7876
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	9112
+f60	NULL
+f61	0000008771
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	76710
+f60	226546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	569300
+f60	9114376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 Select * from test2.v2 ;
 f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
 Drop view if exists test2.v1 ;
@@ -1900,12 +7588,110 @@ Drop view if exists test.v1 ;
 CREATE VIEW test.v1 AS SELECT f59,f60 FROM test.tb2;
 INSERT INTO test.v1 values(122,432);
 SELECT * FROM test.tb2 where f59 = 122 and f60 = 432 limit 0,20;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-122	432	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+f59	122
+f60	432
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 UPDATE test.v1 SET f59 = 3000 WHERE test.v1.f59 = 122 ;
 SELECT * FROM test.tb2  where f59 = 3000 limit 0,20;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-3000	432	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+f59	3000
+f60	432
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 DELETE FROM test.v1
 where test.v1.f59 = 3000 and test.v1.f60 = 432;
 SELECT * FROM test.tb2 where f59 = 3000 and f60 = 432;
@@ -1930,16 +7716,214 @@ info: Rows matched: 2  Changed: 2  Warnings: 0
 SELECT * FROM test.v1   where f59 = 30 order by f59;
 f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
 SELECT * FROM test.tb2        where f59 = 30 ;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-30	4	0000000004	0000000000000000000000000000000000000000000000000000000000000004	0000000004	0000000000000000000000000000000000000000000000000000000000000004	-2	3.300000000000000000000000000000	4	3.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494347e-38	1.17549e-38	1.175494355e-38	01.17549e-38	00000001.175494355e-38	01.17549e-38	00000001.175494355e-38	1000-01-04	838:59:55	1970-01-05 00:00:04	1970-01-05 00:00:04	1905	1905	1905	1enum	2set
-30	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+f59	30
+f60	4
+f61	0000000004
+f62	0000000000000000000000000000000000000000000000000000000000000004
+f63	0000000004
+f64	0000000000000000000000000000000000000000000000000000000000000004
+f65	-2
+f66	3.300000000000000000000000000000
+f67	4
+f68	3.300000000000000000000000000000
+f69	0000000004
+f70	000000000000000000000000000000003.300000000000000000000000000000
+f71	0000000004
+f72	000000000000000000000000000000003.300000000000000000000000000000
+f73	-1.175494347e-38
+f74	1.175494355e-38
+f75	00000001.175494355e-38
+f76	00000001.175494355e-38
+f77	-1.175494347e-38
+f78	1.175494355e-38
+f79	00000001.175494355e-38
+f80	00000001.175494355e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494347e-38
+f95	1.17549e-38
+f96	1.175494355e-38
+f97	01.17549e-38
+f98	00000001.175494355e-38
+f99	01.17549e-38
+f100	00000001.175494355e-38
+f101	1000-01-04
+f102	838:59:55
+f103	1970-01-05 00:00:04
+f104	1970-01-05 00:00:04
+f105	1905
+f106	1905
+f107	1905
+f108	1enum
+f109	2set
+f59	30
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 UPDATE tb2 SET f59 = 100 where f59 = 30 ;
 affected rows: 2
 info: Rows matched: 2  Changed: 2  Warnings: 0
 SELECT * FROM tb2 where f59 = 100 ;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-100	4	0000000004	0000000000000000000000000000000000000000000000000000000000000004	0000000004	0000000000000000000000000000000000000000000000000000000000000004	-2	3.300000000000000000000000000000	4	3.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494347e-38	1.17549e-38	1.175494355e-38	01.17549e-38	00000001.175494355e-38	01.17549e-38	00000001.175494355e-38	1000-01-04	838:59:55	1970-01-05 00:00:04	1970-01-05 00:00:04	1905	1905	1905	1enum	2set
-100	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+f59	100
+f60	4
+f61	0000000004
+f62	0000000000000000000000000000000000000000000000000000000000000004
+f63	0000000004
+f64	0000000000000000000000000000000000000000000000000000000000000004
+f65	-2
+f66	3.300000000000000000000000000000
+f67	4
+f68	3.300000000000000000000000000000
+f69	0000000004
+f70	000000000000000000000000000000003.300000000000000000000000000000
+f71	0000000004
+f72	000000000000000000000000000000003.300000000000000000000000000000
+f73	-1.175494347e-38
+f74	1.175494355e-38
+f75	00000001.175494355e-38
+f76	00000001.175494355e-38
+f77	-1.175494347e-38
+f78	1.175494355e-38
+f79	00000001.175494355e-38
+f80	00000001.175494355e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494347e-38
+f95	1.17549e-38
+f96	1.175494355e-38
+f97	01.17549e-38
+f98	00000001.175494355e-38
+f99	01.17549e-38
+f100	00000001.175494355e-38
+f101	1000-01-04
+f102	838:59:55
+f103	1970-01-05 00:00:04
+f104	1970-01-05 00:00:04
+f105	1905
+f106	1905
+f107	1905
+f108	1enum
+f109	2set
+f59	100
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 SELECT * FROM test.v1 order by f59 ;
 f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
 drop view if exists test.v1 ;
@@ -9726,13 +15710,2557 @@ Testcase 3.3.1.50 - 3.3.1.53
 --------------------------------------------------------------------------------
 DROP VIEW  IF EXISTS test.v1;
 CREATE VIEW test.v1 AS SELECT * FROM test.tb2;
-SELECT * FROM test.v1 order by f59 limit 5;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-1	1	0000000001	0000000000000000000000000000000000000000000000000000000000000001	0000000001	0000000000000000000000000000000000000000000000000000000000000001	-5	0.000000000000000000000000000000	1	0.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549435e-38	1.17549e-38	1.175494352e-38	01.17549e-38	00000001.175494352e-38	01.17549e-38	00000001.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	1970-01-02 00:00:01	1902	1902	1902	2enum	2set
-2	2	0000000002	0000000000000000000000000000000000000000000000000000000000000002	0000000002	0000000000000000000000000000000000000000000000000000000000000002	-4	1.100000000000000000000000000000	2	1.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494349e-38	1.17549e-38	1.175494353e-38	01.17549e-38	00000001.175494353e-38	01.17549e-38	00000001.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	1970-01-03 00:00:02	1903	1903	1903	1enum	1set,2set
-3	3	0000000003	0000000000000000000000000000000000000000000000000000000000000003	0000000003	0000000000000000000000000000000000000000000000000000000000000003	-3	2.200000000000000000000000000000	3	2.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494348e-38	1.17549e-38	1.175494354e-38	01.17549e-38	00000001.175494354e-38	01.17549e-38	00000001.175494354e-38	1000-01-03	838:59:56	1970-01-04 00:00:03	1970-01-04 00:00:03	1904	1904	1904	2enum	1set
-5	5	0000000005	0000000000000000000000000000000000000000000000000000000000000005	0000000005	0000000000000000000000000000000000000000000000000000000000000005	-1	4.400000000000000000000000000000	5	4.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494346e-38	1.17549e-38	1.175494356e-38	01.17549e-38	00000001.175494356e-38	01.17549e-38	00000001.175494356e-38	1000-01-05	838:59:54	1970-01-06 00:00:05	1970-01-06 00:00:05	1906	1906	1906	2enum	1set,2set
-6	6	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0	5.500000000000000000000000000000	6	5.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494345e-38	1.17549e-38	1.175494357e-38	01.17549e-38	00000001.175494357e-38	01.17549e-38	00000001.175494357e-38	1000-01-06	838:59:53	1970-01-07 00:00:06	1970-01-07 00:00:06	1907	1907	1907	1enum	1set
+SELECT * FROM test.v1 order by f59,f60,f61 ;
+f59	1
+f60	1
+f61	0000000001
+f62	0000000000000000000000000000000000000000000000000000000000000001
+f63	0000000001
+f64	0000000000000000000000000000000000000000000000000000000000000001
+f65	-5
+f66	0.000000000000000000000000000000
+f67	1
+f68	0.000000000000000000000000000000
+f69	0000000001
+f70	000000000000000000000000000000000.000000000000000000000000000000
+f71	0000000001
+f72	000000000000000000000000000000000.000000000000000000000000000000
+f73	-1.17549435e-38
+f74	1.175494352e-38
+f75	00000001.175494352e-38
+f76	00000001.175494352e-38
+f77	-1.17549435e-38
+f78	1.175494352e-38
+f79	00000001.175494352e-38
+f80	00000001.175494352e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.17549435e-38
+f95	1.17549e-38
+f96	1.175494352e-38
+f97	01.17549e-38
+f98	00000001.175494352e-38
+f99	01.17549e-38
+f100	00000001.175494352e-38
+f101	1000-01-01
+f102	838:59:58
+f103	1970-01-02 00:00:01
+f104	1970-01-02 00:00:01
+f105	1902
+f106	1902
+f107	1902
+f108	2enum
+f109	2set
+f59	2
+f60	2
+f61	0000000002
+f62	0000000000000000000000000000000000000000000000000000000000000002
+f63	0000000002
+f64	0000000000000000000000000000000000000000000000000000000000000002
+f65	-4
+f66	1.100000000000000000000000000000
+f67	2
+f68	1.100000000000000000000000000000
+f69	0000000002
+f70	000000000000000000000000000000001.100000000000000000000000000000
+f71	0000000002
+f72	000000000000000000000000000000001.100000000000000000000000000000
+f73	-1.175494349e-38
+f74	1.175494353e-38
+f75	00000001.175494353e-38
+f76	00000001.175494353e-38
+f77	-1.175494349e-38
+f78	1.175494353e-38
+f79	00000001.175494353e-38
+f80	00000001.175494353e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494349e-38
+f95	1.17549e-38
+f96	1.175494353e-38
+f97	01.17549e-38
+f98	00000001.175494353e-38
+f99	01.17549e-38
+f100	00000001.175494353e-38
+f101	1000-01-02
+f102	838:59:57
+f103	1970-01-03 00:00:02
+f104	1970-01-03 00:00:02
+f105	1903
+f106	1903
+f107	1903
+f108	1enum
+f109	1set,2set
+f59	3
+f60	3
+f61	0000000003
+f62	0000000000000000000000000000000000000000000000000000000000000003
+f63	0000000003
+f64	0000000000000000000000000000000000000000000000000000000000000003
+f65	-3
+f66	2.200000000000000000000000000000
+f67	3
+f68	2.200000000000000000000000000000
+f69	0000000003
+f70	000000000000000000000000000000002.200000000000000000000000000000
+f71	0000000003
+f72	000000000000000000000000000000002.200000000000000000000000000000
+f73	-1.175494348e-38
+f74	1.175494354e-38
+f75	00000001.175494354e-38
+f76	00000001.175494354e-38
+f77	-1.175494348e-38
+f78	1.175494354e-38
+f79	00000001.175494354e-38
+f80	00000001.175494354e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494348e-38
+f95	1.17549e-38
+f96	1.175494354e-38
+f97	01.17549e-38
+f98	00000001.175494354e-38
+f99	01.17549e-38
+f100	00000001.175494354e-38
+f101	1000-01-03
+f102	838:59:56
+f103	1970-01-04 00:00:03
+f104	1970-01-04 00:00:03
+f105	1904
+f106	1904
+f107	1904
+f108	2enum
+f109	1set
+f59	5
+f60	5
+f61	0000000005
+f62	0000000000000000000000000000000000000000000000000000000000000005
+f63	0000000005
+f64	0000000000000000000000000000000000000000000000000000000000000005
+f65	-1
+f66	4.400000000000000000000000000000
+f67	5
+f68	4.400000000000000000000000000000
+f69	0000000005
+f70	000000000000000000000000000000004.400000000000000000000000000000
+f71	0000000005
+f72	000000000000000000000000000000004.400000000000000000000000000000
+f73	-1.175494346e-38
+f74	1.175494356e-38
+f75	00000001.175494356e-38
+f76	00000001.175494356e-38
+f77	-1.175494346e-38
+f78	1.175494356e-38
+f79	00000001.175494356e-38
+f80	00000001.175494356e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494346e-38
+f95	1.17549e-38
+f96	1.175494356e-38
+f97	01.17549e-38
+f98	00000001.175494356e-38
+f99	01.17549e-38
+f100	00000001.175494356e-38
+f101	1000-01-05
+f102	838:59:54
+f103	1970-01-06 00:00:05
+f104	1970-01-06 00:00:05
+f105	1906
+f106	1906
+f107	1906
+f108	2enum
+f109	1set,2set
+f59	6
+f60	6
+f61	0000000006
+f62	0000000000000000000000000000000000000000000000000000000000000006
+f63	0000000006
+f64	0000000000000000000000000000000000000000000000000000000000000006
+f65	0
+f66	5.500000000000000000000000000000
+f67	6
+f68	5.500000000000000000000000000000
+f69	0000000006
+f70	000000000000000000000000000000005.500000000000000000000000000000
+f71	0000000006
+f72	000000000000000000000000000000005.500000000000000000000000000000
+f73	-1.175494345e-38
+f74	1.175494357e-38
+f75	00000001.175494357e-38
+f76	00000001.175494357e-38
+f77	-1.175494345e-38
+f78	1.175494357e-38
+f79	00000001.175494357e-38
+f80	00000001.175494357e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494345e-38
+f95	1.17549e-38
+f96	1.175494357e-38
+f97	01.17549e-38
+f98	00000001.175494357e-38
+f99	01.17549e-38
+f100	00000001.175494357e-38
+f101	1000-01-06
+f102	838:59:53
+f103	1970-01-07 00:00:06
+f104	1970-01-07 00:00:06
+f105	1907
+f106	1907
+f107	1907
+f108	1enum
+f109	1set
+f59	7
+f60	7
+f61	0000000007
+f62	0000000000000000000000000000000000000000000000000000000000000007
+f63	0000000007
+f64	0000000000000000000000000000000000000000000000000000000000000007
+f65	1
+f66	6.600000000000000000000000000000
+f67	7
+f68	6.600000000000000000000000000000
+f69	0000000007
+f70	000000000000000000000000000000006.600000000000000000000000000000
+f71	0000000007
+f72	000000000000000000000000000000006.600000000000000000000000000000
+f73	-1.175494344e-38
+f74	1.175494358e-38
+f75	00000001.175494358e-38
+f76	00000001.175494358e-38
+f77	-1.175494344e-38
+f78	1.175494358e-38
+f79	00000001.175494358e-38
+f80	00000001.175494358e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494344e-38
+f95	1.17549e-38
+f96	1.175494358e-38
+f97	01.17549e-38
+f98	00000001.175494358e-38
+f99	01.17549e-38
+f100	00000001.175494358e-38
+f101	1000-01-07
+f102	838:59:52
+f103	1970-01-08 00:00:07
+f104	1970-01-08 00:00:07
+f105	1908
+f106	1908
+f107	1908
+f108	2enum
+f109	2set
+f59	8
+f60	8
+f61	0000000008
+f62	0000000000000000000000000000000000000000000000000000000000000008
+f63	0000000008
+f64	0000000000000000000000000000000000000000000000000000000000000008
+f65	2
+f66	7.700000000000000000000000000000
+f67	8
+f68	7.700000000000000000000000000000
+f69	0000000008
+f70	000000000000000000000000000000007.700000000000000000000000000000
+f71	0000000008
+f72	000000000000000000000000000000007.700000000000000000000000000000
+f73	-1.175494343e-38
+f74	1.175494359e-38
+f75	00000001.175494359e-38
+f76	00000001.175494359e-38
+f77	-1.175494343e-38
+f78	1.175494359e-38
+f79	00000001.175494359e-38
+f80	00000001.175494359e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494343e-38
+f95	1.17549e-38
+f96	1.175494359e-38
+f97	01.17549e-38
+f98	00000001.175494359e-38
+f99	01.17549e-38
+f100	00000001.175494359e-38
+f101	1000-01-08
+f102	838:59:51
+f103	1970-01-09 00:00:08
+f104	1970-01-09 00:00:08
+f105	1909
+f106	1909
+f107	1909
+f108	1enum
+f109	1set,2set
+f59	9
+f60	9
+f61	0000000009
+f62	0000000000000000000000000000000000000000000000000000000000000009
+f63	0000000009
+f64	0000000000000000000000000000000000000000000000000000000000000009
+f65	3
+f66	8.800000000000000000000000000000
+f67	9
+f68	8.800000000000000000000000000000
+f69	0000000009
+f70	000000000000000000000000000000008.800000000000000000000000000000
+f71	0000000009
+f72	000000000000000000000000000000008.800000000000000000000000000000
+f73	-1.175494342e-38
+f74	1.17549436e-38
+f75	000000001.17549436e-38
+f76	000000001.17549436e-38
+f77	-1.175494342e-38
+f78	1.17549436e-38
+f79	000000001.17549436e-38
+f80	000000001.17549436e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494342e-38
+f95	1.17549e-38
+f96	1.17549436e-38
+f97	01.17549e-38
+f98	000000001.17549436e-38
+f99	01.17549e-38
+f100	000000001.17549436e-38
+f101	1000-01-09
+f102	838:59:50
+f103	1970-01-10 00:00:09
+f104	1970-01-10 00:00:09
+f105	1910
+f106	1910
+f107	1910
+f108	2enum
+f109	1set
+f59	10
+f60	10
+f61	0000000010
+f62	0000000000000000000000000000000000000000000000000000000000000010
+f63	0000000010
+f64	0000000000000000000000000000000000000000000000000000000000000010
+f65	4
+f66	9.900000000000000000000000000000
+f67	10
+f68	9.900000000000000000000000000000
+f69	0000000010
+f70	000000000000000000000000000000009.900000000000000000000000000000
+f71	0000000010
+f72	000000000000000000000000000000009.900000000000000000000000000000
+f73	-1.175494341e-38
+f74	1.175494361e-38
+f75	00000001.175494361e-38
+f76	00000001.175494361e-38
+f77	-1.175494341e-38
+f78	1.175494361e-38
+f79	00000001.175494361e-38
+f80	00000001.175494361e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494341e-38
+f95	1.17549e-38
+f96	1.175494361e-38
+f97	01.17549e-38
+f98	00000001.175494361e-38
+f99	01.17549e-38
+f100	00000001.175494361e-38
+f101	1000-01-10
+f102	838:59:49
+f103	1970-01-11 00:00:10
+f104	1970-01-11 00:00:10
+f105	1911
+f106	1911
+f107	1911
+f108	1enum
+f109	2set
+f59	15
+f60	87
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	17
+f60	15
+f61	0000000016
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	19
+f60	18
+f61	0000000014
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	22
+f60	93
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	24
+f60	51654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	27
+f60	25
+f61	0000000026
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	29
+f60	28
+f61	0000000024
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	34
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	94
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	100
+f60	4
+f61	0000000004
+f62	0000000000000000000000000000000000000000000000000000000000000004
+f63	0000000004
+f64	0000000000000000000000000000000000000000000000000000000000000004
+f65	-2
+f66	3.300000000000000000000000000000
+f67	4
+f68	3.300000000000000000000000000000
+f69	0000000004
+f70	000000000000000000000000000000003.300000000000000000000000000000
+f71	0000000004
+f72	000000000000000000000000000000003.300000000000000000000000000000
+f73	-1.175494347e-38
+f74	1.175494355e-38
+f75	00000001.175494355e-38
+f76	00000001.175494355e-38
+f77	-1.175494347e-38
+f78	1.175494355e-38
+f79	00000001.175494355e-38
+f80	00000001.175494355e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494347e-38
+f95	1.17549e-38
+f96	1.175494355e-38
+f97	01.17549e-38
+f98	00000001.175494355e-38
+f99	01.17549e-38
+f100	00000001.175494355e-38
+f101	1000-01-04
+f102	838:59:55
+f103	1970-01-05 00:00:04
+f104	1970-01-05 00:00:04
+f105	1905
+f106	1905
+f107	1905
+f108	1enum
+f109	2set
+f59	100
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	107
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	107
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	109
+f60	108
+f61	0000000104
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	109
+f60	108
+f61	0000000104
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	195
+f60	87
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	207
+f60	205
+f61	0000000206
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	209
+f60	208
+f61	0000000204
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	242
+f60	79
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	250
+f60	87895654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	292
+f60	93
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	299
+f60	899
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	321
+f60	NULL
+f61	0000000765
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	323
+f60	14376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	340
+f60	9984376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	394
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	424
+f60	89
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	441
+f60	16546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	660
+f60	876546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	987
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	2550
+f60	775654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	2760
+f60	985654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	3330
+f60	764376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	3410
+f60	996546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	7876
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	9112
+f60	NULL
+f61	0000008771
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	76710
+f60	226546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	569300
+f60	9114376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 drop view test.v1 ;
 CREATE VIEW test.v1 AS SELECT F59,F61 FROM test.tb2;
 SELECT * FROM test.v1 order by F59, F61 limit 50;
@@ -9789,28 +18317,2557 @@ F59	F61
 569300	NULL
 drop view test.v1 ;
 CREATE VIEW test.v1 AS SELECT * FROM test.tb2 order by f59, f60, f61;
-SELECT * FROM test.v1 order by f59,f60,f61 limit 20;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-1	1	0000000001	0000000000000000000000000000000000000000000000000000000000000001	0000000001	0000000000000000000000000000000000000000000000000000000000000001	-5	0.000000000000000000000000000000	1	0.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549435e-38	1.17549e-38	1.175494352e-38	01.17549e-38	00000001.175494352e-38	01.17549e-38	00000001.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	1970-01-02 00:00:01	1902	1902	1902	2enum	2set
-2	2	0000000002	0000000000000000000000000000000000000000000000000000000000000002	0000000002	0000000000000000000000000000000000000000000000000000000000000002	-4	1.100000000000000000000000000000	2	1.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494349e-38	1.17549e-38	1.175494353e-38	01.17549e-38	00000001.175494353e-38	01.17549e-38	00000001.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	1970-01-03 00:00:02	1903	1903	1903	1enum	1set,2set
-3	3	0000000003	0000000000000000000000000000000000000000000000000000000000000003	0000000003	0000000000000000000000000000000000000000000000000000000000000003	-3	2.200000000000000000000000000000	3	2.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494348e-38	1.17549e-38	1.175494354e-38	01.17549e-38	00000001.175494354e-38	01.17549e-38	00000001.175494354e-38	1000-01-03	838:59:56	1970-01-04 00:00:03	1970-01-04 00:00:03	1904	1904	1904	2enum	1set
-5	5	0000000005	0000000000000000000000000000000000000000000000000000000000000005	0000000005	0000000000000000000000000000000000000000000000000000000000000005	-1	4.400000000000000000000000000000	5	4.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494346e-38	1.17549e-38	1.175494356e-38	01.17549e-38	00000001.175494356e-38	01.17549e-38	00000001.175494356e-38	1000-01-05	838:59:54	1970-01-06 00:00:05	1970-01-06 00:00:05	1906	1906	1906	2enum	1set,2set
-6	6	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0	5.500000000000000000000000000000	6	5.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494345e-38	1.17549e-38	1.175494357e-38	01.17549e-38	00000001.175494357e-38	01.17549e-38	00000001.175494357e-38	1000-01-06	838:59:53	1970-01-07 00:00:06	1970-01-07 00:00:06	1907	1907	1907	1enum	1set
-7	7	0000000007	0000000000000000000000000000000000000000000000000000000000000007	0000000007	0000000000000000000000000000000000000000000000000000000000000007	1	6.600000000000000000000000000000	7	6.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494344e-38	1.17549e-38	1.175494358e-38	01.17549e-38	00000001.175494358e-38	01.17549e-38	00000001.175494358e-38	1000-01-07	838:59:52	1970-01-08 00:00:07	1970-01-08 00:00:07	1908	1908	1908	2enum	2set
-8	8	0000000008	0000000000000000000000000000000000000000000000000000000000000008	0000000008	0000000000000000000000000000000000000000000000000000000000000008	2	7.700000000000000000000000000000	8	7.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494343e-38	1.17549e-38	1.175494359e-38	01.17549e-38	00000001.175494359e-38	01.17549e-38	00000001.175494359e-38	1000-01-08	838:59:51	1970-01-09 00:00:08	1970-01-09 00:00:08	1909	1909	1909	1enum	1set,2set
-9	9	0000000009	0000000000000000000000000000000000000000000000000000000000000009	0000000009	0000000000000000000000000000000000000000000000000000000000000009	3	8.800000000000000000000000000000	9	8.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494342e-38	1.17549e-38	1.17549436e-38	01.17549e-38	000000001.17549436e-38	01.17549e-38	000000001.17549436e-38	1000-01-09	838:59:50	1970-01-10 00:00:09	1970-01-10 00:00:09	1910	1910	1910	2enum	1set
-10	10	0000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000010	0000000000000000000000000000000000000000000000000000000000000010	4	9.900000000000000000000000000000	10	9.900000000000000000000000000000	0000000010	000000000000000000000000000000009.900000000000000000000000000000	0000000010	000000000000000000000000000000009.900000000000000000000000000000	-1.175494341e-38	1.175494361e-38	00000001.175494361e-38	00000001.175494361e-38	-1.175494341e-38	1.175494361e-38	00000001.175494361e-38	00000001.175494361e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494341e-38	1.17549e-38	1.175494361e-38	01.17549e-38	00000001.175494361e-38	01.17549e-38	00000001.175494361e-38	1000-01-10	838:59:49	1970-01-11 00:00:10	1970-01-11 00:00:10	1911	1911	1911	1enum	2set
-15	87	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-17	15	0000000016	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-19	18	0000000014	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-22	93	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-24	51654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-27	25	0000000026	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-29	28	0000000024	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-34	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-94	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-100	4	0000000004	0000000000000000000000000000000000000000000000000000000000000004	0000000004	0000000000000000000000000000000000000000000000000000000000000004	-2	3.300000000000000000000000000000	4	3.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494347e-38	1.17549e-38	1.175494355e-38	01.17549e-38	00000001.175494355e-38	01.17549e-38	00000001.175494355e-38	1000-01-04	838:59:55	1970-01-05 00:00:04	1970-01-05 00:00:04	1905	1905	1905	1enum	2set
-100	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+SELECT * FROM test.v1 order by f59,f60,f61 ;
+f59	1
+f60	1
+f61	0000000001
+f62	0000000000000000000000000000000000000000000000000000000000000001
+f63	0000000001
+f64	0000000000000000000000000000000000000000000000000000000000000001
+f65	-5
+f66	0.000000000000000000000000000000
+f67	1
+f68	0.000000000000000000000000000000
+f69	0000000001
+f70	000000000000000000000000000000000.000000000000000000000000000000
+f71	0000000001
+f72	000000000000000000000000000000000.000000000000000000000000000000
+f73	-1.17549435e-38
+f74	1.175494352e-38
+f75	00000001.175494352e-38
+f76	00000001.175494352e-38
+f77	-1.17549435e-38
+f78	1.175494352e-38
+f79	00000001.175494352e-38
+f80	00000001.175494352e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.17549435e-38
+f95	1.17549e-38
+f96	1.175494352e-38
+f97	01.17549e-38
+f98	00000001.175494352e-38
+f99	01.17549e-38
+f100	00000001.175494352e-38
+f101	1000-01-01
+f102	838:59:58
+f103	1970-01-02 00:00:01
+f104	1970-01-02 00:00:01
+f105	1902
+f106	1902
+f107	1902
+f108	2enum
+f109	2set
+f59	2
+f60	2
+f61	0000000002
+f62	0000000000000000000000000000000000000000000000000000000000000002
+f63	0000000002
+f64	0000000000000000000000000000000000000000000000000000000000000002
+f65	-4
+f66	1.100000000000000000000000000000
+f67	2
+f68	1.100000000000000000000000000000
+f69	0000000002
+f70	000000000000000000000000000000001.100000000000000000000000000000
+f71	0000000002
+f72	000000000000000000000000000000001.100000000000000000000000000000
+f73	-1.175494349e-38
+f74	1.175494353e-38
+f75	00000001.175494353e-38
+f76	00000001.175494353e-38
+f77	-1.175494349e-38
+f78	1.175494353e-38
+f79	00000001.175494353e-38
+f80	00000001.175494353e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494349e-38
+f95	1.17549e-38
+f96	1.175494353e-38
+f97	01.17549e-38
+f98	00000001.175494353e-38
+f99	01.17549e-38
+f100	00000001.175494353e-38
+f101	1000-01-02
+f102	838:59:57
+f103	1970-01-03 00:00:02
+f104	1970-01-03 00:00:02
+f105	1903
+f106	1903
+f107	1903
+f108	1enum
+f109	1set,2set
+f59	3
+f60	3
+f61	0000000003
+f62	0000000000000000000000000000000000000000000000000000000000000003
+f63	0000000003
+f64	0000000000000000000000000000000000000000000000000000000000000003
+f65	-3
+f66	2.200000000000000000000000000000
+f67	3
+f68	2.200000000000000000000000000000
+f69	0000000003
+f70	000000000000000000000000000000002.200000000000000000000000000000
+f71	0000000003
+f72	000000000000000000000000000000002.200000000000000000000000000000
+f73	-1.175494348e-38
+f74	1.175494354e-38
+f75	00000001.175494354e-38
+f76	00000001.175494354e-38
+f77	-1.175494348e-38
+f78	1.175494354e-38
+f79	00000001.175494354e-38
+f80	00000001.175494354e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494348e-38
+f95	1.17549e-38
+f96	1.175494354e-38
+f97	01.17549e-38
+f98	00000001.175494354e-38
+f99	01.17549e-38
+f100	00000001.175494354e-38
+f101	1000-01-03
+f102	838:59:56
+f103	1970-01-04 00:00:03
+f104	1970-01-04 00:00:03
+f105	1904
+f106	1904
+f107	1904
+f108	2enum
+f109	1set
+f59	5
+f60	5
+f61	0000000005
+f62	0000000000000000000000000000000000000000000000000000000000000005
+f63	0000000005
+f64	0000000000000000000000000000000000000000000000000000000000000005
+f65	-1
+f66	4.400000000000000000000000000000
+f67	5
+f68	4.400000000000000000000000000000
+f69	0000000005
+f70	000000000000000000000000000000004.400000000000000000000000000000
+f71	0000000005
+f72	000000000000000000000000000000004.400000000000000000000000000000
+f73	-1.175494346e-38
+f74	1.175494356e-38
+f75	00000001.175494356e-38
+f76	00000001.175494356e-38
+f77	-1.175494346e-38
+f78	1.175494356e-38
+f79	00000001.175494356e-38
+f80	00000001.175494356e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494346e-38
+f95	1.17549e-38
+f96	1.175494356e-38
+f97	01.17549e-38
+f98	00000001.175494356e-38
+f99	01.17549e-38
+f100	00000001.175494356e-38
+f101	1000-01-05
+f102	838:59:54
+f103	1970-01-06 00:00:05
+f104	1970-01-06 00:00:05
+f105	1906
+f106	1906
+f107	1906
+f108	2enum
+f109	1set,2set
+f59	6
+f60	6
+f61	0000000006
+f62	0000000000000000000000000000000000000000000000000000000000000006
+f63	0000000006
+f64	0000000000000000000000000000000000000000000000000000000000000006
+f65	0
+f66	5.500000000000000000000000000000
+f67	6
+f68	5.500000000000000000000000000000
+f69	0000000006
+f70	000000000000000000000000000000005.500000000000000000000000000000
+f71	0000000006
+f72	000000000000000000000000000000005.500000000000000000000000000000
+f73	-1.175494345e-38
+f74	1.175494357e-38
+f75	00000001.175494357e-38
+f76	00000001.175494357e-38
+f77	-1.175494345e-38
+f78	1.175494357e-38
+f79	00000001.175494357e-38
+f80	00000001.175494357e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494345e-38
+f95	1.17549e-38
+f96	1.175494357e-38
+f97	01.17549e-38
+f98	00000001.175494357e-38
+f99	01.17549e-38
+f100	00000001.175494357e-38
+f101	1000-01-06
+f102	838:59:53
+f103	1970-01-07 00:00:06
+f104	1970-01-07 00:00:06
+f105	1907
+f106	1907
+f107	1907
+f108	1enum
+f109	1set
+f59	7
+f60	7
+f61	0000000007
+f62	0000000000000000000000000000000000000000000000000000000000000007
+f63	0000000007
+f64	0000000000000000000000000000000000000000000000000000000000000007
+f65	1
+f66	6.600000000000000000000000000000
+f67	7
+f68	6.600000000000000000000000000000
+f69	0000000007
+f70	000000000000000000000000000000006.600000000000000000000000000000
+f71	0000000007
+f72	000000000000000000000000000000006.600000000000000000000000000000
+f73	-1.175494344e-38
+f74	1.175494358e-38
+f75	00000001.175494358e-38
+f76	00000001.175494358e-38
+f77	-1.175494344e-38
+f78	1.175494358e-38
+f79	00000001.175494358e-38
+f80	00000001.175494358e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494344e-38
+f95	1.17549e-38
+f96	1.175494358e-38
+f97	01.17549e-38
+f98	00000001.175494358e-38
+f99	01.17549e-38
+f100	00000001.175494358e-38
+f101	1000-01-07
+f102	838:59:52
+f103	1970-01-08 00:00:07
+f104	1970-01-08 00:00:07
+f105	1908
+f106	1908
+f107	1908
+f108	2enum
+f109	2set
+f59	8
+f60	8
+f61	0000000008
+f62	0000000000000000000000000000000000000000000000000000000000000008
+f63	0000000008
+f64	0000000000000000000000000000000000000000000000000000000000000008
+f65	2
+f66	7.700000000000000000000000000000
+f67	8
+f68	7.700000000000000000000000000000
+f69	0000000008
+f70	000000000000000000000000000000007.700000000000000000000000000000
+f71	0000000008
+f72	000000000000000000000000000000007.700000000000000000000000000000
+f73	-1.175494343e-38
+f74	1.175494359e-38
+f75	00000001.175494359e-38
+f76	00000001.175494359e-38
+f77	-1.175494343e-38
+f78	1.175494359e-38
+f79	00000001.175494359e-38
+f80	00000001.175494359e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494343e-38
+f95	1.17549e-38
+f96	1.175494359e-38
+f97	01.17549e-38
+f98	00000001.175494359e-38
+f99	01.17549e-38
+f100	00000001.175494359e-38
+f101	1000-01-08
+f102	838:59:51
+f103	1970-01-09 00:00:08
+f104	1970-01-09 00:00:08
+f105	1909
+f106	1909
+f107	1909
+f108	1enum
+f109	1set,2set
+f59	9
+f60	9
+f61	0000000009
+f62	0000000000000000000000000000000000000000000000000000000000000009
+f63	0000000009
+f64	0000000000000000000000000000000000000000000000000000000000000009
+f65	3
+f66	8.800000000000000000000000000000
+f67	9
+f68	8.800000000000000000000000000000
+f69	0000000009
+f70	000000000000000000000000000000008.800000000000000000000000000000
+f71	0000000009
+f72	000000000000000000000000000000008.800000000000000000000000000000
+f73	-1.175494342e-38
+f74	1.17549436e-38
+f75	000000001.17549436e-38
+f76	000000001.17549436e-38
+f77	-1.175494342e-38
+f78	1.17549436e-38
+f79	000000001.17549436e-38
+f80	000000001.17549436e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494342e-38
+f95	1.17549e-38
+f96	1.17549436e-38
+f97	01.17549e-38
+f98	000000001.17549436e-38
+f99	01.17549e-38
+f100	000000001.17549436e-38
+f101	1000-01-09
+f102	838:59:50
+f103	1970-01-10 00:00:09
+f104	1970-01-10 00:00:09
+f105	1910
+f106	1910
+f107	1910
+f108	2enum
+f109	1set
+f59	10
+f60	10
+f61	0000000010
+f62	0000000000000000000000000000000000000000000000000000000000000010
+f63	0000000010
+f64	0000000000000000000000000000000000000000000000000000000000000010
+f65	4
+f66	9.900000000000000000000000000000
+f67	10
+f68	9.900000000000000000000000000000
+f69	0000000010
+f70	000000000000000000000000000000009.900000000000000000000000000000
+f71	0000000010
+f72	000000000000000000000000000000009.900000000000000000000000000000
+f73	-1.175494341e-38
+f74	1.175494361e-38
+f75	00000001.175494361e-38
+f76	00000001.175494361e-38
+f77	-1.175494341e-38
+f78	1.175494361e-38
+f79	00000001.175494361e-38
+f80	00000001.175494361e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494341e-38
+f95	1.17549e-38
+f96	1.175494361e-38
+f97	01.17549e-38
+f98	00000001.175494361e-38
+f99	01.17549e-38
+f100	00000001.175494361e-38
+f101	1000-01-10
+f102	838:59:49
+f103	1970-01-11 00:00:10
+f104	1970-01-11 00:00:10
+f105	1911
+f106	1911
+f107	1911
+f108	1enum
+f109	2set
+f59	15
+f60	87
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	17
+f60	15
+f61	0000000016
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	19
+f60	18
+f61	0000000014
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	22
+f60	93
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	24
+f60	51654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	27
+f60	25
+f61	0000000026
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	29
+f60	28
+f61	0000000024
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	34
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	94
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	100
+f60	4
+f61	0000000004
+f62	0000000000000000000000000000000000000000000000000000000000000004
+f63	0000000004
+f64	0000000000000000000000000000000000000000000000000000000000000004
+f65	-2
+f66	3.300000000000000000000000000000
+f67	4
+f68	3.300000000000000000000000000000
+f69	0000000004
+f70	000000000000000000000000000000003.300000000000000000000000000000
+f71	0000000004
+f72	000000000000000000000000000000003.300000000000000000000000000000
+f73	-1.175494347e-38
+f74	1.175494355e-38
+f75	00000001.175494355e-38
+f76	00000001.175494355e-38
+f77	-1.175494347e-38
+f78	1.175494355e-38
+f79	00000001.175494355e-38
+f80	00000001.175494355e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494347e-38
+f95	1.17549e-38
+f96	1.175494355e-38
+f97	01.17549e-38
+f98	00000001.175494355e-38
+f99	01.17549e-38
+f100	00000001.175494355e-38
+f101	1000-01-04
+f102	838:59:55
+f103	1970-01-05 00:00:04
+f104	1970-01-05 00:00:04
+f105	1905
+f106	1905
+f107	1905
+f108	1enum
+f109	2set
+f59	100
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	107
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	107
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	109
+f60	108
+f61	0000000104
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	109
+f60	108
+f61	0000000104
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	195
+f60	87
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	207
+f60	205
+f61	0000000206
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	209
+f60	208
+f61	0000000204
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	242
+f60	79
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	250
+f60	87895654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	292
+f60	93
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	299
+f60	899
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	321
+f60	NULL
+f61	0000000765
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	323
+f60	14376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	340
+f60	9984376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	394
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	424
+f60	89
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	441
+f60	16546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	660
+f60	876546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	987
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	2550
+f60	775654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	2760
+f60	985654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	3330
+f60	764376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	3410
+f60	996546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	7876
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	9112
+f60	NULL
+f61	0000008771
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	76710
+f60	226546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	569300
+f60	9114376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 drop view test.v1 ;
 CREATE VIEW test.v1 AS SELECT F59,f61 FROM test.tb2;
 SELECT * FROM test.v1 order by f59,f61 desc limit 20;
@@ -10185,8 +21242,57 @@ F59
 ALTER VIEW test.v1 AS  SELECT *
 FROM test.tb2 WHERE test.tb2.f59 = 242 ;
 SELECT * FROM test.v1 order by f59 limit 0,10;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-242	79	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+f59	242
+f60	79
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 Drop view test.v1 ;
 
 Testcase 3.3.1.65, 3.3.1.A4, 3.3.1.66, 3.3.1.67 
@@ -10549,8 +21655,57 @@ Create view test.v1 AS SELECT f59,f60,f61 FROM tb2  ;
 INSERT INTO test.v1 ( f59 , f60 ) values (2005,0101) ;
 affected rows: 1
 SELECT * FROM tb2 where f59 = 2005 and f60 = 0101 ;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-2005	101	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+f59	2005
+f60	101
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 SELECT f59,f60 FROM test.v1 where f59 = 2005 and f60 = 0101 ;
 f59	f60
 2005	101
@@ -10566,8 +21721,57 @@ UPDATE test.v1 SET f59 = 8 WHERE f59 = 780 and f60 = 105;
 affected rows: 1
 info: Rows matched: 1  Changed: 1  Warnings: 0
 SELECT * FROM tb2 where f59 = 8 and f60 = 105;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-8	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+f59	8
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 SELECT f59,f60 FROM test.v1 where f59 = 8 and f60 = 105 ;
 f59	f60
 8	105
@@ -10582,11 +21786,210 @@ UPDATE test.v1 SET f59 = 891 WHERE f60 = 105 ;
 affected rows: 4
 info: Rows matched: 4  Changed: 4  Warnings: 0
 SELECT * FROM tb2 where f59 = 891 and f60 = 105;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-891	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-891	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-891	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-891	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+f59	891
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	891
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	891
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	891
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 SELECT f59,f60 FROM test.v1 where f59 = 891 and f60 = 105 ;
 f59	f60
 891	105
@@ -10935,10 +22338,6 @@ SET @variant4= 'CREATE VIEW v1 AS SELECT f61 FROM t1 GROUP BY f61';
 SET @variant5= 'CREATE VIEW v1 AS SELECT f61 FROM t1 HAVING f61 > 0';
 SET @variant6= 'CREATE VIEW v1 AS SELECT (SELECT f60 FROM t2 WHERE f59=19) AS f61 FROM t1';
 SET @variant7= 'CREATE VIEW v1 AS SELECT f61 FROM v2';
-
-Some server responses suffer from
-Bug#10773 Incorrect message is displayed while updating a view
---------------------------------------------------------------------------------
 SET @variant8= 'CREATE VIEW v1 AS SELECT f59 AS f61 FROM t1 WHERE f60 IN (SELECT f59 FROM t1)';
 SET @variant9= 'CREATE ALGORITHM = TEMPTABLE VIEW v1 (f61) AS select f60 from t1';
 CREATE ALGORITHM = TEMPTABLE VIEW v1 (f61) AS select f60 from t1;
@@ -11470,21 +22869,24 @@ ABC	0
 ABC	1.7320508075689
 CREATE TABLE t2 AS SELECT f1, SQRT(f2) my_sqrt FROM t1;
 SELECT * FROM t2 order by 2;
-f1	my_sqrt
-ABC	0
-ABC	1.73205080756888
+f1	ABC
+my_sqrt	0
+f1	ABC
+my_sqrt	1.73205080756888
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v1;
 SELECT * FROM t2 order by 2;
-f1	my_sqrt
-ABC	0
-ABC	1.73205080756888
+f1	ABC
+my_sqrt	0
+f1	ABC
+my_sqrt	1.73205080756888
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v2;
 SELECT * FROM t2 order by 2;
-f1	my_sqrt
-ABC	0
-ABC	1.73205080756888
+f1	ABC
+my_sqrt	0
+f1	ABC
+my_sqrt	1.73205080756888
 DROP TABLE t1;
 DROP TABLE t2;
 DROP VIEW  v1;
diff --git a/mysql-test/suite/funcs_1/r/myisam__datadict.result b/mysql-test/suite/funcs_1/r/myisam__datadict.result
index 29fcc8a378f..836e749a9f1 100644
--- a/mysql-test/suite/funcs_1/r/myisam__datadict.result
+++ b/mysql-test/suite/funcs_1/r/myisam__datadict.result
@@ -483,6 +483,7 @@ KEY_COLUMN_USAGE
 PARTITIONS
 PLUGINS
 PROCESSLIST
+PROFILING
 REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
@@ -802,6 +803,27 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	PROFILING
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+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	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	REFERENTIAL_CONSTRAINTS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
@@ -1915,6 +1937,7 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
@@ -1983,6 +2006,7 @@ NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
@@ -2051,6 +2075,7 @@ NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
@@ -2119,6 +2144,7 @@ NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
@@ -2187,6 +2213,7 @@ NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
@@ -2255,6 +2282,7 @@ NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
@@ -2433,6 +2461,24 @@ NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	u
 NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
 NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PROFILING	QUERY_ID	1	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SEQ	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	STATE	3		NO	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	DURATION	4	0.000000	NO	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_USER	5	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_SYSTEM	6	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CONTEXT_VOLUNTARY	7	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	CONTEXT_INVOLUNTARY	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_IN	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_OUT	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_SENT	11	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_RECEIVED	12	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MAJOR	13	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MINOR	14	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SWAPS	15	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SOURCE_FUNCTION	16	NULL	YES	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	SOURCE_FILE	17	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PROFILING	SOURCE_LINE	18	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -3491,6 +3537,7 @@ Table or view 'KEY_COLUMN_USAGE' is associated with the database 'information_sc
 Table or view 'PARTITIONS' is associated with the database 'information_schema'.
 Table or view 'PLUGINS' is associated with the database 'information_schema'.
 Table or view 'PROCESSLIST' is associated with the database 'information_schema'.
+Table or view 'PROFILING' is associated with the database 'information_schema'.
 Table or view 'REFERENTIAL_CONSTRAINTS' is associated with the database 'information_schema'.
 Table or view 'ROUTINES' is associated with the database 'information_schema'.
 Table or view 'SCHEMATA' is associated with the database 'information_schema'.
@@ -3609,6 +3656,7 @@ PLUGINS	10
 proc	20
 PROCESSLIST	8
 procs_priv	8
+PROFILING	18
 REFERENTIAL_CONSTRAINTS	11
 ROUTINES	23
 SCHEMATA	5
@@ -4082,6 +4130,27 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	PROFILING
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+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	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	REFERENTIAL_CONSTRAINTS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
@@ -5195,6 +5264,7 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
@@ -5263,6 +5333,7 @@ NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
@@ -5331,6 +5402,7 @@ NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
@@ -5399,6 +5471,7 @@ NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
@@ -5467,6 +5540,7 @@ NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
@@ -5535,6 +5609,7 @@ NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
@@ -5642,10 +5717,10 @@ COUNT(*)
 6
 SELECT COUNT(*) FROM information_schema. tables                                ;
 COUNT(*)
-68
+69
 SELECT COUNT(*) FROM information_schema. columns                               ;
 COUNT(*)
-886
+904
 SELECT COUNT(*) FROM information_schema. character_sets                        ;
 COUNT(*)
 36
@@ -5707,10 +5782,10 @@ NULL	test1	latin1
 NULL	test4	latin1
 select count(*) as tot_tabs from tables;
 tot_tabs
-65
+66
 select count(*) as the_cols from columns;
 the_cols
-861
+879
 select max(maxlen) as the_max from character_sets;
 the_max
 3
@@ -5757,6 +5832,7 @@ information_schema, KEY_COLUMN_USAGE
 information_schema, PARTITIONS
 information_schema, PLUGINS
 information_schema, PROCESSLIST
+information_schema, PROFILING
 information_schema, REFERENTIAL_CONSTRAINTS
 information_schema, ROUTINES
 information_schema, SCHEMATA
@@ -8415,6 +8491,7 @@ information_schema	KEY_COLUMN_USAGE	MEMORY
 information_schema	PARTITIONS	MyISAM
 information_schema	PLUGINS	MyISAM
 information_schema	PROCESSLIST	MyISAM
+information_schema	PROFILING	MEMORY
 information_schema	REFERENTIAL_CONSTRAINTS	MEMORY
 information_schema	ROUTINES	MyISAM
 information_schema	SCHEMATA	MEMORY
@@ -8458,6 +8535,7 @@ KEY_COLUMN_USAGE
 PARTITIONS
 PLUGINS
 PROCESSLIST
+PROFILING
 REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
@@ -8499,6 +8577,7 @@ KEY_COLUMN_USAGE
 PARTITIONS
 PLUGINS
 PROCESSLIST
+PROFILING
 REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
@@ -8684,6 +8763,7 @@ KEY_COLUMN_USAGE
 PARTITIONS
 PLUGINS
 PROCESSLIST
+PROFILING
 REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
@@ -8877,6 +8957,24 @@ PROCESSLIST	COMMAND	varchar(16)
 PROCESSLIST	TIME	bigint(7)
 PROCESSLIST	STATE	varchar(64)
 PROCESSLIST	INFO	longtext
+PROFILING	QUERY_ID	int(20)
+PROFILING	SEQ	int(20)
+PROFILING	STATE	varchar(30)
+PROFILING	DURATION	decimal(9,6)
+PROFILING	CPU_USER	decimal(9,6)
+PROFILING	CPU_SYSTEM	decimal(9,6)
+PROFILING	CONTEXT_VOLUNTARY	int(20)
+PROFILING	CONTEXT_INVOLUNTARY	int(20)
+PROFILING	BLOCK_OPS_IN	int(20)
+PROFILING	BLOCK_OPS_OUT	int(20)
+PROFILING	MESSAGES_SENT	int(20)
+PROFILING	MESSAGES_RECEIVED	int(20)
+PROFILING	PAGE_FAULTS_MAJOR	int(20)
+PROFILING	PAGE_FAULTS_MINOR	int(20)
+PROFILING	SWAPS	int(20)
+PROFILING	SOURCE_FUNCTION	varchar(30)
+PROFILING	SOURCE_FILE	varchar(20)
+PROFILING	SOURCE_LINE	int(20)
 REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	varchar(4096)
 REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	varchar(64)
 REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	varchar(64)
@@ -10421,6 +10519,24 @@ NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	u
 NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
 NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PROFILING	QUERY_ID	1	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SEQ	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	STATE	3		NO	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	DURATION	4	0.000000	NO	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_USER	5	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_SYSTEM	6	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CONTEXT_VOLUNTARY	7	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	CONTEXT_INVOLUNTARY	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_IN	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_OUT	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_SENT	11	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_RECEIVED	12	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MAJOR	13	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MINOR	14	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SWAPS	15	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SOURCE_FUNCTION	16	NULL	YES	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	SOURCE_FILE	17	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PROFILING	SOURCE_LINE	18	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -11288,6 +11404,24 @@ NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	u
 NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
 NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PROFILING	QUERY_ID	1	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SEQ	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	STATE	3		NO	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	DURATION	4	0.000000	NO	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_USER	5	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_SYSTEM	6	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CONTEXT_VOLUNTARY	7	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	CONTEXT_INVOLUNTARY	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_IN	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_OUT	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_SENT	11	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_RECEIVED	12	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MAJOR	13	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MINOR	14	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SWAPS	15	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SOURCE_FUNCTION	16	NULL	YES	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	SOURCE_FILE	17	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PROFILING	SOURCE_LINE	18	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -11877,6 +12011,24 @@ NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	u
 NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
 NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PROFILING	QUERY_ID	1	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SEQ	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	STATE	3		NO	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	DURATION	4	0.000000	NO	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_USER	5	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_SYSTEM	6	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CONTEXT_VOLUNTARY	7	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	CONTEXT_INVOLUNTARY	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_IN	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_OUT	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_SENT	11	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_RECEIVED	12	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MAJOR	13	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MINOR	14	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SWAPS	15	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SOURCE_FUNCTION	16	NULL	YES	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	SOURCE_FILE	17	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PROFILING	SOURCE_LINE	18	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -12562,6 +12714,24 @@ NULL	information_schema	PROCESSLIST	ID	bigint	NULL	NULL	NULL	NULL	bigint(4)
 NULL	information_schema	PROCESSLIST	TIME	bigint	NULL	NULL	NULL	NULL	bigint(7)
 3.0000	information_schema	PROCESSLIST	STATE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 1.0000	information_schema	PROCESSLIST	INFO	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+NULL	information_schema	PROFILING	QUERY_ID	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	SEQ	int	NULL	NULL	NULL	NULL	int(20)
+3.0000	information_schema	PROFILING	STATE	varchar	30	90	utf8	utf8_general_ci	varchar(30)
+NULL	information_schema	PROFILING	DURATION	decimal	NULL	NULL	NULL	NULL	decimal(9,6)
+NULL	information_schema	PROFILING	CPU_USER	decimal	NULL	NULL	NULL	NULL	decimal(9,6)
+NULL	information_schema	PROFILING	CPU_SYSTEM	decimal	NULL	NULL	NULL	NULL	decimal(9,6)
+NULL	information_schema	PROFILING	CONTEXT_VOLUNTARY	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	CONTEXT_INVOLUNTARY	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	BLOCK_OPS_IN	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	BLOCK_OPS_OUT	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	MESSAGES_SENT	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	MESSAGES_RECEIVED	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	PAGE_FAULTS_MAJOR	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	PAGE_FAULTS_MINOR	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	SWAPS	int	NULL	NULL	NULL	NULL	int(20)
+3.0000	information_schema	PROFILING	SOURCE_FUNCTION	varchar	30	90	utf8	utf8_general_ci	varchar(30)
+3.0000	information_schema	PROFILING	SOURCE_FILE	varchar	20	60	utf8	utf8_general_ci	varchar(20)
+NULL	information_schema	PROFILING	SOURCE_LINE	int	NULL	NULL	NULL	NULL	int(20)
 3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
 3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
@@ -14181,6 +14351,7 @@ NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#
 NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROFILING	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
@@ -14232,6 +14403,7 @@ NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#
 NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROFILING	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
@@ -14281,6 +14453,7 @@ NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#
 NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROFILING	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
@@ -14331,6 +14504,7 @@ NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#
 NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROFILING	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	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	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	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	utf8_general_ci	NULL	#CO#	
diff --git a/mysql-test/suite/funcs_1/r/myisam_func_view.result b/mysql-test/suite/funcs_1/r/myisam_func_view.result
index 02ef728fad5..14568643665 100644
--- a/mysql-test/suite/funcs_1/r/myisam_func_view.result
+++ b/mysql-test/suite/funcs_1/r/myisam_func_view.result
@@ -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 = @select_id,
 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 = @select_id,
 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 = @select_id,
 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 = @select_id,
 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 = @select_id,
 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	collation_connection
 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_varbinary_1000),
 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_30),
 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_varchar_1000),
 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_30),
 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_varbinary_1000),
 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_30),
 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_varchar_1000),
 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_30),
 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('-', ' - -ABC', my_decimal),
 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('-', ' - -ABC', my_double),
 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('-', ' - -ABC', my_bigint),
 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_varbinary_1000, 3),
 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_binary_30, 3),
 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_varchar_1000, 3),
 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_char_30, 3),
 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_varbinary_1000, my_binary_30 ),
 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_varbinary_1000, my_varchar_1000 ),
 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_varbinary_1000, my_char_30 ),
 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_varbinary_1000, my_varbinary_1000 ),
 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_binary_30, my_varbinary_1000 ),
 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_binary_30, my_varchar_1000 ),
 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_binary_30, my_char_30 ),
 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_binary_30, my_binary_30 ),
 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_varchar_1000, my_varbinary_1000 ),
 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_varchar_1000, my_binary_30 ),
 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_varchar_1000, my_char_30 ),
 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_varchar_1000, my_varchar_1000 ),
 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_30, my_varbinary_1000 ),
 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_30, my_binary_30 ),
 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_30, my_varchar_1000 ),
 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_30, my_char_30 ),
 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),
 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),
 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),
 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),
 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	collation_connection
 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_varbinary_1000),
 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_binary_30),
 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_varchar_1000),
 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_30),
 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	collation_connection
 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 value: ''
 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	collation_connection
 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	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_binary_30`,2) AS `LEFT(my_binary_30, 2)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
 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	collation_connection
 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	collation_connection
 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_varchar_1000),
 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_30, 'char'),
 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_varbinary_1000),
 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	collation_connection
 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_binary_30),
 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	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_binary_30`) AS `BIT_LENGTH(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
 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_varchar_1000),
 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	collation_connection
 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_char_30),
 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	collation_connection
 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,'IS_NULL'),
 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	collation_connection
 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,'IS_NULL'),
 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	collation_connection
 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_timestamp,'IS_NULL'),
 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	collation_connection
 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,'IS_NULL'),
 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	collation_connection
 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_datetime,'IS_NULL'),
 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	collation_connection
 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_double,'IS_NULL'),
 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	collation_connection
 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_decimal,'IS_NULL'),
 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	collation_connection
 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_bigint,'IS_NULL'),
 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	collation_connection
 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_varbinary_1000,'IS_NULL'),
 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	collation_connection
 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_binary_30,'IS_NULL'),
 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	collation_connection
 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_varchar_1000,'IS_NULL'),
 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	collation_connection
 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_30,'IS_NULL'),
 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	collation_connection
 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 NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 IS NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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_1000 IS NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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_1000 IS NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 IS NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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_1000, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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_1000, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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_varbinary_1000 USING koi8r),
 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	collation_connection
 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_binary_30 USING koi8r),
 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	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using koi8r) AS `CONVERT(my_binary_30 USING koi8r)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
 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_varchar_1000 USING koi8r),
 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	collation_connection
 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_30 USING koi8r),
 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	collation_connection
 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_varbinary_1000 USING utf8),
 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	collation_connection
 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_binary_30 USING utf8),
 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	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using utf8) AS `CONVERT(my_binary_30 USING utf8)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
 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_varchar_1000 USING utf8),
 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	collation_connection
 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_30 USING utf8),
 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	collation_connection
 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 UNSIGNED INTEGER),
 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	collation_connection
 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 UNSIGNED INTEGER),
 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	collation_connection
 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_timestamp AS UNSIGNED INTEGER),
 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	collation_connection
 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 UNSIGNED INTEGER),
 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	collation_connection
 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_datetime AS UNSIGNED INTEGER),
 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,7 +2528,7 @@ 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_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
@@ -2482,6 +2538,38 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
+CREATE VIEW v1 AS SELECT CAST(my_double AS UNSIGNED INTEGER),
+my_double, id FROM t1_values;
+SELECT CAST(my_double AS UNSIGNED INTEGER),
+my_double, id FROM t1_values
+WHERE select_id = 89 OR select_id IS NULL order by id;
+CAST(my_double AS UNSIGNED INTEGER)	my_double	id
+NULL	NULL	1
+9223372036854775808	-1.7976931348623e+308	2
+9223372036854775807	1.7976931348623e+308	3
+0	0	4
+18446744073709551615	-1	5
+Warnings:
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+SHOW CREATE VIEW v1;
+View	Create View	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;
+
+
 CREATE VIEW v1 AS SELECT CAST(my_decimal AS UNSIGNED INTEGER),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS UNSIGNED INTEGER),
diff --git a/mysql-test/suite/funcs_1/r/myisam_storedproc.result b/mysql-test/suite/funcs_1/r/myisam_storedproc.result
index b52f0dbbbf0..daa6fa8a71e 100644
--- a/mysql-test/suite/funcs_1/r/myisam_storedproc.result
+++ b/mysql-test/suite/funcs_1/r/myisam_storedproc.result
@@ -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@1.1975.1.2, 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 b char(20))
 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,MYSQL_PORT,MYSQL_SOCK);
 	
 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 1
 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 comment 'this is a function';
 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()
+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 'float4:BEGIN
+SELECT @x;
+END' at line 2
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
-float:BEGIN
+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 '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 '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, conditions, and handlers declared for
 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 '23000' set @x2 = 1;
 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 declare multiple variables both separately
 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';
-declare exit handler for tables set @var2 = 1;
-END//
-DROP PROCEDURE IF EXISTS sp1;
-CREATE PROCEDURE sp1( )
-BEGIN
 declare terminated condition for sqlstate '02000';
 declare exit handler for terminated set @var2 = 1;
 END//
@@ -10144,10 +11240,10 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare USE condition for sqlstate '02000';
+declare use condition for sqlstate '02000';
 declare exit handler for USE 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 'USE 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 'use condition for sqlstate '02000';
 declare exit handler for USE set @var2 = 1;
 ' at line 3
 DROP PROCEDURE IF EXISTS sp1;
@@ -10409,6 +11505,15 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare accessible handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare add handler for sqlstate '02000' 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 'add handler for sqlstate '02000' set @var2 = 1;
@@ -10544,9 +11649,9 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare CALL handler for sqlstate '02000' set @var2 = 1;
+declare call handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'call handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
@@ -10625,15 +11730,6 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare columns handler for sqlstate '02000' 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 'handler for sqlstate '02000' set @var2 = 1;
-END' at line 3
-DROP PROCEDURE IF EXISTS sp1;
-Warnings:
-Note	1305	PROCEDURE sp1 does not exist
-CREATE PROCEDURE sp1( )
-BEGIN
 declare condition handler for sqlstate '02000' 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 'condition handler for sqlstate '02000' set @var2 = 1;
@@ -10643,22 +11739,18 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare connection handler for sqlstate '02000' set @var2 = 1;
+declare constraint handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'constraint handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare constraint handler for sqlstate '02000' set @var2 = 1;
+declare continue handler for sqlstate '02000' 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 'constraint handler for sqlstate '02000' set @var2 = 1;
-END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
-Warnings:
-Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare convert handler for sqlstate '02000' set @var2 = 1;
@@ -10976,6 +12068,11 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare exit handler for sqlstate '02000' set @var2 = 1;
+END//
+DROP PROCEDURE IF EXISTS sp1;
+CREATE PROCEDURE sp1( )
+BEGIN
 declare explain handler for sqlstate '02000' 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 'explain handler for sqlstate '02000' set @var2 = 1;
@@ -11003,54 +12100,54 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare fields handler for sqlstate '02000' set @var2 = 1;
+declare float handler for sqlstate '02000' 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 'handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare float handler for sqlstate '02000' set @var2 = 1;
+declare float4 handler for sqlstate '02000' 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 'float handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float4 handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare for handler for sqlstate '02000' set @var2 = 1;
+declare float8 handler for sqlstate '02000' 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 'for handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float8 handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare force handler for sqlstate '02000' set @var2 = 1;
+declare for handler for sqlstate '02000' 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 'force handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'for handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare foreign handler for sqlstate '02000' set @var2 = 1;
+declare force handler for sqlstate '02000' 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 'foreign handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'force handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare found handler for sqlstate '02000' set @var2 = 1;
+declare foreign handler for sqlstate '02000' 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 'handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'foreign handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
@@ -11075,15 +12172,6 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare goto handler for sqlstate '02000' 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 'handler for sqlstate '02000' set @var2 = 1;
-END' at line 3
-DROP PROCEDURE IF EXISTS sp1;
-Warnings:
-Note	1305	PROCEDURE sp1 does not exist
-CREATE PROCEDURE sp1( )
-BEGIN
 declare grant handler for sqlstate '02000' 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 'grant handler for sqlstate '02000' set @var2 = 1;
@@ -11237,6 +12325,51 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare int1 handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
+declare int2 handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
+declare int3 handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
+declare int4 handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
+declare int8 handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare integer handler for sqlstate '02000' 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 'integer handler for sqlstate '02000' set @var2 = 1;
@@ -11363,6 +12496,15 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare linear handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare lines handler for sqlstate '02000' 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 'lines handler for sqlstate '02000' set @var2 = 1;
@@ -11453,6 +12595,15 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare master_ssl_verify_server_cert handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare match handler for sqlstate '02000' 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 'match handler for sqlstate '02000' set @var2 = 1;
@@ -11705,6 +12856,15 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare range handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare read handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
@@ -11723,6 +12883,24 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare read_only handler for sqlstate '02000' 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 'handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
+declare read_write handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare real handler for sqlstate '02000' 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 'real handler for sqlstate '02000' set @var2 = 1;
@@ -11750,6 +12928,15 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare release handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare rename handler for sqlstate '02000' 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 'rename handler for sqlstate '02000' set @var2 = 1;
@@ -11858,9 +13045,9 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare SELECT handler for sqlstate '02000' set @var2 = 1;
+declare select handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'select handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
@@ -11912,15 +13099,6 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare soname handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
-END' at line 3
-DROP PROCEDURE IF EXISTS sp1;
-Warnings:
-Note	1305	PROCEDURE sp1 does not exist
-CREATE PROCEDURE sp1( )
-BEGIN
 declare spatial handler for sqlstate '02000' 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 'spatial handler for sqlstate '02000' set @var2 = 1;
@@ -12038,15 +13216,6 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare tables handler for sqlstate '02000' 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 'handler for sqlstate '02000' set @var2 = 1;
-END' at line 3
-DROP PROCEDURE IF EXISTS sp1;
-Warnings:
-Note	1305	PROCEDURE sp1 does not exist
-CREATE PROCEDURE sp1( )
-BEGIN
 declare terminated handler for sqlstate '02000' 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 'terminated handler for sqlstate '02000' set @var2 = 1;
@@ -12191,9 +13360,9 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare USE handler for sqlstate '02000' set @var2 = 1;
+declare use handler for sqlstate '02000' 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 'USE handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'use handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
@@ -12384,10 +13553,13 @@ set @v2 = y;
 END//
 CALL sp1();
 x	y	@x
-NULL	abaa	3
+NULL	a	3
+Warnings:
+Warning	1265	Data truncated for column 'y' at row 3
+Warning	1265	Data truncated for column 'y' at row 1
 SELECT @v1, @v2;
 @v1	@v2
-4	a`
+4	a
 DROP PROCEDURE sp1;
 
 Testcase 4.2.28:
@@ -12454,7 +13626,7 @@ CALL sp1();
 @xx
 0
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: 'asd'
+Warning	1366	Incorrect integer value: 'asd' for column 'xx' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12481,9 +13653,11 @@ set xx = 'temp';
 set @xx = xx;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'xx' at row 1
 SELECT @xx;
 @xx
-temp
+t
 DROP PROCEDURE sp1;
 
 Testcase 4.2.31 - b:
@@ -12501,7 +13675,7 @@ CALL sp1();
 xx
 0
 Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: 'asd'
+Warning	1265	Data truncated for column 'xx' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12527,7 +13701,9 @@ SELECT xx;
 END//
 CALL sp1();
 xx
-asd
+0000-00-00 00:00:00
+Warnings:
+Warning	1264	Out of range value for column 'xx' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12571,7 +13747,7 @@ CALL sp1();
 xx
 0
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: 'asd'
+Warning	1366	Incorrect integer value: 'asd' for column 'xx' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12602,6 +13778,8 @@ declare x char ascii;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12665,6 +13843,8 @@ declare x binary;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12812,8 +13992,6 @@ declare x decimal;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12821,8 +13999,6 @@ declare x decimal unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12830,8 +14006,6 @@ declare x decimal zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12839,8 +14013,6 @@ declare x decimal unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12848,8 +14020,6 @@ declare x numeric;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12857,8 +14027,6 @@ declare x numeric unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12866,8 +14034,6 @@ declare x numeric zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12875,8 +14041,6 @@ declare x numeric unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13254,7 +14418,7 @@ declare continue handler for sqlstate '02000' set done = 1;
 BEGIN
 open cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newlf1, newf3, newsal;
 set count = count - 1;
 END while;
@@ -13279,7 +14443,7 @@ declare continue handler for sqlstate '02000' set done = 1;
 BEGIN
 open cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newlf1, newf3, newsal;
 set count = count - 1;
 END while;
@@ -13306,7 +14470,7 @@ declare continue handler for sqlstate '02000' set done = 1;
 BEGIN
 open cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
 set count = count - 1;
 END while;
@@ -13330,7 +14494,7 @@ open cur1;
 BEGIN
 open cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf3, newf4;
 set count = count - 1;
 END while;
@@ -13358,7 +14522,7 @@ BEGIN
 open cur1;
 open cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
 set count = count - 1;
 END while;
@@ -13388,7 +14552,7 @@ declare continue handler for sqlstate '02000' set done = 1;
 BEGIN
 open cur2;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
 set count = count - 1;
 END while;
@@ -13416,7 +14580,7 @@ declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 limit 20, 10;
 declare continue handler for sqlstate '02000' set done = 1;
 BEGIN
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
 set count = count - 1;
 END while;
@@ -13430,7 +14594,7 @@ DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
 declare done int default 0;
-declare count integer default 0;
+declare count integer default 10;
 declare newf1 char(20);
 declare newf2 char(20);
 declare newf3 char(20);
@@ -13441,7 +14605,7 @@ open cur1;
 BEGIN
 declare cur1 cursor for SELECT f1, f2, f3, f4 from t2;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf3, newf4;
 set count = count - 1;
 END while;
@@ -13473,7 +14637,7 @@ BEGIN
 open cur1;
 close cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
 set count = count - 1;
 END while;
@@ -13485,7 +14649,7 @@ DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
 declare done int default 0;
-declare count integer default 0;
+declare count integer default 20;
 declare newf1 char(20);
 declare newf2 char(20);
 declare newf3 char(20);
@@ -13514,13 +14678,13 @@ BEGIN
 declare done int default 0;
 declare count integer default 20;
 declare newf2 char(20);
-declare newf1 date;
+declare newf1 int1;
 declare cur1 cursor for SELECT f1, f3 from t2 limit 20, 10;
 declare continue handler for sqlstate '02000' set done = 1;
 BEGIN
 open cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2;
 set @x = newf1;
 set @y = newf2;
@@ -13590,7 +14754,7 @@ BEGIN
 close cur1;
 open cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
 set count = count - 1;
 END while;
@@ -13643,7 +14807,7 @@ fetch cur1 into newf1, newf2, newf4, newf3;
 END;
 END//
 CALL sp1();
-ERROR 02000: No data to FETCH
+ERROR 02000: No data - zero rows fetched, selected, or processed
 DROP PROCEDURE sp1;
 
 Testcase 4.2.65:
@@ -13669,7 +14833,7 @@ commit;
 END;
 END//
 CALL sp1();
-ERROR 02000: No data to FETCH
+ERROR 02000: No data - zero rows fetched, selected, or processed
 DROP PROCEDURE sp1;
 
 Testcase 4.2.66:
@@ -13690,7 +14854,7 @@ declare continue handler for sqlstate '02000' set done = 1;
 BEGIN
 open cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
 set count = count - 1;
 END while;
@@ -13719,12 +14883,13 @@ declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 limit 20, 10;
 declare continue handler for sqlstate '02000' set done = 1;
 BEGIN
 open cur1;
-set count = count - 1;
-while count <> 0 do
+#      set count = count - 1;
+#      while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
-set count = count - 1;
-END while;
+#        set count = count - 1;
+#      END while;
 END;
+fetch cur1 into newf1, newf2, newf4, newf3;
 END//
 CALL sp1();
 DROP PROCEDURE sp1;
@@ -13756,7 +14921,7 @@ BEGIN
 set count = 10;
 BEGIN
 open cur2;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
 set count = count - 1;
 END while;
@@ -13765,7 +14930,8 @@ insert into temp1 values(newf1, newf2, newf4, newf3);
 close cur1;
 END;
 BEGIN
-while count <> 0 do
+set count = 10;
+while count > 0 do
 fetch cur2 into newf21, newf22, newf24, newf23;
 set count = count - 1;
 END while;
@@ -13774,9 +14940,9 @@ insert into temp2 values(newf21, newf22, newf24, newf23);
 close cur2;
 END//
 CALL sp1();
-SELECT * from temp1;
-f1	f2	f3	f4
-agaaaaaaa	agaaaaaaa	-4993	agaaaaaaa
+SELECT count(*) from temp1;
+count(*)
+1
 SELECT * from temp2;
 f1	f2	f3	f4
 NULL	NULL	NULL	NULL
@@ -13797,7 +14963,7 @@ CREATE TABLE res_t3_itisalongname_1381742_itsaverylongname_1381742(
 middleinitial CHAR,
 lastname VARCHAR(50),
 age_averylongfieldname_averylongname_1234569 int,
-COMMENT TEXT) ENGINE=innodb;
+COMMENT TEXT) ENGINE=myisam;
 INSERT INTO res_t3_itisalongname_1381742_itsaverylongname_1381742
 VALUES('a', 'aaaaaaaaaabbbbbbbbc', 0, 'default');
 CREATE PROCEDURE sp1(a int)
@@ -13924,23 +15090,23 @@ CALL sp2( 'insert' );
 SELECT * from t3 where f3 <=5 && f3 >= 0;
 f1	f2	f3
 f1	address	1
-f1	address	2
-f1	address	3
-f1	address	4
-f1	address	5
 f1	address	1
-f1	address	2
-f1	address	3
-f1	address	4
-f1	address	5
 f1	address	1
-f1	address	2
-f1	address	3
-f1	address	4
 f1	address	1
 f1	address	2
+f1	address	2
+f1	address	2
+f1	address	2
 f1	address	3
+f1	address	3
+f1	address	3
+f1	address	3
+f1	address	4
 f1	address	4
+f1	address	4
+f1	address	4
+f1	address	5
+f1	address	5
 SELECT count(*) from t3;
 count(*)
 28
@@ -14023,7 +15189,7 @@ delete from res_t3_itisalongname_1381742_itsaverylongname_1381742;
 END case;
 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 'when 'delete'  then
-delete from res_t3_itisalongname_1381742_itsaverylongname_13' at line 10
+delete from res_t3_itisalongname_1381742_itsaverylongname_13' at line 11
 DROP PROCEDURE IF EXISTS sp3;
 CREATE PROCEDURE sp3( action char(20) )
 BEGIN
@@ -14041,8 +15207,9 @@ label2: while count < 10 do
 BEGIN
 insert into res_t3_itisalongname_1381742_itsaverylongname_1381742
 values('xxxxxxxxxxxxxxxxxxx', '1231230981(*&(*&)(*&(', count);
-if done=1 then
-set count=10;
+set count = count + 1;
+if count= 10 then
+set done=1;
 END if;
 END;
 END while label2;
@@ -14056,6 +15223,19 @@ END if;
 END loop label1;
 SELECT count, done;
 END//
+CALL sp3('insert');
+count	done
+10	1
+Warnings:
+Warning	1265	Data truncated for column 'name' at row 1
+Warning	1265	Data truncated for column 'name' at row 2
+Warning	1265	Data truncated for column 'name' at row 3
+Warning	1265	Data truncated for column 'name' at row 4
+Warning	1265	Data truncated for column 'name' at row 5
+Warning	1265	Data truncated for column 'name' at row 6
+Warning	1265	Data truncated for column 'name' at row 7
+Warning	1265	Data truncated for column 'name' at row 8
+Warning	1265	Data truncated for column 'name' at row 9
 DROP PROCEDURE sp3;
 drop table res_t3_itisalongname_1381742_itsaverylongname_1381742;
 
@@ -14330,11 +15510,14 @@ CREATE PROCEDURE sp6()
 BEGIN
 declare count1 integer default 1;
 label1: repeat
-set count1 = count1;
+set count1 = count1-1;
 until count1 < 0
 END repeat label1;
 SELECT count1;
 END//
+CALL sp6();
+count1
+-1
 DROP PROCEDURE sp6;
 
 Testcase 4.3.7:
@@ -14403,7 +15586,7 @@ do v1 > 0 while
 set v1 = v1 - 1;
 END while;
 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 'do v1 > 0 while
+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 'while
 set v1 = v1 - 1;
 END while;
 END' at line 4
@@ -14442,7 +15625,7 @@ set count1 = count1 + 1;
 iterate label1;
 END loop label2;
 END//
-ERROR 42000: End-label label2 without match
+ERROR 42000: End-label label1 without match
 drop table res_t3_itisalongname_1381742_itsaverylongname_1381742;
 
 Testcase 4.3.13:
@@ -14606,7 +15789,7 @@ until count1 < 3
 END repeat label1;
 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 'label1;
-END' at line 7
+END' at line 8
 
 Testcase 4.3.21:
 --------------------------------------------------------------------------------
@@ -14789,15 +15972,15 @@ insert into t43 values('abcde', 'a!@#$%^&*(');
 CREATE PROCEDURE d1.sp4()
 SELECT * from d1.t43;
 SELECT * from mysql.proc where specific_name = 'sp4';
-db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment
-d1	sp4	PROCEDURE	sp4	SQL	CONTAINS_SQL	NO	DEFINER			SELECT * from d1.t43	root@localhost	modified	created		
+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
+d1	sp4	PROCEDURE	sp4	SQL	CONTAINS_SQL	NO	DEFINER			SELECT * from d1.t43	root@localhost	modified	created			latin1	latin1_swedish_ci	latin1_swedish_ci	SELECT * from d1.t43
 USE db_storedproc;
 DROP DATABASE d1;
 CREATE DATABASE d1;
 USE d1;
 create table t44(a char(5), b char(10));
 SELECT * from mysql.proc where specific_name = 'sp4';
-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
 USE db_storedproc;
 DROP DATABASE d1;
 
@@ -14839,8 +16022,8 @@ CREATE PROCEDURE sp8 ( n char(20) ) sql security definer comment 'initial'
 USE d2;
 alter procedure d1.sp8 sql security definer comment 'updated';
 SELECT * from mysql.proc where specific_name='sp8' and db='d1';
-db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment
-d1	sp8	PROCEDURE	sp8	SQL	CONTAINS_SQL	NO	DEFINER	 n char(20) 		SELECT * from t1 where t1.f1 = n	root@localhost	modified	created		updated
+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
+d1	sp8	PROCEDURE	sp8	SQL	CONTAINS_SQL	NO	DEFINER	 n char(20) 		SELECT * from t1 where t1.f1 = n	root@localhost	modified	created		updated	latin1	latin1_swedish_ci	latin1_swedish_ci	SELECT * from t1 where t1.f1 = n
 
 Testcase 4.4.9:
 --------------------------------------------------------------------------------
@@ -14856,12 +16039,16 @@ END//
 USE d2;
 alter function d1.fn2 sql security definer comment 'updated';
 SELECT * from mysql.proc where specific_name='fn2' and db='d1';
-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
 d1	fn2	FUNCTION	fn2	SQL	CONTAINS_SQL	NO	DEFINER	n int	int(11)	BEGIN
 declare a int;
 set a = 0.9 * n;
 return a;
-END	root@localhost	modified	created		updated
+END	root@localhost	modified	created		updated	latin1	latin1_swedish_ci	latin1_swedish_ci	BEGIN
+declare a int;
+set a = 0.9 * n;
+return a;
+END
 
 Testcase 4.4.10:
 --------------------------------------------------------------------------------
@@ -14871,7 +16058,7 @@ SELECT * from t1 where t1.f1 = n;
 USE d2;
 DROP PROCEDURE d1.sp9;
 SELECT * from mysql.proc where specific_name='sp9' and db='d1';
-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.4.11:
 --------------------------------------------------------------------------------
@@ -14885,7 +16072,7 @@ END//
 USE d2;
 DROP FUNCTION d1.fn3;
 SELECT * from mysql.proc where specific_name='fn3' and db='d1';
-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
 USE db_storedproc;
 DROP DATABASE d1;
 DROP DATABASE d2;
@@ -14893,19 +16080,6 @@ DROP DATABASE d2;
 Section 3.1.5 - Parameter use checks:
 Functions with all data types
 --------------------------------------------------------------------------------
-SELECT 1 as 'bug_dec_num';
-bug_dec_num
-1
-
-.
-FIXME:  There are differences with datatypes DECIMAL and NUMERIC if large
-FIXME:  exponent values are used. The diffs are shown only on some machines like
-FIXME:  AIX52 and HPUX11. Until this has been solved we use numbers that
-FIXME:  *should* be equal to the exponent representation but have no exponents
-FIXME:  and use the specified count of *0*s instead.
-FIXME:  In the source file these tests are marked with the comment  hpux11
-.
---------------------------------------------------------------------------------
 DROP DATABASE IF EXISTS d1;
 CREATE DATABASE d1;
 USE d1;
@@ -14926,7 +16100,7 @@ return f1;
 END//
 SELECT fn2(1.84e+19);
 fn2(1.84e+19)
-0
+18400000000000000000
 DROP FUNCTION IF EXISTS fn3;
 CREATE FUNCTION fn3( f1 bigint unsigned zerofill) returns bigint unsigned zerofill
 BEGIN
@@ -14945,6 +16119,8 @@ END//
 SELECT fn4(-9.22e+15);
 fn4(-9.22e+15)
 0
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn5;
 CREATE FUNCTION fn5( f1 decimal) returns decimal
 BEGIN
@@ -14972,6 +16148,10 @@ END//
 SELECT fn7(99999999999);
 fn7(99999999999)
 9999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn8;
 CREATE FUNCTION fn8( f1 decimal (0) unsigned zerofill) returns decimal (0) unsigned zerofill
 BEGIN
@@ -14980,7 +16160,9 @@ return f1;
 END//
 SELECT fn8(999999999);
 fn8(999999999)
-0999999999
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn9;
 CREATE FUNCTION fn9( f1 decimal (0) zerofill) returns decimal (0) zerofill
 BEGIN
@@ -14989,7 +16171,10 @@ return f1;
 END//
 SELECT fn9(-1.00e+09);
 fn9(-1.00e+09)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn10;
 CREATE FUNCTION fn10( f1 decimal (0, 0)) returns decimal (0, 0)
 BEGIN
@@ -15008,6 +16193,10 @@ END//
 SELECT fn11(99999999999);
 fn11(99999999999)
 9999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn12;
 CREATE FUNCTION fn12( f1 decimal (0, 0) unsigned zerofill) returns decimal (0, 0) unsigned zerofill
 BEGIN
@@ -15016,7 +16205,9 @@ return f1;
 END//
 SELECT fn12(999999999);
 fn12(999999999)
-0999999999
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn13;
 CREATE FUNCTION fn13( f1 decimal (0, 0) zerofill) returns decimal (0, 0) zerofill
 BEGIN
@@ -15025,7 +16216,10 @@ return f1;
 END//
 SELECT fn13(-1.00e+09);
 fn13(-1.00e+09)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn14;
 CREATE FUNCTION fn14( f1 decimal (63, 30)) returns decimal (63, 30)
 BEGIN
@@ -15061,7 +16255,10 @@ return f1;
 END//
 SELECT fn17(-1.00e+21);
 fn17(-1.00e+21)
-000000000000000000000000000000000.000000000000000000000000000000
+000000000000000000000000000000010.000000000000000000000000000000
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn18_d;
 CREATE FUNCTION fn18_d( f1 decimal (64)) returns decimal (64)
 BEGIN
@@ -15097,7 +16294,10 @@ return f1;
 END//
 SELECT fn21_d_z(1.00e+00);
 fn21_d_z(1.00e+00)
-0000000000000000000000000000000000000000000000000000000000000001
+0000000000000000000000000000000000000000000000000000000000000010
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn22;
 CREATE FUNCTION fn22( f1 decimal unsigned) returns decimal unsigned
 BEGIN
@@ -15106,7 +16306,10 @@ return f1;
 END//
 SELECT fn22(1.00e+00);
 fn22(1.00e+00)
-1
+10
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn23;
 CREATE FUNCTION fn23( f1 decimal unsigned zerofill) returns decimal unsigned zerofill
 BEGIN
@@ -15115,7 +16318,10 @@ return f1;
 END//
 SELECT fn23(1.00e+00);
 fn23(1.00e+00)
-0000000001
+0000000010
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn24;
 CREATE FUNCTION fn24( f1 decimal zerofill) returns decimal zerofill
 BEGIN
@@ -15124,7 +16330,10 @@ return f1;
 END//
 SELECT fn24(-1.00e+09);
 fn24(-1.00e+09)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn25;
 CREATE FUNCTION fn25( f1 double) returns double
 BEGIN
@@ -15142,7 +16351,9 @@ return f1;
 END//
 SELECT fn26(1.00e+00);
 fn26(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn27;
 CREATE FUNCTION fn27( f1 double unsigned zerofill) returns double unsigned zerofill
 BEGIN
@@ -15151,7 +16362,9 @@ return f1;
 END//
 SELECT fn27(1.00e+00);
 fn27(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn28;
 CREATE FUNCTION fn28( f1 double zerofill) returns double zerofill
 BEGIN
@@ -15160,7 +16373,9 @@ return f1;
 END//
 SELECT fn28(1.00e+00);
 fn28(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn29;
 CREATE FUNCTION fn29( f1 float) returns float
 BEGIN
@@ -15178,7 +16393,9 @@ return f1;
 END//
 SELECT fn30(1.00e+00);
 fn30(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn31;
 CREATE FUNCTION fn31( f1 float unsigned zerofill) returns float unsigned zerofill
 BEGIN
@@ -15187,7 +16404,9 @@ return f1;
 END//
 SELECT fn31(1.00e+00);
 fn31(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn32;
 CREATE FUNCTION fn32( f1 float zerofill) returns float zerofill
 BEGIN
@@ -15196,7 +16415,9 @@ return f1;
 END//
 SELECT fn32(1.00e+00);
 fn32(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn33;
 CREATE FUNCTION fn33( f1 float(0)) returns float(0)
 BEGIN
@@ -15214,7 +16435,9 @@ return f1;
 END//
 SELECT fn34(1.00e+00);
 fn34(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn35;
 CREATE FUNCTION fn35( f1 float(0) unsigned zerofill) returns float(0) unsigned zerofill
 BEGIN
@@ -15223,7 +16446,9 @@ return f1;
 END//
 SELECT fn35(1.00e+00);
 fn35(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn36;
 CREATE FUNCTION fn36( f1 float(0) zerofill) returns float(0) zerofill
 BEGIN
@@ -15232,7 +16457,9 @@ return f1;
 END//
 SELECT fn36(1.00e+00);
 fn36(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn37;
 CREATE FUNCTION fn37( f1 float(23)) returns float(23)
 BEGIN
@@ -15250,7 +16477,9 @@ return f1;
 END//
 SELECT fn38(1.00e+00);
 fn38(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn39;
 CREATE FUNCTION fn39( f1 float(23) unsigned zerofill) returns float(23) unsigned zerofill
 BEGIN
@@ -15259,7 +16488,9 @@ return f1;
 END//
 SELECT fn39(1.00e+00);
 fn39(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn40;
 CREATE FUNCTION fn40( f1 float(23) zerofill) returns float(23) zerofill
 BEGIN
@@ -15268,7 +16499,9 @@ return f1;
 END//
 SELECT fn40(1.00e+00);
 fn40(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn41;
 CREATE FUNCTION fn41( f1 float(24)) returns float(24)
 BEGIN
@@ -15286,7 +16519,9 @@ return f1;
 END//
 SELECT fn42(1.00e+00);
 fn42(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn43;
 CREATE FUNCTION fn43( f1 float(24) unsigned zerofill) returns float(24) unsigned zerofill
 BEGIN
@@ -15295,7 +16530,9 @@ return f1;
 END//
 SELECT fn43(1.00e+00);
 fn43(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn44;
 CREATE FUNCTION fn44( f1 float(24) zerofill) returns float(24) zerofill
 BEGIN
@@ -15304,7 +16541,9 @@ return f1;
 END//
 SELECT fn44(1.00e+00);
 fn44(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn45;
 CREATE FUNCTION fn45( f1 float(53)) returns float(53)
 BEGIN
@@ -15322,7 +16561,9 @@ return f1;
 END//
 SELECT fn46(1.00e+00);
 fn46(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn47;
 CREATE FUNCTION fn47( f1 float(53) unsigned zerofill) returns float(53) unsigned zerofill
 BEGIN
@@ -15331,7 +16572,9 @@ return f1;
 END//
 SELECT fn47(1.00e+00);
 fn47(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn48;
 CREATE FUNCTION fn48( f1 float(53) zerofill) returns float(53) zerofill
 BEGIN
@@ -15340,7 +16583,9 @@ return f1;
 END//
 SELECT fn48(1.00e+00);
 fn48(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn49;
 CREATE FUNCTION fn49( f1 int) returns int
 BEGIN
@@ -15349,7 +16594,10 @@ return f1;
 END//
 SELECT fn49(-2.15e+09);
 fn49(-2.15e+09)
--2147483648
+-2147483638
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn50;
 CREATE FUNCTION fn50( f1 int unsigned) returns int unsigned
 BEGIN
@@ -15385,7 +16633,9 @@ return f1;
 END//
 SELECT fn53(-8388600);
 fn53(-8388600)
--8388600
+-8388598
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn54;
 CREATE FUNCTION fn54( f1 mediumint unsigned) returns mediumint unsigned
 BEGIN
@@ -15412,7 +16662,11 @@ return f1;
 END//
 SELECT fn56(-8388601);
 fn56(-8388601)
-0
+16777215
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn57;
 CREATE FUNCTION fn57( f1 numeric) returns numeric
 BEGIN
@@ -15421,7 +16675,9 @@ return f1;
 END//
 SELECT fn57(-999999999);
 fn57(-999999999)
--999999999
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn58;
 CREATE FUNCTION fn58( f1 numeric (0)) returns numeric (0)
 BEGIN
@@ -15430,7 +16686,9 @@ return f1;
 END//
 SELECT fn58(-999999999);
 fn58(-999999999)
--999999999
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn59;
 CREATE FUNCTION fn59( f1 numeric (0) unsigned) returns numeric (0) unsigned
 BEGIN
@@ -15440,6 +16698,9 @@ END//
 SELECT fn59(9999999999);
 fn59(9999999999)
 9999999999
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn60;
 CREATE FUNCTION fn60( f1 numeric (0) unsigned zerofill) returns numeric (0) unsigned zerofill
 BEGIN
@@ -15448,7 +16709,9 @@ return f1;
 END//
 SELECT fn60(99999999);
 fn60(99999999)
-0099999999
+0100000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn61;
 CREATE FUNCTION fn61( f1 numeric (0) zerofill) returns numeric (0) zerofill
 BEGIN
@@ -15457,7 +16720,10 @@ return f1;
 END//
 SELECT fn61(-99999999);
 fn61(-99999999)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn62;
 CREATE FUNCTION fn62( f1 numeric (0, 0)) returns numeric (0, 0)
 BEGIN
@@ -15466,7 +16732,9 @@ return f1;
 END//
 SELECT fn62(-999999999);
 fn62(-999999999)
--999999999
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn63;
 CREATE FUNCTION fn63( f1 numeric (0, 0) unsigned) returns numeric (0, 0) unsigned
 BEGIN
@@ -15476,6 +16744,9 @@ END//
 SELECT fn63(9999999999);
 fn63(9999999999)
 9999999999
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn64;
 CREATE FUNCTION fn64( f1 numeric (0, 0) unsigned zerofill) returns numeric (0, 0) unsigned zerofill
 BEGIN
@@ -15484,7 +16755,9 @@ return f1;
 END//
 SELECT fn64(99999999);
 fn64(99999999)
-0099999999
+0100000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn65;
 CREATE FUNCTION fn65( f1 numeric (0, 0) zerofill) returns numeric (0, 0) zerofill
 BEGIN
@@ -15493,7 +16766,10 @@ return f1;
 END//
 SELECT fn65(-99999999);
 fn65(-99999999)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn66;
 CREATE FUNCTION fn66( f1 numeric (63, 30)) returns numeric (63, 30)
 BEGIN
@@ -15502,7 +16778,12 @@ return f1;
 END//
 SELECT fn66(-1e+36);
 fn66(-1e+36)
--999999999999999999999999999999999.999999999999999999999999999999
+-999999999999999999999999999999989.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn67;
 CREATE FUNCTION fn67( f1 numeric (63, 30) unsigned) returns numeric (63, 30) unsigned
 BEGIN
@@ -15512,6 +16793,10 @@ END//
 SELECT fn67(1e+36);
 fn67(1e+36)
 999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn68;
 CREATE FUNCTION fn68( f1 numeric (63, 30) unsigned zerofill) returns numeric (63, 30) unsigned zerofill
 BEGIN
@@ -15521,6 +16806,10 @@ END//
 SELECT fn68(1e+36);
 fn68(1e+36)
 999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn69;
 CREATE FUNCTION fn69( f1 numeric (63, 30) zerofill) returns numeric (63, 30) zerofill
 BEGIN
@@ -15529,7 +16818,10 @@ return f1;
 END//
 SELECT fn69(-1e+36);
 fn69(-1e+36)
-000000000000000000000000000000000.000000000000000000000000000000
+000000000000000000000000000000010.000000000000000000000000000000
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn70_n;
 CREATE FUNCTION fn70_n( f1 numeric (64)) returns numeric (64)
 BEGIN
@@ -15577,7 +16869,9 @@ return f1;
 END//
 SELECT fn74(999999999);
 fn74(999999999)
-999999999
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn75;
 CREATE FUNCTION fn75( f1 numeric unsigned zerofill) returns numeric unsigned zerofill
 BEGIN
@@ -15586,7 +16880,9 @@ return f1;
 END//
 SELECT fn75(999999999);
 fn75(999999999)
-0999999999
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn76;
 CREATE FUNCTION fn76( f1 numeric zerofill) returns numeric zerofill
 BEGIN
@@ -15595,7 +16891,10 @@ return f1;
 END//
 SELECT fn76(-999999999);
 fn76(-999999999)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn77;
 CREATE FUNCTION fn77( f1 real) returns real
 BEGIN
@@ -15613,7 +16912,9 @@ return f1;
 END//
 SELECT fn78(1.1);
 fn78(1.1)
-1.1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn79;
 CREATE FUNCTION fn79( f1 real unsigned zerofill) returns real unsigned zerofill
 BEGIN
@@ -15622,7 +16923,9 @@ return f1;
 END//
 SELECT fn79(1.1);
 fn79(1.1)
-1.1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn80;
 CREATE FUNCTION fn80( f1 real zerofill) returns real zerofill
 BEGIN
@@ -15631,7 +16934,9 @@ return f1;
 END//
 SELECT fn80(1.1);
 fn80(1.1)
-1.1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn81;
 CREATE FUNCTION fn81( f1 smallint) returns smallint
 BEGIN
@@ -15667,7 +16972,11 @@ return f1;
 END//
 SELECT fn84(-32601);
 fn84(-32601)
-0
+65535
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn85;
 CREATE FUNCTION fn85( f1 tinyint) returns tinyint
 BEGIN
@@ -15703,45 +17012,37 @@ return f1;
 END//
 SELECT fn88(-101);
 fn88(-101)
-0
+255
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn89;
 CREATE FUNCTION fn89( f1 enum('1enum', '2enum')) returns enum('1enum', '2enum')
 BEGIN
-if f1 eq "1enum" then
-set f1 = '2enum';
-else
-set f1 = '1enum';
-END if;
-return f1;
+IF f1 = '1enum' THEN
+SET f1 = '2enum';
+ELSE
+SET f1 = '1enum';
+END IF;
+RETURN f1;
 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 'eq "1enum" then
-set f1 = '2enum';
-else
-set f1 = '1enum';
-END if;
-return f1;
-END' at line 3
 SELECT fn89( '1enum');
-ERROR 42000: FUNCTION d1.fn89 does not exist
+fn89( '1enum')
+2enum
 DROP FUNCTION IF EXISTS fn90;
-CREATE FUNCTION fn90( f1 set("1set", "2set")) returns set("1set", "2set")
+CREATE FUNCTION fn90( f1 set('1set', '2set')) returns set('1set', '2set')
 BEGIN
-if(f1 == "1set") then
-set f1 = "2set";
-else
-set f1 = "1set";
-END if;
-return f1;
+IF f1 = '1set' THEN
+SET f1 = '2set';
+ELSE
+SET f1 = '1set';
+END IF;
+RETURN f1;
 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 '== "1set") then
-set f1 = "2set";
-else
-set f1 = "1set";
-END if;
-return f1;
-END' at line 3
 SELECT fn90( '1set');
-ERROR 42000: FUNCTION d1.fn90 does not exist
+fn90( '1set')
+2set
 DROP FUNCTION IF EXISTS fn91;
 CREATE FUNCTION fn91( f1 date) returns date
 BEGIN
@@ -15759,7 +17060,7 @@ return f1;
 END//
 SELECT fn92( '23:59:59.999999');
 fn92( '23:59:59.999999')
-26:00:00
+25:59:59
 DROP FUNCTION IF EXISTS fn93;
 CREATE FUNCTION fn93( f1 datetime) returns datetime
 BEGIN
@@ -15768,7 +17069,7 @@ return f1;
 END//
 SELECT fn93('1997-12-31 23:59:59.999999');
 fn93('1997-12-31 23:59:59.999999')
-1998-01-02 01:01:01
+1998-01-02 01:01:00
 DROP FUNCTION IF EXISTS fn94;
 CREATE FUNCTION fn94( f1 char) returns char
 BEGIN
@@ -15778,6 +17079,8 @@ END//
 SELECT fn94( 'h');
 fn94( 'h')
 a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn95;
 CREATE FUNCTION fn95( f1 char ascii) returns char ascii
 BEGIN
@@ -15787,15 +17090,19 @@ END//
 SELECT fn95('h');
 fn95('h')
 a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn96;
-CREATE FUNCTION fn96( f1 char binary) returns char binary
+CREATE FUNCTION fn96( f1 binary) returns binary(2)
 BEGIN
 set f1 = concat('a', f1);
 return f1;
 END//
 SELECT fn96( 'h');
 fn96( 'h')
-a
+a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn97;
 CREATE FUNCTION fn97( f1 longtext) returns longtext
 BEGIN
@@ -15917,7 +17224,7 @@ SELECT f1;
 END//
 CALL sp2(1.84e+19);
 f1
--9223372036854775808
+18400000000000000000
 DROP PROCEDURE IF EXISTS sp3;
 CREATE PROCEDURE sp3( f1 bigint unsigned zerofill)
 BEGIN
@@ -15926,7 +17233,7 @@ SELECT f1;
 END//
 CALL sp3(1.84e+17);
 f1
-184000000000000000
+00184000000000000000
 DROP PROCEDURE IF EXISTS sp4;
 CREATE PROCEDURE sp4( f1 bigint zerofill)
 BEGIN
@@ -15935,31 +17242,27 @@ SELECT f1;
 END//
 CALL sp4(-9.22e+15);
 f1
--9220000000000000
+00000000000000000000
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp5;
 CREATE PROCEDURE sp5( f1 decimal)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: default (10) for DECIMAL not checked, decimal digits shown although not defined
 CALL sp5(-1.00e+09);
 f1
--1000000000.000000000
+-1000000000
 DROP PROCEDURE IF EXISTS sp6;
 CREATE PROCEDURE sp6( f1 decimal (0))
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp6(-1.00e+09);
 f1
--1000000000.000000000
+-1000000000
 DROP PROCEDURE IF EXISTS sp7;
 CREATE PROCEDURE sp7( f1 decimal (0) unsigned)
 BEGIN
@@ -15968,7 +17271,11 @@ SELECT f1;
 END//
 CALL sp7(99999999999);
 f1
-99999999999.000000000
+9999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp8;
 CREATE PROCEDURE sp8( f1 decimal (0) unsigned zerofill)
 BEGIN
@@ -15977,199 +17284,201 @@ SELECT f1;
 END//
 CALL sp8(999999999);
 f1
-999999999.000000000
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp9;
 CREATE PROCEDURE sp9( f1 decimal (0) zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp9(-1.00e+09);
 f1
--1000000000.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp10;
 CREATE PROCEDURE sp10( f1 decimal (0, 0))
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp10(-1.00e+09);
 f1
--1000000000.000000000
+-1000000000
 DROP PROCEDURE IF EXISTS sp11;
 CREATE PROCEDURE sp11( f1 decimal (0, 0) unsigned)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp11(99999999999);
 f1
-99999999999.000000000
+9999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp12;
 CREATE PROCEDURE sp12( f1 decimal (0, 0) unsigned zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp12(999999999);
 f1
-999999999.000000000
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp13;
 CREATE PROCEDURE sp13( f1 decimal (0, 0) zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp13(-1.00e+09);
 f1
--1000000000.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp14;
 CREATE PROCEDURE sp14( f1 decimal (63, 30))
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: wrong number of decimal digits shown
 CALL sp14(-1.00e+21);
 f1
--1000000000000000000000.000000000
+-1000000000000000000000.000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp15;
 CREATE PROCEDURE sp15( f1 decimal (63, 30) unsigned)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: wrong number of decimal digits shown
 CALL sp15(1.00e+16);
 f1
-10000000000000000.000000000
+10000000000000000.000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp16;
 CREATE PROCEDURE sp16( f1 decimal (63, 30) unsigned zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: wrong number of decimal digits shown
 CALL sp16(1.00e+16);
 f1
-10000000000000000.000000000
+000000000000000010000000000000000.000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp17;
 CREATE PROCEDURE sp17( f1 decimal (63, 30) zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: wrong number of decimal digits shown
 CALL sp17(-1.00e+21);
 f1
--1000000000000000000000.000000000
+000000000000000000000000000000010.000000000000000000000000000000
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp18_d;
 CREATE PROCEDURE sp18_d( f1 decimal (64))
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp18_d(-1.00e+30);
+f1
+-1000000000000000000000000000000
 CALL sp18_d( -1000000000000000000000000000000 );
 f1
--1000000000000000000000000000000.000000000
+-1000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp19_du;
 CREATE PROCEDURE sp19_du( f1 decimal (64) unsigned)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp19_du(1.00e+20);
+f1
+100000000000000000000
 CALL sp19_du( 100000000000000000000 );
 f1
-100000000000000000000.000000000
+100000000000000000000
+CALL sp19_du(1.00e+24);
+f1
+1000000000000000000000000
 CALL sp19_du( 1000000000000000000000000 );
 f1
-1000000000000000000000000.000000000
+1000000000000000000000000
 DROP PROCEDURE IF EXISTS sp20_duz;
 CREATE PROCEDURE sp20_duz( f1 decimal (64) unsigned zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
+CALL sp20_duz(1.00e+20);
+f1
+0000000000000000000000000000000000000000000100000000000000000000
 CALL sp20_duz( 100000000000000000000 );
 f1
-100000000000000000000.000000000
+0000000000000000000000000000000000000000000100000000000000000000
+CALL sp20_duz(1.00e+24);
+f1
+0000000000000000000000000000000000000001000000000000000000000000
 CALL sp20_duz( 1000000000000000000000000 );
 f1
-1000000000000000000000000.000000000
+0000000000000000000000000000000000000001000000000000000000000000
 DROP PROCEDURE IF EXISTS sp21;
 CREATE PROCEDURE sp21( f1 decimal (64) zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp21(1.00e+00);
 f1
-1.000000000
+0000000000000000000000000000000000000000000000000000000000000010
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp22;
 CREATE PROCEDURE sp22( f1 decimal unsigned)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp22(1.00e+00);
 f1
-1.000000000
+10
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp23;
 CREATE PROCEDURE sp23( f1 decimal unsigned zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp23(1.00e+00);
 f1
-1.000000000
+0000000010
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp24;
 CREATE PROCEDURE sp24( f1 decimal zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp24(-1.00e+09);
 f1
--1000000000.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp25;
 CREATE PROCEDURE sp25( f1 double)
 BEGIN
@@ -16187,7 +17496,9 @@ SELECT f1;
 END//
 CALL sp26(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp27;
 CREATE PROCEDURE sp27( f1 double unsigned zerofill)
 BEGIN
@@ -16196,7 +17507,9 @@ SELECT f1;
 END//
 CALL sp27(1.00e+00);
 f1
-1
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp28;
 CREATE PROCEDURE sp28( f1 double zerofill)
 BEGIN
@@ -16205,7 +17518,9 @@ SELECT f1;
 END//
 CALL sp28(1.00e+00);
 f1
-1
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp29;
 CREATE PROCEDURE sp29( f1 float)
 BEGIN
@@ -16223,7 +17538,9 @@ SELECT f1;
 END//
 CALL sp30(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp31;
 CREATE PROCEDURE sp31( f1 float unsigned zerofill)
 BEGIN
@@ -16232,7 +17549,9 @@ SELECT f1;
 END//
 CALL sp31(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp32;
 CREATE PROCEDURE sp32( f1 float zerofill)
 BEGIN
@@ -16241,7 +17560,9 @@ SELECT f1;
 END//
 CALL sp32(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp33;
 CREATE PROCEDURE sp33( f1 float(0))
 BEGIN
@@ -16259,7 +17580,9 @@ SELECT f1;
 END//
 CALL sp34(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp35;
 CREATE PROCEDURE sp35( f1 float(0) unsigned zerofill)
 BEGIN
@@ -16268,7 +17591,9 @@ SELECT f1;
 END//
 CALL sp35(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp36;
 CREATE PROCEDURE sp36( f1 float(0) zerofill)
 BEGIN
@@ -16277,7 +17602,9 @@ SELECT f1;
 END//
 CALL sp36(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp37;
 CREATE PROCEDURE sp37( f1 float(23))
 BEGIN
@@ -16295,7 +17622,9 @@ SELECT f1;
 END//
 CALL sp38(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp39;
 CREATE PROCEDURE sp39( f1 float(23) unsigned zerofill)
 BEGIN
@@ -16304,7 +17633,9 @@ SELECT f1;
 END//
 CALL sp39(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp40;
 CREATE PROCEDURE sp40( f1 float(23) zerofill)
 BEGIN
@@ -16313,7 +17644,9 @@ SELECT f1;
 END//
 CALL sp40(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp41;
 CREATE PROCEDURE sp41( f1 float(24))
 BEGIN
@@ -16331,7 +17664,9 @@ SELECT f1;
 END//
 CALL sp42(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp43;
 CREATE PROCEDURE sp43( f1 float(24) unsigned zerofill)
 BEGIN
@@ -16340,7 +17675,9 @@ SELECT f1;
 END//
 CALL sp43(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp44;
 CREATE PROCEDURE sp44( f1 float(24) zerofill)
 BEGIN
@@ -16349,7 +17686,9 @@ SELECT f1;
 END//
 CALL sp44(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp45;
 CREATE PROCEDURE sp45( f1 float(53))
 BEGIN
@@ -16367,7 +17706,9 @@ SELECT f1;
 END//
 CALL sp46(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp47;
 CREATE PROCEDURE sp47( f1 float(53) unsigned zerofill)
 BEGIN
@@ -16376,7 +17717,9 @@ SELECT f1;
 END//
 CALL sp47(1.00e+00);
 f1
-1
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp48;
 CREATE PROCEDURE sp48( f1 float(53) zerofill)
 BEGIN
@@ -16385,7 +17728,9 @@ SELECT f1;
 END//
 CALL sp48(1.00e+00);
 f1
-1
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp49;
 CREATE PROCEDURE sp49( f1 int)
 BEGIN
@@ -16394,7 +17739,10 @@ SELECT f1;
 END//
 CALL sp49(-2.15e+09);
 f1
--2150000000
+-2147483638
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp50;
 CREATE PROCEDURE sp50( f1 int unsigned)
 BEGIN
@@ -16421,7 +17769,7 @@ SELECT f1;
 END//
 CALL sp52(2.15e+08);
 f1
-215000000
+0215000000
 DROP PROCEDURE IF EXISTS sp53;
 CREATE PROCEDURE sp53( f1 mediumint)
 BEGIN
@@ -16430,7 +17778,9 @@ SELECT f1;
 END//
 CALL sp53(-8388600);
 f1
--8388600
+-8388598
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp54;
 CREATE PROCEDURE sp54( f1 mediumint unsigned)
 BEGIN
@@ -16457,7 +17807,11 @@ SELECT f1;
 END//
 CALL sp56(-8388601);
 f1
--8388602
+16777215
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp57;
 CREATE PROCEDURE sp57( f1 numeric)
 BEGIN
@@ -16466,7 +17820,9 @@ SELECT f1;
 END//
 CALL sp57(-999999999);
 f1
--999999999.000000000
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp58;
 CREATE PROCEDURE sp58( f1 numeric (0))
 BEGIN
@@ -16475,7 +17831,9 @@ SELECT f1;
 END//
 CALL sp58(-999999999);
 f1
--999999999.000000000
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp59;
 CREATE PROCEDURE sp59( f1 numeric (0) unsigned)
 BEGIN
@@ -16484,7 +17842,10 @@ SELECT f1;
 END//
 CALL sp59(9999999999);
 f1
-9999999999.000000000
+9999999999
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp60;
 CREATE PROCEDURE sp60( f1 numeric (0) unsigned zerofill)
 BEGIN
@@ -16493,7 +17854,9 @@ SELECT f1;
 END//
 CALL sp60(99999999);
 f1
-99999999.000000000
+0100000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp61;
 CREATE PROCEDURE sp61( f1 numeric (0) zerofill)
 BEGIN
@@ -16502,7 +17865,10 @@ SELECT f1;
 END//
 CALL sp61(-99999999);
 f1
--99999999.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp62;
 CREATE PROCEDURE sp62( f1 numeric (0, 0))
 BEGIN
@@ -16511,7 +17877,9 @@ SELECT f1;
 END//
 CALL sp62(-999999999);
 f1
--999999999.000000000
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp63;
 CREATE PROCEDURE sp63( f1 numeric (0, 0) unsigned)
 BEGIN
@@ -16520,7 +17888,10 @@ SELECT f1;
 END//
 CALL sp63(9999999999);
 f1
-9999999999.000000000
+9999999999
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp64;
 CREATE PROCEDURE sp64( f1 numeric (0, 0) unsigned zerofill)
 BEGIN
@@ -16529,7 +17900,9 @@ SELECT f1;
 END//
 CALL sp64(99999999);
 f1
-99999999.000000000
+0100000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp65;
 CREATE PROCEDURE sp65( f1 numeric (0, 0) zerofill)
 BEGIN
@@ -16538,79 +17911,146 @@ SELECT f1;
 END//
 CALL sp65(-99999999);
 f1
--99999999.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp66_n;
 CREATE PROCEDURE sp66_n( f1 numeric (63, 30))
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp66_n(-1e+36);
+f1
+-999999999999999999999999999999989.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 CALL sp66_n( -1000000000000000000000000000000000000 );
 f1
--1000000000000000000000000000000000000.000000000
+-999999999999999999999999999999989.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp67_nu;
 CREATE PROCEDURE sp67_nu( f1 numeric (63, 30) unsigned)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp67_nu(1e+36);
+f1
+999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 CALL sp67_nu( 1000000000000000000000000000000000000 );
 f1
-1000000000000000000000000000000000000.000000000
+999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp68_nuz;
 CREATE PROCEDURE sp68_nuz( f1 numeric (63, 30) unsigned zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp68_nuz(1e+36);
+f1
+999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 CALL sp68_nuz( 1000000000000000000000000000000000000 );
 f1
-1000000000000000000000000000000000000.000000000
+999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp69_n_z;
 CREATE PROCEDURE sp69_n_z( f1 numeric (63, 30) zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp69_n_z(-1e+36);
+f1
+000000000000000000000000000000010.000000000000000000000000000000
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 CALL sp69_n_z( -1000000000000000000000000000000000000 );
 f1
--1000000000000000000000000000000000000.000000000
+000000000000000000000000000000010.000000000000000000000000000000
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp70_n;
 CREATE PROCEDURE sp70_n( f1 numeric (64))
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp70_n(-1e+40);
+f1
+-10000000000000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 CALL sp70_n( -10000000000000000000000000000000000000000 );
 f1
--10000000000000000000000000000000000000000.000000000
+-10000000000000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp71_nu;
 CREATE PROCEDURE sp71_nu( f1 numeric (64) unsigned)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp71_nu(1.00e+40);
+f1
+10000000000000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 CALL sp71_nu( 10000000000000000000000000000000000000000 );
 f1
-10000000000000000000000000000000000000000.000000000
+10000000000000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp72_nuz;
 CREATE PROCEDURE sp72_nuz( f1 numeric (64) unsigned zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp72_nuz(1.00e+40);
+f1
+0000000000000000000000010000000000000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 CALL sp72_nuz( 10000000000000000000000000000000000000000 );
 f1
-10000000000000000000000000000000000000000.000000000
+0000000000000000000000010000000000000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp73_n_z;
 CREATE PROCEDURE sp73_n_z( f1 numeric (64) zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp73_n_z(1.00e+40);
+f1
+0000000000000000000000010000000000000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 CALL sp73_n_z( 10000000000000000000000000000000000000000 );
 f1
-10000000000000000000000000000000000000000.000000000
+0000000000000000000000010000000000000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp74;
 CREATE PROCEDURE sp74( f1 numeric unsigned)
 BEGIN
@@ -16619,7 +18059,9 @@ SELECT f1;
 END//
 CALL sp74(999999999);
 f1
-999999999.000000000
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp75;
 CREATE PROCEDURE sp75( f1 numeric unsigned zerofill)
 BEGIN
@@ -16628,7 +18070,9 @@ SELECT f1;
 END//
 CALL sp75(999999999);
 f1
-999999999.000000000
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp76;
 CREATE PROCEDURE sp76( f1 numeric zerofill)
 BEGIN
@@ -16637,7 +18081,10 @@ SELECT f1;
 END//
 CALL sp76(-999999999);
 f1
--999999999.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp77;
 CREATE PROCEDURE sp77( f1 real)
 BEGIN
@@ -16646,7 +18093,7 @@ SELECT f1;
 END//
 CALL sp77(1.1);
 f1
-1.10000
+1.1
 DROP PROCEDURE IF EXISTS sp78;
 CREATE PROCEDURE sp78( f1 real unsigned)
 BEGIN
@@ -16655,7 +18102,9 @@ SELECT f1;
 END//
 CALL sp78(1.1);
 f1
-1.10000
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp79;
 CREATE PROCEDURE sp79( f1 real unsigned zerofill)
 BEGIN
@@ -16664,7 +18113,9 @@ SELECT f1;
 END//
 CALL sp79(1.1);
 f1
-1.10000
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp80;
 CREATE PROCEDURE sp80( f1 real zerofill)
 BEGIN
@@ -16673,7 +18124,9 @@ SELECT f1;
 END//
 CALL sp80(1.1);
 f1
-1.10000
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp81;
 CREATE PROCEDURE sp81( f1 smallint)
 BEGIN
@@ -16709,7 +18162,11 @@ SELECT f1;
 END//
 CALL sp84(-32601);
 f1
--32602
+65535
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp85;
 CREATE PROCEDURE sp85( f1 tinyint)
 BEGIN
@@ -16745,9 +18202,23 @@ SELECT f1;
 END//
 CALL sp88(-101);
 f1
--102
+255
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp89;
+CREATE PROCEDURE sp89( f1 enum('1enum', '2enum'))
+BEGIN
+IF f1 = '1enum' THEN set f1 = '2enum'; ELSE  set f1 = '1enum'; END IF;
+END//
+CALL sp89( '1enum');
 DROP PROCEDURE IF EXISTS sp90;
+CREATE PROCEDURE sp90( f1 set('1set', '2set'))
+BEGIN
+IF f1 = '1set' THEN  set f1 = '2set';  ELSE set f1 = '1set'; END IF;
+END//
+CALL sp90( '1set');
 DROP PROCEDURE IF EXISTS sp91;
 CREATE PROCEDURE sp91( f1 date)
 BEGIN
@@ -16765,7 +18236,7 @@ SELECT f1;
 END//
 CALL sp92( '23:59:59.999999');
 f1
-26:00:00.999997
+25:59:59
 DROP PROCEDURE IF EXISTS sp93;
 CREATE PROCEDURE sp93( f1 datetime)
 BEGIN
@@ -16774,7 +18245,7 @@ SELECT f1;
 END//
 CALL sp93('1997-12-31 23:59:59.999999');
 f1
-1998-01-02 01:01:01.000001
+1998-01-02 01:01:00
 DROP PROCEDURE IF EXISTS sp94;
 CREATE PROCEDURE sp94( f1 char)
 BEGIN
@@ -16783,7 +18254,9 @@ SELECT f1;
 END//
 CALL sp94( 'h');
 f1
-ah
+a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp95;
 CREATE PROCEDURE sp95( f1 char ascii)
 BEGIN
@@ -16792,7 +18265,9 @@ SELECT f1;
 END//
 CALL sp95( 'h');
 f1
-ah
+a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp96;
 CREATE PROCEDURE sp96( f1 char binary)
 BEGIN
@@ -16801,7 +18276,9 @@ SELECT f1;
 END//
 CALL sp96( 'h');
 f1
-ah
+a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp97;
 CREATE PROCEDURE sp97( f1 longtext)
 BEGIN
@@ -16846,7 +18323,7 @@ SELECT f1;
 END//
 CALL sp101(51);
 f1
-61
+2061
 DROP PROCEDURE IF EXISTS sp102;
 CREATE PROCEDURE sp102( f1 year(4))
 BEGIN
@@ -16901,6 +18378,8 @@ END//
 CALL sp107(2.00e+13);
 f1
 returned
+Warnings:
+returned	1265	Data truncated for column 'f1' at row 1
 USE db_storedproc;
 DROP DATABASE db1;
 DROP DATABASE IF EXISTS db1;
@@ -16937,9 +18416,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute01();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-61	61	71	61	61	71	2033	2033	2084	2033	2033	2084
+2061	2061	2071	2061	2061	2071	2033	2033	2084	2033	2033	2084
 var1	var2	var3	var4	var5	var6	var7	var8
-61	71	61	71	2033	2084	2033	2084
+2061	2071	2061	2071	2033	2084	2033	2084
 DROP PROCEDURE spexecute01;
 DROP PROCEDURE sp1;
 DROP PROCEDURE IF EXISTS sp2;
@@ -17010,9 +18489,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute03();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-ah	ah	aah	ah	ah	aah	helloworld	helloworld	NULL	helloworld	helloworld	hellohelloworld
+a	a	a	a	a	a	helloworld	helloworld	NULL	helloworld	helloworld	hellohelloworld
 var1	var2	var3	var4	var5	var6	var7	var8
-ah	aah	ah	aah	helloworld	NULL	helloworld	hellohelloworld
+a	a	a	a	helloworld	NULL	helloworld	hellohelloworld
 DROP PROCEDURE spexecute03;
 DROP PROCEDURE sp3;
 DROP PROCEDURE IF EXISTS sp4;
@@ -17155,7 +18634,7 @@ SELECT var7, var8;
 END//
 CALL spexecute07();
 var1	var2
-9223372036854775807	NULL
+18400000000000000000	NULL
 var3	var4
 -9220000000000000000	NULL
 var5	var6
@@ -17163,7 +18642,7 @@ var5	var6
 var7	var8
 -9220000000000000000	NULL
 f1	f2	f3
-9223372036854775807	9223372036854775807	NULL
+18400000000000000000	18400000000000000000	NULL
 f4	f5	f6
 -9220000000000000000	-9220000000000000000	NULL
 f7	f8	f9
@@ -17171,7 +18650,7 @@ f7	f8	f9
 f10	f11	f12
 -9220000000000000000	-9220000000000000000	NULL
 f1	f2	f3
--2	-2	-2
+18353255926290448384	18353255926290448384	18353255926290448384
 f4	f5	f6
 -9220000000000000000	6744073709551616	6744073709551616
 f7	f8	f9
@@ -17179,7 +18658,7 @@ f7	f8	f9
 f10	f11	f12
 -9220000000000000000	6744073709551616	6744073709551616
 var1	var2
--2	-2
+18353255926290448384	18353255926290448384
 var3	var4
 6744073709551616	6744073709551616
 var5	var6
@@ -17237,9 +18716,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute08();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-368000000000000000	368000000000000000	368000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+00368000000000000000	00368000000000000000	00368000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-368000000000000000	368000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+00368000000000000000	00368000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute08;
 DROP PROCEDURE sp8;
 DROP PROCEDURE IF EXISTS sp9;
@@ -17291,9 +18770,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute09();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--18440000000000000	-18440000000000000	-18439999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+00000000000000000000	00000000000000000000	00000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--18440000000000000	-18439999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+00000000000000000000	00000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute09;
 DROP PROCEDURE sp9;
 DROP PROCEDURE IF EXISTS sp10;
@@ -17337,9 +18816,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute10();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute10;
 DROP PROCEDURE sp10;
 DROP PROCEDURE IF EXISTS sp11;
@@ -17372,9 +18851,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute11();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1000000000.000000000	1000000000.000000000	1000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1000000000	1000000000	1000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1000000000.000000000	1000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1000000000	1000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute11;
 DROP PROCEDURE sp11;
 DROP PROCEDURE IF EXISTS sp12;
@@ -17407,9 +18886,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute12();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-99999999999.000000000	99999999999.000000000	100000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-99999999999.000000000	100000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute12;
 DROP PROCEDURE sp12;
 DROP PROCEDURE IF EXISTS sp13;
@@ -17442,9 +18921,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute13();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute13;
 DROP PROCEDURE sp13;
 DROP PROCEDURE IF EXISTS sp14;
@@ -17477,9 +18956,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute14();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000000000000000.000000000	-1000000000000000000000.000000000	-999999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000000000000000.000000000000000000000000000000	-1000000000000000000000.000000000000000000000000000000	-999999999999999999990.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000000000000000.000000000	-999999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000000000000000.000000000000000000000000000000	-999999999999999999990.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute14;
 DROP PROCEDURE sp14;
 DROP PROCEDURE IF EXISTS sp15;
@@ -17545,9 +19024,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute16();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute16;
 DROP PROCEDURE sp16;
 DROP PROCEDURE IF EXISTS sp17;
@@ -17579,9 +19058,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute17();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute17;
 DROP PROCEDURE sp17;
 DROP PROCEDURE IF EXISTS sp18;
@@ -17613,9 +19092,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute18();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute18;
 DROP PROCEDURE sp18;
 DROP PROCEDURE IF EXISTS sp19;
@@ -17647,9 +19126,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute19();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute19;
 DROP PROCEDURE sp19;
 DROP PROCEDURE IF EXISTS sp20;
@@ -17681,9 +19160,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute20();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute20;
 DROP PROCEDURE sp20;
 DROP PROCEDURE IF EXISTS sp21;
@@ -17715,9 +19194,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute21();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute21;
 DROP PROCEDURE sp21;
 DROP PROCEDURE IF EXISTS sp22;
@@ -17783,9 +19262,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute23();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute23;
 DROP PROCEDURE sp23;
 DROP PROCEDURE IF EXISTS sp24;
@@ -17817,9 +19296,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute24();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.1	1.1	11.1	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.1	11.1	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute24;
 DROP PROCEDURE sp24;
 DROP PROCEDURE IF EXISTS sp25;
@@ -17851,9 +19330,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute25();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--65402	-65402	-65392	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-32758	-32758	-32748	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--65402	-65392	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-32758	-32748	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute25;
 DROP PROCEDURE sp25;
 DROP PROCEDURE IF EXISTS sp26;
@@ -17919,9 +19398,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute27();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-26:00:00.999997	26:00:00.999997	28:00:01.999995	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+25:59:59	25:59:59	27:59:59	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-26:00:00.999997	28:00:01.999995	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+25:59:59	27:59:59	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute27;
 DROP PROCEDURE sp27;
 DROP PROCEDURE IF EXISTS sp28;
@@ -17953,9 +19432,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute28();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1998-01-02 01:01:01.000001	1998-01-02 01:01:01.000001	1998-01-03 02:02:02.000003	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1998-01-02 01:01:00	1998-01-02 01:01:00	1998-01-03 02:02:01	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1998-01-02 01:01:01.000001	1998-01-03 02:02:02.000003	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1998-01-02 01:01:00	1998-01-03 02:02:01	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute28;
 DROP PROCEDURE sp28;
 DROP PROCEDURE IF EXISTS sp29;
@@ -17987,9 +19466,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute29();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute29;
 DROP PROCEDURE sp29;
 DROP PROCEDURE IF EXISTS sp30;
@@ -18021,9 +19500,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute30();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute30;
 DROP PROCEDURE sp30;
 DROP PROCEDURE IF EXISTS sp31;
@@ -18089,9 +19568,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute32();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute32;
 DROP PROCEDURE sp32;
 DROP PROCEDURE IF EXISTS sp33;
@@ -18123,9 +19602,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute33();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute33;
 DROP PROCEDURE sp33;
 DROP PROCEDURE IF EXISTS sp34;
@@ -18191,9 +19670,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute35();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute35;
 DROP PROCEDURE sp35;
 DROP PROCEDURE IF EXISTS sp36;
@@ -18225,9 +19704,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute36();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute36;
 DROP PROCEDURE sp36;
 DROP PROCEDURE IF EXISTS sp37;
@@ -18293,9 +19772,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute38();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute38;
 DROP PROCEDURE sp38;
 DROP PROCEDURE IF EXISTS sp39;
@@ -18327,9 +19806,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute39();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute39;
 DROP PROCEDURE sp39;
 DROP PROCEDURE IF EXISTS sp40;
@@ -18361,9 +19840,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute40();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute40;
 DROP PROCEDURE sp40;
 DROP PROCEDURE IF EXISTS sp41;
@@ -18395,9 +19874,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute41();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute41;
 DROP PROCEDURE sp41;
 DROP PROCEDURE IF EXISTS sp42;
@@ -18429,9 +19908,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute42();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute42;
 DROP PROCEDURE sp42;
 DROP PROCEDURE IF EXISTS sp43;
@@ -18463,9 +19942,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute43();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute43;
 DROP PROCEDURE sp43;
 DROP PROCEDURE IF EXISTS sp44;
@@ -18497,9 +19976,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute44();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute44;
 DROP PROCEDURE sp44;
 DROP PROCEDURE IF EXISTS sp45;
@@ -18531,9 +20010,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute45();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute45;
 DROP PROCEDURE sp45;
 DROP PROCEDURE IF EXISTS sp46;
@@ -18565,9 +20044,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute46();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute46;
 DROP PROCEDURE sp46;
 DROP PROCEDURE IF EXISTS sp47;
@@ -18599,9 +20078,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute47();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute47;
 DROP PROCEDURE sp47;
 DROP PROCEDURE IF EXISTS sp48;
@@ -18633,9 +20112,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute48();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute48;
 DROP PROCEDURE sp48;
 DROP PROCEDURE IF EXISTS sp49;
@@ -18667,9 +20146,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute49();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute49;
 DROP PROCEDURE sp49;
 DROP PROCEDURE IF EXISTS sp50;
@@ -18701,9 +20180,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute50();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute50;
 DROP PROCEDURE sp50;
 DROP PROCEDURE IF EXISTS sp51;
@@ -18735,9 +20214,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute51();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute51;
 DROP PROCEDURE sp51;
 DROP PROCEDURE IF EXISTS sp52;
@@ -18769,9 +20248,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute52();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000000000000000000000000	-10000000000000000000000.000000000000000000000000000000	-99999999999999999990.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000000000000000000000000	-99999999999999999990.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute52;
 DROP PROCEDURE sp52;
 DROP PROCEDURE IF EXISTS sp53;
@@ -18803,9 +20282,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute53();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000	-10000000000000000000000	-99999999999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000	-99999999999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute53;
 DROP PROCEDURE sp53;
 DROP PROCEDURE IF EXISTS sp54;
@@ -18837,9 +20316,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute54();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000	10000000000000000000000	100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000	100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute54;
 DROP PROCEDURE sp54;
 DROP PROCEDURE IF EXISTS sp55;
@@ -18871,9 +20350,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute55();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute55;
 DROP PROCEDURE sp55;
 DROP PROCEDURE IF EXISTS sp56;
@@ -18905,9 +20384,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute56();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-61	61	71	61	61	71	61	61	71	61	61	71
+2061	2061	2071	2061	2061	2071	2061	2061	2071	2061	2061	2071
 var1	var2	var3	var4	var5	var6	var7	var8
-61	71	61	71	61	71	61	71
+2061	2071	2061	2071	2061	2071	2061	2071
 DROP PROCEDURE spexecute56;
 DROP PROCEDURE sp56;
 DROP PROCEDURE IF EXISTS sp57;
@@ -19041,9 +20520,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute60();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-ah	ah	aah	ah	ah	aah	ah	ah	aah	ah	ah	aah
+a	a	a	a	a	a	a	a	a	a	a	a
 var1	var2	var3	var4	var5	var6	var7	var8
-ah	aah	ah	aah	ah	aah	ah	aah
+a	a	a	a	a	a	a	a
 DROP PROCEDURE spexecute60;
 DROP PROCEDURE sp60;
 DROP PROCEDURE IF EXISTS sp61;
@@ -19075,9 +20554,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute61();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-ah	ah	aah	ah	ah	aah	ah	ah	NULL	ah	ah	aah
+a	a	a	a	a	a	a	a	NULL	a	a	a
 var1	var2	var3	var4	var5	var6	var7	var8
-ah	aah	ah	aah	ah	NULL	ah	aah
+a	a	a	a	a	NULL	a	a
 DROP PROCEDURE spexecute61;
 DROP PROCEDURE sp61;
 DROP PROCEDURE IF EXISTS sp62;
@@ -19177,9 +20656,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute64();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000
+1000000000	1000000000	1000000010	1000000000	1000000000	1000000010	1000000000	1000000000	1000000010	1000000000	1000000000	1000000010
 var1	var2	var3	var4	var5	var6	var7	var8
-1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000
+1000000000	1000000010	1000000000	1000000010	1000000000	1000000010	1000000000	1000000010
 DROP PROCEDURE spexecute64;
 DROP PROCEDURE sp64;
 DROP PROCEDURE IF EXISTS sp65;
@@ -19211,9 +20690,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute65();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-999999999.000000000	999999999.000000000	1000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1000000000	1000000000	1000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-999999999.000000000	1000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1000000000	1000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute65;
 DROP PROCEDURE sp65;
 DROP PROCEDURE IF EXISTS sp66;
@@ -19245,9 +20724,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute66();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10000000000000000.000000000	10000000000000000.000000000	10000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10000000000000000.000000000000000000000000000000	10000000000000000.000000000000000000000000000000	10000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000.000000000	10000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000.000000000000000000000000000000	10000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute66;
 DROP PROCEDURE sp66;
 DROP PROCEDURE IF EXISTS sp67;
@@ -19279,9 +20758,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute67();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10000000000000000.000000000	10000000000000000.000000000	10000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000.000000000	10000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute67;
 DROP PROCEDURE sp67;
 DROP PROCEDURE IF EXISTS sp68;
@@ -19313,9 +20792,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute68();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000000000000000.000000000	-1000000000000000000000.000000000	-999999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000000000000000.000000000	-999999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute68;
 DROP PROCEDURE sp68;
 DROP PROCEDURE IF EXISTS sp69;
@@ -19347,9 +20826,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute69();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000	-10000000000000000000000	-99999999999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000	-99999999999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute69;
 DROP PROCEDURE sp69;
 DROP PROCEDURE IF EXISTS sp70;
@@ -19381,9 +20860,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute70();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000	10000000000000000000000	100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000	100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute70;
 DROP PROCEDURE sp70;
 DROP PROCEDURE IF EXISTS sp71;
@@ -19415,9 +20894,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute71();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000100000000000000000000	0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute71;
 DROP PROCEDURE sp71;
 DROP PROCEDURE IF EXISTS sp72;
@@ -19449,9 +20928,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute72();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute72;
 DROP PROCEDURE sp72;
 DROP PROCEDURE IF EXISTS sp73;
@@ -19483,9 +20962,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute73();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute73;
 DROP PROCEDURE sp73;
 DROP PROCEDURE IF EXISTS sp74;
@@ -19517,9 +20996,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute74();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute74;
 DROP PROCEDURE sp74;
 DROP PROCEDURE IF EXISTS sp75;
@@ -19551,9 +21030,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute75();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute75;
 DROP PROCEDURE sp75;
 DROP PROCEDURE IF EXISTS sp76;
@@ -19585,9 +21064,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute76();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute76;
 DROP PROCEDURE sp76;
 DROP PROCEDURE IF EXISTS sp77;
@@ -19619,9 +21098,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute77();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute77;
 DROP PROCEDURE sp77;
 DROP PROCEDURE IF EXISTS sp78;
@@ -19653,9 +21132,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute78();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute78;
 DROP PROCEDURE sp78;
 DROP PROCEDURE IF EXISTS sp79;
@@ -19687,9 +21166,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute79();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute79;
 DROP PROCEDURE sp79;
 DROP PROCEDURE IF EXISTS sp80;
@@ -19721,9 +21200,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute80();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--2150000000	-2150000000	-2149999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-2147483638	-2147483638	-2147483628	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--2150000000	-2149999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-2147483638	-2147483628	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute80;
 DROP PROCEDURE sp80;
 DROP PROCEDURE IF EXISTS sp81;
@@ -19823,9 +21302,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute83();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-215000000	215000000	215000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0215000000	0215000000	0215000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-215000000	215000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0215000000	0215000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute83;
 DROP PROCEDURE sp83;
 DROP PROCEDURE IF EXISTS sp84;
@@ -19857,9 +21336,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute84();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--8388600	-8388600	-8388590	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-8388598	-8388598	-8388588	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--8388600	-8388590	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-8388598	-8388588	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute84;
 DROP PROCEDURE sp84;
 DROP PROCEDURE IF EXISTS sp85;
@@ -19925,9 +21404,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute86();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-16777210	16777210	16777220	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+16777210	16777210	16777215	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-16777210	16777220	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+16777210	16777215	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute86;
 DROP PROCEDURE sp86;
 DROP PROCEDURE IF EXISTS sp87;
@@ -19959,9 +21438,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute87();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--8388602	-8388602	-8388592	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+16777215	16777215	16777215	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--8388602	-8388592	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+16777215	16777215	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute87;
 DROP PROCEDURE sp87;
 DROP PROCEDURE IF EXISTS sp88;
@@ -19993,9 +21472,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute88();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-99999999.000000000	99999999.000000000	100000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0100000000	0100000000	0100000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-99999999.000000000	100000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0100000000	0100000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute88;
 DROP PROCEDURE sp88;
 DROP PROCEDURE IF EXISTS sp89;
@@ -20027,9 +21506,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute89();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-99999999.000000000	99999999.000000000	100000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0100000000	0100000000	0100000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-99999999.000000000	100000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0100000000	0100000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute89;
 DROP PROCEDURE sp89;
 DROP PROCEDURE IF EXISTS sp90;
@@ -20061,9 +21540,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute90();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000000000000000000000000	10000000000000000000000.000000000000000000000000000000	100000000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000000000000000000000000	100000000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute90;
 DROP PROCEDURE sp90;
 DROP PROCEDURE IF EXISTS sp91;
@@ -20095,9 +21574,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute91();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000000100000000000000000000.000000000000000000000000000000	000000000010000000000000000000000.000000000000000000000000000000	000000000000100000000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010000000000000000000000.000000000000000000000000000000	000000000000100000000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute91;
 DROP PROCEDURE sp91;
 DROP PROCEDURE IF EXISTS sp92;
@@ -20129,9 +21608,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute92();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute92;
 DROP PROCEDURE sp92;
 DROP PROCEDURE IF EXISTS sp93;
@@ -20163,9 +21642,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute93();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000100000000000000000000	0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute93;
 DROP PROCEDURE sp93;
 DROP PROCEDURE IF EXISTS sp94;
@@ -20231,9 +21710,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute95();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-65532	65532	65542	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+65532	65532	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-65532	65542	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+65532	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute95;
 DROP PROCEDURE sp95;
 DROP PROCEDURE IF EXISTS sp96;
@@ -20265,9 +21744,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute96();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-65532	65532	65542	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+65532	65532	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-65532	65542	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+65532	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute96;
 DROP PROCEDURE sp96;
 DROP PROCEDURE IF EXISTS sp97;
@@ -20299,9 +21778,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute97();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--32602	-32602	-32592	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+65535	65535	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--32602	-32592	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+65535	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute97;
 DROP PROCEDURE sp97;
 DROP PROCEDURE IF EXISTS sp98;
@@ -20367,9 +21846,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute99();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-252	252	262	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+252	252	255	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-252	262	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+252	255	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute99;
 DROP PROCEDURE sp99;
 DROP PROCEDURE IF EXISTS sp100;
@@ -20435,9 +21914,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute101();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--102	-102	-92	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+255	255	255	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--102	-92	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+255	255	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute101;
 DROP PROCEDURE sp101;
 USE db_storedproc;
@@ -20462,13 +21941,13 @@ set a = '2005-03-14 01:01:02';
 insert into temp_table values(a);
 END//
 show CREATE PROCEDURE sp2;
-Procedure	sql_mode	Create Procedure
-sp2	ALLOW_INVALID_DATES	CREATE PROCEDURE `sp2`()
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
+sp2	ALLOW_INVALID_DATES	CREATE DEFINER=`root`@`localhost` PROCEDURE `sp2`()
 BEGIN
 declare a datetime;
 set a = '2005-03-14 01:01:02';
 insert into temp_table values(a);
-END
+END	latin1	latin1_swedish_ci	latin1_swedish_ci
 set @@sql_mode = 'traditional';
 CALL sp2 ();
 SELECT * from temp_table;
@@ -20498,15 +21977,15 @@ set b = 5;
 SELECT not 1 between a and b;
 END//
 show CREATE PROCEDURE sp3;
-Procedure	sql_mode	Create Procedure
-sp3	HIGH_NOT_PRECEDENCE	CREATE PROCEDURE `sp3`()
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
+sp3	HIGH_NOT_PRECEDENCE	CREATE DEFINER=`root`@`localhost` PROCEDURE `sp3`()
 BEGIN
 declare a int signed;
 declare b int unsigned;
 set a = -5;
 set b = 5;
 SELECT not 1 between a and b;
-END
+END	latin1	latin1_swedish_ci	latin1_swedish_ci
 set @@sql_mode='';
 CALL sp3();
 not 1 between a and b
@@ -20541,8 +22020,8 @@ set c = b/a;
 show warnings;
 END//
 show CREATE PROCEDURE sp4;
-Procedure	sql_mode	Create Procedure
-sp4	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI,ERROR_FOR_DIVISION_BY_ZERO	CREATE PROCEDURE "sp4"()
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
+sp4	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI,ERROR_FOR_DIVISION_BY_ZERO	CREATE DEFINER="root"@"localhost" PROCEDURE "sp4"()
 BEGIN
 declare a int;
 declare b int;
@@ -20551,7 +22030,7 @@ set a = 0;
 set b = 1;
 set c = b/a;
 show warnings;
-END
+END	latin1	latin1_swedish_ci	latin1_swedish_ci
 set @@sql_mode='';
 CALL sp4();
 Level	Code	Message
@@ -20589,37 +22068,37 @@ set @x=i1;
 set @y=@x;
 END//
 show CREATE PROCEDURE sp6a;
-Procedure	sql_mode	Create Procedure
-sp6a		CREATE PROCEDURE `sp6a`(i1 longtext, out i2 mediumint , inout i3 longblob, in i4 year, out i5 real)
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
+sp6a		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6a`(i1 longtext, out i2 mediumint , inout i3 longblob, in i4 year, out i5 real)
 BEGIN
 set @x=i1;
 set @y=@x;
-END
+END	latin1	latin1_swedish_ci	latin1_swedish_ci
 show CREATE PROCEDURE sp6b;
-Procedure	sql_mode	Create Procedure
-sp6b		CREATE PROCEDURE `sp6b`(out i1 longtext, out i2 mediumint , out i3 longblob, out i4 year, out i5 real)
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
+sp6b		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6b`(out i1 longtext, out i2 mediumint , out i3 longblob, out i4 year, out i5 real)
     DETERMINISTIC
 BEGIN
 set @x=i1;
 set @y=@x;
-END
+END	latin1	latin1_swedish_ci	latin1_swedish_ci
 show CREATE PROCEDURE sp6c;
-Procedure	sql_mode	Create Procedure
-sp6c		CREATE PROCEDURE `sp6c`(inout i1 longtext, inout  i2 mediumint , inout i3 longblob, inout  i4 year, inout  i5 real)
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
+sp6c		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6c`(inout i1 longtext, inout  i2 mediumint , inout i3 longblob, inout  i4 year, inout  i5 real)
     COMMENT 'this is a comment'
 BEGIN
 set @x=i1;
 set @y=@x;
-END
+END	latin1	latin1_swedish_ci	latin1_swedish_ci
 SHOW PROCEDURE status like 'sp6a';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp6a	PROCEDURE	root@localhost	modified	created	DEFINER	
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp6a	PROCEDURE	root@localhost	modified	created	DEFINER		latin1	latin1_swedish_ci	latin1_swedish_ci
 SHOW PROCEDURE status like 'sp6b';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp6b	PROCEDURE	root@localhost	modified	created	DEFINER	
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp6b	PROCEDURE	root@localhost	modified	created	DEFINER		latin1	latin1_swedish_ci	latin1_swedish_ci
 SHOW PROCEDURE status like 'sp6c';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp6c	PROCEDURE	root@localhost	modified	created	DEFINER	this is a comment
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp6c	PROCEDURE	root@localhost	modified	created	DEFINER	this is a comment	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP PROCEDURE sp6a;
 DROP PROCEDURE sp6b;
 DROP PROCEDURE sp6c;
@@ -20633,8 +22112,8 @@ set @x=i1;
 set @y=@x;
 END//
 SHOW PROCEDURE status like 'sp6';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp6	PROCEDURE	root@localhost	modified	created	DEFINER	
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp6	PROCEDURE	root@localhost	modified	created	DEFINER		latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP PROCEDURE sp6;
 
 Testcase 4.8.3:
@@ -20659,8 +22138,8 @@ set @y=@x;
 return 0;
 END//
 show  function status like 'sp6';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp6	FUNCTION	root@localhost	modified	created	DEFINER	
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp6	FUNCTION	root@localhost	modified	created	DEFINER		latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP FUNCTION sp6;
 
 Testcase 4.8.5:
@@ -20673,7 +22152,7 @@ Testcase 4.8.6:
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp6;
 show  procedure status like 'sp6';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
 
 Testcase 4.8.7:
 --------------------------------------------------------------------------------
@@ -20694,7 +22173,7 @@ BEGIN
 return i1;
 END//
 show  procedure status like 'fn1';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
 DROP FUNCTION fn1;
 
 Testcase 4.8.9:
@@ -20708,8 +22187,8 @@ BEGIN
 return i1;
 END//
 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 fn1;
 
 Testcase 4.8.11:
@@ -20738,7 +22217,7 @@ Testcase 4.8.13:
 --------------------------------------------------------------------------------
 DROP FUNCTION IF EXISTS f1000;
 SHOW FUNCTION STATUS LIKE 'f1000';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
 
 Testcase 4.8.14:
 --------------------------------------------------------------------------------
@@ -20760,7 +22239,7 @@ set @x=i1;
 set @y=@x;
 END//
 show  function status like 'sp6';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
 DROP PROCEDURE sp6;
 
 Testcase 4.8.16:
@@ -20777,8 +22256,8 @@ END//
 alter procedure sp6 sql security invoker;
 alter procedure sp6 comment  'this is a new comment';
 SHOW PROCEDURE status like 'sp6';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp6	PROCEDURE	root@localhost	modified	created	INVOKER	this is a new comment
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp6	PROCEDURE	root@localhost	modified	created	INVOKER	this is a new comment	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP PROCEDURE sp6;
 
 Testcase 4.8.18:
@@ -20790,12 +22269,12 @@ return x;
 END//
 alter function fn1 sql security invoker;
 show  create  function  fn1;
-Function	sql_mode	Create Function
-fn1		CREATE FUNCTION `fn1`(x int) RETURNS int(11)
+Function	sql_mode	Create Function	character_set_client	collation_connection	Database Collation
+fn1		CREATE DEFINER=`root`@`localhost` FUNCTION `fn1`(x int) RETURNS int(11)
     SQL SECURITY INVOKER
 BEGIN
 return x;
-END
+END	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP FUNCTION fn1;
 
 Testcase 4.8.19:
@@ -20808,8 +22287,8 @@ END//
 alter function fn1 sql security invoker;
 alter function fn1 comment 'this is a function 3242#@%$#@';
 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 a function 3242#@%$#@
+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 a function 3242#@%$#@	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP FUNCTION fn1;
 
 Testcase 4.8.20:
@@ -20822,13 +22301,13 @@ set @y=@x;
 END//
 alter procedure sp6 comment 'this is simple';
 show CREATE PROCEDURE sp6;
-Procedure	sql_mode	Create Procedure
-sp6		CREATE PROCEDURE `sp6`(i1 int , i2 int)
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
+sp6		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6`(i1 int , i2 int)
     COMMENT 'this is simple'
 BEGIN
 set @x=i1;
 set @y=@x;
-END
+END	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP PROCEDURE sp6;
 
 Testcase 4.8.21:
@@ -20853,7 +22332,7 @@ set @y=@x;
 END//
 DROP PROCEDURE sp6;
 SHOW PROCEDURE status like 'sp6';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
 
 Testcase 4.8.23:
 --------------------------------------------------------------------------------
@@ -20875,7 +22354,7 @@ return i1;
 END//
 DROP FUNCTION fn1;
 SHOW FUNCTION STATUS LIKE 'fn1';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
 
 Section 3.1.9 - Routine body checks:
 --------------------------------------------------------------------------------
@@ -20894,16 +22373,16 @@ SELECT * from t9 limit 0, 100;
 END//
 CALL sp6 (10, 20, 30, 40, 50);
 f1	f2	f3
--5000	a`	-5000
--4999	aaa	-4999
--4998	abaa	-4998
--4997	acaaa	-4997
--4996	adaaaa	-4996
--4995	aeaaaaa	-4995
--4994	afaaaaaa	-4994
--4993	agaaaaaaa	-4993
--4992	a^aaaaaaaa	-4992
 -4991	a_aaaaaaaaa	-4991
+-4992	a^aaaaaaaa	-4992
+-4993	agaaaaaaa	-4993
+-4994	afaaaaaa	-4994
+-4995	aeaaaaa	-4995
+-4996	adaaaa	-4996
+-4997	acaaa	-4997
+-4998	abaa	-4998
+-4999	aaa	-4999
+-5000	a`	-5000
 DROP PROCEDURE sp6;
 
 Testcase 4.9.2:
@@ -21363,9 +22842,16 @@ until done END repeat;
 SELECT done;
 close cur1;
 END//
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+CALL h1();
+done
+0
+done
+1
+done
+1
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.14:
 --------------------------------------------------------------------------------
@@ -21392,9 +22878,16 @@ until done END repeat;
 SELECT done;
 close cur1;
 END//
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+CALL h1();
+done
+0
+done
+1
+done
+1
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.15:
 --------------------------------------------------------------------------------
@@ -21422,9 +22915,16 @@ until done END repeat;
 SELECT done;
 close cur1;
 END//
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+CALL h1();
+done
+0
+@x=1
+0
+done
+1
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.16:
 --------------------------------------------------------------------------------
@@ -21452,17 +22952,16 @@ until done END repeat;
 SELECT done;
 close cur1;
 END//
-CALL h1()
-# cleanup;
+CALL h1();
 done
 0
 @x=1
 0
 done
 1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.17:
 --------------------------------------------------------------------------------
@@ -21490,9 +22989,9 @@ done
 0
 done
 1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.18:
 --------------------------------------------------------------------------------
@@ -21520,9 +23019,9 @@ done
 0
 done
 1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.19:
 --------------------------------------------------------------------------------
@@ -21550,9 +23049,9 @@ END//
 CALL h1();
 done
 0
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.20:
 --------------------------------------------------------------------------------
@@ -21580,9 +23079,9 @@ END//
 CALL h1();
 done
 0
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.21:
 --------------------------------------------------------------------------------
@@ -21610,9 +23109,9 @@ done
 0
 done
 1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.22:
 --------------------------------------------------------------------------------
@@ -21641,9 +23140,9 @@ done
 0
 done	@x
 1	1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.23:
 --------------------------------------------------------------------------------
@@ -21671,9 +23170,9 @@ END//
 CALL h1();
 done
 0
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.24:
 --------------------------------------------------------------------------------
@@ -21701,9 +23200,9 @@ END//
 CALL h1();
 done
 0
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.25:
 --------------------------------------------------------------------------------
@@ -21728,9 +23227,9 @@ END//
 CALL h1();
 done	@x
 1	1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.26:
 --------------------------------------------------------------------------------
@@ -21755,9 +23254,9 @@ END//
 CALL h1();
 done	@x
 1	1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.27:
 --------------------------------------------------------------------------------
@@ -21780,9 +23279,9 @@ set @x=1;
 SELECT done, @x;
 END//
 CALL h1();
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.28:
 --------------------------------------------------------------------------------
@@ -21805,9 +23304,9 @@ set @x=1;
 SELECT done, @x;
 END//
 CALL h1();
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+drop table IF EXISTS res_t1;
+drop table IF EXISTS res_t2;
 
 Testcase 4.11.29:
 --------------------------------------------------------------------------------
@@ -21835,9 +23334,9 @@ END//
 CALL h1();
 done	@x
 1	1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+drop table IF EXISTS res_t1;
+drop table IF EXISTS res_t2;
 
 Testcase 4.11.30:
 --------------------------------------------------------------------------------
@@ -21865,9 +23364,9 @@ END//
 CALL h1();
 done	@x
 1	1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+drop table IF EXISTS res_t1;
+drop table IF EXISTS res_t2;
 
 Testcase 4.11.31:
 --------------------------------------------------------------------------------
@@ -21893,9 +23392,9 @@ set @x=1;
 SELECT done, @x;
 END//
 CALL h1();
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+drop table IF EXISTS res_t1;
+drop table IF EXISTS res_t2;
 
 Testcase 4.11.32:
 --------------------------------------------------------------------------------
@@ -21921,9 +23420,9 @@ set @x=1;
 SELECT done, @x;
 END//
 CALL h1();
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.33:
 --------------------------------------------------------------------------------
@@ -21948,7 +23447,7 @@ set @x=1;
 SELECT done, @x;
 END//
 ERROR 42000: Duplicate condition: condname
-drop table res_t1;
+DROP TABLE IF EXISTS res_t1;
 
 Testcase 4.11.35:
 --------------------------------------------------------------------------------
@@ -21973,7 +23472,21 @@ insert into res_t1 values (3, 'c');
 END begin2_label;
 END begin1_label//
 ERROR 42000: Bad SQLSTATE: '020'
-drop table res_t1;
+CREATE PROCEDURE h1 ()
+begin1_label:BEGIN
+declare condname1 condition for sqlstate '020';
+declare condname2 condition for sqlstate 'wewe';
+declare condname3 condition for 9999;
+set @var2 = 1;
+insert into res_t1 values (2, 'b');
+begin2_label: BEGIN
+declare continue handler for sqlstate '90000023' set @var3= 1;
+set @var4 = 1;
+insert into res_t1 values (3, 'c');
+END begin2_label;
+END begin1_label//
+ERROR 42000: Bad SQLSTATE: '020'
+DROP TABLE IF EXISTS res_t1;
 
 Testcase 4.11.36:
 --------------------------------------------------------------------------------
@@ -21989,7 +23502,7 @@ set x1 = 2;
 END;
 SELECT @x, x1;
 END//
-DROP PROCEDURE h1;
+DROP PROCEDURE IF EXISTS h1;
 
 Testcase 4.11.40:
 --------------------------------------------------------------------------------
@@ -22010,7 +23523,7 @@ declare exit handler for condname2 set x5 = 1;
 END//
 ERROR 42000: Duplicate handler declared in the same block
 DROP PROCEDURE IF EXISTS h1;
-drop table res_t1;
+DROP TABLE IF EXISTS res_t1;
 
 Testcase 4.11.41:
 --------------------------------------------------------------------------------
@@ -22026,6 +23539,9 @@ set x1 = 2;
 END;
 SELECT @x, x1;
 END//
+CALL h1();
+@x	x1
+0	2
 DROP PROCEDURE IF EXISTS h1;
 
 * Testcase 3.1.2.53 (4.11.42):
@@ -22076,8 +23592,8 @@ CALL h1();
 SELECT @done, @x;
 @done	@x
 1	1
-DROP PROCEDURE h1;
-DROP TABLE res_t1;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
 
 --source suite/funcs_1/storedproc/cleanup_sp_tb.inc
 --------------------------------------------------------------------------------
diff --git a/mysql-test/suite/funcs_1/r/myisam_storedproc_10.result b/mysql-test/suite/funcs_1/r/myisam_storedproc_10.result
index 13b14b242fe..a5a52acbc1d 100755
--- a/mysql-test/suite/funcs_1/r/myisam_storedproc_10.result
+++ b/mysql-test/suite/funcs_1/r/myisam_storedproc_10.result
@@ -58,6 +58,7 @@ load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
 
 Section 3.1.10 - CALL checks:
 --------------------------------------------------------------------------------
+USE db_storedproc;
 
 Testcase 3.1.10.2 + 3.1.10.5:
 -----------------------------
@@ -94,6 +95,7 @@ CALL sp31102();
 ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.sp31102'
 SELECT fn31105( 9 );
 ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.fn31105'
+connection default;
 USE db_storedproc;
 	
 root@localhost	db_storedproc
@@ -114,6 +116,7 @@ a`	a`	1000-01-01	-5000	a`	-5000
 SELECT fn31105( 9 );
 fn31105( 9 )
 81
+connection default;
 USE db_storedproc;
 	
 root@localhost	db_storedproc
@@ -180,6 +183,8 @@ DROP PROCEDURE IF EXISTS sp_ins_1;
 DROP PROCEDURE IF EXISTS sp_ins_3;
 DROP PROCEDURE IF EXISTS sp_upd;
 DROP PROCEDURE IF EXISTS sp_ins_upd;
+DROP PROCEDURE IF EXISTS sp_del;
+DROP PROCEDURE IF EXISTS sp_with_rowcount;
 CREATE TABLE temp(f1 CHAR(20),f2 CHAR(25),f3 DATE,f4 INT,f5 CHAR(25),f6 INT);
 INSERT INTO temp SELECT * FROM t10;
 CREATE PROCEDURE sp_ins_1()
@@ -207,49 +212,72 @@ END;
 SELECT COUNT( f1 ), f1 FROM temp GROUP BY f1;
 UPDATE temp SET temp.f1 = 'updated_2' WHERE temp.f1 ='qwe' AND temp.f2 = 'abc';
 END//
+CREATE PROCEDURE sp_del()
+BEGIN
+DELETE FROM temp WHERE temp.f1 ='qwe' OR temp.f1 = 'updated_2';
+END//
+CREATE PROCEDURE sp_with_rowcount()
+BEGIN
+BEGIN
+INSERT INTO temp VALUES  ('qwe', 'abc', '1989-11-09', 100, 'uvw', 1000),
+('qwe', 'xyz', '1998-03-26', 100, 'uvw', 1000),
+('qwe', 'abc', '2000-11-09', 100, 'uvw', 1000),
+('qwe', 'xyz', '2005-11-07', 100, 'uvw', 1000);
+END;
+SELECT row_count() AS 'row_count() after insert';
+SELECT row_count() AS 'row_count() after select row_count()';
+SELECT f1,f2,f3 FROM temp ORDER BY f1,f2,f3;
+UPDATE temp SET temp.f1 = 'updated_2' WHERE temp.f2 = 'abc';
+SELECT row_count() AS 'row_count() after update';
+SELECT f1,f2,f3 FROM temp ORDER BY f1,f2,f3;
+DELETE FROM temp WHERE temp.f1 = 'updated_2';
+SELECT row_count() AS 'row_count() after delete';
+END//
 CALL sp_ins_1();
 SELECT row_count();
 row_count()
 1
-SELECT * FROM temp ORDER BY f4;
+SELECT * FROM temp;
 f1	f2	f3	f4	f5	f6
+a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
+a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
 abaa	abaa	1000-01-03	-4998	abaa	-4998
+abc	abc	2005-10-03	100	uvw	1000
 acaaa	acaaa	1000-01-04	-4997	acaaa	-4997
 adaaaa	adaaaa	1000-01-05	-4996	adaaaa	-4996
 aeaaaaa	aeaaaaa	1000-01-06	-4995	aeaaaaa	-4995
 afaaaaaa	afaaaaaa	1000-01-07	-4994	afaaaaaa	-4994
 agaaaaaaa	agaaaaaaa	1000-01-08	-4993	agaaaaaaa	-4993
-a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
-a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
-abc	abc	2005-10-03	100	uvw	1000
 CALL sp_ins_3();
 SELECT row_count();
 row_count()
 1
-SELECT * FROM temp ORDER BY f4;
+SELECT * FROM temp;
 f1	f2	f3	f4	f5	f6
+a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
+a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
 abaa	abaa	1000-01-03	-4998	abaa	-4998
+abc	abc	2005-10-03	100	uvw	1000
+abc	xyz	1949-05-23	100	uvw	1000
+abc	xyz	1989-11-09	100	uvw	1000
+abc	xyz	2005-10-24	100	uvw	1000
 acaaa	acaaa	1000-01-04	-4997	acaaa	-4997
 adaaaa	adaaaa	1000-01-05	-4996	adaaaa	-4996
 aeaaaaa	aeaaaaa	1000-01-06	-4995	aeaaaaa	-4995
 afaaaaaa	afaaaaaa	1000-01-07	-4994	afaaaaaa	-4994
 agaaaaaaa	agaaaaaaa	1000-01-08	-4993	agaaaaaaa	-4993
-a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
-a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
-abc	abc	2005-10-03	100	uvw	1000
-abc	xyz	1949-05-23	100	uvw	1000
-abc	xyz	1989-11-09	100	uvw	1000
-abc	xyz	2005-10-24	100	uvw	1000
 CALL sp_upd();
 SELECT row_count();
 row_count()
 4
-SELECT * FROM temp ORDER BY f4;
+SELECT * FROM temp;
 f1	f2	f3	f4	f5	f6
+a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
+a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
 abaa	abaa	1000-01-03	-4998	abaa	-4998
@@ -258,8 +286,6 @@ adaaaa	adaaaa	1000-01-05	-4996	adaaaa	-4996
 aeaaaaa	aeaaaaa	1000-01-06	-4995	aeaaaaa	-4995
 afaaaaaa	afaaaaaa	1000-01-07	-4994	afaaaaaa	-4994
 agaaaaaaa	agaaaaaaa	1000-01-08	-4993	agaaaaaaa	-4993
-a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
-a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
 updated	abc	2005-10-03	100	uvw	1000
 updated	xyz	1949-05-23	100	uvw	1000
 updated	xyz	1989-11-09	100	uvw	1000
@@ -281,8 +307,10 @@ COUNT( f1 )	f1
 SELECT row_count();
 row_count()
 3
-SELECT * FROM temp ORDER BY f4;
+SELECT * FROM temp;
 f1	f2	f3	f4	f5	f6
+a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
+a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
 abaa	abaa	1000-01-03	-4998	abaa	-4998
@@ -291,20 +319,67 @@ adaaaa	adaaaa	1000-01-05	-4996	adaaaa	-4996
 aeaaaaa	aeaaaaa	1000-01-06	-4995	aeaaaaa	-4995
 afaaaaaa	afaaaaaa	1000-01-07	-4994	afaaaaaa	-4994
 agaaaaaaa	agaaaaaaa	1000-01-08	-4993	agaaaaaaa	-4993
-a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
-a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
+qwe	xyz	1998-03-26	100	uvw	1000
 updated	abc	2005-10-03	100	uvw	1000
 updated	xyz	1949-05-23	100	uvw	1000
 updated	xyz	1989-11-09	100	uvw	1000
 updated	xyz	2005-10-24	100	uvw	1000
 updated_2	abc	1989-11-09	100	uvw	1000
-qwe	xyz	1998-03-26	100	uvw	1000
 updated_2	abc	2000-11-09	100	uvw	1000
 updated_2	abc	2005-11-07	100	uvw	1000
+CALL sp_del();
+SELECT row_count();
+row_count()
+4
+SELECT * FROM temp;
+f1	f2	f3	f4	f5	f6
+a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
+a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
+a`	a`	1000-01-01	-5000	a`	-5000
+aaa	aaa	1000-01-02	-4999	aaa	-4999
+abaa	abaa	1000-01-03	-4998	abaa	-4998
+acaaa	acaaa	1000-01-04	-4997	acaaa	-4997
+adaaaa	adaaaa	1000-01-05	-4996	adaaaa	-4996
+aeaaaaa	aeaaaaa	1000-01-06	-4995	aeaaaaa	-4995
+afaaaaaa	afaaaaaa	1000-01-07	-4994	afaaaaaa	-4994
+agaaaaaaa	agaaaaaaa	1000-01-08	-4993	agaaaaaaa	-4993
+updated	abc	2005-10-03	100	uvw	1000
+updated	xyz	1949-05-23	100	uvw	1000
+updated	xyz	1989-11-09	100	uvw	1000
+updated	xyz	2005-10-24	100	uvw	1000
+DELETE FROM temp;
+CALL sp_with_rowcount();
+row_count() after insert
+4
+row_count() after select row_count()
+-1
+f1	f2	f3
+qwe	abc	1989-11-09
+qwe	abc	2000-11-09
+qwe	xyz	1998-03-26
+qwe	xyz	2005-11-07
+row_count() after update
+2
+f1	f2	f3
+qwe	xyz	1998-03-26
+qwe	xyz	2005-11-07
+updated_2	abc	1989-11-09
+updated_2	abc	2000-11-09
+row_count() after delete
+2
+SELECT row_count();
+row_count()
+-1
+SELECT * FROM temp;
+f1	f2	f3	f4	f5	f6
+qwe	xyz	1998-03-26	100	uvw	1000
+qwe	xyz	2005-11-07	100	uvw	1000
 DROP PROCEDURE sp_ins_1;
 DROP PROCEDURE sp_ins_3;
 DROP PROCEDURE sp_upd;
 DROP PROCEDURE sp_ins_upd;
+DROP PROCEDURE sp_del;
+DROP PROCEDURE sp_with_rowcount;
 DROP TABLE temp;
 
 Testcase 3.1.10.8:
diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_03.result b/mysql-test/suite/funcs_1/r/myisam_trig_03.result
index 73befa606c9..3bd8db3880a 100644
--- a/mysql-test/suite/funcs_1/r/myisam_trig_03.result
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_03.result
@@ -184,15 +184,14 @@ insert 3.5.3.2-no
 insert 3.5.3.6-no
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
-
-Trigger create disabled - should fail - Bug 8884
-------------------------------------------------
+create trigger trg4a_1 before INSERT on t1 for each row
+set new.f1 = 'trig 3.5.3.7-1a';
 insert into t1 (f1) values ('insert 3.5.3.7-1a');
+ERROR 42000: UPDATE command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 drop trigger trg4a_1;
@@ -210,7 +209,6 @@ select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
@@ -239,29 +237,27 @@ Grants for test_noprivs@localhost
 GRANT USAGE ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
 use priv_db;
-
-Trigger create disabled - should fail - Bug 8884
-------------------------------------------------
+create trigger trg4b_1 before UPDATE on t1 for each row
+set new.f1 = 'trig 3.5.3.7-1b';
 insert into t1 (f1) values ('insert 3.5.3.7-1b');
 select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
 insert 3.5.3.7-1b
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 update t1 set  f1 = 'update 3.5.3.7-1b' where f1 = 'insert 3.5.3.7-1b';
+ERROR 42000: UPDATE command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
+insert 3.5.3.7-1b
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-update 3.5.3.7-1b
 drop trigger trg4b_1;
 show grants;
 Grants for test_yesprivs@localhost
@@ -275,23 +271,21 @@ select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
+insert 3.5.3.7-1b
 insert 3.5.3.7-2b
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-update 3.5.3.7-1b
 update t1 set  f1 = 'update 3.5.3.7-2b' where f1 = 'insert 3.5.3.7-2b';
 select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
+insert 3.5.3.7-1b
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 trig 3.5.3.7-2b
-update 3.5.3.7-1b
 drop trigger trg4b_2;
 
 Testcase 3.5.3.7c
@@ -317,21 +311,19 @@ Grants for test_noprivs@localhost
 GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
-
-Trigger create disabled - should fail - Bug 8884
-------------------------------------------------
+create trigger trg4c_1 before INSERT on t1 for each row
+set new.f1 = 'trig 3.5.3.7-1c';
 insert into t1 (f1) values ('insert 3.5.3.7-1c');
+ERROR 42000: UPDATE command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
-insert 3.5.3.7-1c
+insert 3.5.3.7-1b
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 trig 3.5.3.7-2b
-update 3.5.3.7-1b
 drop trigger trg4c_1;
 show grants;
 Grants for test_yesprivs@localhost
@@ -345,14 +337,12 @@ select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
-insert 3.5.3.7-1c
+insert 3.5.3.7-1b
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 trig 3.5.3.7-2b
 trig 3.5.3.7-2c
-update 3.5.3.7-1b
 drop trigger trg4c_2;
 
 Testcase 3.5.3.7d:
@@ -376,23 +366,20 @@ Grants for test_noprivs@localhost
 GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT (f1), INSERT (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
-
-Trigger create disabled - should fail - Bug 8884
-------------------------------------------------
+create trigger trg4d_1 before INSERT on t1 for each row
+set new.f1 = 'trig 3.5.3.7-1d';
 insert into t1 (f1) values ('insert 3.5.3.7-1d');
+ERROR 42000: UPDATE command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
-insert 3.5.3.7-1c
-insert 3.5.3.7-1d
+insert 3.5.3.7-1b
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 trig 3.5.3.7-2b
 trig 3.5.3.7-2c
-update 3.5.3.7-1b
 drop trigger trg4d_1;
 show grants;
 Grants for test_yesprivs@localhost
@@ -406,16 +393,13 @@ select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
-insert 3.5.3.7-1c
-insert 3.5.3.7-1d
+insert 3.5.3.7-1b
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 trig 3.5.3.7-2b
 trig 3.5.3.7-2c
 trig 3.5.3.7-2d
-update 3.5.3.7-1b
 drop trigger trg4d_2;
 
 Testcase 3.5.3.8a:
@@ -440,14 +424,14 @@ use priv_db;
 show grants;
 Grants for test_noprivs@localhost
 GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-
-Trigger create disabled - should fail - Bug 8887
-------------------------------------------------
+create trigger trg5a_1 before INSERT on t1 for each row
+set @test_var = new.f1;
 set @test_var = 'before trig 3.5.3.8-1a';
 select @test_var;
 @test_var
 before trig 3.5.3.8-1a
 insert into t1 (f1) values ('insert 3.5.3.8-1a');
+ERROR 42000: SELECT command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select @test_var;
 @test_var
 before trig 3.5.3.8-1a
@@ -495,15 +479,15 @@ Grants for test_noprivs@localhost
 GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
 use priv_db;
-
-Trigger create disabled - should fail - Bug 8887
-------------------------------------------------
+create trigger trg5b_1 before UPDATE on t1 for each row
+set @test_var= new.f1;
 set @test_var= 'before trig 3.5.3.8-1b';
 insert into t1 (f1) values ('insert 3.5.3.8-1b');
 select @test_var;
 @test_var
 before trig 3.5.3.8-1b
 update t1 set  f1= 'update 3.5.3.8-1b' where f1 = 'insert 3.5.3.8-1b';
+ERROR 42000: SELECT command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select @test_var;
 @test_var
 before trig 3.5.3.8-1b
@@ -550,11 +534,11 @@ Grants for test_noprivs@localhost
 GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
-
-Trigger create disabled - should fail - Bug 8887
-------------------------------------------------
+create trigger trg5c_1 before INSERT on t1 for each row
+set @test_var= new.f1;
 set @test_var= 'before trig 3.5.3.8-1c';
 insert into t1 (f1) values ('insert 3.5.3.8-1c');
+ERROR 42000: SELECT command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select @test_var;
 @test_var
 before trig 3.5.3.8-1c
@@ -596,11 +580,11 @@ Grants for test_noprivs@localhost
 GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
-
-Trigger create disabled - should fail - Bug 8887
-------------------------------------------------
+create trigger trg5d_1 before INSERT on t1 for each row
+set @test_var= new.f1;
 set @test_var='before trig 3.5.3.8-1d';
 insert into t1 (f1) values ('insert 3.5.3.8-1d');
+ERROR 42000: SELECT command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select @test_var;
 @test_var
 before trig 3.5.3.8-1d
diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_08.result b/mysql-test/suite/funcs_1/r/myisam_trig_08.result
index 4f350191099..69e8d2313e7 100644
--- a/mysql-test/suite/funcs_1/r/myisam_trig_08.result
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_08.result
@@ -139,10 +139,10 @@ values ('1', 'Test 3.5.8.4', 222, 23456, 1.05);
 Select f120, f122, f136, f144, f163 from tb3 where f122= 'Test 3.5.8.4';
 f120	f122	f136	f144	f163
 1	Test 3.5.8.4	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_i order by i120;
+select * from db_test.t1_i;
 i120	i136	i144	i163
 1	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_u order by u120;
+select * from db_test.t1_u;
 u120	u136	u144	u163
 a	00111	0000099999	999.990000000000000000000000000000
 b	00222	0000023456	1.050000000000000000000000000000
@@ -150,7 +150,7 @@ c	00333	0000099999	999.990000000000000000000000000000
 d	00222	0000023456	1.050000000000000000000000000000
 e	00222	0000023456	1.050000000000000000000000000000
 f	00333	0000099999	999.990000000000000000000000000000
-select * from db_test.t1_d order by d120;
+select * from db_test.t1_d;
 d120	d136	d144	d163
 a	00111	0000099999	999.990000000000000000000000000000
 c	00333	0000099999	999.990000000000000000000000000000
@@ -343,20 +343,20 @@ set @test_var='Empty';
 Insert into tb3 (f120, f122, f136, f144) 
 values ('a', 'Test 3.5.8.5-case', 5, 7);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	A*seven
 Insert into tb3 (f120, f122, f136, f144) 
 values ('b', 'Test 3.5.8.5-case', 71,16);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	B*0000000016
 B	Test 3.5.8.5-case	00191	0000000016	B*0000000016
 Insert into tb3 (f120, f122, f136, f144) 
 values ('c', 'Test 3.5.8.5-case', 80,1);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	C=one
 B	Test 3.5.8.5-case	00191	0000000016	C=one
@@ -366,7 +366,7 @@ values ('d', 'Test 3.5.8.5-case', 152);
 Warnings:
 Warning	1265	Data truncated for column 'f120' at row 1
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 f120	f122	f136	f144	@test_var
 1	Test 3.5.8.5-case	00152	0000099999	1*0000099999
 A	Test 3.5.8.5-case	00125	0000000007	1*0000099999
@@ -377,7 +377,7 @@ values ('e', 'Test 3.5.8.5-case', 200, 8);
 Warnings:
 Warning	1265	Data truncated for column 'f120' at row 1
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 f120	f122	f136	f144	@test_var
 1	Test 3.5.8.5-case	00152	0000099999	1=eight
 1	Test 3.5.8.5-case	00200	0000000008	1=eight
@@ -387,7 +387,7 @@ C	Test 3.5.8.5-case	00200	0000000001	1=eight
 Insert into tb3 (f120, f122, f136, f144) 
 values ('f', 'Test 3.5.8.5-case', 100, 8);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 f120	f122	f136	f144	@test_var
 1	Test 3.5.8.5-case	00152	0000099999	1=eight
 1	Test 3.5.8.5-case	00200	0000000008	1=eight
@@ -499,9 +499,38 @@ drop trigger trg7;
 
 Testcase 3.5.8.6: (requirement void)
 ------------------------------------
+CREATE PROCEDURE sp_01 () BEGIN set @v1=1; END//
+CREATE TRIGGER trg8_1 BEFORE UPDATE ON tb3 FOR EACH ROW
+BEGIN
+CALL sp_01 ();
+END//
+Insert into tb3 (f120, f122, f136) values ('6', 'Test 3.5.8.6-insert', 101);
+update tb3 set f120='S', f136=111,
+f122='Test 3.5.8.6-tr8_1'
+	       where f122='Test 3.5.8.6-insert';
+select f120, f122
+from tb3 where f122  like 'Test 3.5.8.6%' order by f120;
+f120	f122
+S	Test 3.5.8.6-tr8_1
+DROP TRIGGER trg8_1;
+DROP PROCEDURE sp_01;
 
-Testcase 3.5.8.7: (Disabled as a result of bug _____)
------------------------------------------------------
+Testcase 3.5.8.7
+----------------
+Create trigger trg9_1 before update on tb3 for each row
+BEGIN
+Start transaction;
+Set new.f120='U';
+Commit;
+END//
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+Create trigger trg9_2 before delete on tb3 for each row
+BEGIN
+Start transaction;
+Set @var2=old.f120;
+Rollback;
+END//
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
 drop user test_general@localhost;
 drop user test_general;
 drop user test_super@localhost;
diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_09.result b/mysql-test/suite/funcs_1/r/myisam_trig_09.result
index 6a98e527244..f73be556fba 100644
--- a/mysql-test/suite/funcs_1/r/myisam_trig_09.result
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_09.result
@@ -193,8 +193,9 @@ a	NULL	Test 3.5.9.4	7	999	995.240000000000000000000000000000
 0	0	0	0	0	0
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
-Warnings:
-Warning	1048	Column 'f136' cannot be null
+ERROR 23000: Column 'f136' cannot be null
+Update tb3 Set f122='Test 3.5.9.4-trig', f136=0, f151=DEFAULT, f163=NULL
+where f122='Test 3.5.9.4';
 select f118, f121, f122, f136, f151, f163 from tb3 
 where f122 like 'Test 3.5.9.4-trig' order by f163;
 f118	f121	f122	f136	f151	f163
diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result b/mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result
index d1ab6daa423..5d26ea7d8c9 100644
--- a/mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result
@@ -298,8 +298,8 @@ drop table t2;
 drop table t3;
 drop table t4;
 
-Testcase y.y.y.4: Recursive trigger/SP references (disabled bug 11889)
-----------------------------------------------------------------------
+Testcase y.y.y.4: Recursive trigger/SP references
+-------------------------------------------------
 set @sql_mode='traditional';
 create table t1_sp (
 count integer,
diff --git a/mysql-test/suite/funcs_1/r/myisam_views.result b/mysql-test/suite/funcs_1/r/myisam_views.result
index 3e494f53a2d..d6585d90374 100644
--- a/mysql-test/suite/funcs_1/r/myisam_views.result
+++ b/mysql-test/suite/funcs_1/r/myisam_views.result
@@ -145,11 +145,7 @@ SET @limit1 = 20;
 --------------------------------------------------------------------------------
 
 There are some statements where the ps-protocol is switched off.
-Bug#11589: mysqltest, --ps-protocol, strange output, float/double/real with zerofill
---------------------------------------------------------------------------------
-
-! Attention: The file with the expected results suffers from
-Bug#10713: mysqldump includes database in create view and referenced tables
+Bug#32285: mysqltest, --ps-protocol, strange output, float/double/real with zerofill
 --------------------------------------------------------------------------------
 insert into test.tb2 (f59,f60) values (76710,226546);
 insert into test.tb2 (f59,f60) values(2760,985654);
@@ -425,71 +421,3549 @@ f59
 CREATE or REPLACE VIEW v1 AS select *
 FROM test.tb2 WITH LOCAL CHECK OPTION ;
 select * FROM v1 order by f59,f60,f61,f62,f63,f64 limit 0,50;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109	f110	f111	f112	f113	f114	f115	f116	f117
-1	1	0000000001	0000000000000000000000000000000000000000000000000000000000000001	0000000001	0000000000000000000000000000000000000000000000000000000000000001	-5	0.000000000000000000000000000000	1	0.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549435e-38	1.17549e-38	1.175494352e-38	01.17549e-38	00000001.175494352e-38	01.17549e-38	00000001.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	1970-01-02 00:00:01	1902	1902	1902	2enum	2set	
-2	2	0000000002	0000000000000000000000000000000000000000000000000000000000000002	0000000002	0000000000000000000000000000000000000000000000000000000000000002	-4	1.100000000000000000000000000000	2	1.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494349e-38	1.17549e-38	1.175494353e-38	01.17549e-38	00000001.175494353e-38	01.17549e-38	00000001.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	1970-01-03 00:00:02	1903	1903	1903	1enum	1set,2set	
-3	3	0000000003	0000000000000000000000000000000000000000000000000000000000000003	0000000003	0000000000000000000000000000000000000000000000000000000000000003	-3	2.200000000000000000000000000000	3	2.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494348e-38	1.17549e-38	1.175494354e-38	01.17549e-38	00000001.175494354e-38	01.17549e-38	00000001.175494354e-38	1000-01-03	838:59:56	1970-01-04 00:00:03	1970-01-04 00:00:03	1904	1904	1904	2enum	1set	
-4	4	0000000004	0000000000000000000000000000000000000000000000000000000000000004	0000000004	0000000000000000000000000000000000000000000000000000000000000004	-2	3.300000000000000000000000000000	4	3.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494347e-38	1.17549e-38	1.175494355e-38	01.17549e-38	00000001.175494355e-38	01.17549e-38	00000001.175494355e-38	1000-01-04	838:59:55	1970-01-05 00:00:04	1970-01-05 00:00:04	1905	1905	1905	1enum	2set	
-4	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	5	0000000005	0000000000000000000000000000000000000000000000000000000000000005	0000000005	0000000000000000000000000000000000000000000000000000000000000005	-1	4.400000000000000000000000000000	5	4.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494346e-38	1.17549e-38	1.175494356e-38	01.17549e-38	00000001.175494356e-38	01.17549e-38	00000001.175494356e-38	1000-01-05	838:59:54	1970-01-06 00:00:05	1970-01-06 00:00:05	1906	1906	1906	2enum	1set,2set	
-6	6	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0	5.500000000000000000000000000000	6	5.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494345e-38	1.17549e-38	1.175494357e-38	01.17549e-38	00000001.175494357e-38	01.17549e-38	00000001.175494357e-38	1000-01-06	838:59:53	1970-01-07 00:00:06	1970-01-07 00:00:06	1907	1907	1907	1enum	1set	
-7	7	0000000007	0000000000000000000000000000000000000000000000000000000000000007	0000000007	0000000000000000000000000000000000000000000000000000000000000007	1	6.600000000000000000000000000000	7	6.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494344e-38	1.17549e-38	1.175494358e-38	01.17549e-38	00000001.175494358e-38	01.17549e-38	00000001.175494358e-38	1000-01-07	838:59:52	1970-01-08 00:00:07	1970-01-08 00:00:07	1908	1908	1908	2enum	2set	
-8	8	0000000008	0000000000000000000000000000000000000000000000000000000000000008	0000000008	0000000000000000000000000000000000000000000000000000000000000008	2	7.700000000000000000000000000000	8	7.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494343e-38	1.17549e-38	1.175494359e-38	01.17549e-38	00000001.175494359e-38	01.17549e-38	00000001.175494359e-38	1000-01-08	838:59:51	1970-01-09 00:00:08	1970-01-09 00:00:08	1909	1909	1909	1enum	1set,2set	
-9	9	0000000009	0000000000000000000000000000000000000000000000000000000000000009	0000000009	0000000000000000000000000000000000000000000000000000000000000009	3	8.800000000000000000000000000000	9	8.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494342e-38	1.17549e-38	1.17549436e-38	01.17549e-38	000000001.17549436e-38	01.17549e-38	000000001.17549436e-38	1000-01-09	838:59:50	1970-01-10 00:00:09	1970-01-10 00:00:09	1910	1910	1910	2enum	1set	
-10	10	0000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000010	0000000000000000000000000000000000000000000000000000000000000010	4	9.900000000000000000000000000000	10	9.900000000000000000000000000000	0000000010	000000000000000000000000000000009.900000000000000000000000000000	0000000010	000000000000000000000000000000009.900000000000000000000000000000	-1.175494341e-38	1.175494361e-38	00000001.175494361e-38	00000001.175494361e-38	-1.175494341e-38	1.175494361e-38	00000001.175494361e-38	00000001.175494361e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494341e-38	1.17549e-38	1.175494361e-38	01.17549e-38	00000001.175494361e-38	01.17549e-38	00000001.175494361e-38	1000-01-10	838:59:49	1970-01-11 00:00:10	1970-01-11 00:00:10	1911	1911	1911	1enum	2set	
-15	87	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-17	15	0000000016	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-19	18	0000000014	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-22	93	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-24	51654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-27	25	0000000026	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-29	28	0000000024	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-34	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-94	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-107	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-107	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-109	108	0000000104	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-109	108	0000000104	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-195	87	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-207	205	0000000206	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-209	208	0000000204	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-242	79	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-250	87895654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-292	93	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-299	899	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-321	NULL	0000000765	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-323	14376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-340	9984376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-394	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-424	89	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-441	16546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-500	NULL	0000000900	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-500	NULL	0000000900	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-500	NULL	0000000900	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-660	876546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-987	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-2550	775654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-2760	985654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3330	764376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3410	996546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-7876	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-9112	NULL	0000008771	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-76710	226546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-569300	9114376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+f59	1
+f60	1
+f61	0000000001
+f62	0000000000000000000000000000000000000000000000000000000000000001
+f63	0000000001
+f64	0000000000000000000000000000000000000000000000000000000000000001
+f65	-5
+f66	0.000000000000000000000000000000
+f67	1
+f68	0.000000000000000000000000000000
+f69	0000000001
+f70	000000000000000000000000000000000.000000000000000000000000000000
+f71	0000000001
+f72	000000000000000000000000000000000.000000000000000000000000000000
+f73	-1.17549435e-38
+f74	1.175494352e-38
+f75	00000001.175494352e-38
+f76	00000001.175494352e-38
+f77	-1.17549435e-38
+f78	1.175494352e-38
+f79	00000001.175494352e-38
+f80	00000001.175494352e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.17549435e-38
+f95	1.17549e-38
+f96	1.175494352e-38
+f97	01.17549e-38
+f98	00000001.175494352e-38
+f99	01.17549e-38
+f100	00000001.175494352e-38
+f101	1000-01-01
+f102	838:59:58
+f103	1970-01-02 00:00:01
+f104	1970-01-02 00:00:01
+f105	1902
+f106	1902
+f107	1902
+f108	2enum
+f109	2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	2
+f60	2
+f61	0000000002
+f62	0000000000000000000000000000000000000000000000000000000000000002
+f63	0000000002
+f64	0000000000000000000000000000000000000000000000000000000000000002
+f65	-4
+f66	1.100000000000000000000000000000
+f67	2
+f68	1.100000000000000000000000000000
+f69	0000000002
+f70	000000000000000000000000000000001.100000000000000000000000000000
+f71	0000000002
+f72	000000000000000000000000000000001.100000000000000000000000000000
+f73	-1.175494349e-38
+f74	1.175494353e-38
+f75	00000001.175494353e-38
+f76	00000001.175494353e-38
+f77	-1.175494349e-38
+f78	1.175494353e-38
+f79	00000001.175494353e-38
+f80	00000001.175494353e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494349e-38
+f95	1.17549e-38
+f96	1.175494353e-38
+f97	01.17549e-38
+f98	00000001.175494353e-38
+f99	01.17549e-38
+f100	00000001.175494353e-38
+f101	1000-01-02
+f102	838:59:57
+f103	1970-01-03 00:00:02
+f104	1970-01-03 00:00:02
+f105	1903
+f106	1903
+f107	1903
+f108	1enum
+f109	1set,2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	3
+f60	3
+f61	0000000003
+f62	0000000000000000000000000000000000000000000000000000000000000003
+f63	0000000003
+f64	0000000000000000000000000000000000000000000000000000000000000003
+f65	-3
+f66	2.200000000000000000000000000000
+f67	3
+f68	2.200000000000000000000000000000
+f69	0000000003
+f70	000000000000000000000000000000002.200000000000000000000000000000
+f71	0000000003
+f72	000000000000000000000000000000002.200000000000000000000000000000
+f73	-1.175494348e-38
+f74	1.175494354e-38
+f75	00000001.175494354e-38
+f76	00000001.175494354e-38
+f77	-1.175494348e-38
+f78	1.175494354e-38
+f79	00000001.175494354e-38
+f80	00000001.175494354e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494348e-38
+f95	1.17549e-38
+f96	1.175494354e-38
+f97	01.17549e-38
+f98	00000001.175494354e-38
+f99	01.17549e-38
+f100	00000001.175494354e-38
+f101	1000-01-03
+f102	838:59:56
+f103	1970-01-04 00:00:03
+f104	1970-01-04 00:00:03
+f105	1904
+f106	1904
+f107	1904
+f108	2enum
+f109	1set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	4
+f60	4
+f61	0000000004
+f62	0000000000000000000000000000000000000000000000000000000000000004
+f63	0000000004
+f64	0000000000000000000000000000000000000000000000000000000000000004
+f65	-2
+f66	3.300000000000000000000000000000
+f67	4
+f68	3.300000000000000000000000000000
+f69	0000000004
+f70	000000000000000000000000000000003.300000000000000000000000000000
+f71	0000000004
+f72	000000000000000000000000000000003.300000000000000000000000000000
+f73	-1.175494347e-38
+f74	1.175494355e-38
+f75	00000001.175494355e-38
+f76	00000001.175494355e-38
+f77	-1.175494347e-38
+f78	1.175494355e-38
+f79	00000001.175494355e-38
+f80	00000001.175494355e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494347e-38
+f95	1.17549e-38
+f96	1.175494355e-38
+f97	01.17549e-38
+f98	00000001.175494355e-38
+f99	01.17549e-38
+f100	00000001.175494355e-38
+f101	1000-01-04
+f102	838:59:55
+f103	1970-01-05 00:00:04
+f104	1970-01-05 00:00:04
+f105	1905
+f106	1905
+f107	1905
+f108	1enum
+f109	2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	NULL
+f59	4
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	5
+f60	5
+f61	0000000005
+f62	0000000000000000000000000000000000000000000000000000000000000005
+f63	0000000005
+f64	0000000000000000000000000000000000000000000000000000000000000005
+f65	-1
+f66	4.400000000000000000000000000000
+f67	5
+f68	4.400000000000000000000000000000
+f69	0000000005
+f70	000000000000000000000000000000004.400000000000000000000000000000
+f71	0000000005
+f72	000000000000000000000000000000004.400000000000000000000000000000
+f73	-1.175494346e-38
+f74	1.175494356e-38
+f75	00000001.175494356e-38
+f76	00000001.175494356e-38
+f77	-1.175494346e-38
+f78	1.175494356e-38
+f79	00000001.175494356e-38
+f80	00000001.175494356e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494346e-38
+f95	1.17549e-38
+f96	1.175494356e-38
+f97	01.17549e-38
+f98	00000001.175494356e-38
+f99	01.17549e-38
+f100	00000001.175494356e-38
+f101	1000-01-05
+f102	838:59:54
+f103	1970-01-06 00:00:05
+f104	1970-01-06 00:00:05
+f105	1906
+f106	1906
+f107	1906
+f108	2enum
+f109	1set,2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	6
+f60	6
+f61	0000000006
+f62	0000000000000000000000000000000000000000000000000000000000000006
+f63	0000000006
+f64	0000000000000000000000000000000000000000000000000000000000000006
+f65	0
+f66	5.500000000000000000000000000000
+f67	6
+f68	5.500000000000000000000000000000
+f69	0000000006
+f70	000000000000000000000000000000005.500000000000000000000000000000
+f71	0000000006
+f72	000000000000000000000000000000005.500000000000000000000000000000
+f73	-1.175494345e-38
+f74	1.175494357e-38
+f75	00000001.175494357e-38
+f76	00000001.175494357e-38
+f77	-1.175494345e-38
+f78	1.175494357e-38
+f79	00000001.175494357e-38
+f80	00000001.175494357e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494345e-38
+f95	1.17549e-38
+f96	1.175494357e-38
+f97	01.17549e-38
+f98	00000001.175494357e-38
+f99	01.17549e-38
+f100	00000001.175494357e-38
+f101	1000-01-06
+f102	838:59:53
+f103	1970-01-07 00:00:06
+f104	1970-01-07 00:00:06
+f105	1907
+f106	1907
+f107	1907
+f108	1enum
+f109	1set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	7
+f60	7
+f61	0000000007
+f62	0000000000000000000000000000000000000000000000000000000000000007
+f63	0000000007
+f64	0000000000000000000000000000000000000000000000000000000000000007
+f65	1
+f66	6.600000000000000000000000000000
+f67	7
+f68	6.600000000000000000000000000000
+f69	0000000007
+f70	000000000000000000000000000000006.600000000000000000000000000000
+f71	0000000007
+f72	000000000000000000000000000000006.600000000000000000000000000000
+f73	-1.175494344e-38
+f74	1.175494358e-38
+f75	00000001.175494358e-38
+f76	00000001.175494358e-38
+f77	-1.175494344e-38
+f78	1.175494358e-38
+f79	00000001.175494358e-38
+f80	00000001.175494358e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494344e-38
+f95	1.17549e-38
+f96	1.175494358e-38
+f97	01.17549e-38
+f98	00000001.175494358e-38
+f99	01.17549e-38
+f100	00000001.175494358e-38
+f101	1000-01-07
+f102	838:59:52
+f103	1970-01-08 00:00:07
+f104	1970-01-08 00:00:07
+f105	1908
+f106	1908
+f107	1908
+f108	2enum
+f109	2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	8
+f60	8
+f61	0000000008
+f62	0000000000000000000000000000000000000000000000000000000000000008
+f63	0000000008
+f64	0000000000000000000000000000000000000000000000000000000000000008
+f65	2
+f66	7.700000000000000000000000000000
+f67	8
+f68	7.700000000000000000000000000000
+f69	0000000008
+f70	000000000000000000000000000000007.700000000000000000000000000000
+f71	0000000008
+f72	000000000000000000000000000000007.700000000000000000000000000000
+f73	-1.175494343e-38
+f74	1.175494359e-38
+f75	00000001.175494359e-38
+f76	00000001.175494359e-38
+f77	-1.175494343e-38
+f78	1.175494359e-38
+f79	00000001.175494359e-38
+f80	00000001.175494359e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494343e-38
+f95	1.17549e-38
+f96	1.175494359e-38
+f97	01.17549e-38
+f98	00000001.175494359e-38
+f99	01.17549e-38
+f100	00000001.175494359e-38
+f101	1000-01-08
+f102	838:59:51
+f103	1970-01-09 00:00:08
+f104	1970-01-09 00:00:08
+f105	1909
+f106	1909
+f107	1909
+f108	1enum
+f109	1set,2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	9
+f60	9
+f61	0000000009
+f62	0000000000000000000000000000000000000000000000000000000000000009
+f63	0000000009
+f64	0000000000000000000000000000000000000000000000000000000000000009
+f65	3
+f66	8.800000000000000000000000000000
+f67	9
+f68	8.800000000000000000000000000000
+f69	0000000009
+f70	000000000000000000000000000000008.800000000000000000000000000000
+f71	0000000009
+f72	000000000000000000000000000000008.800000000000000000000000000000
+f73	-1.175494342e-38
+f74	1.17549436e-38
+f75	000000001.17549436e-38
+f76	000000001.17549436e-38
+f77	-1.175494342e-38
+f78	1.17549436e-38
+f79	000000001.17549436e-38
+f80	000000001.17549436e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494342e-38
+f95	1.17549e-38
+f96	1.17549436e-38
+f97	01.17549e-38
+f98	000000001.17549436e-38
+f99	01.17549e-38
+f100	000000001.17549436e-38
+f101	1000-01-09
+f102	838:59:50
+f103	1970-01-10 00:00:09
+f104	1970-01-10 00:00:09
+f105	1910
+f106	1910
+f107	1910
+f108	2enum
+f109	1set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	10
+f60	10
+f61	0000000010
+f62	0000000000000000000000000000000000000000000000000000000000000010
+f63	0000000010
+f64	0000000000000000000000000000000000000000000000000000000000000010
+f65	4
+f66	9.900000000000000000000000000000
+f67	10
+f68	9.900000000000000000000000000000
+f69	0000000010
+f70	000000000000000000000000000000009.900000000000000000000000000000
+f71	0000000010
+f72	000000000000000000000000000000009.900000000000000000000000000000
+f73	-1.175494341e-38
+f74	1.175494361e-38
+f75	00000001.175494361e-38
+f76	00000001.175494361e-38
+f77	-1.175494341e-38
+f78	1.175494361e-38
+f79	00000001.175494361e-38
+f80	00000001.175494361e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494341e-38
+f95	1.17549e-38
+f96	1.175494361e-38
+f97	01.17549e-38
+f98	00000001.175494361e-38
+f99	01.17549e-38
+f100	00000001.175494361e-38
+f101	1000-01-10
+f102	838:59:49
+f103	1970-01-11 00:00:10
+f104	1970-01-11 00:00:10
+f105	1911
+f106	1911
+f107	1911
+f108	1enum
+f109	2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	NULL
+f59	15
+f60	87
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	17
+f60	15
+f61	0000000016
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	19
+f60	18
+f61	0000000014
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	22
+f60	93
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	24
+f60	51654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	27
+f60	25
+f61	0000000026
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	29
+f60	28
+f61	0000000024
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	34
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	94
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	107
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	107
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	109
+f60	108
+f61	0000000104
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	109
+f60	108
+f61	0000000104
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	195
+f60	87
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	207
+f60	205
+f61	0000000206
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	209
+f60	208
+f61	0000000204
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	242
+f60	79
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	250
+f60	87895654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	292
+f60	93
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	299
+f60	899
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	321
+f60	NULL
+f61	0000000765
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	323
+f60	14376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	340
+f60	9984376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	394
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	424
+f60	89
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	441
+f60	16546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	660
+f60	876546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	987
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	2550
+f60	775654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	2760
+f60	985654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	3330
+f60	764376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	3410
+f60	996546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	7876
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	9112
+f60	NULL
+f61	0000008771
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	76710
+f60	226546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	569300
+f60	9114376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
 CREATE or REPLACE VIEW v1 AS select *
 FROM test.tb2 WITH CASCADED CHECK OPTION ;
 select * FROM v1 order by f59,f60,f61,f62,f63,f64 limit 0,10;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109	f110	f111	f112	f113	f114	f115	f116	f117
-1	1	0000000001	0000000000000000000000000000000000000000000000000000000000000001	0000000001	0000000000000000000000000000000000000000000000000000000000000001	-5	0.000000000000000000000000000000	1	0.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549435e-38	1.17549e-38	1.175494352e-38	01.17549e-38	00000001.175494352e-38	01.17549e-38	00000001.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	1970-01-02 00:00:01	1902	1902	1902	2enum	2set	
-2	2	0000000002	0000000000000000000000000000000000000000000000000000000000000002	0000000002	0000000000000000000000000000000000000000000000000000000000000002	-4	1.100000000000000000000000000000	2	1.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494349e-38	1.17549e-38	1.175494353e-38	01.17549e-38	00000001.175494353e-38	01.17549e-38	00000001.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	1970-01-03 00:00:02	1903	1903	1903	1enum	1set,2set	
-3	3	0000000003	0000000000000000000000000000000000000000000000000000000000000003	0000000003	0000000000000000000000000000000000000000000000000000000000000003	-3	2.200000000000000000000000000000	3	2.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494348e-38	1.17549e-38	1.175494354e-38	01.17549e-38	00000001.175494354e-38	01.17549e-38	00000001.175494354e-38	1000-01-03	838:59:56	1970-01-04 00:00:03	1970-01-04 00:00:03	1904	1904	1904	2enum	1set	
-4	4	0000000004	0000000000000000000000000000000000000000000000000000000000000004	0000000004	0000000000000000000000000000000000000000000000000000000000000004	-2	3.300000000000000000000000000000	4	3.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494347e-38	1.17549e-38	1.175494355e-38	01.17549e-38	00000001.175494355e-38	01.17549e-38	00000001.175494355e-38	1000-01-04	838:59:55	1970-01-05 00:00:04	1970-01-05 00:00:04	1905	1905	1905	1enum	2set	
-4	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	5	0000000005	0000000000000000000000000000000000000000000000000000000000000005	0000000005	0000000000000000000000000000000000000000000000000000000000000005	-1	4.400000000000000000000000000000	5	4.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494346e-38	1.17549e-38	1.175494356e-38	01.17549e-38	00000001.175494356e-38	01.17549e-38	00000001.175494356e-38	1000-01-05	838:59:54	1970-01-06 00:00:05	1970-01-06 00:00:05	1906	1906	1906	2enum	1set,2set	
-6	6	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0	5.500000000000000000000000000000	6	5.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494345e-38	1.17549e-38	1.175494357e-38	01.17549e-38	00000001.175494357e-38	01.17549e-38	00000001.175494357e-38	1000-01-06	838:59:53	1970-01-07 00:00:06	1970-01-07 00:00:06	1907	1907	1907	1enum	1set	
-7	7	0000000007	0000000000000000000000000000000000000000000000000000000000000007	0000000007	0000000000000000000000000000000000000000000000000000000000000007	1	6.600000000000000000000000000000	7	6.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494344e-38	1.17549e-38	1.175494358e-38	01.17549e-38	00000001.175494358e-38	01.17549e-38	00000001.175494358e-38	1000-01-07	838:59:52	1970-01-08 00:00:07	1970-01-08 00:00:07	1908	1908	1908	2enum	2set	
-8	8	0000000008	0000000000000000000000000000000000000000000000000000000000000008	0000000008	0000000000000000000000000000000000000000000000000000000000000008	2	7.700000000000000000000000000000	8	7.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494343e-38	1.17549e-38	1.175494359e-38	01.17549e-38	00000001.175494359e-38	01.17549e-38	00000001.175494359e-38	1000-01-08	838:59:51	1970-01-09 00:00:08	1970-01-09 00:00:08	1909	1909	1909	1enum	1set,2set	
-9	9	0000000009	0000000000000000000000000000000000000000000000000000000000000009	0000000009	0000000000000000000000000000000000000000000000000000000000000009	3	8.800000000000000000000000000000	9	8.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494342e-38	1.17549e-38	1.17549436e-38	01.17549e-38	000000001.17549436e-38	01.17549e-38	000000001.17549436e-38	1000-01-09	838:59:50	1970-01-10 00:00:09	1970-01-10 00:00:09	1910	1910	1910	2enum	1set	
+f59	1
+f60	1
+f61	0000000001
+f62	0000000000000000000000000000000000000000000000000000000000000001
+f63	0000000001
+f64	0000000000000000000000000000000000000000000000000000000000000001
+f65	-5
+f66	0.000000000000000000000000000000
+f67	1
+f68	0.000000000000000000000000000000
+f69	0000000001
+f70	000000000000000000000000000000000.000000000000000000000000000000
+f71	0000000001
+f72	000000000000000000000000000000000.000000000000000000000000000000
+f73	-1.17549435e-38
+f74	1.175494352e-38
+f75	00000001.175494352e-38
+f76	00000001.175494352e-38
+f77	-1.17549435e-38
+f78	1.175494352e-38
+f79	00000001.175494352e-38
+f80	00000001.175494352e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.17549435e-38
+f95	1.17549e-38
+f96	1.175494352e-38
+f97	01.17549e-38
+f98	00000001.175494352e-38
+f99	01.17549e-38
+f100	00000001.175494352e-38
+f101	1000-01-01
+f102	838:59:58
+f103	1970-01-02 00:00:01
+f104	1970-01-02 00:00:01
+f105	1902
+f106	1902
+f107	1902
+f108	2enum
+f109	2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	2
+f60	2
+f61	0000000002
+f62	0000000000000000000000000000000000000000000000000000000000000002
+f63	0000000002
+f64	0000000000000000000000000000000000000000000000000000000000000002
+f65	-4
+f66	1.100000000000000000000000000000
+f67	2
+f68	1.100000000000000000000000000000
+f69	0000000002
+f70	000000000000000000000000000000001.100000000000000000000000000000
+f71	0000000002
+f72	000000000000000000000000000000001.100000000000000000000000000000
+f73	-1.175494349e-38
+f74	1.175494353e-38
+f75	00000001.175494353e-38
+f76	00000001.175494353e-38
+f77	-1.175494349e-38
+f78	1.175494353e-38
+f79	00000001.175494353e-38
+f80	00000001.175494353e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494349e-38
+f95	1.17549e-38
+f96	1.175494353e-38
+f97	01.17549e-38
+f98	00000001.175494353e-38
+f99	01.17549e-38
+f100	00000001.175494353e-38
+f101	1000-01-02
+f102	838:59:57
+f103	1970-01-03 00:00:02
+f104	1970-01-03 00:00:02
+f105	1903
+f106	1903
+f107	1903
+f108	1enum
+f109	1set,2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	3
+f60	3
+f61	0000000003
+f62	0000000000000000000000000000000000000000000000000000000000000003
+f63	0000000003
+f64	0000000000000000000000000000000000000000000000000000000000000003
+f65	-3
+f66	2.200000000000000000000000000000
+f67	3
+f68	2.200000000000000000000000000000
+f69	0000000003
+f70	000000000000000000000000000000002.200000000000000000000000000000
+f71	0000000003
+f72	000000000000000000000000000000002.200000000000000000000000000000
+f73	-1.175494348e-38
+f74	1.175494354e-38
+f75	00000001.175494354e-38
+f76	00000001.175494354e-38
+f77	-1.175494348e-38
+f78	1.175494354e-38
+f79	00000001.175494354e-38
+f80	00000001.175494354e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494348e-38
+f95	1.17549e-38
+f96	1.175494354e-38
+f97	01.17549e-38
+f98	00000001.175494354e-38
+f99	01.17549e-38
+f100	00000001.175494354e-38
+f101	1000-01-03
+f102	838:59:56
+f103	1970-01-04 00:00:03
+f104	1970-01-04 00:00:03
+f105	1904
+f106	1904
+f107	1904
+f108	2enum
+f109	1set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	4
+f60	4
+f61	0000000004
+f62	0000000000000000000000000000000000000000000000000000000000000004
+f63	0000000004
+f64	0000000000000000000000000000000000000000000000000000000000000004
+f65	-2
+f66	3.300000000000000000000000000000
+f67	4
+f68	3.300000000000000000000000000000
+f69	0000000004
+f70	000000000000000000000000000000003.300000000000000000000000000000
+f71	0000000004
+f72	000000000000000000000000000000003.300000000000000000000000000000
+f73	-1.175494347e-38
+f74	1.175494355e-38
+f75	00000001.175494355e-38
+f76	00000001.175494355e-38
+f77	-1.175494347e-38
+f78	1.175494355e-38
+f79	00000001.175494355e-38
+f80	00000001.175494355e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494347e-38
+f95	1.17549e-38
+f96	1.175494355e-38
+f97	01.17549e-38
+f98	00000001.175494355e-38
+f99	01.17549e-38
+f100	00000001.175494355e-38
+f101	1000-01-04
+f102	838:59:55
+f103	1970-01-05 00:00:04
+f104	1970-01-05 00:00:04
+f105	1905
+f106	1905
+f107	1905
+f108	1enum
+f109	2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	NULL
+f59	4
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	5
+f60	5
+f61	0000000005
+f62	0000000000000000000000000000000000000000000000000000000000000005
+f63	0000000005
+f64	0000000000000000000000000000000000000000000000000000000000000005
+f65	-1
+f66	4.400000000000000000000000000000
+f67	5
+f68	4.400000000000000000000000000000
+f69	0000000005
+f70	000000000000000000000000000000004.400000000000000000000000000000
+f71	0000000005
+f72	000000000000000000000000000000004.400000000000000000000000000000
+f73	-1.175494346e-38
+f74	1.175494356e-38
+f75	00000001.175494356e-38
+f76	00000001.175494356e-38
+f77	-1.175494346e-38
+f78	1.175494356e-38
+f79	00000001.175494356e-38
+f80	00000001.175494356e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494346e-38
+f95	1.17549e-38
+f96	1.175494356e-38
+f97	01.17549e-38
+f98	00000001.175494356e-38
+f99	01.17549e-38
+f100	00000001.175494356e-38
+f101	1000-01-05
+f102	838:59:54
+f103	1970-01-06 00:00:05
+f104	1970-01-06 00:00:05
+f105	1906
+f106	1906
+f107	1906
+f108	2enum
+f109	1set,2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	6
+f60	6
+f61	0000000006
+f62	0000000000000000000000000000000000000000000000000000000000000006
+f63	0000000006
+f64	0000000000000000000000000000000000000000000000000000000000000006
+f65	0
+f66	5.500000000000000000000000000000
+f67	6
+f68	5.500000000000000000000000000000
+f69	0000000006
+f70	000000000000000000000000000000005.500000000000000000000000000000
+f71	0000000006
+f72	000000000000000000000000000000005.500000000000000000000000000000
+f73	-1.175494345e-38
+f74	1.175494357e-38
+f75	00000001.175494357e-38
+f76	00000001.175494357e-38
+f77	-1.175494345e-38
+f78	1.175494357e-38
+f79	00000001.175494357e-38
+f80	00000001.175494357e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494345e-38
+f95	1.17549e-38
+f96	1.175494357e-38
+f97	01.17549e-38
+f98	00000001.175494357e-38
+f99	01.17549e-38
+f100	00000001.175494357e-38
+f101	1000-01-06
+f102	838:59:53
+f103	1970-01-07 00:00:06
+f104	1970-01-07 00:00:06
+f105	1907
+f106	1907
+f107	1907
+f108	1enum
+f109	1set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	7
+f60	7
+f61	0000000007
+f62	0000000000000000000000000000000000000000000000000000000000000007
+f63	0000000007
+f64	0000000000000000000000000000000000000000000000000000000000000007
+f65	1
+f66	6.600000000000000000000000000000
+f67	7
+f68	6.600000000000000000000000000000
+f69	0000000007
+f70	000000000000000000000000000000006.600000000000000000000000000000
+f71	0000000007
+f72	000000000000000000000000000000006.600000000000000000000000000000
+f73	-1.175494344e-38
+f74	1.175494358e-38
+f75	00000001.175494358e-38
+f76	00000001.175494358e-38
+f77	-1.175494344e-38
+f78	1.175494358e-38
+f79	00000001.175494358e-38
+f80	00000001.175494358e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494344e-38
+f95	1.17549e-38
+f96	1.175494358e-38
+f97	01.17549e-38
+f98	00000001.175494358e-38
+f99	01.17549e-38
+f100	00000001.175494358e-38
+f101	1000-01-07
+f102	838:59:52
+f103	1970-01-08 00:00:07
+f104	1970-01-08 00:00:07
+f105	1908
+f106	1908
+f107	1908
+f108	2enum
+f109	2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	8
+f60	8
+f61	0000000008
+f62	0000000000000000000000000000000000000000000000000000000000000008
+f63	0000000008
+f64	0000000000000000000000000000000000000000000000000000000000000008
+f65	2
+f66	7.700000000000000000000000000000
+f67	8
+f68	7.700000000000000000000000000000
+f69	0000000008
+f70	000000000000000000000000000000007.700000000000000000000000000000
+f71	0000000008
+f72	000000000000000000000000000000007.700000000000000000000000000000
+f73	-1.175494343e-38
+f74	1.175494359e-38
+f75	00000001.175494359e-38
+f76	00000001.175494359e-38
+f77	-1.175494343e-38
+f78	1.175494359e-38
+f79	00000001.175494359e-38
+f80	00000001.175494359e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494343e-38
+f95	1.17549e-38
+f96	1.175494359e-38
+f97	01.17549e-38
+f98	00000001.175494359e-38
+f99	01.17549e-38
+f100	00000001.175494359e-38
+f101	1000-01-08
+f102	838:59:51
+f103	1970-01-09 00:00:08
+f104	1970-01-09 00:00:08
+f105	1909
+f106	1909
+f107	1909
+f108	1enum
+f109	1set,2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	9
+f60	9
+f61	0000000009
+f62	0000000000000000000000000000000000000000000000000000000000000009
+f63	0000000009
+f64	0000000000000000000000000000000000000000000000000000000000000009
+f65	3
+f66	8.800000000000000000000000000000
+f67	9
+f68	8.800000000000000000000000000000
+f69	0000000009
+f70	000000000000000000000000000000008.800000000000000000000000000000
+f71	0000000009
+f72	000000000000000000000000000000008.800000000000000000000000000000
+f73	-1.175494342e-38
+f74	1.17549436e-38
+f75	000000001.17549436e-38
+f76	000000001.17549436e-38
+f77	-1.175494342e-38
+f78	1.17549436e-38
+f79	000000001.17549436e-38
+f80	000000001.17549436e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494342e-38
+f95	1.17549e-38
+f96	1.17549436e-38
+f97	01.17549e-38
+f98	000000001.17549436e-38
+f99	01.17549e-38
+f100	000000001.17549436e-38
+f101	1000-01-09
+f102	838:59:50
+f103	1970-01-10 00:00:09
+f104	1970-01-10 00:00:09
+f105	1910
+f106	1910
+f107	1910
+f108	2enum
+f109	1set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
 CREATE OR REPLACE VIEW v1 AS SELECT F59, F60
 FROM test.tb2 WITH CASCADED CHECK OPTION;
 SELECT * FROM v1 order by f59,f60 limit 0,10;
@@ -953,9 +4427,124 @@ SHOW CREATE VIEW test.v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `tb2`.`f59` AS `f59`,`tb2`.`f60` AS `f60`,`tb2`.`f61` AS `f61`,`tb2`.`f62` AS `f62`,`tb2`.`f63` AS `f63`,`tb2`.`f64` AS `f64`,`tb2`.`f65` AS `f65`,`tb2`.`f66` AS `f66`,`tb2`.`f67` AS `f67`,`tb2`.`f68` AS `f68`,`tb2`.`f69` AS `f69`,`tb2`.`f70` AS `f70`,`tb2`.`f71` AS `f71`,`tb2`.`f72` AS `f72`,`tb2`.`f73` AS `f73`,`tb2`.`f74` AS `f74`,`tb2`.`f75` AS `f75`,`tb2`.`f76` AS `f76`,`tb2`.`f77` AS `f77`,`tb2`.`f78` AS `f78`,`tb2`.`f79` AS `f79`,`tb2`.`f80` AS `f80`,`tb2`.`f81` AS `f81`,`tb2`.`f82` AS `f82`,`tb2`.`f83` AS `f83`,`tb2`.`f84` AS `f84`,`tb2`.`f85` AS `f85`,`tb2`.`f86` AS `f86`,`tb2`.`f87` AS `f87`,`tb2`.`f88` AS `f88`,`tb2`.`f89` AS `f89`,`tb2`.`f90` AS `f90`,`tb2`.`f91` AS `f91`,`tb2`.`f92` AS `f92`,`tb2`.`f93` AS `f93`,`tb2`.`f94` AS `f94`,`tb2`.`f95` AS `f95`,`tb2`.`f96` AS `f96`,`tb2`.`f97` AS `f97`,`tb2`.`f98` AS `f98`,`tb2`.`f99` AS `f99`,`tb2`.`f100` AS `f100`,`tb2`.`f101` AS `f101`,`tb2`.`f102` AS `f102`,`tb2`.`f103` AS `f103`,`tb2`.`f104` AS `f104`,`tb2`.`f105` AS `f105`,`tb2`.`f106` AS `f106`,`tb2`.`f107` AS `f107`,`tb2`.`f108` AS `f108`,`tb2`.`f109` AS `f109`,`tb2`.`f110` AS `f110`,`tb2`.`f111` AS `f111`,`tb2`.`f112` AS `f112`,`tb2`.`f113` AS `f113`,`tb2`.`f114` AS `f114`,`tb2`.`f115` AS `f115`,`tb2`.`f116` AS `f116`,`tb2`.`f117` AS `f117` from `tb2` order by `tb2`.`f59` limit 2	latin1	latin1_swedish_ci
 SELECT * FROM test.v1 order by f59,f60,f61,f62,f63,f64,f65;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109	f110	f111	f112	f113	f114	f115	f116	f117
-1	1	0000000001	0000000000000000000000000000000000000000000000000000000000000001	0000000001	0000000000000000000000000000000000000000000000000000000000000001	-5	0.000000000000000000000000000000	1	0.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549435e-38	1.17549e-38	1.175494352e-38	01.17549e-38	00000001.175494352e-38	01.17549e-38	00000001.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	1970-01-02 00:00:01	1902	1902	1902	2enum	2set	
-2	2	0000000002	0000000000000000000000000000000000000000000000000000000000000002	0000000002	0000000000000000000000000000000000000000000000000000000000000002	-4	1.100000000000000000000000000000	2	1.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494349e-38	1.17549e-38	1.175494353e-38	01.17549e-38	00000001.175494353e-38	01.17549e-38	00000001.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	1970-01-03 00:00:02	1903	1903	1903	1enum	1set,2set	
+f59	1
+f60	1
+f61	0000000001
+f62	0000000000000000000000000000000000000000000000000000000000000001
+f63	0000000001
+f64	0000000000000000000000000000000000000000000000000000000000000001
+f65	-5
+f66	0.000000000000000000000000000000
+f67	1
+f68	0.000000000000000000000000000000
+f69	0000000001
+f70	000000000000000000000000000000000.000000000000000000000000000000
+f71	0000000001
+f72	000000000000000000000000000000000.000000000000000000000000000000
+f73	-1.17549435e-38
+f74	1.175494352e-38
+f75	00000001.175494352e-38
+f76	00000001.175494352e-38
+f77	-1.17549435e-38
+f78	1.175494352e-38
+f79	00000001.175494352e-38
+f80	00000001.175494352e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.17549435e-38
+f95	1.17549e-38
+f96	1.175494352e-38
+f97	01.17549e-38
+f98	00000001.175494352e-38
+f99	01.17549e-38
+f100	00000001.175494352e-38
+f101	1000-01-01
+f102	838:59:58
+f103	1970-01-02 00:00:01
+f104	1970-01-02 00:00:01
+f105	1902
+f106	1902
+f107	1902
+f108	2enum
+f109	2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	2
+f60	2
+f61	0000000002
+f62	0000000000000000000000000000000000000000000000000000000000000002
+f63	0000000002
+f64	0000000000000000000000000000000000000000000000000000000000000002
+f65	-4
+f66	1.100000000000000000000000000000
+f67	2
+f68	1.100000000000000000000000000000
+f69	0000000002
+f70	000000000000000000000000000000001.100000000000000000000000000000
+f71	0000000002
+f72	000000000000000000000000000000001.100000000000000000000000000000
+f73	-1.175494349e-38
+f74	1.175494353e-38
+f75	00000001.175494353e-38
+f76	00000001.175494353e-38
+f77	-1.175494349e-38
+f78	1.175494353e-38
+f79	00000001.175494353e-38
+f80	00000001.175494353e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494349e-38
+f95	1.17549e-38
+f96	1.175494353e-38
+f97	01.17549e-38
+f98	00000001.175494353e-38
+f99	01.17549e-38
+f100	00000001.175494353e-38
+f101	1000-01-02
+f102	838:59:57
+f103	1970-01-03 00:00:02
+f104	1970-01-03 00:00:02
+f105	1903
+f106	1903
+f107	1903
+f108	1enum
+f109	1set,2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
 CREATE OR REPLACE VIEW test.v1 AS SELECT F59 FROM tb2;
 SHOW CREATE VIEW test.v1;
 View	Create View	character_set_client	collation_connection
@@ -1016,10 +4605,9 @@ Testcase 3.3.1.15
 --------------------------------------------------------------------------------
 Drop table if exists test.v1 ;
 CREATE OR REPLACE view test.v1 as select * from tb2;
-SELECT * FROM test.v1 ORDER BY f59,f60,f61 LIMIT 2;
+SELECT * FROM test.v1;
 f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109	f110	f111	f112	f113	f114	f115	f116	f117
-1	1	0000000001	0000000000000000000000000000000000000000000000000000000000000001	0000000001	0000000000000000000000000000000000000000000000000000000000000001	-5	0.000000000000000000000000000000	1	0.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549435e-38	1.17549e-38	1.175494352e-38	01.17549e-38	00000001.175494352e-38	01.17549e-38	00000001.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	1970-01-02 00:00:01	1902	1902	1902	2enum	2set	
-2	2	0000000002	0000000000000000000000000000000000000000000000000000000000000002	0000000002	0000000000000000000000000000000000000000000000000000000000000002	-4	1.100000000000000000000000000000	2	1.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494349e-38	1.17549e-38	1.175494353e-38	01.17549e-38	00000001.175494353e-38	01.17549e-38	00000001.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	1970-01-03 00:00:02	1903	1903	1903	1enum	1set,2set	
+1	1	0000000001	0000000000000000000000000000000000000000000000000000000000000001	0000000001	0000000000000000000000000000000000000000000000000000000000000001	-5	0.000000000000000000000000000000	1	0.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549435e-38	1.17549e-38	1.175494352e-38	01.17549e-38	00000001.175494352e-38	01.17549e-38	00000001.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	1970-01-02 00:00:01	1902	1902	1902	2enum	2set	
 Drop view test.v1 ;
 
 Testcase 3.3.1.16 + 3.3.1.17 
@@ -1162,17 +4750,17 @@ Drop view if exists test.v1 ;
 Testcase 3.3.1.22 
 --------------------------------------------------------------------------------
 DROP VIEW  IF EXISTS v1;
-CREATE VIEW test.v1( product ) AS SELECT f59*f60 From tb2;
-SELECT * FROM test.v1 WHERE product IS NOT NULL ORDER BY product LIMIT 2;
+CREATE VIEW test.v1( product ) AS SELECT f59*f60 From tb2 WHERE f59 < 3;
+SELECT * FROM test.v1;
 product
 1
 4
 CREATE OR REPLACE VIEW test.v1( product ) AS SELECT 1*2;
-SELECT * FROM test.v1 LIMIT 2;
+SELECT * FROM test.v1;
 product
 2
 CREATE OR REPLACE VIEW test.v1( product ) AS SELECT USER();
-SELECT * FROM test.v1 LIMIT 2;
+SELECT * FROM test.v1;
 product
 root@localhost
 Drop view if exists test.v1 ;
@@ -1250,10 +4838,9 @@ Testcase 3.3.1.26
 --------------------------------------------------------------------------------
 DROP VIEW  IF EXISTS v1;
 Create view test.v1 AS Select * from test.tb2;
-Select * from test.v1 order by f59, f60, f61 limit 2;
+Select * from test.v1;
 f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109	f110	f111	f112	f113	f114	f115	f116	f117
-1	1	0000000001	0000000000000000000000000000000000000000000000000000000000000001	0000000001	0000000000000000000000000000000000000000000000000000000000000001	-5	0.000000000000000000000000000000	1	0.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549435e-38	1.17549e-38	1.175494352e-38	01.17549e-38	00000001.175494352e-38	01.17549e-38	00000001.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	1970-01-02 00:00:01	1902	1902	1902	2enum	2set	
-2	2	0000000002	0000000000000000000000000000000000000000000000000000000000000002	0000000002	0000000000000000000000000000000000000000000000000000000000000002	-4	1.100000000000000000000000000000	2	1.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494349e-38	1.17549e-38	1.175494353e-38	01.17549e-38	00000001.175494353e-38	01.17549e-38	00000001.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	1970-01-03 00:00:02	1903	1903	1903	1enum	1set,2set	
+1	1	0000000001	0000000000000000000000000000000000000000000000000000000000000001	0000000001	0000000000000000000000000000000000000000000000000000000000000001	-5	0.000000000000000000000000000000	1	0.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549435e-38	1.17549e-38	1.175494352e-38	01.17549e-38	00000001.175494352e-38	01.17549e-38	00000001.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	1970-01-02 00:00:01	1902	1902	1902	2enum	2set	
 Drop view test.v1 ;
 
 Testcase 3.3.1.27 
@@ -1277,57 +4864,2956 @@ Create view test2.v2 AS Select * from test.tb2 limit 50,50;
 use test2 ;
 Create view v1 AS Select * from test.tb2 limit 50 ;
 Select * from v1 order by f59,f60,f61,f62,f63,f64,f65;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109	f110	f111	f112	f113	f114	f115	f116	f117
-1	1	0000000001	0000000000000000000000000000000000000000000000000000000000000001	0000000001	0000000000000000000000000000000000000000000000000000000000000001	-5	0.000000000000000000000000000000	1	0.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549435e-38	1.17549e-38	1.175494352e-38	01.17549e-38	00000001.175494352e-38	01.17549e-38	00000001.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	1970-01-02 00:00:01	1902	1902	1902	2enum	2set	
-2	2	0000000002	0000000000000000000000000000000000000000000000000000000000000002	0000000002	0000000000000000000000000000000000000000000000000000000000000002	-4	1.100000000000000000000000000000	2	1.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494349e-38	1.17549e-38	1.175494353e-38	01.17549e-38	00000001.175494353e-38	01.17549e-38	00000001.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	1970-01-03 00:00:02	1903	1903	1903	1enum	1set,2set	
-3	3	0000000003	0000000000000000000000000000000000000000000000000000000000000003	0000000003	0000000000000000000000000000000000000000000000000000000000000003	-3	2.200000000000000000000000000000	3	2.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494348e-38	1.17549e-38	1.175494354e-38	01.17549e-38	00000001.175494354e-38	01.17549e-38	00000001.175494354e-38	1000-01-03	838:59:56	1970-01-04 00:00:03	1970-01-04 00:00:03	1904	1904	1904	2enum	1set	
-4	4	0000000004	0000000000000000000000000000000000000000000000000000000000000004	0000000004	0000000000000000000000000000000000000000000000000000000000000004	-2	3.300000000000000000000000000000	4	3.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494347e-38	1.17549e-38	1.175494355e-38	01.17549e-38	00000001.175494355e-38	01.17549e-38	00000001.175494355e-38	1000-01-04	838:59:55	1970-01-05 00:00:04	1970-01-05 00:00:04	1905	1905	1905	1enum	2set	
-4	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	5	0000000005	0000000000000000000000000000000000000000000000000000000000000005	0000000005	0000000000000000000000000000000000000000000000000000000000000005	-1	4.400000000000000000000000000000	5	4.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494346e-38	1.17549e-38	1.175494356e-38	01.17549e-38	00000001.175494356e-38	01.17549e-38	00000001.175494356e-38	1000-01-05	838:59:54	1970-01-06 00:00:05	1970-01-06 00:00:05	1906	1906	1906	2enum	1set,2set	
-6	6	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0	5.500000000000000000000000000000	6	5.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494345e-38	1.17549e-38	1.175494357e-38	01.17549e-38	00000001.175494357e-38	01.17549e-38	00000001.175494357e-38	1000-01-06	838:59:53	1970-01-07 00:00:06	1970-01-07 00:00:06	1907	1907	1907	1enum	1set	
-7	7	0000000007	0000000000000000000000000000000000000000000000000000000000000007	0000000007	0000000000000000000000000000000000000000000000000000000000000007	1	6.600000000000000000000000000000	7	6.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494344e-38	1.17549e-38	1.175494358e-38	01.17549e-38	00000001.175494358e-38	01.17549e-38	00000001.175494358e-38	1000-01-07	838:59:52	1970-01-08 00:00:07	1970-01-08 00:00:07	1908	1908	1908	2enum	2set	
-8	8	0000000008	0000000000000000000000000000000000000000000000000000000000000008	0000000008	0000000000000000000000000000000000000000000000000000000000000008	2	7.700000000000000000000000000000	8	7.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494343e-38	1.17549e-38	1.175494359e-38	01.17549e-38	00000001.175494359e-38	01.17549e-38	00000001.175494359e-38	1000-01-08	838:59:51	1970-01-09 00:00:08	1970-01-09 00:00:08	1909	1909	1909	1enum	1set,2set	
-9	9	0000000009	0000000000000000000000000000000000000000000000000000000000000009	0000000009	0000000000000000000000000000000000000000000000000000000000000009	3	8.800000000000000000000000000000	9	8.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494342e-38	1.17549e-38	1.17549436e-38	01.17549e-38	000000001.17549436e-38	01.17549e-38	000000001.17549436e-38	1000-01-09	838:59:50	1970-01-10 00:00:09	1970-01-10 00:00:09	1910	1910	1910	2enum	1set	
-10	10	0000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000010	0000000000000000000000000000000000000000000000000000000000000010	4	9.900000000000000000000000000000	10	9.900000000000000000000000000000	0000000010	000000000000000000000000000000009.900000000000000000000000000000	0000000010	000000000000000000000000000000009.900000000000000000000000000000	-1.175494341e-38	1.175494361e-38	00000001.175494361e-38	00000001.175494361e-38	-1.175494341e-38	1.175494361e-38	00000001.175494361e-38	00000001.175494361e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494341e-38	1.17549e-38	1.175494361e-38	01.17549e-38	00000001.175494361e-38	01.17549e-38	00000001.175494361e-38	1000-01-10	838:59:49	1970-01-11 00:00:10	1970-01-11 00:00:10	1911	1911	1911	1enum	2set	
-15	87	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-17	15	0000000016	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-19	18	0000000014	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-22	93	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-24	51654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-27	25	0000000026	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-29	28	0000000024	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-34	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-94	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-107	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-107	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-109	108	0000000104	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-109	108	0000000104	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-195	87	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-207	205	0000000206	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-209	208	0000000204	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-242	79	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-250	87895654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-292	93	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-299	899	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-321	NULL	0000000765	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-323	14376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-340	9984376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-394	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-424	89	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-441	16546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-500	NULL	0000000900	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-500	NULL	0000000900	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-500	NULL	0000000900	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-660	876546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-987	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-2550	775654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-2760	985654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3330	764376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3410	996546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-7876	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-9112	NULL	0000008771	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-76710	226546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-569300	9114376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+f59	1
+f60	1
+f61	0000000001
+f62	0000000000000000000000000000000000000000000000000000000000000001
+f63	0000000001
+f64	0000000000000000000000000000000000000000000000000000000000000001
+f65	-5
+f66	0.000000000000000000000000000000
+f67	1
+f68	0.000000000000000000000000000000
+f69	0000000001
+f70	000000000000000000000000000000000.000000000000000000000000000000
+f71	0000000001
+f72	000000000000000000000000000000000.000000000000000000000000000000
+f73	-1.17549435e-38
+f74	1.175494352e-38
+f75	00000001.175494352e-38
+f76	00000001.175494352e-38
+f77	-1.17549435e-38
+f78	1.175494352e-38
+f79	00000001.175494352e-38
+f80	00000001.175494352e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.17549435e-38
+f95	1.17549e-38
+f96	1.175494352e-38
+f97	01.17549e-38
+f98	00000001.175494352e-38
+f99	01.17549e-38
+f100	00000001.175494352e-38
+f101	1000-01-01
+f102	838:59:58
+f103	1970-01-02 00:00:01
+f104	1970-01-02 00:00:01
+f105	1902
+f106	1902
+f107	1902
+f108	2enum
+f109	2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	2
+f60	2
+f61	0000000002
+f62	0000000000000000000000000000000000000000000000000000000000000002
+f63	0000000002
+f64	0000000000000000000000000000000000000000000000000000000000000002
+f65	-4
+f66	1.100000000000000000000000000000
+f67	2
+f68	1.100000000000000000000000000000
+f69	0000000002
+f70	000000000000000000000000000000001.100000000000000000000000000000
+f71	0000000002
+f72	000000000000000000000000000000001.100000000000000000000000000000
+f73	-1.175494349e-38
+f74	1.175494353e-38
+f75	00000001.175494353e-38
+f76	00000001.175494353e-38
+f77	-1.175494349e-38
+f78	1.175494353e-38
+f79	00000001.175494353e-38
+f80	00000001.175494353e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494349e-38
+f95	1.17549e-38
+f96	1.175494353e-38
+f97	01.17549e-38
+f98	00000001.175494353e-38
+f99	01.17549e-38
+f100	00000001.175494353e-38
+f101	1000-01-02
+f102	838:59:57
+f103	1970-01-03 00:00:02
+f104	1970-01-03 00:00:02
+f105	1903
+f106	1903
+f107	1903
+f108	1enum
+f109	1set,2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	3
+f60	3
+f61	0000000003
+f62	0000000000000000000000000000000000000000000000000000000000000003
+f63	0000000003
+f64	0000000000000000000000000000000000000000000000000000000000000003
+f65	-3
+f66	2.200000000000000000000000000000
+f67	3
+f68	2.200000000000000000000000000000
+f69	0000000003
+f70	000000000000000000000000000000002.200000000000000000000000000000
+f71	0000000003
+f72	000000000000000000000000000000002.200000000000000000000000000000
+f73	-1.175494348e-38
+f74	1.175494354e-38
+f75	00000001.175494354e-38
+f76	00000001.175494354e-38
+f77	-1.175494348e-38
+f78	1.175494354e-38
+f79	00000001.175494354e-38
+f80	00000001.175494354e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494348e-38
+f95	1.17549e-38
+f96	1.175494354e-38
+f97	01.17549e-38
+f98	00000001.175494354e-38
+f99	01.17549e-38
+f100	00000001.175494354e-38
+f101	1000-01-03
+f102	838:59:56
+f103	1970-01-04 00:00:03
+f104	1970-01-04 00:00:03
+f105	1904
+f106	1904
+f107	1904
+f108	2enum
+f109	1set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	4
+f60	4
+f61	0000000004
+f62	0000000000000000000000000000000000000000000000000000000000000004
+f63	0000000004
+f64	0000000000000000000000000000000000000000000000000000000000000004
+f65	-2
+f66	3.300000000000000000000000000000
+f67	4
+f68	3.300000000000000000000000000000
+f69	0000000004
+f70	000000000000000000000000000000003.300000000000000000000000000000
+f71	0000000004
+f72	000000000000000000000000000000003.300000000000000000000000000000
+f73	-1.175494347e-38
+f74	1.175494355e-38
+f75	00000001.175494355e-38
+f76	00000001.175494355e-38
+f77	-1.175494347e-38
+f78	1.175494355e-38
+f79	00000001.175494355e-38
+f80	00000001.175494355e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494347e-38
+f95	1.17549e-38
+f96	1.175494355e-38
+f97	01.17549e-38
+f98	00000001.175494355e-38
+f99	01.17549e-38
+f100	00000001.175494355e-38
+f101	1000-01-04
+f102	838:59:55
+f103	1970-01-05 00:00:04
+f104	1970-01-05 00:00:04
+f105	1905
+f106	1905
+f107	1905
+f108	1enum
+f109	2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	NULL
+f59	4
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	5
+f60	5
+f61	0000000005
+f62	0000000000000000000000000000000000000000000000000000000000000005
+f63	0000000005
+f64	0000000000000000000000000000000000000000000000000000000000000005
+f65	-1
+f66	4.400000000000000000000000000000
+f67	5
+f68	4.400000000000000000000000000000
+f69	0000000005
+f70	000000000000000000000000000000004.400000000000000000000000000000
+f71	0000000005
+f72	000000000000000000000000000000004.400000000000000000000000000000
+f73	-1.175494346e-38
+f74	1.175494356e-38
+f75	00000001.175494356e-38
+f76	00000001.175494356e-38
+f77	-1.175494346e-38
+f78	1.175494356e-38
+f79	00000001.175494356e-38
+f80	00000001.175494356e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494346e-38
+f95	1.17549e-38
+f96	1.175494356e-38
+f97	01.17549e-38
+f98	00000001.175494356e-38
+f99	01.17549e-38
+f100	00000001.175494356e-38
+f101	1000-01-05
+f102	838:59:54
+f103	1970-01-06 00:00:05
+f104	1970-01-06 00:00:05
+f105	1906
+f106	1906
+f107	1906
+f108	2enum
+f109	1set,2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	6
+f60	6
+f61	0000000006
+f62	0000000000000000000000000000000000000000000000000000000000000006
+f63	0000000006
+f64	0000000000000000000000000000000000000000000000000000000000000006
+f65	0
+f66	5.500000000000000000000000000000
+f67	6
+f68	5.500000000000000000000000000000
+f69	0000000006
+f70	000000000000000000000000000000005.500000000000000000000000000000
+f71	0000000006
+f72	000000000000000000000000000000005.500000000000000000000000000000
+f73	-1.175494345e-38
+f74	1.175494357e-38
+f75	00000001.175494357e-38
+f76	00000001.175494357e-38
+f77	-1.175494345e-38
+f78	1.175494357e-38
+f79	00000001.175494357e-38
+f80	00000001.175494357e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494345e-38
+f95	1.17549e-38
+f96	1.175494357e-38
+f97	01.17549e-38
+f98	00000001.175494357e-38
+f99	01.17549e-38
+f100	00000001.175494357e-38
+f101	1000-01-06
+f102	838:59:53
+f103	1970-01-07 00:00:06
+f104	1970-01-07 00:00:06
+f105	1907
+f106	1907
+f107	1907
+f108	1enum
+f109	1set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	7
+f60	7
+f61	0000000007
+f62	0000000000000000000000000000000000000000000000000000000000000007
+f63	0000000007
+f64	0000000000000000000000000000000000000000000000000000000000000007
+f65	1
+f66	6.600000000000000000000000000000
+f67	7
+f68	6.600000000000000000000000000000
+f69	0000000007
+f70	000000000000000000000000000000006.600000000000000000000000000000
+f71	0000000007
+f72	000000000000000000000000000000006.600000000000000000000000000000
+f73	-1.175494344e-38
+f74	1.175494358e-38
+f75	00000001.175494358e-38
+f76	00000001.175494358e-38
+f77	-1.175494344e-38
+f78	1.175494358e-38
+f79	00000001.175494358e-38
+f80	00000001.175494358e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494344e-38
+f95	1.17549e-38
+f96	1.175494358e-38
+f97	01.17549e-38
+f98	00000001.175494358e-38
+f99	01.17549e-38
+f100	00000001.175494358e-38
+f101	1000-01-07
+f102	838:59:52
+f103	1970-01-08 00:00:07
+f104	1970-01-08 00:00:07
+f105	1908
+f106	1908
+f107	1908
+f108	2enum
+f109	2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	8
+f60	8
+f61	0000000008
+f62	0000000000000000000000000000000000000000000000000000000000000008
+f63	0000000008
+f64	0000000000000000000000000000000000000000000000000000000000000008
+f65	2
+f66	7.700000000000000000000000000000
+f67	8
+f68	7.700000000000000000000000000000
+f69	0000000008
+f70	000000000000000000000000000000007.700000000000000000000000000000
+f71	0000000008
+f72	000000000000000000000000000000007.700000000000000000000000000000
+f73	-1.175494343e-38
+f74	1.175494359e-38
+f75	00000001.175494359e-38
+f76	00000001.175494359e-38
+f77	-1.175494343e-38
+f78	1.175494359e-38
+f79	00000001.175494359e-38
+f80	00000001.175494359e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494343e-38
+f95	1.17549e-38
+f96	1.175494359e-38
+f97	01.17549e-38
+f98	00000001.175494359e-38
+f99	01.17549e-38
+f100	00000001.175494359e-38
+f101	1000-01-08
+f102	838:59:51
+f103	1970-01-09 00:00:08
+f104	1970-01-09 00:00:08
+f105	1909
+f106	1909
+f107	1909
+f108	1enum
+f109	1set,2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	9
+f60	9
+f61	0000000009
+f62	0000000000000000000000000000000000000000000000000000000000000009
+f63	0000000009
+f64	0000000000000000000000000000000000000000000000000000000000000009
+f65	3
+f66	8.800000000000000000000000000000
+f67	9
+f68	8.800000000000000000000000000000
+f69	0000000009
+f70	000000000000000000000000000000008.800000000000000000000000000000
+f71	0000000009
+f72	000000000000000000000000000000008.800000000000000000000000000000
+f73	-1.175494342e-38
+f74	1.17549436e-38
+f75	000000001.17549436e-38
+f76	000000001.17549436e-38
+f77	-1.175494342e-38
+f78	1.17549436e-38
+f79	000000001.17549436e-38
+f80	000000001.17549436e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494342e-38
+f95	1.17549e-38
+f96	1.17549436e-38
+f97	01.17549e-38
+f98	000000001.17549436e-38
+f99	01.17549e-38
+f100	000000001.17549436e-38
+f101	1000-01-09
+f102	838:59:50
+f103	1970-01-10 00:00:09
+f104	1970-01-10 00:00:09
+f105	1910
+f106	1910
+f107	1910
+f108	2enum
+f109	1set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	10
+f60	10
+f61	0000000010
+f62	0000000000000000000000000000000000000000000000000000000000000010
+f63	0000000010
+f64	0000000000000000000000000000000000000000000000000000000000000010
+f65	4
+f66	9.900000000000000000000000000000
+f67	10
+f68	9.900000000000000000000000000000
+f69	0000000010
+f70	000000000000000000000000000000009.900000000000000000000000000000
+f71	0000000010
+f72	000000000000000000000000000000009.900000000000000000000000000000
+f73	-1.175494341e-38
+f74	1.175494361e-38
+f75	00000001.175494361e-38
+f76	00000001.175494361e-38
+f77	-1.175494341e-38
+f78	1.175494361e-38
+f79	00000001.175494361e-38
+f80	00000001.175494361e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494341e-38
+f95	1.17549e-38
+f96	1.175494361e-38
+f97	01.17549e-38
+f98	00000001.175494361e-38
+f99	01.17549e-38
+f100	00000001.175494361e-38
+f101	1000-01-10
+f102	838:59:49
+f103	1970-01-11 00:00:10
+f104	1970-01-11 00:00:10
+f105	1911
+f106	1911
+f107	1911
+f108	1enum
+f109	2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	NULL
+f59	15
+f60	87
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	17
+f60	15
+f61	0000000016
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	19
+f60	18
+f61	0000000014
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	22
+f60	93
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	24
+f60	51654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	27
+f60	25
+f61	0000000026
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	29
+f60	28
+f61	0000000024
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	34
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	94
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	107
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	107
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	109
+f60	108
+f61	0000000104
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	109
+f60	108
+f61	0000000104
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	195
+f60	87
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	207
+f60	205
+f61	0000000206
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	209
+f60	208
+f61	0000000204
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	242
+f60	79
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	250
+f60	87895654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	292
+f60	93
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	299
+f60	899
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	321
+f60	NULL
+f61	0000000765
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	323
+f60	14376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	340
+f60	9984376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	394
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	424
+f60	89
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	441
+f60	16546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	660
+f60	876546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	987
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	2550
+f60	775654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	2760
+f60	985654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	3330
+f60	764376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	3410
+f60	996546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	7876
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	9112
+f60	NULL
+f61	0000008771
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	76710
+f60	226546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	569300
+f60	9114376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
 Select * from test2.v2 ;
 f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109	f110	f111	f112	f113	f114	f115	f116	f117
 Drop view if exists test2.v1 ;
@@ -1918,12 +8404,126 @@ Drop view if exists test.v1 ;
 CREATE VIEW test.v1 AS SELECT f59,f60 FROM test.tb2;
 INSERT INTO test.v1 values(122,432);
 SELECT * FROM test.tb2 where f59 = 122 and f60 = 432 limit 0,20;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109	f110	f111	f112	f113	f114	f115	f116	f117
-122	432	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+f59	122
+f60	432
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
 UPDATE test.v1 SET f59 = 3000 WHERE test.v1.f59 = 122 ;
 SELECT * FROM test.tb2  where f59 = 3000 limit 0,20;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109	f110	f111	f112	f113	f114	f115	f116	f117
-3000	432	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+f59	3000
+f60	432
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
 DELETE FROM test.v1
 where test.v1.f59 = 3000 and test.v1.f60 = 432;
 SELECT * FROM test.tb2 where f59 = 3000 and f60 = 432;
@@ -1948,16 +8548,246 @@ info: Rows matched: 2  Changed: 2  Warnings: 0
 SELECT * FROM test.v1   where f59 = 30 order by f59;
 f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109	f110	f111	f112	f113	f114	f115	f116	f117
 SELECT * FROM test.tb2        where f59 = 30 ;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109	f110	f111	f112	f113	f114	f115	f116	f117
-30	4	0000000004	0000000000000000000000000000000000000000000000000000000000000004	0000000004	0000000000000000000000000000000000000000000000000000000000000004	-2	3.300000000000000000000000000000	4	3.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494347e-38	1.17549e-38	1.175494355e-38	01.17549e-38	00000001.175494355e-38	01.17549e-38	00000001.175494355e-38	1000-01-04	838:59:55	1970-01-05 00:00:04	1970-01-05 00:00:04	1905	1905	1905	1enum	2set	
-30	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+f59	30
+f60	4
+f61	0000000004
+f62	0000000000000000000000000000000000000000000000000000000000000004
+f63	0000000004
+f64	0000000000000000000000000000000000000000000000000000000000000004
+f65	-2
+f66	3.300000000000000000000000000000
+f67	4
+f68	3.300000000000000000000000000000
+f69	0000000004
+f70	000000000000000000000000000000003.300000000000000000000000000000
+f71	0000000004
+f72	000000000000000000000000000000003.300000000000000000000000000000
+f73	-1.175494347e-38
+f74	1.175494355e-38
+f75	00000001.175494355e-38
+f76	00000001.175494355e-38
+f77	-1.175494347e-38
+f78	1.175494355e-38
+f79	00000001.175494355e-38
+f80	00000001.175494355e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494347e-38
+f95	1.17549e-38
+f96	1.175494355e-38
+f97	01.17549e-38
+f98	00000001.175494355e-38
+f99	01.17549e-38
+f100	00000001.175494355e-38
+f101	1000-01-04
+f102	838:59:55
+f103	1970-01-05 00:00:04
+f104	1970-01-05 00:00:04
+f105	1905
+f106	1905
+f107	1905
+f108	1enum
+f109	2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	NULL
+f59	30
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
 UPDATE tb2 SET f59 = 100 where f59 = 30 ;
 affected rows: 2
 info: Rows matched: 2  Changed: 2  Warnings: 0
 SELECT * FROM tb2 where f59 = 100 ;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109	f110	f111	f112	f113	f114	f115	f116	f117
-100	4	0000000004	0000000000000000000000000000000000000000000000000000000000000004	0000000004	0000000000000000000000000000000000000000000000000000000000000004	-2	3.300000000000000000000000000000	4	3.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494347e-38	1.17549e-38	1.175494355e-38	01.17549e-38	00000001.175494355e-38	01.17549e-38	00000001.175494355e-38	1000-01-04	838:59:55	1970-01-05 00:00:04	1970-01-05 00:00:04	1905	1905	1905	1enum	2set	
-100	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+f59	100
+f60	4
+f61	0000000004
+f62	0000000000000000000000000000000000000000000000000000000000000004
+f63	0000000004
+f64	0000000000000000000000000000000000000000000000000000000000000004
+f65	-2
+f66	3.300000000000000000000000000000
+f67	4
+f68	3.300000000000000000000000000000
+f69	0000000004
+f70	000000000000000000000000000000003.300000000000000000000000000000
+f71	0000000004
+f72	000000000000000000000000000000003.300000000000000000000000000000
+f73	-1.175494347e-38
+f74	1.175494355e-38
+f75	00000001.175494355e-38
+f76	00000001.175494355e-38
+f77	-1.175494347e-38
+f78	1.175494355e-38
+f79	00000001.175494355e-38
+f80	00000001.175494355e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494347e-38
+f95	1.17549e-38
+f96	1.175494355e-38
+f97	01.17549e-38
+f98	00000001.175494355e-38
+f99	01.17549e-38
+f100	00000001.175494355e-38
+f101	1000-01-04
+f102	838:59:55
+f103	1970-01-05 00:00:04
+f104	1970-01-05 00:00:04
+f105	1905
+f106	1905
+f107	1905
+f108	1enum
+f109	2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	NULL
+f59	100
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
 SELECT * FROM test.v1 order by f59 ;
 f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109	f110	f111	f112	f113	f114	f115	f116	f117
 drop view if exists test.v1 ;
@@ -9743,13 +16573,2957 @@ Testcase 3.3.1.50 - 3.3.1.53
 --------------------------------------------------------------------------------
 DROP VIEW  IF EXISTS test.v1;
 CREATE VIEW test.v1 AS SELECT * FROM test.tb2;
-SELECT * FROM test.v1 order by f59 limit 5;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109	f110	f111	f112	f113	f114	f115	f116	f117
-1	1	0000000001	0000000000000000000000000000000000000000000000000000000000000001	0000000001	0000000000000000000000000000000000000000000000000000000000000001	-5	0.000000000000000000000000000000	1	0.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549435e-38	1.17549e-38	1.175494352e-38	01.17549e-38	00000001.175494352e-38	01.17549e-38	00000001.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	1970-01-02 00:00:01	1902	1902	1902	2enum	2set	
-2	2	0000000002	0000000000000000000000000000000000000000000000000000000000000002	0000000002	0000000000000000000000000000000000000000000000000000000000000002	-4	1.100000000000000000000000000000	2	1.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494349e-38	1.17549e-38	1.175494353e-38	01.17549e-38	00000001.175494353e-38	01.17549e-38	00000001.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	1970-01-03 00:00:02	1903	1903	1903	1enum	1set,2set	
-3	3	0000000003	0000000000000000000000000000000000000000000000000000000000000003	0000000003	0000000000000000000000000000000000000000000000000000000000000003	-3	2.200000000000000000000000000000	3	2.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494348e-38	1.17549e-38	1.175494354e-38	01.17549e-38	00000001.175494354e-38	01.17549e-38	00000001.175494354e-38	1000-01-03	838:59:56	1970-01-04 00:00:03	1970-01-04 00:00:03	1904	1904	1904	2enum	1set	
-5	5	0000000005	0000000000000000000000000000000000000000000000000000000000000005	0000000005	0000000000000000000000000000000000000000000000000000000000000005	-1	4.400000000000000000000000000000	5	4.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494346e-38	1.17549e-38	1.175494356e-38	01.17549e-38	00000001.175494356e-38	01.17549e-38	00000001.175494356e-38	1000-01-05	838:59:54	1970-01-06 00:00:05	1970-01-06 00:00:05	1906	1906	1906	2enum	1set,2set	
-6	6	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0	5.500000000000000000000000000000	6	5.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494345e-38	1.17549e-38	1.175494357e-38	01.17549e-38	00000001.175494357e-38	01.17549e-38	00000001.175494357e-38	1000-01-06	838:59:53	1970-01-07 00:00:06	1970-01-07 00:00:06	1907	1907	1907	1enum	1set	
+SELECT * FROM test.v1 order by f59,f60,f61 ;
+f59	1
+f60	1
+f61	0000000001
+f62	0000000000000000000000000000000000000000000000000000000000000001
+f63	0000000001
+f64	0000000000000000000000000000000000000000000000000000000000000001
+f65	-5
+f66	0.000000000000000000000000000000
+f67	1
+f68	0.000000000000000000000000000000
+f69	0000000001
+f70	000000000000000000000000000000000.000000000000000000000000000000
+f71	0000000001
+f72	000000000000000000000000000000000.000000000000000000000000000000
+f73	-1.17549435e-38
+f74	1.175494352e-38
+f75	00000001.175494352e-38
+f76	00000001.175494352e-38
+f77	-1.17549435e-38
+f78	1.175494352e-38
+f79	00000001.175494352e-38
+f80	00000001.175494352e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.17549435e-38
+f95	1.17549e-38
+f96	1.175494352e-38
+f97	01.17549e-38
+f98	00000001.175494352e-38
+f99	01.17549e-38
+f100	00000001.175494352e-38
+f101	1000-01-01
+f102	838:59:58
+f103	1970-01-02 00:00:01
+f104	1970-01-02 00:00:01
+f105	1902
+f106	1902
+f107	1902
+f108	2enum
+f109	2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	2
+f60	2
+f61	0000000002
+f62	0000000000000000000000000000000000000000000000000000000000000002
+f63	0000000002
+f64	0000000000000000000000000000000000000000000000000000000000000002
+f65	-4
+f66	1.100000000000000000000000000000
+f67	2
+f68	1.100000000000000000000000000000
+f69	0000000002
+f70	000000000000000000000000000000001.100000000000000000000000000000
+f71	0000000002
+f72	000000000000000000000000000000001.100000000000000000000000000000
+f73	-1.175494349e-38
+f74	1.175494353e-38
+f75	00000001.175494353e-38
+f76	00000001.175494353e-38
+f77	-1.175494349e-38
+f78	1.175494353e-38
+f79	00000001.175494353e-38
+f80	00000001.175494353e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494349e-38
+f95	1.17549e-38
+f96	1.175494353e-38
+f97	01.17549e-38
+f98	00000001.175494353e-38
+f99	01.17549e-38
+f100	00000001.175494353e-38
+f101	1000-01-02
+f102	838:59:57
+f103	1970-01-03 00:00:02
+f104	1970-01-03 00:00:02
+f105	1903
+f106	1903
+f107	1903
+f108	1enum
+f109	1set,2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	3
+f60	3
+f61	0000000003
+f62	0000000000000000000000000000000000000000000000000000000000000003
+f63	0000000003
+f64	0000000000000000000000000000000000000000000000000000000000000003
+f65	-3
+f66	2.200000000000000000000000000000
+f67	3
+f68	2.200000000000000000000000000000
+f69	0000000003
+f70	000000000000000000000000000000002.200000000000000000000000000000
+f71	0000000003
+f72	000000000000000000000000000000002.200000000000000000000000000000
+f73	-1.175494348e-38
+f74	1.175494354e-38
+f75	00000001.175494354e-38
+f76	00000001.175494354e-38
+f77	-1.175494348e-38
+f78	1.175494354e-38
+f79	00000001.175494354e-38
+f80	00000001.175494354e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494348e-38
+f95	1.17549e-38
+f96	1.175494354e-38
+f97	01.17549e-38
+f98	00000001.175494354e-38
+f99	01.17549e-38
+f100	00000001.175494354e-38
+f101	1000-01-03
+f102	838:59:56
+f103	1970-01-04 00:00:03
+f104	1970-01-04 00:00:03
+f105	1904
+f106	1904
+f107	1904
+f108	2enum
+f109	1set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	5
+f60	5
+f61	0000000005
+f62	0000000000000000000000000000000000000000000000000000000000000005
+f63	0000000005
+f64	0000000000000000000000000000000000000000000000000000000000000005
+f65	-1
+f66	4.400000000000000000000000000000
+f67	5
+f68	4.400000000000000000000000000000
+f69	0000000005
+f70	000000000000000000000000000000004.400000000000000000000000000000
+f71	0000000005
+f72	000000000000000000000000000000004.400000000000000000000000000000
+f73	-1.175494346e-38
+f74	1.175494356e-38
+f75	00000001.175494356e-38
+f76	00000001.175494356e-38
+f77	-1.175494346e-38
+f78	1.175494356e-38
+f79	00000001.175494356e-38
+f80	00000001.175494356e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494346e-38
+f95	1.17549e-38
+f96	1.175494356e-38
+f97	01.17549e-38
+f98	00000001.175494356e-38
+f99	01.17549e-38
+f100	00000001.175494356e-38
+f101	1000-01-05
+f102	838:59:54
+f103	1970-01-06 00:00:05
+f104	1970-01-06 00:00:05
+f105	1906
+f106	1906
+f107	1906
+f108	2enum
+f109	1set,2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	6
+f60	6
+f61	0000000006
+f62	0000000000000000000000000000000000000000000000000000000000000006
+f63	0000000006
+f64	0000000000000000000000000000000000000000000000000000000000000006
+f65	0
+f66	5.500000000000000000000000000000
+f67	6
+f68	5.500000000000000000000000000000
+f69	0000000006
+f70	000000000000000000000000000000005.500000000000000000000000000000
+f71	0000000006
+f72	000000000000000000000000000000005.500000000000000000000000000000
+f73	-1.175494345e-38
+f74	1.175494357e-38
+f75	00000001.175494357e-38
+f76	00000001.175494357e-38
+f77	-1.175494345e-38
+f78	1.175494357e-38
+f79	00000001.175494357e-38
+f80	00000001.175494357e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494345e-38
+f95	1.17549e-38
+f96	1.175494357e-38
+f97	01.17549e-38
+f98	00000001.175494357e-38
+f99	01.17549e-38
+f100	00000001.175494357e-38
+f101	1000-01-06
+f102	838:59:53
+f103	1970-01-07 00:00:06
+f104	1970-01-07 00:00:06
+f105	1907
+f106	1907
+f107	1907
+f108	1enum
+f109	1set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	7
+f60	7
+f61	0000000007
+f62	0000000000000000000000000000000000000000000000000000000000000007
+f63	0000000007
+f64	0000000000000000000000000000000000000000000000000000000000000007
+f65	1
+f66	6.600000000000000000000000000000
+f67	7
+f68	6.600000000000000000000000000000
+f69	0000000007
+f70	000000000000000000000000000000006.600000000000000000000000000000
+f71	0000000007
+f72	000000000000000000000000000000006.600000000000000000000000000000
+f73	-1.175494344e-38
+f74	1.175494358e-38
+f75	00000001.175494358e-38
+f76	00000001.175494358e-38
+f77	-1.175494344e-38
+f78	1.175494358e-38
+f79	00000001.175494358e-38
+f80	00000001.175494358e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494344e-38
+f95	1.17549e-38
+f96	1.175494358e-38
+f97	01.17549e-38
+f98	00000001.175494358e-38
+f99	01.17549e-38
+f100	00000001.175494358e-38
+f101	1000-01-07
+f102	838:59:52
+f103	1970-01-08 00:00:07
+f104	1970-01-08 00:00:07
+f105	1908
+f106	1908
+f107	1908
+f108	2enum
+f109	2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	8
+f60	8
+f61	0000000008
+f62	0000000000000000000000000000000000000000000000000000000000000008
+f63	0000000008
+f64	0000000000000000000000000000000000000000000000000000000000000008
+f65	2
+f66	7.700000000000000000000000000000
+f67	8
+f68	7.700000000000000000000000000000
+f69	0000000008
+f70	000000000000000000000000000000007.700000000000000000000000000000
+f71	0000000008
+f72	000000000000000000000000000000007.700000000000000000000000000000
+f73	-1.175494343e-38
+f74	1.175494359e-38
+f75	00000001.175494359e-38
+f76	00000001.175494359e-38
+f77	-1.175494343e-38
+f78	1.175494359e-38
+f79	00000001.175494359e-38
+f80	00000001.175494359e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494343e-38
+f95	1.17549e-38
+f96	1.175494359e-38
+f97	01.17549e-38
+f98	00000001.175494359e-38
+f99	01.17549e-38
+f100	00000001.175494359e-38
+f101	1000-01-08
+f102	838:59:51
+f103	1970-01-09 00:00:08
+f104	1970-01-09 00:00:08
+f105	1909
+f106	1909
+f107	1909
+f108	1enum
+f109	1set,2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	9
+f60	9
+f61	0000000009
+f62	0000000000000000000000000000000000000000000000000000000000000009
+f63	0000000009
+f64	0000000000000000000000000000000000000000000000000000000000000009
+f65	3
+f66	8.800000000000000000000000000000
+f67	9
+f68	8.800000000000000000000000000000
+f69	0000000009
+f70	000000000000000000000000000000008.800000000000000000000000000000
+f71	0000000009
+f72	000000000000000000000000000000008.800000000000000000000000000000
+f73	-1.175494342e-38
+f74	1.17549436e-38
+f75	000000001.17549436e-38
+f76	000000001.17549436e-38
+f77	-1.175494342e-38
+f78	1.17549436e-38
+f79	000000001.17549436e-38
+f80	000000001.17549436e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494342e-38
+f95	1.17549e-38
+f96	1.17549436e-38
+f97	01.17549e-38
+f98	000000001.17549436e-38
+f99	01.17549e-38
+f100	000000001.17549436e-38
+f101	1000-01-09
+f102	838:59:50
+f103	1970-01-10 00:00:09
+f104	1970-01-10 00:00:09
+f105	1910
+f106	1910
+f107	1910
+f108	2enum
+f109	1set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	10
+f60	10
+f61	0000000010
+f62	0000000000000000000000000000000000000000000000000000000000000010
+f63	0000000010
+f64	0000000000000000000000000000000000000000000000000000000000000010
+f65	4
+f66	9.900000000000000000000000000000
+f67	10
+f68	9.900000000000000000000000000000
+f69	0000000010
+f70	000000000000000000000000000000009.900000000000000000000000000000
+f71	0000000010
+f72	000000000000000000000000000000009.900000000000000000000000000000
+f73	-1.175494341e-38
+f74	1.175494361e-38
+f75	00000001.175494361e-38
+f76	00000001.175494361e-38
+f77	-1.175494341e-38
+f78	1.175494361e-38
+f79	00000001.175494361e-38
+f80	00000001.175494361e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494341e-38
+f95	1.17549e-38
+f96	1.175494361e-38
+f97	01.17549e-38
+f98	00000001.175494361e-38
+f99	01.17549e-38
+f100	00000001.175494361e-38
+f101	1000-01-10
+f102	838:59:49
+f103	1970-01-11 00:00:10
+f104	1970-01-11 00:00:10
+f105	1911
+f106	1911
+f107	1911
+f108	1enum
+f109	2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	NULL
+f59	15
+f60	87
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	17
+f60	15
+f61	0000000016
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	19
+f60	18
+f61	0000000014
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	22
+f60	93
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	24
+f60	51654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	27
+f60	25
+f61	0000000026
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	29
+f60	28
+f61	0000000024
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	34
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	94
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	100
+f60	4
+f61	0000000004
+f62	0000000000000000000000000000000000000000000000000000000000000004
+f63	0000000004
+f64	0000000000000000000000000000000000000000000000000000000000000004
+f65	-2
+f66	3.300000000000000000000000000000
+f67	4
+f68	3.300000000000000000000000000000
+f69	0000000004
+f70	000000000000000000000000000000003.300000000000000000000000000000
+f71	0000000004
+f72	000000000000000000000000000000003.300000000000000000000000000000
+f73	-1.175494347e-38
+f74	1.175494355e-38
+f75	00000001.175494355e-38
+f76	00000001.175494355e-38
+f77	-1.175494347e-38
+f78	1.175494355e-38
+f79	00000001.175494355e-38
+f80	00000001.175494355e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494347e-38
+f95	1.17549e-38
+f96	1.175494355e-38
+f97	01.17549e-38
+f98	00000001.175494355e-38
+f99	01.17549e-38
+f100	00000001.175494355e-38
+f101	1000-01-04
+f102	838:59:55
+f103	1970-01-05 00:00:04
+f104	1970-01-05 00:00:04
+f105	1905
+f106	1905
+f107	1905
+f108	1enum
+f109	2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	NULL
+f59	100
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	107
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	107
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	109
+f60	108
+f61	0000000104
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	109
+f60	108
+f61	0000000104
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	195
+f60	87
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	207
+f60	205
+f61	0000000206
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	209
+f60	208
+f61	0000000204
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	242
+f60	79
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	250
+f60	87895654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	292
+f60	93
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	299
+f60	899
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	321
+f60	NULL
+f61	0000000765
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	323
+f60	14376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	340
+f60	9984376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	394
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	424
+f60	89
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	441
+f60	16546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	660
+f60	876546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	987
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	2550
+f60	775654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	2760
+f60	985654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	3330
+f60	764376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	3410
+f60	996546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	7876
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	9112
+f60	NULL
+f61	0000008771
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	76710
+f60	226546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	569300
+f60	9114376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
 drop view test.v1 ;
 CREATE VIEW test.v1 AS SELECT F59,F61 FROM test.tb2;
 SELECT * FROM test.v1 order by F59, F61 limit 50;
@@ -9806,28 +19580,2957 @@ F59	F61
 569300	NULL
 drop view test.v1 ;
 CREATE VIEW test.v1 AS SELECT * FROM test.tb2 order by f59, f60, f61;
-SELECT * FROM test.v1 order by f59,f60,f61 limit 20;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109	f110	f111	f112	f113	f114	f115	f116	f117
-1	1	0000000001	0000000000000000000000000000000000000000000000000000000000000001	0000000001	0000000000000000000000000000000000000000000000000000000000000001	-5	0.000000000000000000000000000000	1	0.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549435e-38	1.17549e-38	1.175494352e-38	01.17549e-38	00000001.175494352e-38	01.17549e-38	00000001.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	1970-01-02 00:00:01	1902	1902	1902	2enum	2set	
-2	2	0000000002	0000000000000000000000000000000000000000000000000000000000000002	0000000002	0000000000000000000000000000000000000000000000000000000000000002	-4	1.100000000000000000000000000000	2	1.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494349e-38	1.17549e-38	1.175494353e-38	01.17549e-38	00000001.175494353e-38	01.17549e-38	00000001.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	1970-01-03 00:00:02	1903	1903	1903	1enum	1set,2set	
-3	3	0000000003	0000000000000000000000000000000000000000000000000000000000000003	0000000003	0000000000000000000000000000000000000000000000000000000000000003	-3	2.200000000000000000000000000000	3	2.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494348e-38	1.17549e-38	1.175494354e-38	01.17549e-38	00000001.175494354e-38	01.17549e-38	00000001.175494354e-38	1000-01-03	838:59:56	1970-01-04 00:00:03	1970-01-04 00:00:03	1904	1904	1904	2enum	1set	
-5	5	0000000005	0000000000000000000000000000000000000000000000000000000000000005	0000000005	0000000000000000000000000000000000000000000000000000000000000005	-1	4.400000000000000000000000000000	5	4.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494346e-38	1.17549e-38	1.175494356e-38	01.17549e-38	00000001.175494356e-38	01.17549e-38	00000001.175494356e-38	1000-01-05	838:59:54	1970-01-06 00:00:05	1970-01-06 00:00:05	1906	1906	1906	2enum	1set,2set	
-6	6	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0	5.500000000000000000000000000000	6	5.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494345e-38	1.17549e-38	1.175494357e-38	01.17549e-38	00000001.175494357e-38	01.17549e-38	00000001.175494357e-38	1000-01-06	838:59:53	1970-01-07 00:00:06	1970-01-07 00:00:06	1907	1907	1907	1enum	1set	
-7	7	0000000007	0000000000000000000000000000000000000000000000000000000000000007	0000000007	0000000000000000000000000000000000000000000000000000000000000007	1	6.600000000000000000000000000000	7	6.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494344e-38	1.17549e-38	1.175494358e-38	01.17549e-38	00000001.175494358e-38	01.17549e-38	00000001.175494358e-38	1000-01-07	838:59:52	1970-01-08 00:00:07	1970-01-08 00:00:07	1908	1908	1908	2enum	2set	
-8	8	0000000008	0000000000000000000000000000000000000000000000000000000000000008	0000000008	0000000000000000000000000000000000000000000000000000000000000008	2	7.700000000000000000000000000000	8	7.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494343e-38	1.17549e-38	1.175494359e-38	01.17549e-38	00000001.175494359e-38	01.17549e-38	00000001.175494359e-38	1000-01-08	838:59:51	1970-01-09 00:00:08	1970-01-09 00:00:08	1909	1909	1909	1enum	1set,2set	
-9	9	0000000009	0000000000000000000000000000000000000000000000000000000000000009	0000000009	0000000000000000000000000000000000000000000000000000000000000009	3	8.800000000000000000000000000000	9	8.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494342e-38	1.17549e-38	1.17549436e-38	01.17549e-38	000000001.17549436e-38	01.17549e-38	000000001.17549436e-38	1000-01-09	838:59:50	1970-01-10 00:00:09	1970-01-10 00:00:09	1910	1910	1910	2enum	1set	
-10	10	0000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000010	0000000000000000000000000000000000000000000000000000000000000010	4	9.900000000000000000000000000000	10	9.900000000000000000000000000000	0000000010	000000000000000000000000000000009.900000000000000000000000000000	0000000010	000000000000000000000000000000009.900000000000000000000000000000	-1.175494341e-38	1.175494361e-38	00000001.175494361e-38	00000001.175494361e-38	-1.175494341e-38	1.175494361e-38	00000001.175494361e-38	00000001.175494361e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494341e-38	1.17549e-38	1.175494361e-38	01.17549e-38	00000001.175494361e-38	01.17549e-38	00000001.175494361e-38	1000-01-10	838:59:49	1970-01-11 00:00:10	1970-01-11 00:00:10	1911	1911	1911	1enum	2set	
-15	87	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-17	15	0000000016	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-19	18	0000000014	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-22	93	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-24	51654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-27	25	0000000026	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-29	28	0000000024	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-34	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-94	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-100	4	0000000004	0000000000000000000000000000000000000000000000000000000000000004	0000000004	0000000000000000000000000000000000000000000000000000000000000004	-2	3.300000000000000000000000000000	4	3.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494347e-38	1.17549e-38	1.175494355e-38	01.17549e-38	00000001.175494355e-38	01.17549e-38	00000001.175494355e-38	1000-01-04	838:59:55	1970-01-05 00:00:04	1970-01-05 00:00:04	1905	1905	1905	1enum	2set	
-100	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+SELECT * FROM test.v1 order by f59,f60,f61 ;
+f59	1
+f60	1
+f61	0000000001
+f62	0000000000000000000000000000000000000000000000000000000000000001
+f63	0000000001
+f64	0000000000000000000000000000000000000000000000000000000000000001
+f65	-5
+f66	0.000000000000000000000000000000
+f67	1
+f68	0.000000000000000000000000000000
+f69	0000000001
+f70	000000000000000000000000000000000.000000000000000000000000000000
+f71	0000000001
+f72	000000000000000000000000000000000.000000000000000000000000000000
+f73	-1.17549435e-38
+f74	1.175494352e-38
+f75	00000001.175494352e-38
+f76	00000001.175494352e-38
+f77	-1.17549435e-38
+f78	1.175494352e-38
+f79	00000001.175494352e-38
+f80	00000001.175494352e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.17549435e-38
+f95	1.17549e-38
+f96	1.175494352e-38
+f97	01.17549e-38
+f98	00000001.175494352e-38
+f99	01.17549e-38
+f100	00000001.175494352e-38
+f101	1000-01-01
+f102	838:59:58
+f103	1970-01-02 00:00:01
+f104	1970-01-02 00:00:01
+f105	1902
+f106	1902
+f107	1902
+f108	2enum
+f109	2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	2
+f60	2
+f61	0000000002
+f62	0000000000000000000000000000000000000000000000000000000000000002
+f63	0000000002
+f64	0000000000000000000000000000000000000000000000000000000000000002
+f65	-4
+f66	1.100000000000000000000000000000
+f67	2
+f68	1.100000000000000000000000000000
+f69	0000000002
+f70	000000000000000000000000000000001.100000000000000000000000000000
+f71	0000000002
+f72	000000000000000000000000000000001.100000000000000000000000000000
+f73	-1.175494349e-38
+f74	1.175494353e-38
+f75	00000001.175494353e-38
+f76	00000001.175494353e-38
+f77	-1.175494349e-38
+f78	1.175494353e-38
+f79	00000001.175494353e-38
+f80	00000001.175494353e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494349e-38
+f95	1.17549e-38
+f96	1.175494353e-38
+f97	01.17549e-38
+f98	00000001.175494353e-38
+f99	01.17549e-38
+f100	00000001.175494353e-38
+f101	1000-01-02
+f102	838:59:57
+f103	1970-01-03 00:00:02
+f104	1970-01-03 00:00:02
+f105	1903
+f106	1903
+f107	1903
+f108	1enum
+f109	1set,2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	3
+f60	3
+f61	0000000003
+f62	0000000000000000000000000000000000000000000000000000000000000003
+f63	0000000003
+f64	0000000000000000000000000000000000000000000000000000000000000003
+f65	-3
+f66	2.200000000000000000000000000000
+f67	3
+f68	2.200000000000000000000000000000
+f69	0000000003
+f70	000000000000000000000000000000002.200000000000000000000000000000
+f71	0000000003
+f72	000000000000000000000000000000002.200000000000000000000000000000
+f73	-1.175494348e-38
+f74	1.175494354e-38
+f75	00000001.175494354e-38
+f76	00000001.175494354e-38
+f77	-1.175494348e-38
+f78	1.175494354e-38
+f79	00000001.175494354e-38
+f80	00000001.175494354e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494348e-38
+f95	1.17549e-38
+f96	1.175494354e-38
+f97	01.17549e-38
+f98	00000001.175494354e-38
+f99	01.17549e-38
+f100	00000001.175494354e-38
+f101	1000-01-03
+f102	838:59:56
+f103	1970-01-04 00:00:03
+f104	1970-01-04 00:00:03
+f105	1904
+f106	1904
+f107	1904
+f108	2enum
+f109	1set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	5
+f60	5
+f61	0000000005
+f62	0000000000000000000000000000000000000000000000000000000000000005
+f63	0000000005
+f64	0000000000000000000000000000000000000000000000000000000000000005
+f65	-1
+f66	4.400000000000000000000000000000
+f67	5
+f68	4.400000000000000000000000000000
+f69	0000000005
+f70	000000000000000000000000000000004.400000000000000000000000000000
+f71	0000000005
+f72	000000000000000000000000000000004.400000000000000000000000000000
+f73	-1.175494346e-38
+f74	1.175494356e-38
+f75	00000001.175494356e-38
+f76	00000001.175494356e-38
+f77	-1.175494346e-38
+f78	1.175494356e-38
+f79	00000001.175494356e-38
+f80	00000001.175494356e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494346e-38
+f95	1.17549e-38
+f96	1.175494356e-38
+f97	01.17549e-38
+f98	00000001.175494356e-38
+f99	01.17549e-38
+f100	00000001.175494356e-38
+f101	1000-01-05
+f102	838:59:54
+f103	1970-01-06 00:00:05
+f104	1970-01-06 00:00:05
+f105	1906
+f106	1906
+f107	1906
+f108	2enum
+f109	1set,2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	6
+f60	6
+f61	0000000006
+f62	0000000000000000000000000000000000000000000000000000000000000006
+f63	0000000006
+f64	0000000000000000000000000000000000000000000000000000000000000006
+f65	0
+f66	5.500000000000000000000000000000
+f67	6
+f68	5.500000000000000000000000000000
+f69	0000000006
+f70	000000000000000000000000000000005.500000000000000000000000000000
+f71	0000000006
+f72	000000000000000000000000000000005.500000000000000000000000000000
+f73	-1.175494345e-38
+f74	1.175494357e-38
+f75	00000001.175494357e-38
+f76	00000001.175494357e-38
+f77	-1.175494345e-38
+f78	1.175494357e-38
+f79	00000001.175494357e-38
+f80	00000001.175494357e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494345e-38
+f95	1.17549e-38
+f96	1.175494357e-38
+f97	01.17549e-38
+f98	00000001.175494357e-38
+f99	01.17549e-38
+f100	00000001.175494357e-38
+f101	1000-01-06
+f102	838:59:53
+f103	1970-01-07 00:00:06
+f104	1970-01-07 00:00:06
+f105	1907
+f106	1907
+f107	1907
+f108	1enum
+f109	1set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	7
+f60	7
+f61	0000000007
+f62	0000000000000000000000000000000000000000000000000000000000000007
+f63	0000000007
+f64	0000000000000000000000000000000000000000000000000000000000000007
+f65	1
+f66	6.600000000000000000000000000000
+f67	7
+f68	6.600000000000000000000000000000
+f69	0000000007
+f70	000000000000000000000000000000006.600000000000000000000000000000
+f71	0000000007
+f72	000000000000000000000000000000006.600000000000000000000000000000
+f73	-1.175494344e-38
+f74	1.175494358e-38
+f75	00000001.175494358e-38
+f76	00000001.175494358e-38
+f77	-1.175494344e-38
+f78	1.175494358e-38
+f79	00000001.175494358e-38
+f80	00000001.175494358e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494344e-38
+f95	1.17549e-38
+f96	1.175494358e-38
+f97	01.17549e-38
+f98	00000001.175494358e-38
+f99	01.17549e-38
+f100	00000001.175494358e-38
+f101	1000-01-07
+f102	838:59:52
+f103	1970-01-08 00:00:07
+f104	1970-01-08 00:00:07
+f105	1908
+f106	1908
+f107	1908
+f108	2enum
+f109	2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	8
+f60	8
+f61	0000000008
+f62	0000000000000000000000000000000000000000000000000000000000000008
+f63	0000000008
+f64	0000000000000000000000000000000000000000000000000000000000000008
+f65	2
+f66	7.700000000000000000000000000000
+f67	8
+f68	7.700000000000000000000000000000
+f69	0000000008
+f70	000000000000000000000000000000007.700000000000000000000000000000
+f71	0000000008
+f72	000000000000000000000000000000007.700000000000000000000000000000
+f73	-1.175494343e-38
+f74	1.175494359e-38
+f75	00000001.175494359e-38
+f76	00000001.175494359e-38
+f77	-1.175494343e-38
+f78	1.175494359e-38
+f79	00000001.175494359e-38
+f80	00000001.175494359e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494343e-38
+f95	1.17549e-38
+f96	1.175494359e-38
+f97	01.17549e-38
+f98	00000001.175494359e-38
+f99	01.17549e-38
+f100	00000001.175494359e-38
+f101	1000-01-08
+f102	838:59:51
+f103	1970-01-09 00:00:08
+f104	1970-01-09 00:00:08
+f105	1909
+f106	1909
+f107	1909
+f108	1enum
+f109	1set,2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	9
+f60	9
+f61	0000000009
+f62	0000000000000000000000000000000000000000000000000000000000000009
+f63	0000000009
+f64	0000000000000000000000000000000000000000000000000000000000000009
+f65	3
+f66	8.800000000000000000000000000000
+f67	9
+f68	8.800000000000000000000000000000
+f69	0000000009
+f70	000000000000000000000000000000008.800000000000000000000000000000
+f71	0000000009
+f72	000000000000000000000000000000008.800000000000000000000000000000
+f73	-1.175494342e-38
+f74	1.17549436e-38
+f75	000000001.17549436e-38
+f76	000000001.17549436e-38
+f77	-1.175494342e-38
+f78	1.17549436e-38
+f79	000000001.17549436e-38
+f80	000000001.17549436e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494342e-38
+f95	1.17549e-38
+f96	1.17549436e-38
+f97	01.17549e-38
+f98	000000001.17549436e-38
+f99	01.17549e-38
+f100	000000001.17549436e-38
+f101	1000-01-09
+f102	838:59:50
+f103	1970-01-10 00:00:09
+f104	1970-01-10 00:00:09
+f105	1910
+f106	1910
+f107	1910
+f108	2enum
+f109	1set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	
+f59	10
+f60	10
+f61	0000000010
+f62	0000000000000000000000000000000000000000000000000000000000000010
+f63	0000000010
+f64	0000000000000000000000000000000000000000000000000000000000000010
+f65	4
+f66	9.900000000000000000000000000000
+f67	10
+f68	9.900000000000000000000000000000
+f69	0000000010
+f70	000000000000000000000000000000009.900000000000000000000000000000
+f71	0000000010
+f72	000000000000000000000000000000009.900000000000000000000000000000
+f73	-1.175494341e-38
+f74	1.175494361e-38
+f75	00000001.175494361e-38
+f76	00000001.175494361e-38
+f77	-1.175494341e-38
+f78	1.175494361e-38
+f79	00000001.175494361e-38
+f80	00000001.175494361e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494341e-38
+f95	1.17549e-38
+f96	1.175494361e-38
+f97	01.17549e-38
+f98	00000001.175494361e-38
+f99	01.17549e-38
+f100	00000001.175494361e-38
+f101	1000-01-10
+f102	838:59:49
+f103	1970-01-11 00:00:10
+f104	1970-01-11 00:00:10
+f105	1911
+f106	1911
+f107	1911
+f108	1enum
+f109	2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	NULL
+f59	15
+f60	87
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	17
+f60	15
+f61	0000000016
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	19
+f60	18
+f61	0000000014
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	22
+f60	93
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	24
+f60	51654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	27
+f60	25
+f61	0000000026
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	29
+f60	28
+f61	0000000024
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	34
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	94
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	100
+f60	4
+f61	0000000004
+f62	0000000000000000000000000000000000000000000000000000000000000004
+f63	0000000004
+f64	0000000000000000000000000000000000000000000000000000000000000004
+f65	-2
+f66	3.300000000000000000000000000000
+f67	4
+f68	3.300000000000000000000000000000
+f69	0000000004
+f70	000000000000000000000000000000003.300000000000000000000000000000
+f71	0000000004
+f72	000000000000000000000000000000003.300000000000000000000000000000
+f73	-1.175494347e-38
+f74	1.175494355e-38
+f75	00000001.175494355e-38
+f76	00000001.175494355e-38
+f77	-1.175494347e-38
+f78	1.175494355e-38
+f79	00000001.175494355e-38
+f80	00000001.175494355e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494347e-38
+f95	1.17549e-38
+f96	1.175494355e-38
+f97	01.17549e-38
+f98	00000001.175494355e-38
+f99	01.17549e-38
+f100	00000001.175494355e-38
+f101	1000-01-04
+f102	838:59:55
+f103	1970-01-05 00:00:04
+f104	1970-01-05 00:00:04
+f105	1905
+f106	1905
+f107	1905
+f108	1enum
+f109	2set
+f110	
+f111	
+f112	
+f113	
+f114	
+f115	
+f116	
+f117	NULL
+f59	100
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	107
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	107
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	109
+f60	108
+f61	0000000104
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	109
+f60	108
+f61	0000000104
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	195
+f60	87
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	207
+f60	205
+f61	0000000206
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	209
+f60	208
+f61	0000000204
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	242
+f60	79
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	250
+f60	87895654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	292
+f60	93
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	299
+f60	899
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	321
+f60	NULL
+f61	0000000765
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	323
+f60	14376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	340
+f60	9984376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	394
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	424
+f60	89
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	441
+f60	16546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	660
+f60	876546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	987
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	2550
+f60	775654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	2760
+f60	985654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	3330
+f60	764376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	3410
+f60	996546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	7876
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	9112
+f60	NULL
+f61	0000008771
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	76710
+f60	226546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	569300
+f60	9114376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
 drop view test.v1 ;
 CREATE VIEW test.v1 AS SELECT F59,f61 FROM test.tb2;
 SELECT * FROM test.v1 order by f59,f61 desc limit 20;
@@ -10202,8 +22905,65 @@ F59
 ALTER VIEW test.v1 AS  SELECT *
 FROM test.tb2 WHERE test.tb2.f59 = 242 ;
 SELECT * FROM test.v1 order by f59 limit 0,10;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109	f110	f111	f112	f113	f114	f115	f116	f117
-242	79	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+f59	242
+f60	79
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
 Drop view test.v1 ;
 
 Testcase 3.3.1.65, 3.3.1.A4, 3.3.1.66, 3.3.1.67 
@@ -10545,8 +23305,65 @@ Create view test.v1 AS SELECT f59,f60,f61 FROM tb2  ;
 INSERT INTO test.v1 ( f59 , f60 ) values (2005,0101) ;
 affected rows: 1
 SELECT * FROM tb2 where f59 = 2005 and f60 = 0101 ;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109	f110	f111	f112	f113	f114	f115	f116	f117
-2005	101	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+f59	2005
+f60	101
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
 SELECT f59,f60 FROM test.v1 where f59 = 2005 and f60 = 0101 ;
 f59	f60
 2005	101
@@ -10562,8 +23379,65 @@ UPDATE test.v1 SET f59 = 8 WHERE f59 = 780 and f60 = 105;
 affected rows: 1
 info: Rows matched: 1  Changed: 1  Warnings: 0
 SELECT * FROM tb2 where f59 = 8 and f60 = 105;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109	f110	f111	f112	f113	f114	f115	f116	f117
-8	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+f59	8
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
 SELECT f59,f60 FROM test.v1 where f59 = 8 and f60 = 105 ;
 f59	f60
 8	105
@@ -10578,11 +23452,242 @@ UPDATE test.v1 SET f59 = 891 WHERE f60 = 105 ;
 affected rows: 4
 info: Rows matched: 4  Changed: 4  Warnings: 0
 SELECT * FROM tb2 where f59 = 891 and f60 = 105;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109	f110	f111	f112	f113	f114	f115	f116	f117
-891	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-891	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-891	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-891	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+f59	891
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	891
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	891
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
+f59	891
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f110	NULL
+f111	NULL
+f112	NULL
+f113	NULL
+f114	NULL
+f115	NULL
+f116	NULL
+f117	NULL
 SELECT f59,f60 FROM test.v1 where f59 = 891 and f60 = 105 ;
 f59	f60
 891	105
@@ -10931,10 +24036,6 @@ SET @variant4= 'CREATE VIEW v1 AS SELECT f61 FROM t1 GROUP BY f61';
 SET @variant5= 'CREATE VIEW v1 AS SELECT f61 FROM t1 HAVING f61 > 0';
 SET @variant6= 'CREATE VIEW v1 AS SELECT (SELECT f60 FROM t2 WHERE f59=19) AS f61 FROM t1';
 SET @variant7= 'CREATE VIEW v1 AS SELECT f61 FROM v2';
-
-Some server responses suffer from
-Bug#10773 Incorrect message is displayed while updating a view
---------------------------------------------------------------------------------
 SET @variant8= 'CREATE VIEW v1 AS SELECT f59 AS f61 FROM t1 WHERE f60 IN (SELECT f59 FROM t1)';
 SET @variant9= 'CREATE ALGORITHM = TEMPTABLE VIEW v1 (f61) AS select f60 from t1';
 CREATE ALGORITHM = TEMPTABLE VIEW v1 (f61) AS select f60 from t1;
@@ -11466,21 +24567,24 @@ ABC	0
 ABC	1.7320508075689
 CREATE TABLE t2 AS SELECT f1, SQRT(f2) my_sqrt FROM t1;
 SELECT * FROM t2 order by 2;
-f1	my_sqrt
-ABC	0
-ABC	1.73205080756888
+f1	ABC
+my_sqrt	0
+f1	ABC
+my_sqrt	1.73205080756888
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v1;
 SELECT * FROM t2 order by 2;
-f1	my_sqrt
-ABC	0
-ABC	1.73205080756888
+f1	ABC
+my_sqrt	0
+f1	ABC
+my_sqrt	1.73205080756888
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v2;
 SELECT * FROM t2 order by 2;
-f1	my_sqrt
-ABC	0
-ABC	1.73205080756888
+f1	ABC
+my_sqrt	0
+f1	ABC
+my_sqrt	1.73205080756888
 DROP TABLE t1;
 DROP TABLE t2;
 DROP VIEW  v1;
diff --git a/mysql-test/suite/funcs_1/r/ndb_func_view.result b/mysql-test/suite/funcs_1/r/ndb_func_view.result
index 02ef728fad5..14568643665 100644
--- a/mysql-test/suite/funcs_1/r/ndb_func_view.result
+++ b/mysql-test/suite/funcs_1/r/ndb_func_view.result
@@ -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 = @select_id,
 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 = @select_id,
 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 = @select_id,
 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 = @select_id,
 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 = @select_id,
 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	collation_connection
 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_varbinary_1000),
 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_30),
 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_varchar_1000),
 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_30),
 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_varbinary_1000),
 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_30),
 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_varchar_1000),
 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_30),
 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('-', ' - -ABC', my_decimal),
 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('-', ' - -ABC', my_double),
 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('-', ' - -ABC', my_bigint),
 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_varbinary_1000, 3),
 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_binary_30, 3),
 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_varchar_1000, 3),
 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_char_30, 3),
 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_varbinary_1000, my_binary_30 ),
 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_varbinary_1000, my_varchar_1000 ),
 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_varbinary_1000, my_char_30 ),
 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_varbinary_1000, my_varbinary_1000 ),
 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_binary_30, my_varbinary_1000 ),
 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_binary_30, my_varchar_1000 ),
 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_binary_30, my_char_30 ),
 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_binary_30, my_binary_30 ),
 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_varchar_1000, my_varbinary_1000 ),
 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_varchar_1000, my_binary_30 ),
 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_varchar_1000, my_char_30 ),
 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_varchar_1000, my_varchar_1000 ),
 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_30, my_varbinary_1000 ),
 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_30, my_binary_30 ),
 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_30, my_varchar_1000 ),
 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_30, my_char_30 ),
 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),
 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),
 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),
 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),
 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	collation_connection
 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_varbinary_1000),
 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_binary_30),
 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_varchar_1000),
 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_30),
 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	collation_connection
 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 value: ''
 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	collation_connection
 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	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_binary_30`,2) AS `LEFT(my_binary_30, 2)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
 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	collation_connection
 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	collation_connection
 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_varchar_1000),
 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_30, 'char'),
 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_varbinary_1000),
 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	collation_connection
 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_binary_30),
 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	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_binary_30`) AS `BIT_LENGTH(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
 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_varchar_1000),
 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	collation_connection
 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_char_30),
 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	collation_connection
 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,'IS_NULL'),
 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	collation_connection
 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,'IS_NULL'),
 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	collation_connection
 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_timestamp,'IS_NULL'),
 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	collation_connection
 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,'IS_NULL'),
 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	collation_connection
 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_datetime,'IS_NULL'),
 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	collation_connection
 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_double,'IS_NULL'),
 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	collation_connection
 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_decimal,'IS_NULL'),
 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	collation_connection
 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_bigint,'IS_NULL'),
 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	collation_connection
 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_varbinary_1000,'IS_NULL'),
 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	collation_connection
 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_binary_30,'IS_NULL'),
 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	collation_connection
 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_varchar_1000,'IS_NULL'),
 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	collation_connection
 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_30,'IS_NULL'),
 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	collation_connection
 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 NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 IS NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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_1000 IS NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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_1000 IS NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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 IS NULL, 'IS     NULL',
 '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=`root`@`localhost` SQL SECURITY DEFINER VI
 '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     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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_1000, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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_1000, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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, 'IS     TRUE', 'IS NOT TRUE'),
 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	collation_connection
 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_varbinary_1000 USING koi8r),
 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	collation_connection
 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_binary_30 USING koi8r),
 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	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using koi8r) AS `CONVERT(my_binary_30 USING koi8r)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
 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_varchar_1000 USING koi8r),
 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	collation_connection
 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_30 USING koi8r),
 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	collation_connection
 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_varbinary_1000 USING utf8),
 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	collation_connection
 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_binary_30 USING utf8),
 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	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using utf8) AS `CONVERT(my_binary_30 USING utf8)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
 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_varchar_1000 USING utf8),
 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	collation_connection
 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_30 USING utf8),
 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	collation_connection
 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 UNSIGNED INTEGER),
 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	collation_connection
 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 UNSIGNED INTEGER),
 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	collation_connection
 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_timestamp AS UNSIGNED INTEGER),
 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	collation_connection
 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 UNSIGNED INTEGER),
 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	collation_connection
 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_datetime AS UNSIGNED INTEGER),
 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,7 +2528,7 @@ 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_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
@@ -2482,6 +2538,38 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
+CREATE VIEW v1 AS SELECT CAST(my_double AS UNSIGNED INTEGER),
+my_double, id FROM t1_values;
+SELECT CAST(my_double AS UNSIGNED INTEGER),
+my_double, id FROM t1_values
+WHERE select_id = 89 OR select_id IS NULL order by id;
+CAST(my_double AS UNSIGNED INTEGER)	my_double	id
+NULL	NULL	1
+9223372036854775808	-1.7976931348623e+308	2
+9223372036854775807	1.7976931348623e+308	3
+0	0	4
+18446744073709551615	-1	5
+Warnings:
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+SHOW CREATE VIEW v1;
+View	Create View	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;
+
+
 CREATE VIEW v1 AS SELECT CAST(my_decimal AS UNSIGNED INTEGER),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS UNSIGNED INTEGER),
diff --git a/mysql-test/suite/funcs_1/r/ndb_storedproc.result b/mysql-test/suite/funcs_1/r/ndb_storedproc.result
index 2e1d5035397..a80e3680a76 100644
--- a/mysql-test/suite/funcs_1/r/ndb_storedproc.result
+++ b/mysql-test/suite/funcs_1/r/ndb_storedproc.result
@@ -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@1.1975.1.2, 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 b char(20))
 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,MYSQL_PORT,MYSQL_SOCK);
 	
 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 1
 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 comment 'this is a function';
 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()
+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 'float4:BEGIN
+SELECT @x;
+END' at line 2
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
-float:BEGIN
+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 '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 '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, conditions, and handlers declared for
 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 '23000' set @x2 = 1;
 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 declare multiple variables both separately
 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';
-declare exit handler for tables set @var2 = 1;
-END//
-DROP PROCEDURE IF EXISTS sp1;
-CREATE PROCEDURE sp1( )
-BEGIN
 declare terminated condition for sqlstate '02000';
 declare exit handler for terminated set @var2 = 1;
 END//
@@ -10144,10 +11240,10 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare USE condition for sqlstate '02000';
+declare use condition for sqlstate '02000';
 declare exit handler for USE 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 'USE 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 'use condition for sqlstate '02000';
 declare exit handler for USE set @var2 = 1;
 ' at line 3
 DROP PROCEDURE IF EXISTS sp1;
@@ -10409,6 +11505,15 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare accessible handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare add handler for sqlstate '02000' 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 'add handler for sqlstate '02000' set @var2 = 1;
@@ -10544,9 +11649,9 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare CALL handler for sqlstate '02000' set @var2 = 1;
+declare call handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'call handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
@@ -10625,15 +11730,6 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare columns handler for sqlstate '02000' 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 'handler for sqlstate '02000' set @var2 = 1;
-END' at line 3
-DROP PROCEDURE IF EXISTS sp1;
-Warnings:
-Note	1305	PROCEDURE sp1 does not exist
-CREATE PROCEDURE sp1( )
-BEGIN
 declare condition handler for sqlstate '02000' 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 'condition handler for sqlstate '02000' set @var2 = 1;
@@ -10643,22 +11739,18 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare connection handler for sqlstate '02000' set @var2 = 1;
+declare constraint handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'constraint handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare constraint handler for sqlstate '02000' set @var2 = 1;
+declare continue handler for sqlstate '02000' 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 'constraint handler for sqlstate '02000' set @var2 = 1;
-END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
-Warnings:
-Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
 declare convert handler for sqlstate '02000' set @var2 = 1;
@@ -10976,6 +12068,11 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare exit handler for sqlstate '02000' set @var2 = 1;
+END//
+DROP PROCEDURE IF EXISTS sp1;
+CREATE PROCEDURE sp1( )
+BEGIN
 declare explain handler for sqlstate '02000' 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 'explain handler for sqlstate '02000' set @var2 = 1;
@@ -11003,54 +12100,54 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare fields handler for sqlstate '02000' set @var2 = 1;
+declare float handler for sqlstate '02000' 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 'handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare float handler for sqlstate '02000' set @var2 = 1;
+declare float4 handler for sqlstate '02000' 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 'float handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float4 handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare for handler for sqlstate '02000' set @var2 = 1;
+declare float8 handler for sqlstate '02000' 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 'for handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'float8 handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare force handler for sqlstate '02000' set @var2 = 1;
+declare for handler for sqlstate '02000' 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 'force handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'for handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare foreign handler for sqlstate '02000' set @var2 = 1;
+declare force handler for sqlstate '02000' 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 'foreign handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'force handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare found handler for sqlstate '02000' set @var2 = 1;
+declare foreign handler for sqlstate '02000' 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 'handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'foreign handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
@@ -11075,15 +12172,6 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare goto handler for sqlstate '02000' 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 'handler for sqlstate '02000' set @var2 = 1;
-END' at line 3
-DROP PROCEDURE IF EXISTS sp1;
-Warnings:
-Note	1305	PROCEDURE sp1 does not exist
-CREATE PROCEDURE sp1( )
-BEGIN
 declare grant handler for sqlstate '02000' 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 'grant handler for sqlstate '02000' set @var2 = 1;
@@ -11237,6 +12325,51 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare int1 handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
+declare int2 handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
+declare int3 handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
+declare int4 handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
+declare int8 handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare integer handler for sqlstate '02000' 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 'integer handler for sqlstate '02000' set @var2 = 1;
@@ -11363,6 +12496,15 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare linear handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare lines handler for sqlstate '02000' 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 'lines handler for sqlstate '02000' set @var2 = 1;
@@ -11453,6 +12595,15 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare master_ssl_verify_server_cert handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare match handler for sqlstate '02000' 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 'match handler for sqlstate '02000' set @var2 = 1;
@@ -11705,6 +12856,15 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare range handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare read handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
@@ -11723,6 +12883,24 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare read_only handler for sqlstate '02000' 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 'handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
+declare read_write handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare real handler for sqlstate '02000' 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 'real handler for sqlstate '02000' set @var2 = 1;
@@ -11750,6 +12928,15 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
+declare release handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+END' at line 3
+DROP PROCEDURE IF EXISTS sp1;
+Warnings:
+Note	1305	PROCEDURE sp1 does not exist
+CREATE PROCEDURE sp1( )
+BEGIN
 declare rename handler for sqlstate '02000' 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 'rename handler for sqlstate '02000' set @var2 = 1;
@@ -11858,9 +13045,9 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare SELECT handler for sqlstate '02000' set @var2 = 1;
+declare select handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'select handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
@@ -11912,15 +13099,6 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare soname handler for sqlstate '02000' 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 handler for sqlstate '02000' set @var2 = 1;
-END' at line 3
-DROP PROCEDURE IF EXISTS sp1;
-Warnings:
-Note	1305	PROCEDURE sp1 does not exist
-CREATE PROCEDURE sp1( )
-BEGIN
 declare spatial handler for sqlstate '02000' 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 'spatial handler for sqlstate '02000' set @var2 = 1;
@@ -12038,15 +13216,6 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare tables handler for sqlstate '02000' 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 'handler for sqlstate '02000' set @var2 = 1;
-END' at line 3
-DROP PROCEDURE IF EXISTS sp1;
-Warnings:
-Note	1305	PROCEDURE sp1 does not exist
-CREATE PROCEDURE sp1( )
-BEGIN
 declare terminated handler for sqlstate '02000' 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 'terminated handler for sqlstate '02000' set @var2 = 1;
@@ -12191,9 +13360,9 @@ Warnings:
 Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare USE handler for sqlstate '02000' set @var2 = 1;
+declare use handler for sqlstate '02000' 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 'USE handler for sqlstate '02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'use handler for sqlstate '02000' set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
@@ -12384,10 +13553,13 @@ set @v2 = y;
 END//
 CALL sp1();
 x	y	@x
-NULL	abaa	3
+NULL	a	3
+Warnings:
+Warning	1265	Data truncated for column 'y' at row 3
+Warning	1265	Data truncated for column 'y' at row 1
 SELECT @v1, @v2;
 @v1	@v2
-4	a`
+4	a
 DROP PROCEDURE sp1;
 
 Testcase 4.2.28:
@@ -12454,7 +13626,7 @@ CALL sp1();
 @xx
 0
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: 'asd'
+Warning	1366	Incorrect integer value: 'asd' for column 'xx' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12481,9 +13653,11 @@ set xx = 'temp';
 set @xx = xx;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'xx' at row 1
 SELECT @xx;
 @xx
-temp
+t
 DROP PROCEDURE sp1;
 
 Testcase 4.2.31 - b:
@@ -12501,7 +13675,7 @@ CALL sp1();
 xx
 0
 Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: 'asd'
+Warning	1265	Data truncated for column 'xx' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12527,7 +13701,9 @@ SELECT xx;
 END//
 CALL sp1();
 xx
-asd
+0000-00-00 00:00:00
+Warnings:
+Warning	1264	Out of range value for column 'xx' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12571,7 +13747,7 @@ CALL sp1();
 xx
 0
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: 'asd'
+Warning	1366	Incorrect integer value: 'asd' for column 'xx' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12602,6 +13778,8 @@ declare x char ascii;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12665,6 +13843,8 @@ declare x binary;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
+Warnings:
+Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12812,8 +13992,6 @@ declare x decimal;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12821,8 +13999,6 @@ declare x decimal unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12830,8 +14006,6 @@ declare x decimal zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12839,8 +14013,6 @@ declare x decimal unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12848,8 +14020,6 @@ declare x numeric;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12857,8 +14027,6 @@ declare x numeric unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12866,8 +14034,6 @@ declare x numeric zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12875,8 +14041,6 @@ declare x numeric unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13254,7 +14418,7 @@ declare continue handler for sqlstate '02000' set done = 1;
 BEGIN
 open cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newlf1, newf3, newsal;
 set count = count - 1;
 END while;
@@ -13279,7 +14443,7 @@ declare continue handler for sqlstate '02000' set done = 1;
 BEGIN
 open cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newlf1, newf3, newsal;
 set count = count - 1;
 END while;
@@ -13306,7 +14470,7 @@ declare continue handler for sqlstate '02000' set done = 1;
 BEGIN
 open cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
 set count = count - 1;
 END while;
@@ -13330,7 +14494,7 @@ open cur1;
 BEGIN
 open cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf3, newf4;
 set count = count - 1;
 END while;
@@ -13358,7 +14522,7 @@ BEGIN
 open cur1;
 open cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
 set count = count - 1;
 END while;
@@ -13388,7 +14552,7 @@ declare continue handler for sqlstate '02000' set done = 1;
 BEGIN
 open cur2;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
 set count = count - 1;
 END while;
@@ -13416,7 +14580,7 @@ declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 limit 20, 10;
 declare continue handler for sqlstate '02000' set done = 1;
 BEGIN
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
 set count = count - 1;
 END while;
@@ -13430,7 +14594,7 @@ DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
 declare done int default 0;
-declare count integer default 0;
+declare count integer default 10;
 declare newf1 char(20);
 declare newf2 char(20);
 declare newf3 char(20);
@@ -13441,7 +14605,7 @@ open cur1;
 BEGIN
 declare cur1 cursor for SELECT f1, f2, f3, f4 from t2;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf3, newf4;
 set count = count - 1;
 END while;
@@ -13473,7 +14637,7 @@ BEGIN
 open cur1;
 close cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
 set count = count - 1;
 END while;
@@ -13485,7 +14649,7 @@ DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
 declare done int default 0;
-declare count integer default 0;
+declare count integer default 20;
 declare newf1 char(20);
 declare newf2 char(20);
 declare newf3 char(20);
@@ -13514,13 +14678,13 @@ BEGIN
 declare done int default 0;
 declare count integer default 20;
 declare newf2 char(20);
-declare newf1 date;
+declare newf1 int1;
 declare cur1 cursor for SELECT f1, f3 from t2 limit 20, 10;
 declare continue handler for sqlstate '02000' set done = 1;
 BEGIN
 open cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2;
 set @x = newf1;
 set @y = newf2;
@@ -13590,7 +14754,7 @@ BEGIN
 close cur1;
 open cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
 set count = count - 1;
 END while;
@@ -13643,7 +14807,7 @@ fetch cur1 into newf1, newf2, newf4, newf3;
 END;
 END//
 CALL sp1();
-ERROR 02000: No data to FETCH
+ERROR 02000: No data - zero rows fetched, selected, or processed
 DROP PROCEDURE sp1;
 
 Testcase 4.2.65:
@@ -13669,7 +14833,7 @@ commit;
 END;
 END//
 CALL sp1();
-ERROR 02000: No data to FETCH
+ERROR 02000: No data - zero rows fetched, selected, or processed
 DROP PROCEDURE sp1;
 
 Testcase 4.2.66:
@@ -13690,7 +14854,7 @@ declare continue handler for sqlstate '02000' set done = 1;
 BEGIN
 open cur1;
 set count = count - 1;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
 set count = count - 1;
 END while;
@@ -13719,12 +14883,13 @@ declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 limit 20, 10;
 declare continue handler for sqlstate '02000' set done = 1;
 BEGIN
 open cur1;
-set count = count - 1;
-while count <> 0 do
+#      set count = count - 1;
+#      while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
-set count = count - 1;
-END while;
+#        set count = count - 1;
+#      END while;
 END;
+fetch cur1 into newf1, newf2, newf4, newf3;
 END//
 CALL sp1();
 DROP PROCEDURE sp1;
@@ -13756,7 +14921,7 @@ BEGIN
 set count = 10;
 BEGIN
 open cur2;
-while count <> 0 do
+while count > 0 do
 fetch cur1 into newf1, newf2, newf4, newf3;
 set count = count - 1;
 END while;
@@ -13765,7 +14930,8 @@ insert into temp1 values(newf1, newf2, newf4, newf3);
 close cur1;
 END;
 BEGIN
-while count <> 0 do
+set count = 10;
+while count > 0 do
 fetch cur2 into newf21, newf22, newf24, newf23;
 set count = count - 1;
 END while;
@@ -13774,9 +14940,9 @@ insert into temp2 values(newf21, newf22, newf24, newf23);
 close cur2;
 END//
 CALL sp1();
-SELECT * from temp1;
-f1	f2	f3	f4
-agaaaaaaa	agaaaaaaa	-4993	agaaaaaaa
+SELECT count(*) from temp1;
+count(*)
+1
 SELECT * from temp2;
 f1	f2	f3	f4
 NULL	NULL	NULL	NULL
@@ -13798,6 +14964,8 @@ middleinitial CHAR,
 lastname VARCHAR(50),
 age_averylongfieldname_averylongname_1234569 int,
 COMMENT TEXT) ENGINE=ndb;
+Warnings:
+Error	1478	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
 INSERT INTO res_t3_itisalongname_1381742_itsaverylongname_1381742
 VALUES('a', 'aaaaaaaaaabbbbbbbbc', 0, 'default');
 CREATE PROCEDURE sp1(a int)
@@ -13924,23 +15092,23 @@ CALL sp2( 'insert' );
 SELECT * from t3 where f3 <=5 && f3 >= 0;
 f1	f2	f3
 f1	address	1
-f1	address	2
-f1	address	3
-f1	address	4
-f1	address	5
 f1	address	1
-f1	address	2
-f1	address	3
-f1	address	4
-f1	address	5
 f1	address	1
-f1	address	2
-f1	address	3
-f1	address	4
 f1	address	1
 f1	address	2
+f1	address	2
+f1	address	2
+f1	address	2
+f1	address	3
+f1	address	3
+f1	address	3
 f1	address	3
 f1	address	4
+f1	address	4
+f1	address	4
+f1	address	4
+f1	address	5
+f1	address	5
 SELECT count(*) from t3;
 count(*)
 28
@@ -14023,7 +15191,7 @@ delete from res_t3_itisalongname_1381742_itsaverylongname_1381742;
 END case;
 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 'when 'delete'  then
-delete from res_t3_itisalongname_1381742_itsaverylongname_13' at line 10
+delete from res_t3_itisalongname_1381742_itsaverylongname_13' at line 11
 DROP PROCEDURE IF EXISTS sp3;
 CREATE PROCEDURE sp3( action char(20) )
 BEGIN
@@ -14041,8 +15209,9 @@ label2: while count < 10 do
 BEGIN
 insert into res_t3_itisalongname_1381742_itsaverylongname_1381742
 values('xxxxxxxxxxxxxxxxxxx', '1231230981(*&(*&)(*&(', count);
-if done=1 then
-set count=10;
+set count = count + 1;
+if count= 10 then
+set done=1;
 END if;
 END;
 END while label2;
@@ -14056,6 +15225,19 @@ END if;
 END loop label1;
 SELECT count, done;
 END//
+CALL sp3('insert');
+count	done
+10	1
+Warnings:
+Warning	1265	Data truncated for column 'name' at row 1
+Warning	1265	Data truncated for column 'name' at row 2
+Warning	1265	Data truncated for column 'name' at row 3
+Warning	1265	Data truncated for column 'name' at row 4
+Warning	1265	Data truncated for column 'name' at row 5
+Warning	1265	Data truncated for column 'name' at row 6
+Warning	1265	Data truncated for column 'name' at row 7
+Warning	1265	Data truncated for column 'name' at row 8
+Warning	1265	Data truncated for column 'name' at row 9
 DROP PROCEDURE sp3;
 drop table res_t3_itisalongname_1381742_itsaverylongname_1381742;
 
@@ -14330,11 +15512,14 @@ CREATE PROCEDURE sp6()
 BEGIN
 declare count1 integer default 1;
 label1: repeat
-set count1 = count1;
+set count1 = count1-1;
 until count1 < 0
 END repeat label1;
 SELECT count1;
 END//
+CALL sp6();
+count1
+-1
 DROP PROCEDURE sp6;
 
 Testcase 4.3.7:
@@ -14403,7 +15588,7 @@ do v1 > 0 while
 set v1 = v1 - 1;
 END while;
 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 'do v1 > 0 while
+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 'while
 set v1 = v1 - 1;
 END while;
 END' at line 4
@@ -14442,7 +15627,7 @@ set count1 = count1 + 1;
 iterate label1;
 END loop label2;
 END//
-ERROR 42000: End-label label2 without match
+ERROR 42000: End-label label1 without match
 drop table res_t3_itisalongname_1381742_itsaverylongname_1381742;
 
 Testcase 4.3.13:
@@ -14606,7 +15791,7 @@ until count1 < 3
 END repeat label1;
 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 'label1;
-END' at line 7
+END' at line 8
 
 Testcase 4.3.21:
 --------------------------------------------------------------------------------
@@ -14789,15 +15974,15 @@ insert into t43 values('abcde', 'a!@#$%^&*(');
 CREATE PROCEDURE d1.sp4()
 SELECT * from d1.t43;
 SELECT * from mysql.proc where specific_name = 'sp4';
-db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment
-d1	sp4	PROCEDURE	sp4	SQL	CONTAINS_SQL	NO	DEFINER			SELECT * from d1.t43	root@localhost	modified	created		
+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
+d1	sp4	PROCEDURE	sp4	SQL	CONTAINS_SQL	NO	DEFINER			SELECT * from d1.t43	root@localhost	modified	created			latin1	latin1_swedish_ci	latin1_swedish_ci	SELECT * from d1.t43
 USE db_storedproc;
 DROP DATABASE d1;
 CREATE DATABASE d1;
 USE d1;
 create table t44(a char(5), b char(10));
 SELECT * from mysql.proc where specific_name = 'sp4';
-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
 USE db_storedproc;
 DROP DATABASE d1;
 
@@ -14839,8 +16024,8 @@ CREATE PROCEDURE sp8 ( n char(20) ) sql security definer comment 'initial'
 USE d2;
 alter procedure d1.sp8 sql security definer comment 'updated';
 SELECT * from mysql.proc where specific_name='sp8' and db='d1';
-db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment
-d1	sp8	PROCEDURE	sp8	SQL	CONTAINS_SQL	NO	DEFINER	 n char(20) 		SELECT * from t1 where t1.f1 = n	root@localhost	modified	created		updated
+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
+d1	sp8	PROCEDURE	sp8	SQL	CONTAINS_SQL	NO	DEFINER	 n char(20) 		SELECT * from t1 where t1.f1 = n	root@localhost	modified	created		updated	latin1	latin1_swedish_ci	latin1_swedish_ci	SELECT * from t1 where t1.f1 = n
 
 Testcase 4.4.9:
 --------------------------------------------------------------------------------
@@ -14856,12 +16041,16 @@ END//
 USE d2;
 alter function d1.fn2 sql security definer comment 'updated';
 SELECT * from mysql.proc where specific_name='fn2' and db='d1';
-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
 d1	fn2	FUNCTION	fn2	SQL	CONTAINS_SQL	NO	DEFINER	n int	int(11)	BEGIN
 declare a int;
 set a = 0.9 * n;
 return a;
-END	root@localhost	modified	created		updated
+END	root@localhost	modified	created		updated	latin1	latin1_swedish_ci	latin1_swedish_ci	BEGIN
+declare a int;
+set a = 0.9 * n;
+return a;
+END
 
 Testcase 4.4.10:
 --------------------------------------------------------------------------------
@@ -14871,7 +16060,7 @@ SELECT * from t1 where t1.f1 = n;
 USE d2;
 DROP PROCEDURE d1.sp9;
 SELECT * from mysql.proc where specific_name='sp9' and db='d1';
-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.4.11:
 --------------------------------------------------------------------------------
@@ -14885,7 +16074,7 @@ END//
 USE d2;
 DROP FUNCTION d1.fn3;
 SELECT * from mysql.proc where specific_name='fn3' and db='d1';
-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
 USE db_storedproc;
 DROP DATABASE d1;
 DROP DATABASE d2;
@@ -14893,19 +16082,6 @@ DROP DATABASE d2;
 Section 3.1.5 - Parameter use checks:
 Functions with all data types
 --------------------------------------------------------------------------------
-SELECT 1 as 'bug_dec_num';
-bug_dec_num
-1
-
-.
-FIXME:  There are differences with datatypes DECIMAL and NUMERIC if large
-FIXME:  exponent values are used. The diffs are shown only on some machines like
-FIXME:  AIX52 and HPUX11. Until this has been solved we use numbers that
-FIXME:  *should* be equal to the exponent representation but have no exponents
-FIXME:  and use the specified count of *0*s instead.
-FIXME:  In the source file these tests are marked with the comment  hpux11
-.
---------------------------------------------------------------------------------
 DROP DATABASE IF EXISTS d1;
 CREATE DATABASE d1;
 USE d1;
@@ -14926,7 +16102,7 @@ return f1;
 END//
 SELECT fn2(1.84e+19);
 fn2(1.84e+19)
-0
+18400000000000000000
 DROP FUNCTION IF EXISTS fn3;
 CREATE FUNCTION fn3( f1 bigint unsigned zerofill) returns bigint unsigned zerofill
 BEGIN
@@ -14945,6 +16121,8 @@ END//
 SELECT fn4(-9.22e+15);
 fn4(-9.22e+15)
 0
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn5;
 CREATE FUNCTION fn5( f1 decimal) returns decimal
 BEGIN
@@ -14972,6 +16150,10 @@ END//
 SELECT fn7(99999999999);
 fn7(99999999999)
 9999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn8;
 CREATE FUNCTION fn8( f1 decimal (0) unsigned zerofill) returns decimal (0) unsigned zerofill
 BEGIN
@@ -14980,7 +16162,9 @@ return f1;
 END//
 SELECT fn8(999999999);
 fn8(999999999)
-0999999999
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn9;
 CREATE FUNCTION fn9( f1 decimal (0) zerofill) returns decimal (0) zerofill
 BEGIN
@@ -14989,7 +16173,10 @@ return f1;
 END//
 SELECT fn9(-1.00e+09);
 fn9(-1.00e+09)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn10;
 CREATE FUNCTION fn10( f1 decimal (0, 0)) returns decimal (0, 0)
 BEGIN
@@ -15008,6 +16195,10 @@ END//
 SELECT fn11(99999999999);
 fn11(99999999999)
 9999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn12;
 CREATE FUNCTION fn12( f1 decimal (0, 0) unsigned zerofill) returns decimal (0, 0) unsigned zerofill
 BEGIN
@@ -15016,7 +16207,9 @@ return f1;
 END//
 SELECT fn12(999999999);
 fn12(999999999)
-0999999999
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn13;
 CREATE FUNCTION fn13( f1 decimal (0, 0) zerofill) returns decimal (0, 0) zerofill
 BEGIN
@@ -15025,7 +16218,10 @@ return f1;
 END//
 SELECT fn13(-1.00e+09);
 fn13(-1.00e+09)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn14;
 CREATE FUNCTION fn14( f1 decimal (63, 30)) returns decimal (63, 30)
 BEGIN
@@ -15061,7 +16257,10 @@ return f1;
 END//
 SELECT fn17(-1.00e+21);
 fn17(-1.00e+21)
-000000000000000000000000000000000.000000000000000000000000000000
+000000000000000000000000000000010.000000000000000000000000000000
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn18_d;
 CREATE FUNCTION fn18_d( f1 decimal (64)) returns decimal (64)
 BEGIN
@@ -15097,7 +16296,10 @@ return f1;
 END//
 SELECT fn21_d_z(1.00e+00);
 fn21_d_z(1.00e+00)
-0000000000000000000000000000000000000000000000000000000000000001
+0000000000000000000000000000000000000000000000000000000000000010
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn22;
 CREATE FUNCTION fn22( f1 decimal unsigned) returns decimal unsigned
 BEGIN
@@ -15106,7 +16308,10 @@ return f1;
 END//
 SELECT fn22(1.00e+00);
 fn22(1.00e+00)
-1
+10
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn23;
 CREATE FUNCTION fn23( f1 decimal unsigned zerofill) returns decimal unsigned zerofill
 BEGIN
@@ -15115,7 +16320,10 @@ return f1;
 END//
 SELECT fn23(1.00e+00);
 fn23(1.00e+00)
-0000000001
+0000000010
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn24;
 CREATE FUNCTION fn24( f1 decimal zerofill) returns decimal zerofill
 BEGIN
@@ -15124,7 +16332,10 @@ return f1;
 END//
 SELECT fn24(-1.00e+09);
 fn24(-1.00e+09)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn25;
 CREATE FUNCTION fn25( f1 double) returns double
 BEGIN
@@ -15142,7 +16353,9 @@ return f1;
 END//
 SELECT fn26(1.00e+00);
 fn26(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn27;
 CREATE FUNCTION fn27( f1 double unsigned zerofill) returns double unsigned zerofill
 BEGIN
@@ -15151,7 +16364,9 @@ return f1;
 END//
 SELECT fn27(1.00e+00);
 fn27(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn28;
 CREATE FUNCTION fn28( f1 double zerofill) returns double zerofill
 BEGIN
@@ -15160,7 +16375,9 @@ return f1;
 END//
 SELECT fn28(1.00e+00);
 fn28(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn29;
 CREATE FUNCTION fn29( f1 float) returns float
 BEGIN
@@ -15178,7 +16395,9 @@ return f1;
 END//
 SELECT fn30(1.00e+00);
 fn30(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn31;
 CREATE FUNCTION fn31( f1 float unsigned zerofill) returns float unsigned zerofill
 BEGIN
@@ -15187,7 +16406,9 @@ return f1;
 END//
 SELECT fn31(1.00e+00);
 fn31(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn32;
 CREATE FUNCTION fn32( f1 float zerofill) returns float zerofill
 BEGIN
@@ -15196,7 +16417,9 @@ return f1;
 END//
 SELECT fn32(1.00e+00);
 fn32(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn33;
 CREATE FUNCTION fn33( f1 float(0)) returns float(0)
 BEGIN
@@ -15214,7 +16437,9 @@ return f1;
 END//
 SELECT fn34(1.00e+00);
 fn34(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn35;
 CREATE FUNCTION fn35( f1 float(0) unsigned zerofill) returns float(0) unsigned zerofill
 BEGIN
@@ -15223,7 +16448,9 @@ return f1;
 END//
 SELECT fn35(1.00e+00);
 fn35(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn36;
 CREATE FUNCTION fn36( f1 float(0) zerofill) returns float(0) zerofill
 BEGIN
@@ -15232,7 +16459,9 @@ return f1;
 END//
 SELECT fn36(1.00e+00);
 fn36(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn37;
 CREATE FUNCTION fn37( f1 float(23)) returns float(23)
 BEGIN
@@ -15250,7 +16479,9 @@ return f1;
 END//
 SELECT fn38(1.00e+00);
 fn38(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn39;
 CREATE FUNCTION fn39( f1 float(23) unsigned zerofill) returns float(23) unsigned zerofill
 BEGIN
@@ -15259,7 +16490,9 @@ return f1;
 END//
 SELECT fn39(1.00e+00);
 fn39(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn40;
 CREATE FUNCTION fn40( f1 float(23) zerofill) returns float(23) zerofill
 BEGIN
@@ -15268,7 +16501,9 @@ return f1;
 END//
 SELECT fn40(1.00e+00);
 fn40(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn41;
 CREATE FUNCTION fn41( f1 float(24)) returns float(24)
 BEGIN
@@ -15286,7 +16521,9 @@ return f1;
 END//
 SELECT fn42(1.00e+00);
 fn42(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn43;
 CREATE FUNCTION fn43( f1 float(24) unsigned zerofill) returns float(24) unsigned zerofill
 BEGIN
@@ -15295,7 +16532,9 @@ return f1;
 END//
 SELECT fn43(1.00e+00);
 fn43(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn44;
 CREATE FUNCTION fn44( f1 float(24) zerofill) returns float(24) zerofill
 BEGIN
@@ -15304,7 +16543,9 @@ return f1;
 END//
 SELECT fn44(1.00e+00);
 fn44(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn45;
 CREATE FUNCTION fn45( f1 float(53)) returns float(53)
 BEGIN
@@ -15322,7 +16563,9 @@ return f1;
 END//
 SELECT fn46(1.00e+00);
 fn46(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn47;
 CREATE FUNCTION fn47( f1 float(53) unsigned zerofill) returns float(53) unsigned zerofill
 BEGIN
@@ -15331,7 +16574,9 @@ return f1;
 END//
 SELECT fn47(1.00e+00);
 fn47(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn48;
 CREATE FUNCTION fn48( f1 float(53) zerofill) returns float(53) zerofill
 BEGIN
@@ -15340,7 +16585,9 @@ return f1;
 END//
 SELECT fn48(1.00e+00);
 fn48(1.00e+00)
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn49;
 CREATE FUNCTION fn49( f1 int) returns int
 BEGIN
@@ -15349,7 +16596,10 @@ return f1;
 END//
 SELECT fn49(-2.15e+09);
 fn49(-2.15e+09)
--2147483648
+-2147483638
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn50;
 CREATE FUNCTION fn50( f1 int unsigned) returns int unsigned
 BEGIN
@@ -15385,7 +16635,9 @@ return f1;
 END//
 SELECT fn53(-8388600);
 fn53(-8388600)
--8388600
+-8388598
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn54;
 CREATE FUNCTION fn54( f1 mediumint unsigned) returns mediumint unsigned
 BEGIN
@@ -15412,7 +16664,11 @@ return f1;
 END//
 SELECT fn56(-8388601);
 fn56(-8388601)
-0
+16777215
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn57;
 CREATE FUNCTION fn57( f1 numeric) returns numeric
 BEGIN
@@ -15421,7 +16677,9 @@ return f1;
 END//
 SELECT fn57(-999999999);
 fn57(-999999999)
--999999999
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn58;
 CREATE FUNCTION fn58( f1 numeric (0)) returns numeric (0)
 BEGIN
@@ -15430,7 +16688,9 @@ return f1;
 END//
 SELECT fn58(-999999999);
 fn58(-999999999)
--999999999
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn59;
 CREATE FUNCTION fn59( f1 numeric (0) unsigned) returns numeric (0) unsigned
 BEGIN
@@ -15440,6 +16700,9 @@ END//
 SELECT fn59(9999999999);
 fn59(9999999999)
 9999999999
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn60;
 CREATE FUNCTION fn60( f1 numeric (0) unsigned zerofill) returns numeric (0) unsigned zerofill
 BEGIN
@@ -15448,7 +16711,9 @@ return f1;
 END//
 SELECT fn60(99999999);
 fn60(99999999)
-0099999999
+0100000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn61;
 CREATE FUNCTION fn61( f1 numeric (0) zerofill) returns numeric (0) zerofill
 BEGIN
@@ -15457,7 +16722,10 @@ return f1;
 END//
 SELECT fn61(-99999999);
 fn61(-99999999)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn62;
 CREATE FUNCTION fn62( f1 numeric (0, 0)) returns numeric (0, 0)
 BEGIN
@@ -15466,7 +16734,9 @@ return f1;
 END//
 SELECT fn62(-999999999);
 fn62(-999999999)
--999999999
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn63;
 CREATE FUNCTION fn63( f1 numeric (0, 0) unsigned) returns numeric (0, 0) unsigned
 BEGIN
@@ -15476,6 +16746,9 @@ END//
 SELECT fn63(9999999999);
 fn63(9999999999)
 9999999999
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn64;
 CREATE FUNCTION fn64( f1 numeric (0, 0) unsigned zerofill) returns numeric (0, 0) unsigned zerofill
 BEGIN
@@ -15484,7 +16757,9 @@ return f1;
 END//
 SELECT fn64(99999999);
 fn64(99999999)
-0099999999
+0100000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn65;
 CREATE FUNCTION fn65( f1 numeric (0, 0) zerofill) returns numeric (0, 0) zerofill
 BEGIN
@@ -15493,7 +16768,10 @@ return f1;
 END//
 SELECT fn65(-99999999);
 fn65(-99999999)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn66;
 CREATE FUNCTION fn66( f1 numeric (63, 30)) returns numeric (63, 30)
 BEGIN
@@ -15502,7 +16780,12 @@ return f1;
 END//
 SELECT fn66(-1e+36);
 fn66(-1e+36)
--999999999999999999999999999999999.999999999999999999999999999999
+-999999999999999999999999999999989.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn67;
 CREATE FUNCTION fn67( f1 numeric (63, 30) unsigned) returns numeric (63, 30) unsigned
 BEGIN
@@ -15512,6 +16795,10 @@ END//
 SELECT fn67(1e+36);
 fn67(1e+36)
 999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn68;
 CREATE FUNCTION fn68( f1 numeric (63, 30) unsigned zerofill) returns numeric (63, 30) unsigned zerofill
 BEGIN
@@ -15521,6 +16808,10 @@ END//
 SELECT fn68(1e+36);
 fn68(1e+36)
 999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn69;
 CREATE FUNCTION fn69( f1 numeric (63, 30) zerofill) returns numeric (63, 30) zerofill
 BEGIN
@@ -15529,7 +16820,10 @@ return f1;
 END//
 SELECT fn69(-1e+36);
 fn69(-1e+36)
-000000000000000000000000000000000.000000000000000000000000000000
+000000000000000000000000000000010.000000000000000000000000000000
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn70_n;
 CREATE FUNCTION fn70_n( f1 numeric (64)) returns numeric (64)
 BEGIN
@@ -15577,7 +16871,9 @@ return f1;
 END//
 SELECT fn74(999999999);
 fn74(999999999)
-999999999
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn75;
 CREATE FUNCTION fn75( f1 numeric unsigned zerofill) returns numeric unsigned zerofill
 BEGIN
@@ -15586,7 +16882,9 @@ return f1;
 END//
 SELECT fn75(999999999);
 fn75(999999999)
-0999999999
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn76;
 CREATE FUNCTION fn76( f1 numeric zerofill) returns numeric zerofill
 BEGIN
@@ -15595,7 +16893,10 @@ return f1;
 END//
 SELECT fn76(-999999999);
 fn76(-999999999)
-0000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn77;
 CREATE FUNCTION fn77( f1 real) returns real
 BEGIN
@@ -15613,7 +16914,9 @@ return f1;
 END//
 SELECT fn78(1.1);
 fn78(1.1)
-1.1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn79;
 CREATE FUNCTION fn79( f1 real unsigned zerofill) returns real unsigned zerofill
 BEGIN
@@ -15622,7 +16925,9 @@ return f1;
 END//
 SELECT fn79(1.1);
 fn79(1.1)
-1.1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn80;
 CREATE FUNCTION fn80( f1 real zerofill) returns real zerofill
 BEGIN
@@ -15631,7 +16936,9 @@ return f1;
 END//
 SELECT fn80(1.1);
 fn80(1.1)
-1.1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn81;
 CREATE FUNCTION fn81( f1 smallint) returns smallint
 BEGIN
@@ -15667,7 +16974,11 @@ return f1;
 END//
 SELECT fn84(-32601);
 fn84(-32601)
-0
+65535
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn85;
 CREATE FUNCTION fn85( f1 tinyint) returns tinyint
 BEGIN
@@ -15703,45 +17014,37 @@ return f1;
 END//
 SELECT fn88(-101);
 fn88(-101)
-0
+255
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn89;
 CREATE FUNCTION fn89( f1 enum('1enum', '2enum')) returns enum('1enum', '2enum')
 BEGIN
-if f1 eq "1enum" then
-set f1 = '2enum';
-else
-set f1 = '1enum';
-END if;
-return f1;
+IF f1 = '1enum' THEN
+SET f1 = '2enum';
+ELSE
+SET f1 = '1enum';
+END IF;
+RETURN f1;
 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 'eq "1enum" then
-set f1 = '2enum';
-else
-set f1 = '1enum';
-END if;
-return f1;
-END' at line 3
 SELECT fn89( '1enum');
-ERROR 42000: FUNCTION d1.fn89 does not exist
+fn89( '1enum')
+2enum
 DROP FUNCTION IF EXISTS fn90;
-CREATE FUNCTION fn90( f1 set("1set", "2set")) returns set("1set", "2set")
+CREATE FUNCTION fn90( f1 set('1set', '2set')) returns set('1set', '2set')
 BEGIN
-if(f1 == "1set") then
-set f1 = "2set";
-else
-set f1 = "1set";
-END if;
-return f1;
+IF f1 = '1set' THEN
+SET f1 = '2set';
+ELSE
+SET f1 = '1set';
+END IF;
+RETURN f1;
 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 '== "1set") then
-set f1 = "2set";
-else
-set f1 = "1set";
-END if;
-return f1;
-END' at line 3
 SELECT fn90( '1set');
-ERROR 42000: FUNCTION d1.fn90 does not exist
+fn90( '1set')
+2set
 DROP FUNCTION IF EXISTS fn91;
 CREATE FUNCTION fn91( f1 date) returns date
 BEGIN
@@ -15759,7 +17062,7 @@ return f1;
 END//
 SELECT fn92( '23:59:59.999999');
 fn92( '23:59:59.999999')
-26:00:00
+25:59:59
 DROP FUNCTION IF EXISTS fn93;
 CREATE FUNCTION fn93( f1 datetime) returns datetime
 BEGIN
@@ -15768,7 +17071,7 @@ return f1;
 END//
 SELECT fn93('1997-12-31 23:59:59.999999');
 fn93('1997-12-31 23:59:59.999999')
-1998-01-02 01:01:01
+1998-01-02 01:01:00
 DROP FUNCTION IF EXISTS fn94;
 CREATE FUNCTION fn94( f1 char) returns char
 BEGIN
@@ -15778,6 +17081,8 @@ END//
 SELECT fn94( 'h');
 fn94( 'h')
 a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn95;
 CREATE FUNCTION fn95( f1 char ascii) returns char ascii
 BEGIN
@@ -15787,15 +17092,19 @@ END//
 SELECT fn95('h');
 fn95('h')
 a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn96;
-CREATE FUNCTION fn96( f1 char binary) returns char binary
+CREATE FUNCTION fn96( f1 binary) returns binary(2)
 BEGIN
 set f1 = concat('a', f1);
 return f1;
 END//
 SELECT fn96( 'h');
 fn96( 'h')
-a
+a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn97;
 CREATE FUNCTION fn97( f1 longtext) returns longtext
 BEGIN
@@ -15917,7 +17226,7 @@ SELECT f1;
 END//
 CALL sp2(1.84e+19);
 f1
--9223372036854775808
+18400000000000000000
 DROP PROCEDURE IF EXISTS sp3;
 CREATE PROCEDURE sp3( f1 bigint unsigned zerofill)
 BEGIN
@@ -15926,7 +17235,7 @@ SELECT f1;
 END//
 CALL sp3(1.84e+17);
 f1
-184000000000000000
+00184000000000000000
 DROP PROCEDURE IF EXISTS sp4;
 CREATE PROCEDURE sp4( f1 bigint zerofill)
 BEGIN
@@ -15935,31 +17244,27 @@ SELECT f1;
 END//
 CALL sp4(-9.22e+15);
 f1
--9220000000000000
+00000000000000000000
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp5;
 CREATE PROCEDURE sp5( f1 decimal)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: default (10) for DECIMAL not checked, decimal digits shown although not defined
 CALL sp5(-1.00e+09);
 f1
--1000000000.000000000
+-1000000000
 DROP PROCEDURE IF EXISTS sp6;
 CREATE PROCEDURE sp6( f1 decimal (0))
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp6(-1.00e+09);
 f1
--1000000000.000000000
+-1000000000
 DROP PROCEDURE IF EXISTS sp7;
 CREATE PROCEDURE sp7( f1 decimal (0) unsigned)
 BEGIN
@@ -15968,7 +17273,11 @@ SELECT f1;
 END//
 CALL sp7(99999999999);
 f1
-99999999999.000000000
+9999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp8;
 CREATE PROCEDURE sp8( f1 decimal (0) unsigned zerofill)
 BEGIN
@@ -15977,199 +17286,201 @@ SELECT f1;
 END//
 CALL sp8(999999999);
 f1
-999999999.000000000
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp9;
 CREATE PROCEDURE sp9( f1 decimal (0) zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp9(-1.00e+09);
 f1
--1000000000.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp10;
 CREATE PROCEDURE sp10( f1 decimal (0, 0))
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp10(-1.00e+09);
 f1
--1000000000.000000000
+-1000000000
 DROP PROCEDURE IF EXISTS sp11;
 CREATE PROCEDURE sp11( f1 decimal (0, 0) unsigned)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp11(99999999999);
 f1
-99999999999.000000000
+9999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp12;
 CREATE PROCEDURE sp12( f1 decimal (0, 0) unsigned zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp12(999999999);
 f1
-999999999.000000000
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp13;
 CREATE PROCEDURE sp13( f1 decimal (0, 0) zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp13(-1.00e+09);
 f1
--1000000000.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp14;
 CREATE PROCEDURE sp14( f1 decimal (63, 30))
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: wrong number of decimal digits shown
 CALL sp14(-1.00e+21);
 f1
--1000000000000000000000.000000000
+-1000000000000000000000.000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp15;
 CREATE PROCEDURE sp15( f1 decimal (63, 30) unsigned)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: wrong number of decimal digits shown
 CALL sp15(1.00e+16);
 f1
-10000000000000000.000000000
+10000000000000000.000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp16;
 CREATE PROCEDURE sp16( f1 decimal (63, 30) unsigned zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: wrong number of decimal digits shown
 CALL sp16(1.00e+16);
 f1
-10000000000000000.000000000
+000000000000000010000000000000000.000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp17;
 CREATE PROCEDURE sp17( f1 decimal (63, 30) zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: wrong number of decimal digits shown
 CALL sp17(-1.00e+21);
 f1
--1000000000000000000000.000000000
+000000000000000000000000000000010.000000000000000000000000000000
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp18_d;
 CREATE PROCEDURE sp18_d( f1 decimal (64))
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp18_d(-1.00e+30);
+f1
+-1000000000000000000000000000000
 CALL sp18_d( -1000000000000000000000000000000 );
 f1
--1000000000000000000000000000000.000000000
+-1000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp19_du;
 CREATE PROCEDURE sp19_du( f1 decimal (64) unsigned)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp19_du(1.00e+20);
+f1
+100000000000000000000
 CALL sp19_du( 100000000000000000000 );
 f1
-100000000000000000000.000000000
+100000000000000000000
+CALL sp19_du(1.00e+24);
+f1
+1000000000000000000000000
 CALL sp19_du( 1000000000000000000000000 );
 f1
-1000000000000000000000000.000000000
+1000000000000000000000000
 DROP PROCEDURE IF EXISTS sp20_duz;
 CREATE PROCEDURE sp20_duz( f1 decimal (64) unsigned zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
+CALL sp20_duz(1.00e+20);
+f1
+0000000000000000000000000000000000000000000100000000000000000000
 CALL sp20_duz( 100000000000000000000 );
 f1
-100000000000000000000.000000000
+0000000000000000000000000000000000000000000100000000000000000000
+CALL sp20_duz(1.00e+24);
+f1
+0000000000000000000000000000000000000001000000000000000000000000
 CALL sp20_duz( 1000000000000000000000000 );
 f1
-1000000000000000000000000.000000000
+0000000000000000000000000000000000000001000000000000000000000000
 DROP PROCEDURE IF EXISTS sp21;
 CREATE PROCEDURE sp21( f1 decimal (64) zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp21(1.00e+00);
 f1
-1.000000000
+0000000000000000000000000000000000000000000000000000000000000010
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp22;
 CREATE PROCEDURE sp22( f1 decimal unsigned)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp22(1.00e+00);
 f1
-1.000000000
+10
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp23;
 CREATE PROCEDURE sp23( f1 decimal unsigned zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp23(1.00e+00);
 f1
-1.000000000
+0000000010
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp24;
 CREATE PROCEDURE sp24( f1 decimal zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
-FIXME: Following test contains a known problem that will be checked again
-FIXME: after WL#2984 has been completed:
-FIXME: decimal digits shown although not defined
 CALL sp24(-1.00e+09);
 f1
--1000000000.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp25;
 CREATE PROCEDURE sp25( f1 double)
 BEGIN
@@ -16187,7 +17498,9 @@ SELECT f1;
 END//
 CALL sp26(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp27;
 CREATE PROCEDURE sp27( f1 double unsigned zerofill)
 BEGIN
@@ -16196,7 +17509,9 @@ SELECT f1;
 END//
 CALL sp27(1.00e+00);
 f1
-1
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp28;
 CREATE PROCEDURE sp28( f1 double zerofill)
 BEGIN
@@ -16205,7 +17520,9 @@ SELECT f1;
 END//
 CALL sp28(1.00e+00);
 f1
-1
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp29;
 CREATE PROCEDURE sp29( f1 float)
 BEGIN
@@ -16223,7 +17540,9 @@ SELECT f1;
 END//
 CALL sp30(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp31;
 CREATE PROCEDURE sp31( f1 float unsigned zerofill)
 BEGIN
@@ -16232,7 +17551,9 @@ SELECT f1;
 END//
 CALL sp31(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp32;
 CREATE PROCEDURE sp32( f1 float zerofill)
 BEGIN
@@ -16241,7 +17562,9 @@ SELECT f1;
 END//
 CALL sp32(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp33;
 CREATE PROCEDURE sp33( f1 float(0))
 BEGIN
@@ -16259,7 +17582,9 @@ SELECT f1;
 END//
 CALL sp34(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp35;
 CREATE PROCEDURE sp35( f1 float(0) unsigned zerofill)
 BEGIN
@@ -16268,7 +17593,9 @@ SELECT f1;
 END//
 CALL sp35(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp36;
 CREATE PROCEDURE sp36( f1 float(0) zerofill)
 BEGIN
@@ -16277,7 +17604,9 @@ SELECT f1;
 END//
 CALL sp36(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp37;
 CREATE PROCEDURE sp37( f1 float(23))
 BEGIN
@@ -16295,7 +17624,9 @@ SELECT f1;
 END//
 CALL sp38(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp39;
 CREATE PROCEDURE sp39( f1 float(23) unsigned zerofill)
 BEGIN
@@ -16304,7 +17635,9 @@ SELECT f1;
 END//
 CALL sp39(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp40;
 CREATE PROCEDURE sp40( f1 float(23) zerofill)
 BEGIN
@@ -16313,7 +17646,9 @@ SELECT f1;
 END//
 CALL sp40(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp41;
 CREATE PROCEDURE sp41( f1 float(24))
 BEGIN
@@ -16331,7 +17666,9 @@ SELECT f1;
 END//
 CALL sp42(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp43;
 CREATE PROCEDURE sp43( f1 float(24) unsigned zerofill)
 BEGIN
@@ -16340,7 +17677,9 @@ SELECT f1;
 END//
 CALL sp43(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp44;
 CREATE PROCEDURE sp44( f1 float(24) zerofill)
 BEGIN
@@ -16349,7 +17688,9 @@ SELECT f1;
 END//
 CALL sp44(1.00e+00);
 f1
-1
+000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp45;
 CREATE PROCEDURE sp45( f1 float(53))
 BEGIN
@@ -16367,7 +17708,9 @@ SELECT f1;
 END//
 CALL sp46(1.00e+00);
 f1
-1
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp47;
 CREATE PROCEDURE sp47( f1 float(53) unsigned zerofill)
 BEGIN
@@ -16376,7 +17719,9 @@ SELECT f1;
 END//
 CALL sp47(1.00e+00);
 f1
-1
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp48;
 CREATE PROCEDURE sp48( f1 float(53) zerofill)
 BEGIN
@@ -16385,7 +17730,9 @@ SELECT f1;
 END//
 CALL sp48(1.00e+00);
 f1
-1
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp49;
 CREATE PROCEDURE sp49( f1 int)
 BEGIN
@@ -16394,7 +17741,10 @@ SELECT f1;
 END//
 CALL sp49(-2.15e+09);
 f1
--2150000000
+-2147483638
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp50;
 CREATE PROCEDURE sp50( f1 int unsigned)
 BEGIN
@@ -16421,7 +17771,7 @@ SELECT f1;
 END//
 CALL sp52(2.15e+08);
 f1
-215000000
+0215000000
 DROP PROCEDURE IF EXISTS sp53;
 CREATE PROCEDURE sp53( f1 mediumint)
 BEGIN
@@ -16430,7 +17780,9 @@ SELECT f1;
 END//
 CALL sp53(-8388600);
 f1
--8388600
+-8388598
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp54;
 CREATE PROCEDURE sp54( f1 mediumint unsigned)
 BEGIN
@@ -16457,7 +17809,11 @@ SELECT f1;
 END//
 CALL sp56(-8388601);
 f1
--8388602
+16777215
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp57;
 CREATE PROCEDURE sp57( f1 numeric)
 BEGIN
@@ -16466,7 +17822,9 @@ SELECT f1;
 END//
 CALL sp57(-999999999);
 f1
--999999999.000000000
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp58;
 CREATE PROCEDURE sp58( f1 numeric (0))
 BEGIN
@@ -16475,7 +17833,9 @@ SELECT f1;
 END//
 CALL sp58(-999999999);
 f1
--999999999.000000000
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp59;
 CREATE PROCEDURE sp59( f1 numeric (0) unsigned)
 BEGIN
@@ -16484,7 +17844,10 @@ SELECT f1;
 END//
 CALL sp59(9999999999);
 f1
-9999999999.000000000
+9999999999
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp60;
 CREATE PROCEDURE sp60( f1 numeric (0) unsigned zerofill)
 BEGIN
@@ -16493,7 +17856,9 @@ SELECT f1;
 END//
 CALL sp60(99999999);
 f1
-99999999.000000000
+0100000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp61;
 CREATE PROCEDURE sp61( f1 numeric (0) zerofill)
 BEGIN
@@ -16502,7 +17867,10 @@ SELECT f1;
 END//
 CALL sp61(-99999999);
 f1
--99999999.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp62;
 CREATE PROCEDURE sp62( f1 numeric (0, 0))
 BEGIN
@@ -16511,7 +17879,9 @@ SELECT f1;
 END//
 CALL sp62(-999999999);
 f1
--999999999.000000000
+-1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp63;
 CREATE PROCEDURE sp63( f1 numeric (0, 0) unsigned)
 BEGIN
@@ -16520,7 +17890,10 @@ SELECT f1;
 END//
 CALL sp63(9999999999);
 f1
-9999999999.000000000
+9999999999
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp64;
 CREATE PROCEDURE sp64( f1 numeric (0, 0) unsigned zerofill)
 BEGIN
@@ -16529,7 +17902,9 @@ SELECT f1;
 END//
 CALL sp64(99999999);
 f1
-99999999.000000000
+0100000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp65;
 CREATE PROCEDURE sp65( f1 numeric (0, 0) zerofill)
 BEGIN
@@ -16538,79 +17913,146 @@ SELECT f1;
 END//
 CALL sp65(-99999999);
 f1
--99999999.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp66_n;
 CREATE PROCEDURE sp66_n( f1 numeric (63, 30))
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp66_n(-1e+36);
+f1
+-999999999999999999999999999999989.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 CALL sp66_n( -1000000000000000000000000000000000000 );
 f1
--1000000000000000000000000000000000000.000000000
+-999999999999999999999999999999989.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp67_nu;
 CREATE PROCEDURE sp67_nu( f1 numeric (63, 30) unsigned)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp67_nu(1e+36);
+f1
+999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 CALL sp67_nu( 1000000000000000000000000000000000000 );
 f1
-1000000000000000000000000000000000000.000000000
+999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp68_nuz;
 CREATE PROCEDURE sp68_nuz( f1 numeric (63, 30) unsigned zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp68_nuz(1e+36);
+f1
+999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 CALL sp68_nuz( 1000000000000000000000000000000000000 );
 f1
-1000000000000000000000000000000000000.000000000
+999999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Note	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp69_n_z;
 CREATE PROCEDURE sp69_n_z( f1 numeric (63, 30) zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp69_n_z(-1e+36);
+f1
+000000000000000000000000000000010.000000000000000000000000000000
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 CALL sp69_n_z( -1000000000000000000000000000000000000 );
 f1
--1000000000000000000000000000000000000.000000000
+000000000000000000000000000000010.000000000000000000000000000000
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp70_n;
 CREATE PROCEDURE sp70_n( f1 numeric (64))
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp70_n(-1e+40);
+f1
+-10000000000000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 CALL sp70_n( -10000000000000000000000000000000000000000 );
 f1
--10000000000000000000000000000000000000000.000000000
+-10000000000000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp71_nu;
 CREATE PROCEDURE sp71_nu( f1 numeric (64) unsigned)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp71_nu(1.00e+40);
+f1
+10000000000000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 CALL sp71_nu( 10000000000000000000000000000000000000000 );
 f1
-10000000000000000000000000000000000000000.000000000
+10000000000000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp72_nuz;
 CREATE PROCEDURE sp72_nuz( f1 numeric (64) unsigned zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp72_nuz(1.00e+40);
+f1
+0000000000000000000000010000000000000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 CALL sp72_nuz( 10000000000000000000000000000000000000000 );
 f1
-10000000000000000000000000000000000000000.000000000
+0000000000000000000000010000000000000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp73_n_z;
 CREATE PROCEDURE sp73_n_z( f1 numeric (64) zerofill)
 BEGIN
 set f1 = (f1 / 2); set f1 = (f1 * 2); set f1 = (f1 - 10); set f1 = (f1 + 10);
 SELECT f1;
 END//
+CALL sp73_n_z(1.00e+40);
+f1
+0000000000000000000000010000000000000000000000000000000000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 CALL sp73_n_z( 10000000000000000000000000000000000000000 );
 f1
-10000000000000000000000000000000000000000.000000000
+0000000000000000000000010000000000000000000000000000000000000000
 DROP PROCEDURE IF EXISTS sp74;
 CREATE PROCEDURE sp74( f1 numeric unsigned)
 BEGIN
@@ -16619,7 +18061,9 @@ SELECT f1;
 END//
 CALL sp74(999999999);
 f1
-999999999.000000000
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp75;
 CREATE PROCEDURE sp75( f1 numeric unsigned zerofill)
 BEGIN
@@ -16628,7 +18072,9 @@ SELECT f1;
 END//
 CALL sp75(999999999);
 f1
-999999999.000000000
+1000000000
+Warnings:
+Note	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp76;
 CREATE PROCEDURE sp76( f1 numeric zerofill)
 BEGIN
@@ -16637,7 +18083,10 @@ SELECT f1;
 END//
 CALL sp76(-999999999);
 f1
--999999999.000000000
+0000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp77;
 CREATE PROCEDURE sp77( f1 real)
 BEGIN
@@ -16646,7 +18095,7 @@ SELECT f1;
 END//
 CALL sp77(1.1);
 f1
-1.10000
+1.1
 DROP PROCEDURE IF EXISTS sp78;
 CREATE PROCEDURE sp78( f1 real unsigned)
 BEGIN
@@ -16655,7 +18104,9 @@ SELECT f1;
 END//
 CALL sp78(1.1);
 f1
-1.10000
+10
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp79;
 CREATE PROCEDURE sp79( f1 real unsigned zerofill)
 BEGIN
@@ -16664,7 +18115,9 @@ SELECT f1;
 END//
 CALL sp79(1.1);
 f1
-1.10000
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp80;
 CREATE PROCEDURE sp80( f1 real zerofill)
 BEGIN
@@ -16673,7 +18126,9 @@ SELECT f1;
 END//
 CALL sp80(1.1);
 f1
-1.10000
+0000000000000000000010
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp81;
 CREATE PROCEDURE sp81( f1 smallint)
 BEGIN
@@ -16709,7 +18164,11 @@ SELECT f1;
 END//
 CALL sp84(-32601);
 f1
--32602
+65535
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp85;
 CREATE PROCEDURE sp85( f1 tinyint)
 BEGIN
@@ -16745,9 +18204,23 @@ SELECT f1;
 END//
 CALL sp88(-101);
 f1
--102
+255
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp89;
+CREATE PROCEDURE sp89( f1 enum('1enum', '2enum'))
+BEGIN
+IF f1 = '1enum' THEN set f1 = '2enum'; ELSE  set f1 = '1enum'; END IF;
+END//
+CALL sp89( '1enum');
 DROP PROCEDURE IF EXISTS sp90;
+CREATE PROCEDURE sp90( f1 set('1set', '2set'))
+BEGIN
+IF f1 = '1set' THEN  set f1 = '2set';  ELSE set f1 = '1set'; END IF;
+END//
+CALL sp90( '1set');
 DROP PROCEDURE IF EXISTS sp91;
 CREATE PROCEDURE sp91( f1 date)
 BEGIN
@@ -16765,7 +18238,7 @@ SELECT f1;
 END//
 CALL sp92( '23:59:59.999999');
 f1
-26:00:00.999997
+25:59:59
 DROP PROCEDURE IF EXISTS sp93;
 CREATE PROCEDURE sp93( f1 datetime)
 BEGIN
@@ -16774,7 +18247,7 @@ SELECT f1;
 END//
 CALL sp93('1997-12-31 23:59:59.999999');
 f1
-1998-01-02 01:01:01.000001
+1998-01-02 01:01:00
 DROP PROCEDURE IF EXISTS sp94;
 CREATE PROCEDURE sp94( f1 char)
 BEGIN
@@ -16783,7 +18256,9 @@ SELECT f1;
 END//
 CALL sp94( 'h');
 f1
-ah
+a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp95;
 CREATE PROCEDURE sp95( f1 char ascii)
 BEGIN
@@ -16792,7 +18267,9 @@ SELECT f1;
 END//
 CALL sp95( 'h');
 f1
-ah
+a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp96;
 CREATE PROCEDURE sp96( f1 char binary)
 BEGIN
@@ -16801,7 +18278,9 @@ SELECT f1;
 END//
 CALL sp96( 'h');
 f1
-ah
+a
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
 DROP PROCEDURE IF EXISTS sp97;
 CREATE PROCEDURE sp97( f1 longtext)
 BEGIN
@@ -16846,7 +18325,7 @@ SELECT f1;
 END//
 CALL sp101(51);
 f1
-61
+2061
 DROP PROCEDURE IF EXISTS sp102;
 CREATE PROCEDURE sp102( f1 year(4))
 BEGIN
@@ -16901,6 +18380,8 @@ END//
 CALL sp107(2.00e+13);
 f1
 returned
+Warnings:
+returned	1265	Data truncated for column 'f1' at row 1
 USE db_storedproc;
 DROP DATABASE db1;
 DROP DATABASE IF EXISTS db1;
@@ -16937,9 +18418,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute01();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-61	61	71	61	61	71	2033	2033	2084	2033	2033	2084
+2061	2061	2071	2061	2061	2071	2033	2033	2084	2033	2033	2084
 var1	var2	var3	var4	var5	var6	var7	var8
-61	71	61	71	2033	2084	2033	2084
+2061	2071	2061	2071	2033	2084	2033	2084
 DROP PROCEDURE spexecute01;
 DROP PROCEDURE sp1;
 DROP PROCEDURE IF EXISTS sp2;
@@ -17010,9 +18491,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute03();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-ah	ah	aah	ah	ah	aah	helloworld	helloworld	NULL	helloworld	helloworld	hellohelloworld
+a	a	a	a	a	a	helloworld	helloworld	NULL	helloworld	helloworld	hellohelloworld
 var1	var2	var3	var4	var5	var6	var7	var8
-ah	aah	ah	aah	helloworld	NULL	helloworld	hellohelloworld
+a	a	a	a	helloworld	NULL	helloworld	hellohelloworld
 DROP PROCEDURE spexecute03;
 DROP PROCEDURE sp3;
 DROP PROCEDURE IF EXISTS sp4;
@@ -17155,7 +18636,7 @@ SELECT var7, var8;
 END//
 CALL spexecute07();
 var1	var2
-9223372036854775807	NULL
+18400000000000000000	NULL
 var3	var4
 -9220000000000000000	NULL
 var5	var6
@@ -17163,7 +18644,7 @@ var5	var6
 var7	var8
 -9220000000000000000	NULL
 f1	f2	f3
-9223372036854775807	9223372036854775807	NULL
+18400000000000000000	18400000000000000000	NULL
 f4	f5	f6
 -9220000000000000000	-9220000000000000000	NULL
 f7	f8	f9
@@ -17171,7 +18652,7 @@ f7	f8	f9
 f10	f11	f12
 -9220000000000000000	-9220000000000000000	NULL
 f1	f2	f3
--2	-2	-2
+18353255926290448384	18353255926290448384	18353255926290448384
 f4	f5	f6
 -9220000000000000000	6744073709551616	6744073709551616
 f7	f8	f9
@@ -17179,7 +18660,7 @@ f7	f8	f9
 f10	f11	f12
 -9220000000000000000	6744073709551616	6744073709551616
 var1	var2
--2	-2
+18353255926290448384	18353255926290448384
 var3	var4
 6744073709551616	6744073709551616
 var5	var6
@@ -17237,9 +18718,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute08();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-368000000000000000	368000000000000000	368000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+00368000000000000000	00368000000000000000	00368000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-368000000000000000	368000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+00368000000000000000	00368000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute08;
 DROP PROCEDURE sp8;
 DROP PROCEDURE IF EXISTS sp9;
@@ -17291,9 +18772,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute09();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--18440000000000000	-18440000000000000	-18439999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+00000000000000000000	00000000000000000000	00000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--18440000000000000	-18439999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+00000000000000000000	00000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute09;
 DROP PROCEDURE sp9;
 DROP PROCEDURE IF EXISTS sp10;
@@ -17337,9 +18818,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute10();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute10;
 DROP PROCEDURE sp10;
 DROP PROCEDURE IF EXISTS sp11;
@@ -17372,9 +18853,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute11();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1000000000.000000000	1000000000.000000000	1000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1000000000	1000000000	1000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1000000000.000000000	1000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1000000000	1000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute11;
 DROP PROCEDURE sp11;
 DROP PROCEDURE IF EXISTS sp12;
@@ -17407,9 +18888,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute12();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-99999999999.000000000	99999999999.000000000	100000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-99999999999.000000000	100000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute12;
 DROP PROCEDURE sp12;
 DROP PROCEDURE IF EXISTS sp13;
@@ -17442,9 +18923,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute13();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute13;
 DROP PROCEDURE sp13;
 DROP PROCEDURE IF EXISTS sp14;
@@ -17477,9 +18958,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute14();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000000000000000.000000000	-1000000000000000000000.000000000	-999999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000000000000000.000000000000000000000000000000	-1000000000000000000000.000000000000000000000000000000	-999999999999999999990.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000000000000000.000000000	-999999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000000000000000.000000000000000000000000000000	-999999999999999999990.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute14;
 DROP PROCEDURE sp14;
 DROP PROCEDURE IF EXISTS sp15;
@@ -17545,9 +19026,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute16();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute16;
 DROP PROCEDURE sp16;
 DROP PROCEDURE IF EXISTS sp17;
@@ -17579,9 +19060,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute17();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute17;
 DROP PROCEDURE sp17;
 DROP PROCEDURE IF EXISTS sp18;
@@ -17613,9 +19094,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute18();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute18;
 DROP PROCEDURE sp18;
 DROP PROCEDURE IF EXISTS sp19;
@@ -17647,9 +19128,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute19();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute19;
 DROP PROCEDURE sp19;
 DROP PROCEDURE IF EXISTS sp20;
@@ -17681,9 +19162,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute20();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute20;
 DROP PROCEDURE sp20;
 DROP PROCEDURE IF EXISTS sp21;
@@ -17715,9 +19196,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute21();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute21;
 DROP PROCEDURE sp21;
 DROP PROCEDURE IF EXISTS sp22;
@@ -17783,9 +19264,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute23();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute23;
 DROP PROCEDURE sp23;
 DROP PROCEDURE IF EXISTS sp24;
@@ -17817,9 +19298,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute24();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.1	1.1	11.1	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.1	11.1	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute24;
 DROP PROCEDURE sp24;
 DROP PROCEDURE IF EXISTS sp25;
@@ -17851,9 +19332,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute25();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--65402	-65402	-65392	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-32758	-32758	-32748	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--65402	-65392	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-32758	-32748	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute25;
 DROP PROCEDURE sp25;
 DROP PROCEDURE IF EXISTS sp26;
@@ -17919,9 +19400,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute27();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-26:00:00.999997	26:00:00.999997	28:00:01.999995	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+25:59:59	25:59:59	27:59:59	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-26:00:00.999997	28:00:01.999995	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+25:59:59	27:59:59	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute27;
 DROP PROCEDURE sp27;
 DROP PROCEDURE IF EXISTS sp28;
@@ -17953,9 +19434,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute28();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1998-01-02 01:01:01.000001	1998-01-02 01:01:01.000001	1998-01-03 02:02:02.000003	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1998-01-02 01:01:00	1998-01-02 01:01:00	1998-01-03 02:02:01	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1998-01-02 01:01:01.000001	1998-01-03 02:02:02.000003	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1998-01-02 01:01:00	1998-01-03 02:02:01	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute28;
 DROP PROCEDURE sp28;
 DROP PROCEDURE IF EXISTS sp29;
@@ -17987,9 +19468,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute29();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute29;
 DROP PROCEDURE sp29;
 DROP PROCEDURE IF EXISTS sp30;
@@ -18021,9 +19502,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute30();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute30;
 DROP PROCEDURE sp30;
 DROP PROCEDURE IF EXISTS sp31;
@@ -18089,9 +19570,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute32();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute32;
 DROP PROCEDURE sp32;
 DROP PROCEDURE IF EXISTS sp33;
@@ -18123,9 +19604,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute33();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute33;
 DROP PROCEDURE sp33;
 DROP PROCEDURE IF EXISTS sp34;
@@ -18191,9 +19672,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute35();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute35;
 DROP PROCEDURE sp35;
 DROP PROCEDURE IF EXISTS sp36;
@@ -18225,9 +19706,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute36();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute36;
 DROP PROCEDURE sp36;
 DROP PROCEDURE IF EXISTS sp37;
@@ -18293,9 +19774,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute38();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute38;
 DROP PROCEDURE sp38;
 DROP PROCEDURE IF EXISTS sp39;
@@ -18327,9 +19808,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute39();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute39;
 DROP PROCEDURE sp39;
 DROP PROCEDURE IF EXISTS sp40;
@@ -18361,9 +19842,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute40();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute40;
 DROP PROCEDURE sp40;
 DROP PROCEDURE IF EXISTS sp41;
@@ -18395,9 +19876,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute41();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute41;
 DROP PROCEDURE sp41;
 DROP PROCEDURE IF EXISTS sp42;
@@ -18429,9 +19910,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute42();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute42;
 DROP PROCEDURE sp42;
 DROP PROCEDURE IF EXISTS sp43;
@@ -18463,9 +19944,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute43();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute43;
 DROP PROCEDURE sp43;
 DROP PROCEDURE IF EXISTS sp44;
@@ -18497,9 +19978,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute44();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute44;
 DROP PROCEDURE sp44;
 DROP PROCEDURE IF EXISTS sp45;
@@ -18531,9 +20012,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute45();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute45;
 DROP PROCEDURE sp45;
 DROP PROCEDURE IF EXISTS sp46;
@@ -18565,9 +20046,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute46();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute46;
 DROP PROCEDURE sp46;
 DROP PROCEDURE IF EXISTS sp47;
@@ -18599,9 +20080,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute47();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute47;
 DROP PROCEDURE sp47;
 DROP PROCEDURE IF EXISTS sp48;
@@ -18633,9 +20114,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute48();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute48;
 DROP PROCEDURE sp48;
 DROP PROCEDURE IF EXISTS sp49;
@@ -18667,9 +20148,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute49();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute49;
 DROP PROCEDURE sp49;
 DROP PROCEDURE IF EXISTS sp50;
@@ -18701,9 +20182,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute50();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute50;
 DROP PROCEDURE sp50;
 DROP PROCEDURE IF EXISTS sp51;
@@ -18735,9 +20216,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute51();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute51;
 DROP PROCEDURE sp51;
 DROP PROCEDURE IF EXISTS sp52;
@@ -18769,9 +20250,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute52();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000000000000000000000000	-10000000000000000000000.000000000000000000000000000000	-99999999999999999990.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000000000000000000000000	-99999999999999999990.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute52;
 DROP PROCEDURE sp52;
 DROP PROCEDURE IF EXISTS sp53;
@@ -18803,9 +20284,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute53();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000	-10000000000000000000000	-99999999999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000	-99999999999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute53;
 DROP PROCEDURE sp53;
 DROP PROCEDURE IF EXISTS sp54;
@@ -18837,9 +20318,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute54();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000	10000000000000000000000	100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000	100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute54;
 DROP PROCEDURE sp54;
 DROP PROCEDURE IF EXISTS sp55;
@@ -18871,9 +20352,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute55();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute55;
 DROP PROCEDURE sp55;
 DROP PROCEDURE IF EXISTS sp56;
@@ -18905,9 +20386,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute56();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-61	61	71	61	61	71	61	61	71	61	61	71
+2061	2061	2071	2061	2061	2071	2061	2061	2071	2061	2061	2071
 var1	var2	var3	var4	var5	var6	var7	var8
-61	71	61	71	61	71	61	71
+2061	2071	2061	2071	2061	2071	2061	2071
 DROP PROCEDURE spexecute56;
 DROP PROCEDURE sp56;
 DROP PROCEDURE IF EXISTS sp57;
@@ -19041,9 +20522,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute60();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-ah	ah	aah	ah	ah	aah	ah	ah	aah	ah	ah	aah
+a	a	a	a	a	a	a	a	a	a	a	a
 var1	var2	var3	var4	var5	var6	var7	var8
-ah	aah	ah	aah	ah	aah	ah	aah
+a	a	a	a	a	a	a	a
 DROP PROCEDURE spexecute60;
 DROP PROCEDURE sp60;
 DROP PROCEDURE IF EXISTS sp61;
@@ -19075,9 +20556,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute61();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-ah	ah	aah	ah	ah	aah	ah	ah	NULL	ah	ah	aah
+a	a	a	a	a	a	a	a	NULL	a	a	a
 var1	var2	var3	var4	var5	var6	var7	var8
-ah	aah	ah	aah	ah	NULL	ah	aah
+a	a	a	a	a	NULL	a	a
 DROP PROCEDURE spexecute61;
 DROP PROCEDURE sp61;
 DROP PROCEDURE IF EXISTS sp62;
@@ -19177,9 +20658,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute64();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000
+1000000000	1000000000	1000000010	1000000000	1000000000	1000000010	1000000000	1000000000	1000000010	1000000000	1000000000	1000000010
 var1	var2	var3	var4	var5	var6	var7	var8
-1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000
+1000000000	1000000010	1000000000	1000000010	1000000000	1000000010	1000000000	1000000010
 DROP PROCEDURE spexecute64;
 DROP PROCEDURE sp64;
 DROP PROCEDURE IF EXISTS sp65;
@@ -19211,9 +20692,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute65();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-999999999.000000000	999999999.000000000	1000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1000000000	1000000000	1000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-999999999.000000000	1000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1000000000	1000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute65;
 DROP PROCEDURE sp65;
 DROP PROCEDURE IF EXISTS sp66;
@@ -19245,9 +20726,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute66();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10000000000000000.000000000	10000000000000000.000000000	10000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10000000000000000.000000000000000000000000000000	10000000000000000.000000000000000000000000000000	10000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000.000000000	10000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000.000000000000000000000000000000	10000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute66;
 DROP PROCEDURE sp66;
 DROP PROCEDURE IF EXISTS sp67;
@@ -19279,9 +20760,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute67();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10000000000000000.000000000	10000000000000000.000000000	10000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000.000000000	10000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute67;
 DROP PROCEDURE sp67;
 DROP PROCEDURE IF EXISTS sp68;
@@ -19313,9 +20794,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute68();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000000000000000.000000000	-1000000000000000000000.000000000	-999999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000000000000000.000000000	-999999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute68;
 DROP PROCEDURE sp68;
 DROP PROCEDURE IF EXISTS sp69;
@@ -19347,9 +20828,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute69();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000	-10000000000000000000000	-99999999999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000	-99999999999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute69;
 DROP PROCEDURE sp69;
 DROP PROCEDURE IF EXISTS sp70;
@@ -19381,9 +20862,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute70();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000	10000000000000000000000	100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000	100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute70;
 DROP PROCEDURE sp70;
 DROP PROCEDURE IF EXISTS sp71;
@@ -19415,9 +20896,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute71();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000100000000000000000000	0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute71;
 DROP PROCEDURE sp71;
 DROP PROCEDURE IF EXISTS sp72;
@@ -19449,9 +20930,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute72();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute72;
 DROP PROCEDURE sp72;
 DROP PROCEDURE IF EXISTS sp73;
@@ -19483,9 +20964,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute73();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute73;
 DROP PROCEDURE sp73;
 DROP PROCEDURE IF EXISTS sp74;
@@ -19517,9 +20998,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute74();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute74;
 DROP PROCEDURE sp74;
 DROP PROCEDURE IF EXISTS sp75;
@@ -19551,9 +21032,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute75();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute75;
 DROP PROCEDURE sp75;
 DROP PROCEDURE IF EXISTS sp76;
@@ -19585,9 +21066,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute76();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute76;
 DROP PROCEDURE sp76;
 DROP PROCEDURE IF EXISTS sp77;
@@ -19619,9 +21100,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute77();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute77;
 DROP PROCEDURE sp77;
 DROP PROCEDURE IF EXISTS sp78;
@@ -19653,9 +21134,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute78();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute78;
 DROP PROCEDURE sp78;
 DROP PROCEDURE IF EXISTS sp79;
@@ -19687,9 +21168,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute79();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute79;
 DROP PROCEDURE sp79;
 DROP PROCEDURE IF EXISTS sp80;
@@ -19721,9 +21202,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute80();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--2150000000	-2150000000	-2149999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-2147483638	-2147483638	-2147483628	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--2150000000	-2149999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-2147483638	-2147483628	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute80;
 DROP PROCEDURE sp80;
 DROP PROCEDURE IF EXISTS sp81;
@@ -19823,9 +21304,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute83();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-215000000	215000000	215000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0215000000	0215000000	0215000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-215000000	215000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0215000000	0215000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute83;
 DROP PROCEDURE sp83;
 DROP PROCEDURE IF EXISTS sp84;
@@ -19857,9 +21338,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute84();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--8388600	-8388600	-8388590	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-8388598	-8388598	-8388588	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--8388600	-8388590	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-8388598	-8388588	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute84;
 DROP PROCEDURE sp84;
 DROP PROCEDURE IF EXISTS sp85;
@@ -19925,9 +21406,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute86();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-16777210	16777210	16777220	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+16777210	16777210	16777215	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-16777210	16777220	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+16777210	16777215	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute86;
 DROP PROCEDURE sp86;
 DROP PROCEDURE IF EXISTS sp87;
@@ -19959,9 +21440,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute87();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--8388602	-8388602	-8388592	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+16777215	16777215	16777215	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--8388602	-8388592	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+16777215	16777215	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute87;
 DROP PROCEDURE sp87;
 DROP PROCEDURE IF EXISTS sp88;
@@ -19993,9 +21474,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute88();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-99999999.000000000	99999999.000000000	100000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0100000000	0100000000	0100000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-99999999.000000000	100000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0100000000	0100000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute88;
 DROP PROCEDURE sp88;
 DROP PROCEDURE IF EXISTS sp89;
@@ -20027,9 +21508,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute89();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-99999999.000000000	99999999.000000000	100000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0100000000	0100000000	0100000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-99999999.000000000	100000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0100000000	0100000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute89;
 DROP PROCEDURE sp89;
 DROP PROCEDURE IF EXISTS sp90;
@@ -20061,9 +21542,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute90();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000000000000000000000000	10000000000000000000000.000000000000000000000000000000	100000000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000000000000000000000000	100000000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute90;
 DROP PROCEDURE sp90;
 DROP PROCEDURE IF EXISTS sp91;
@@ -20095,9 +21576,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute91();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000000100000000000000000000.000000000000000000000000000000	000000000010000000000000000000000.000000000000000000000000000000	000000000000100000000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000010000000000000000000000.000000000000000000000000000000	000000000000100000000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute91;
 DROP PROCEDURE sp91;
 DROP PROCEDURE IF EXISTS sp92;
@@ -20129,9 +21610,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute92();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute92;
 DROP PROCEDURE sp92;
 DROP PROCEDURE IF EXISTS sp93;
@@ -20163,9 +21644,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute93();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000000100000000000000000000	0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute93;
 DROP PROCEDURE sp93;
 DROP PROCEDURE IF EXISTS sp94;
@@ -20231,9 +21712,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute95();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-65532	65532	65542	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+65532	65532	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-65532	65542	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+65532	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute95;
 DROP PROCEDURE sp95;
 DROP PROCEDURE IF EXISTS sp96;
@@ -20265,9 +21746,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute96();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-65532	65532	65542	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+65532	65532	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-65532	65542	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+65532	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute96;
 DROP PROCEDURE sp96;
 DROP PROCEDURE IF EXISTS sp97;
@@ -20299,9 +21780,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute97();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--32602	-32602	-32592	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+65535	65535	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--32602	-32592	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+65535	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute97;
 DROP PROCEDURE sp97;
 DROP PROCEDURE IF EXISTS sp98;
@@ -20367,9 +21848,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute99();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-252	252	262	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+252	252	255	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-252	262	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+252	255	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute99;
 DROP PROCEDURE sp99;
 DROP PROCEDURE IF EXISTS sp100;
@@ -20435,9 +21916,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute101();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--102	-102	-92	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+255	255	255	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--102	-92	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+255	255	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute101;
 DROP PROCEDURE sp101;
 USE db_storedproc;
@@ -20462,13 +21943,13 @@ set a = '2005-03-14 01:01:02';
 insert into temp_table values(a);
 END//
 show CREATE PROCEDURE sp2;
-Procedure	sql_mode	Create Procedure
-sp2	ALLOW_INVALID_DATES	CREATE PROCEDURE `sp2`()
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
+sp2	ALLOW_INVALID_DATES	CREATE DEFINER=`root`@`localhost` PROCEDURE `sp2`()
 BEGIN
 declare a datetime;
 set a = '2005-03-14 01:01:02';
 insert into temp_table values(a);
-END
+END	latin1	latin1_swedish_ci	latin1_swedish_ci
 set @@sql_mode = 'traditional';
 CALL sp2 ();
 SELECT * from temp_table;
@@ -20498,15 +21979,15 @@ set b = 5;
 SELECT not 1 between a and b;
 END//
 show CREATE PROCEDURE sp3;
-Procedure	sql_mode	Create Procedure
-sp3	HIGH_NOT_PRECEDENCE	CREATE PROCEDURE `sp3`()
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
+sp3	HIGH_NOT_PRECEDENCE	CREATE DEFINER=`root`@`localhost` PROCEDURE `sp3`()
 BEGIN
 declare a int signed;
 declare b int unsigned;
 set a = -5;
 set b = 5;
 SELECT not 1 between a and b;
-END
+END	latin1	latin1_swedish_ci	latin1_swedish_ci
 set @@sql_mode='';
 CALL sp3();
 not 1 between a and b
@@ -20541,8 +22022,8 @@ set c = b/a;
 show warnings;
 END//
 show CREATE PROCEDURE sp4;
-Procedure	sql_mode	Create Procedure
-sp4	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI,ERROR_FOR_DIVISION_BY_ZERO	CREATE PROCEDURE "sp4"()
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
+sp4	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI,ERROR_FOR_DIVISION_BY_ZERO	CREATE DEFINER="root"@"localhost" PROCEDURE "sp4"()
 BEGIN
 declare a int;
 declare b int;
@@ -20551,7 +22032,7 @@ set a = 0;
 set b = 1;
 set c = b/a;
 show warnings;
-END
+END	latin1	latin1_swedish_ci	latin1_swedish_ci
 set @@sql_mode='';
 CALL sp4();
 Level	Code	Message
@@ -20589,37 +22070,37 @@ set @x=i1;
 set @y=@x;
 END//
 show CREATE PROCEDURE sp6a;
-Procedure	sql_mode	Create Procedure
-sp6a		CREATE PROCEDURE `sp6a`(i1 longtext, out i2 mediumint , inout i3 longblob, in i4 year, out i5 real)
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
+sp6a		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6a`(i1 longtext, out i2 mediumint , inout i3 longblob, in i4 year, out i5 real)
 BEGIN
 set @x=i1;
 set @y=@x;
-END
+END	latin1	latin1_swedish_ci	latin1_swedish_ci
 show CREATE PROCEDURE sp6b;
-Procedure	sql_mode	Create Procedure
-sp6b		CREATE PROCEDURE `sp6b`(out i1 longtext, out i2 mediumint , out i3 longblob, out i4 year, out i5 real)
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
+sp6b		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6b`(out i1 longtext, out i2 mediumint , out i3 longblob, out i4 year, out i5 real)
     DETERMINISTIC
 BEGIN
 set @x=i1;
 set @y=@x;
-END
+END	latin1	latin1_swedish_ci	latin1_swedish_ci
 show CREATE PROCEDURE sp6c;
-Procedure	sql_mode	Create Procedure
-sp6c		CREATE PROCEDURE `sp6c`(inout i1 longtext, inout  i2 mediumint , inout i3 longblob, inout  i4 year, inout  i5 real)
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
+sp6c		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6c`(inout i1 longtext, inout  i2 mediumint , inout i3 longblob, inout  i4 year, inout  i5 real)
     COMMENT 'this is a comment'
 BEGIN
 set @x=i1;
 set @y=@x;
-END
+END	latin1	latin1_swedish_ci	latin1_swedish_ci
 SHOW PROCEDURE status like 'sp6a';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp6a	PROCEDURE	root@localhost	modified	created	DEFINER	
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp6a	PROCEDURE	root@localhost	modified	created	DEFINER		latin1	latin1_swedish_ci	latin1_swedish_ci
 SHOW PROCEDURE status like 'sp6b';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp6b	PROCEDURE	root@localhost	modified	created	DEFINER	
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp6b	PROCEDURE	root@localhost	modified	created	DEFINER		latin1	latin1_swedish_ci	latin1_swedish_ci
 SHOW PROCEDURE status like 'sp6c';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp6c	PROCEDURE	root@localhost	modified	created	DEFINER	this is a comment
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp6c	PROCEDURE	root@localhost	modified	created	DEFINER	this is a comment	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP PROCEDURE sp6a;
 DROP PROCEDURE sp6b;
 DROP PROCEDURE sp6c;
@@ -20633,8 +22114,8 @@ set @x=i1;
 set @y=@x;
 END//
 SHOW PROCEDURE status like 'sp6';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp6	PROCEDURE	root@localhost	modified	created	DEFINER	
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp6	PROCEDURE	root@localhost	modified	created	DEFINER		latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP PROCEDURE sp6;
 
 Testcase 4.8.3:
@@ -20659,8 +22140,8 @@ set @y=@x;
 return 0;
 END//
 show  function status like 'sp6';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp6	FUNCTION	root@localhost	modified	created	DEFINER	
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp6	FUNCTION	root@localhost	modified	created	DEFINER		latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP FUNCTION sp6;
 
 Testcase 4.8.5:
@@ -20673,7 +22154,7 @@ Testcase 4.8.6:
 --------------------------------------------------------------------------------
 DROP PROCEDURE IF EXISTS sp6;
 show  procedure status like 'sp6';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
 
 Testcase 4.8.7:
 --------------------------------------------------------------------------------
@@ -20694,7 +22175,7 @@ BEGIN
 return i1;
 END//
 show  procedure status like 'fn1';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
 DROP FUNCTION fn1;
 
 Testcase 4.8.9:
@@ -20708,8 +22189,8 @@ BEGIN
 return i1;
 END//
 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 fn1;
 
 Testcase 4.8.11:
@@ -20738,7 +22219,7 @@ Testcase 4.8.13:
 --------------------------------------------------------------------------------
 DROP FUNCTION IF EXISTS f1000;
 SHOW FUNCTION STATUS LIKE 'f1000';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
 
 Testcase 4.8.14:
 --------------------------------------------------------------------------------
@@ -20760,7 +22241,7 @@ set @x=i1;
 set @y=@x;
 END//
 show  function status like 'sp6';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
 DROP PROCEDURE sp6;
 
 Testcase 4.8.16:
@@ -20777,8 +22258,8 @@ END//
 alter procedure sp6 sql security invoker;
 alter procedure sp6 comment  'this is a new comment';
 SHOW PROCEDURE status like 'sp6';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
-db_storedproc	sp6	PROCEDURE	root@localhost	modified	created	INVOKER	this is a new comment
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
+db_storedproc	sp6	PROCEDURE	root@localhost	modified	created	INVOKER	this is a new comment	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP PROCEDURE sp6;
 
 Testcase 4.8.18:
@@ -20790,12 +22271,12 @@ return x;
 END//
 alter function fn1 sql security invoker;
 show  create  function  fn1;
-Function	sql_mode	Create Function
-fn1		CREATE FUNCTION `fn1`(x int) RETURNS int(11)
+Function	sql_mode	Create Function	character_set_client	collation_connection	Database Collation
+fn1		CREATE DEFINER=`root`@`localhost` FUNCTION `fn1`(x int) RETURNS int(11)
     SQL SECURITY INVOKER
 BEGIN
 return x;
-END
+END	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP FUNCTION fn1;
 
 Testcase 4.8.19:
@@ -20808,8 +22289,8 @@ END//
 alter function fn1 sql security invoker;
 alter function fn1 comment 'this is a function 3242#@%$#@';
 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 a function 3242#@%$#@
+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 a function 3242#@%$#@	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP FUNCTION fn1;
 
 Testcase 4.8.20:
@@ -20822,13 +22303,13 @@ set @y=@x;
 END//
 alter procedure sp6 comment 'this is simple';
 show CREATE PROCEDURE sp6;
-Procedure	sql_mode	Create Procedure
-sp6		CREATE PROCEDURE `sp6`(i1 int , i2 int)
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
+sp6		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6`(i1 int , i2 int)
     COMMENT 'this is simple'
 BEGIN
 set @x=i1;
 set @y=@x;
-END
+END	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP PROCEDURE sp6;
 
 Testcase 4.8.21:
@@ -20853,7 +22334,7 @@ set @y=@x;
 END//
 DROP PROCEDURE sp6;
 SHOW PROCEDURE status like 'sp6';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
 
 Testcase 4.8.23:
 --------------------------------------------------------------------------------
@@ -20875,7 +22356,7 @@ return i1;
 END//
 DROP FUNCTION fn1;
 SHOW FUNCTION STATUS LIKE 'fn1';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
 
 Section 3.1.9 - Routine body checks:
 --------------------------------------------------------------------------------
@@ -20894,16 +22375,16 @@ SELECT * from t9 limit 0, 100;
 END//
 CALL sp6 (10, 20, 30, 40, 50);
 f1	f2	f3
--5000	a`	-5000
--4999	aaa	-4999
--4998	abaa	-4998
--4997	acaaa	-4997
--4996	adaaaa	-4996
--4995	aeaaaaa	-4995
--4994	afaaaaaa	-4994
--4993	agaaaaaaa	-4993
--4992	a^aaaaaaaa	-4992
 -4991	a_aaaaaaaaa	-4991
+-4992	a^aaaaaaaa	-4992
+-4993	agaaaaaaa	-4993
+-4994	afaaaaaa	-4994
+-4995	aeaaaaa	-4995
+-4996	adaaaa	-4996
+-4997	acaaa	-4997
+-4998	abaa	-4998
+-4999	aaa	-4999
+-5000	a`	-5000
 DROP PROCEDURE sp6;
 
 Testcase 4.9.2:
@@ -21363,9 +22844,16 @@ until done END repeat;
 SELECT done;
 close cur1;
 END//
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+CALL h1();
+done
+0
+done
+1
+done
+1
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.14:
 --------------------------------------------------------------------------------
@@ -21392,9 +22880,16 @@ until done END repeat;
 SELECT done;
 close cur1;
 END//
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+CALL h1();
+done
+0
+done
+1
+done
+1
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.15:
 --------------------------------------------------------------------------------
@@ -21422,9 +22917,16 @@ until done END repeat;
 SELECT done;
 close cur1;
 END//
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+CALL h1();
+done
+0
+@x=1
+0
+done
+1
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.16:
 --------------------------------------------------------------------------------
@@ -21452,17 +22954,16 @@ until done END repeat;
 SELECT done;
 close cur1;
 END//
-CALL h1()
-# cleanup;
+CALL h1();
 done
 0
 @x=1
 0
 done
 1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.17:
 --------------------------------------------------------------------------------
@@ -21490,9 +22991,9 @@ done
 0
 done
 1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.18:
 --------------------------------------------------------------------------------
@@ -21520,9 +23021,9 @@ done
 0
 done
 1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.19:
 --------------------------------------------------------------------------------
@@ -21550,9 +23051,9 @@ END//
 CALL h1();
 done
 0
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.20:
 --------------------------------------------------------------------------------
@@ -21580,9 +23081,9 @@ END//
 CALL h1();
 done
 0
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.21:
 --------------------------------------------------------------------------------
@@ -21610,9 +23111,9 @@ done
 0
 done
 1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.22:
 --------------------------------------------------------------------------------
@@ -21641,9 +23142,9 @@ done
 0
 done	@x
 1	1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.23:
 --------------------------------------------------------------------------------
@@ -21671,9 +23172,9 @@ END//
 CALL h1();
 done
 0
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.24:
 --------------------------------------------------------------------------------
@@ -21701,9 +23202,9 @@ END//
 CALL h1();
 done
 0
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.25:
 --------------------------------------------------------------------------------
@@ -21728,9 +23229,9 @@ END//
 CALL h1();
 done	@x
 1	1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.26:
 --------------------------------------------------------------------------------
@@ -21755,9 +23256,9 @@ END//
 CALL h1();
 done	@x
 1	1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.27:
 --------------------------------------------------------------------------------
@@ -21780,9 +23281,9 @@ set @x=1;
 SELECT done, @x;
 END//
 CALL h1();
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.28:
 --------------------------------------------------------------------------------
@@ -21805,9 +23306,9 @@ set @x=1;
 SELECT done, @x;
 END//
 CALL h1();
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+drop table IF EXISTS res_t1;
+drop table IF EXISTS res_t2;
 
 Testcase 4.11.29:
 --------------------------------------------------------------------------------
@@ -21835,9 +23336,9 @@ END//
 CALL h1();
 done	@x
 1	1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+drop table IF EXISTS res_t1;
+drop table IF EXISTS res_t2;
 
 Testcase 4.11.30:
 --------------------------------------------------------------------------------
@@ -21865,9 +23366,9 @@ END//
 CALL h1();
 done	@x
 1	1
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+drop table IF EXISTS res_t1;
+drop table IF EXISTS res_t2;
 
 Testcase 4.11.31:
 --------------------------------------------------------------------------------
@@ -21893,9 +23394,9 @@ set @x=1;
 SELECT done, @x;
 END//
 CALL h1();
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+drop table IF EXISTS res_t1;
+drop table IF EXISTS res_t2;
 
 Testcase 4.11.32:
 --------------------------------------------------------------------------------
@@ -21921,9 +23422,9 @@ set @x=1;
 SELECT done, @x;
 END//
 CALL h1();
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
 
 Testcase 4.11.33:
 --------------------------------------------------------------------------------
@@ -21948,7 +23449,7 @@ set @x=1;
 SELECT done, @x;
 END//
 ERROR 42000: Duplicate condition: condname
-drop table res_t1;
+DROP TABLE IF EXISTS res_t1;
 
 Testcase 4.11.35:
 --------------------------------------------------------------------------------
@@ -21973,7 +23474,21 @@ insert into res_t1 values (3, 'c');
 END begin2_label;
 END begin1_label//
 ERROR 42000: Bad SQLSTATE: '020'
-drop table res_t1;
+CREATE PROCEDURE h1 ()
+begin1_label:BEGIN
+declare condname1 condition for sqlstate '020';
+declare condname2 condition for sqlstate 'wewe';
+declare condname3 condition for 9999;
+set @var2 = 1;
+insert into res_t1 values (2, 'b');
+begin2_label: BEGIN
+declare continue handler for sqlstate '90000023' set @var3= 1;
+set @var4 = 1;
+insert into res_t1 values (3, 'c');
+END begin2_label;
+END begin1_label//
+ERROR 42000: Bad SQLSTATE: '020'
+DROP TABLE IF EXISTS res_t1;
 
 Testcase 4.11.36:
 --------------------------------------------------------------------------------
@@ -21989,7 +23504,7 @@ set x1 = 2;
 END;
 SELECT @x, x1;
 END//
-DROP PROCEDURE h1;
+DROP PROCEDURE IF EXISTS h1;
 
 Testcase 4.11.40:
 --------------------------------------------------------------------------------
@@ -22010,7 +23525,7 @@ declare exit handler for condname2 set x5 = 1;
 END//
 ERROR 42000: Duplicate handler declared in the same block
 DROP PROCEDURE IF EXISTS h1;
-drop table res_t1;
+DROP TABLE IF EXISTS res_t1;
 
 Testcase 4.11.41:
 --------------------------------------------------------------------------------
@@ -22026,6 +23541,9 @@ set x1 = 2;
 END;
 SELECT @x, x1;
 END//
+CALL h1();
+@x	x1
+0	2
 DROP PROCEDURE IF EXISTS h1;
 
 * Testcase 3.1.2.53 (4.11.42):
@@ -22076,8 +23594,8 @@ CALL h1();
 SELECT @done, @x;
 @done	@x
 1	1
-DROP PROCEDURE h1;
-DROP TABLE res_t1;
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
 
 --source suite/funcs_1/storedproc/cleanup_sp_tb.inc
 --------------------------------------------------------------------------------
diff --git a/mysql-test/suite/funcs_1/r/ndb_storedproc_10.result b/mysql-test/suite/funcs_1/r/ndb_storedproc_10.result
index ffedbec83fe..9fb78f108b4 100644
--- a/mysql-test/suite/funcs_1/r/ndb_storedproc_10.result
+++ b/mysql-test/suite/funcs_1/r/ndb_storedproc_10.result
@@ -58,6 +58,7 @@ load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
 
 Section 3.1.10 - CALL checks:
 --------------------------------------------------------------------------------
+USE db_storedproc;
 
 Testcase 3.1.10.2 + 3.1.10.5:
 -----------------------------
@@ -94,6 +95,7 @@ CALL sp31102();
 ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.sp31102'
 SELECT fn31105( 9 );
 ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.fn31105'
+connection default;
 USE db_storedproc;
 	
 root@localhost	db_storedproc
@@ -114,6 +116,7 @@ a`	a`	1000-01-01	-5000	a`	-5000
 SELECT fn31105( 9 );
 fn31105( 9 )
 81
+connection default;
 USE db_storedproc;
 	
 root@localhost	db_storedproc
@@ -180,6 +183,8 @@ DROP PROCEDURE IF EXISTS sp_ins_1;
 DROP PROCEDURE IF EXISTS sp_ins_3;
 DROP PROCEDURE IF EXISTS sp_upd;
 DROP PROCEDURE IF EXISTS sp_ins_upd;
+DROP PROCEDURE IF EXISTS sp_del;
+DROP PROCEDURE IF EXISTS sp_with_rowcount;
 CREATE TABLE temp(f1 CHAR(20),f2 CHAR(25),f3 DATE,f4 INT,f5 CHAR(25),f6 INT);
 INSERT INTO temp SELECT * FROM t10;
 CREATE PROCEDURE sp_ins_1()
@@ -207,49 +212,72 @@ END;
 SELECT COUNT( f1 ), f1 FROM temp GROUP BY f1;
 UPDATE temp SET temp.f1 = 'updated_2' WHERE temp.f1 ='qwe' AND temp.f2 = 'abc';
 END//
+CREATE PROCEDURE sp_del()
+BEGIN
+DELETE FROM temp WHERE temp.f1 ='qwe' OR temp.f1 = 'updated_2';
+END//
+CREATE PROCEDURE sp_with_rowcount()
+BEGIN
+BEGIN
+INSERT INTO temp VALUES  ('qwe', 'abc', '1989-11-09', 100, 'uvw', 1000),
+('qwe', 'xyz', '1998-03-26', 100, 'uvw', 1000),
+('qwe', 'abc', '2000-11-09', 100, 'uvw', 1000),
+('qwe', 'xyz', '2005-11-07', 100, 'uvw', 1000);
+END;
+SELECT row_count() AS 'row_count() after insert';
+SELECT row_count() AS 'row_count() after select row_count()';
+SELECT f1,f2,f3 FROM temp ORDER BY f1,f2,f3;
+UPDATE temp SET temp.f1 = 'updated_2' WHERE temp.f2 = 'abc';
+SELECT row_count() AS 'row_count() after update';
+SELECT f1,f2,f3 FROM temp ORDER BY f1,f2,f3;
+DELETE FROM temp WHERE temp.f1 = 'updated_2';
+SELECT row_count() AS 'row_count() after delete';
+END//
 CALL sp_ins_1();
 SELECT row_count();
 row_count()
 1
-SELECT * FROM temp ORDER BY f4;
+SELECT * FROM temp;
 f1	f2	f3	f4	f5	f6
+a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
+a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
 abaa	abaa	1000-01-03	-4998	abaa	-4998
+abc	abc	2005-10-03	100	uvw	1000
 acaaa	acaaa	1000-01-04	-4997	acaaa	-4997
 adaaaa	adaaaa	1000-01-05	-4996	adaaaa	-4996
 aeaaaaa	aeaaaaa	1000-01-06	-4995	aeaaaaa	-4995
 afaaaaaa	afaaaaaa	1000-01-07	-4994	afaaaaaa	-4994
 agaaaaaaa	agaaaaaaa	1000-01-08	-4993	agaaaaaaa	-4993
-a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
-a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
-abc	abc	2005-10-03	100	uvw	1000
 CALL sp_ins_3();
 SELECT row_count();
 row_count()
 1
-SELECT * FROM temp ORDER BY f4;
+SELECT * FROM temp;
 f1	f2	f3	f4	f5	f6
+a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
+a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
 abaa	abaa	1000-01-03	-4998	abaa	-4998
+abc	abc	2005-10-03	100	uvw	1000
+abc	xyz	1949-05-23	100	uvw	1000
+abc	xyz	1989-11-09	100	uvw	1000
+abc	xyz	2005-10-24	100	uvw	1000
 acaaa	acaaa	1000-01-04	-4997	acaaa	-4997
 adaaaa	adaaaa	1000-01-05	-4996	adaaaa	-4996
 aeaaaaa	aeaaaaa	1000-01-06	-4995	aeaaaaa	-4995
 afaaaaaa	afaaaaaa	1000-01-07	-4994	afaaaaaa	-4994
 agaaaaaaa	agaaaaaaa	1000-01-08	-4993	agaaaaaaa	-4993
-a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
-a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
-abc	abc	2005-10-03	100	uvw	1000
-abc	xyz	1949-05-23	100	uvw	1000
-abc	xyz	1989-11-09	100	uvw	1000
-abc	xyz	2005-10-24	100	uvw	1000
 CALL sp_upd();
 SELECT row_count();
 row_count()
 4
-SELECT * FROM temp ORDER BY f4;
+SELECT * FROM temp;
 f1	f2	f3	f4	f5	f6
+a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
+a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
 abaa	abaa	1000-01-03	-4998	abaa	-4998
@@ -258,8 +286,6 @@ adaaaa	adaaaa	1000-01-05	-4996	adaaaa	-4996
 aeaaaaa	aeaaaaa	1000-01-06	-4995	aeaaaaa	-4995
 afaaaaaa	afaaaaaa	1000-01-07	-4994	afaaaaaa	-4994
 agaaaaaaa	agaaaaaaa	1000-01-08	-4993	agaaaaaaa	-4993
-a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
-a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
 updated	abc	2005-10-03	100	uvw	1000
 updated	xyz	1949-05-23	100	uvw	1000
 updated	xyz	1989-11-09	100	uvw	1000
@@ -281,8 +307,10 @@ COUNT( f1 )	f1
 SELECT row_count();
 row_count()
 3
-SELECT * FROM temp ORDER BY f4;
+SELECT * FROM temp;
 f1	f2	f3	f4	f5	f6
+a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
+a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
 abaa	abaa	1000-01-03	-4998	abaa	-4998
@@ -291,20 +319,67 @@ adaaaa	adaaaa	1000-01-05	-4996	adaaaa	-4996
 aeaaaaa	aeaaaaa	1000-01-06	-4995	aeaaaaa	-4995
 afaaaaaa	afaaaaaa	1000-01-07	-4994	afaaaaaa	-4994
 agaaaaaaa	agaaaaaaa	1000-01-08	-4993	agaaaaaaa	-4993
-a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
-a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
-updated_2	abc	2000-11-09	100	uvw	1000
 qwe	xyz	1998-03-26	100	uvw	1000
-updated_2	abc	1989-11-09	100	uvw	1000
-updated	xyz	2005-10-24	100	uvw	1000
-updated	xyz	1989-11-09	100	uvw	1000
-updated	xyz	1949-05-23	100	uvw	1000
 updated	abc	2005-10-03	100	uvw	1000
+updated	xyz	1949-05-23	100	uvw	1000
+updated	xyz	1989-11-09	100	uvw	1000
+updated	xyz	2005-10-24	100	uvw	1000
+updated_2	abc	1989-11-09	100	uvw	1000
+updated_2	abc	2000-11-09	100	uvw	1000
 updated_2	abc	2005-11-07	100	uvw	1000
+CALL sp_del();
+SELECT row_count();
+row_count()
+4
+SELECT * FROM temp;
+f1	f2	f3	f4	f5	f6
+a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992
+a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991
+a`	a`	1000-01-01	-5000	a`	-5000
+aaa	aaa	1000-01-02	-4999	aaa	-4999
+abaa	abaa	1000-01-03	-4998	abaa	-4998
+acaaa	acaaa	1000-01-04	-4997	acaaa	-4997
+adaaaa	adaaaa	1000-01-05	-4996	adaaaa	-4996
+aeaaaaa	aeaaaaa	1000-01-06	-4995	aeaaaaa	-4995
+afaaaaaa	afaaaaaa	1000-01-07	-4994	afaaaaaa	-4994
+agaaaaaaa	agaaaaaaa	1000-01-08	-4993	agaaaaaaa	-4993
+updated	abc	2005-10-03	100	uvw	1000
+updated	xyz	1949-05-23	100	uvw	1000
+updated	xyz	1989-11-09	100	uvw	1000
+updated	xyz	2005-10-24	100	uvw	1000
+DELETE FROM temp;
+CALL sp_with_rowcount();
+row_count() after insert
+4
+row_count() after select row_count()
+-1
+f1	f2	f3
+qwe	abc	1989-11-09
+qwe	abc	2000-11-09
+qwe	xyz	1998-03-26
+qwe	xyz	2005-11-07
+row_count() after update
+2
+f1	f2	f3
+qwe	xyz	1998-03-26
+qwe	xyz	2005-11-07
+updated_2	abc	1989-11-09
+updated_2	abc	2000-11-09
+row_count() after delete
+2
+SELECT row_count();
+row_count()
+-1
+SELECT * FROM temp;
+f1	f2	f3	f4	f5	f6
+qwe	xyz	1998-03-26	100	uvw	1000
+qwe	xyz	2005-11-07	100	uvw	1000
 DROP PROCEDURE sp_ins_1;
 DROP PROCEDURE sp_ins_3;
 DROP PROCEDURE sp_upd;
 DROP PROCEDURE sp_ins_upd;
+DROP PROCEDURE sp_del;
+DROP PROCEDURE sp_with_rowcount;
 DROP TABLE temp;
 
 Testcase 3.1.10.8:
diff --git a/mysql-test/suite/funcs_1/r/ndb_trig_03.result b/mysql-test/suite/funcs_1/r/ndb_trig_03.result
index fa86acedcb7..f69ffd20597 100644
--- a/mysql-test/suite/funcs_1/r/ndb_trig_03.result
+++ b/mysql-test/suite/funcs_1/r/ndb_trig_03.result
@@ -185,15 +185,14 @@ insert 3.5.3.2-no
 insert 3.5.3.6-no
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
-
-Trigger create disabled - should fail - Bug 8884
-------------------------------------------------
+create trigger trg4a_1 before INSERT on t1 for each row
+set new.f1 = 'trig 3.5.3.7-1a';
 insert into t1 (f1) values ('insert 3.5.3.7-1a');
+ERROR 42000: UPDATE command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 drop trigger trg4a_1;
@@ -211,7 +210,6 @@ select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
@@ -240,29 +238,27 @@ Grants for test_noprivs@localhost
 GRANT USAGE ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
 use priv_db;
-
-Trigger create disabled - should fail - Bug 8884
-------------------------------------------------
+create trigger trg4b_1 before UPDATE on t1 for each row
+set new.f1 = 'trig 3.5.3.7-1b';
 insert into t1 (f1) values ('insert 3.5.3.7-1b');
 select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
 insert 3.5.3.7-1b
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 update t1 set  f1 = 'update 3.5.3.7-1b' where f1 = 'insert 3.5.3.7-1b';
+ERROR 42000: UPDATE command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
+insert 3.5.3.7-1b
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-update 3.5.3.7-1b
 drop trigger trg4b_1;
 show grants;
 Grants for test_yesprivs@localhost
@@ -276,23 +272,21 @@ select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
+insert 3.5.3.7-1b
 insert 3.5.3.7-2b
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-update 3.5.3.7-1b
 update t1 set  f1 = 'update 3.5.3.7-2b' where f1 = 'insert 3.5.3.7-2b';
 select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
+insert 3.5.3.7-1b
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 trig 3.5.3.7-2b
-update 3.5.3.7-1b
 drop trigger trg4b_2;
 
 Testcase 3.5.3.7c
@@ -318,21 +312,19 @@ Grants for test_noprivs@localhost
 GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
-
-Trigger create disabled - should fail - Bug 8884
-------------------------------------------------
+create trigger trg4c_1 before INSERT on t1 for each row
+set new.f1 = 'trig 3.5.3.7-1c';
 insert into t1 (f1) values ('insert 3.5.3.7-1c');
+ERROR 42000: UPDATE command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
-insert 3.5.3.7-1c
+insert 3.5.3.7-1b
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 trig 3.5.3.7-2b
-update 3.5.3.7-1b
 drop trigger trg4c_1;
 show grants;
 Grants for test_yesprivs@localhost
@@ -346,14 +338,12 @@ select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
-insert 3.5.3.7-1c
+insert 3.5.3.7-1b
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 trig 3.5.3.7-2b
 trig 3.5.3.7-2c
-update 3.5.3.7-1b
 drop trigger trg4c_2;
 
 Testcase 3.5.3.7d:
@@ -377,23 +367,20 @@ Grants for test_noprivs@localhost
 GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT (f1), INSERT (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
-
-Trigger create disabled - should fail - Bug 8884
-------------------------------------------------
+create trigger trg4d_1 before INSERT on t1 for each row
+set new.f1 = 'trig 3.5.3.7-1d';
 insert into t1 (f1) values ('insert 3.5.3.7-1d');
+ERROR 42000: UPDATE command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
-insert 3.5.3.7-1c
-insert 3.5.3.7-1d
+insert 3.5.3.7-1b
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 trig 3.5.3.7-2b
 trig 3.5.3.7-2c
-update 3.5.3.7-1b
 drop trigger trg4d_1;
 show grants;
 Grants for test_yesprivs@localhost
@@ -407,16 +394,13 @@ select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 insert 3.5.3.6-no
-insert 3.5.3.7-1a
-insert 3.5.3.7-1c
-insert 3.5.3.7-1d
+insert 3.5.3.7-1b
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 trig 3.5.3.7-2b
 trig 3.5.3.7-2c
 trig 3.5.3.7-2d
-update 3.5.3.7-1b
 drop trigger trg4d_2;
 
 Testcase 3.5.3.8a:
@@ -441,14 +425,14 @@ use priv_db;
 show grants;
 Grants for test_noprivs@localhost
 GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-
-Trigger create disabled - should fail - Bug 8887
-------------------------------------------------
+create trigger trg5a_1 before INSERT on t1 for each row
+set @test_var = new.f1;
 set @test_var = 'before trig 3.5.3.8-1a';
 select @test_var;
 @test_var
 before trig 3.5.3.8-1a
 insert into t1 (f1) values ('insert 3.5.3.8-1a');
+ERROR 42000: SELECT command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select @test_var;
 @test_var
 before trig 3.5.3.8-1a
@@ -496,15 +480,15 @@ Grants for test_noprivs@localhost
 GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
 use priv_db;
-
-Trigger create disabled - should fail - Bug 8887
-------------------------------------------------
+create trigger trg5b_1 before UPDATE on t1 for each row
+set @test_var= new.f1;
 set @test_var= 'before trig 3.5.3.8-1b';
 insert into t1 (f1) values ('insert 3.5.3.8-1b');
 select @test_var;
 @test_var
 before trig 3.5.3.8-1b
 update t1 set  f1= 'update 3.5.3.8-1b' where f1 = 'insert 3.5.3.8-1b';
+ERROR 42000: SELECT command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select @test_var;
 @test_var
 before trig 3.5.3.8-1b
@@ -551,11 +535,11 @@ Grants for test_noprivs@localhost
 GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
-
-Trigger create disabled - should fail - Bug 8887
-------------------------------------------------
+create trigger trg5c_1 before INSERT on t1 for each row
+set @test_var= new.f1;
 set @test_var= 'before trig 3.5.3.8-1c';
 insert into t1 (f1) values ('insert 3.5.3.8-1c');
+ERROR 42000: SELECT command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select @test_var;
 @test_var
 before trig 3.5.3.8-1c
@@ -597,11 +581,11 @@ Grants for test_noprivs@localhost
 GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
-
-Trigger create disabled - should fail - Bug 8887
-------------------------------------------------
+create trigger trg5d_1 before INSERT on t1 for each row
+set @test_var= new.f1;
 set @test_var='before trig 3.5.3.8-1d';
 insert into t1 (f1) values ('insert 3.5.3.8-1d');
+ERROR 42000: SELECT command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'
 select @test_var;
 @test_var
 before trig 3.5.3.8-1d
diff --git a/mysql-test/suite/funcs_1/r/ndb_trig_08.result b/mysql-test/suite/funcs_1/r/ndb_trig_08.result
index 63bb50c37eb..ae84a31b170 100644
--- a/mysql-test/suite/funcs_1/r/ndb_trig_08.result
+++ b/mysql-test/suite/funcs_1/r/ndb_trig_08.result
@@ -140,10 +140,10 @@ values ('1', 'Test 3.5.8.4', 222, 23456, 1.05);
 Select f120, f122, f136, f144, f163 from tb3 where f122= 'Test 3.5.8.4';
 f120	f122	f136	f144	f163
 1	Test 3.5.8.4	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_i order by i120;
+select * from db_test.t1_i;
 i120	i136	i144	i163
 1	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_u order by u120;
+select * from db_test.t1_u;
 u120	u136	u144	u163
 a	00111	0000099999	999.990000000000000000000000000000
 b	00222	0000023456	1.050000000000000000000000000000
@@ -151,7 +151,7 @@ c	00333	0000099999	999.990000000000000000000000000000
 d	00222	0000023456	1.050000000000000000000000000000
 e	00222	0000023456	1.050000000000000000000000000000
 f	00333	0000099999	999.990000000000000000000000000000
-select * from db_test.t1_d order by d120;
+select * from db_test.t1_d;
 d120	d136	d144	d163
 a	00111	0000099999	999.990000000000000000000000000000
 c	00333	0000099999	999.990000000000000000000000000000
@@ -344,20 +344,20 @@ set @test_var='Empty';
 Insert into tb3 (f120, f122, f136, f144) 
 values ('a', 'Test 3.5.8.5-case', 5, 7);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	A*seven
 Insert into tb3 (f120, f122, f136, f144) 
 values ('b', 'Test 3.5.8.5-case', 71,16);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	B*0000000016
 B	Test 3.5.8.5-case	00191	0000000016	B*0000000016
 Insert into tb3 (f120, f122, f136, f144) 
 values ('c', 'Test 3.5.8.5-case', 80,1);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	C=one
 B	Test 3.5.8.5-case	00191	0000000016	C=one
@@ -367,7 +367,7 @@ values ('d', 'Test 3.5.8.5-case', 152);
 Warnings:
 Warning	1265	Data truncated for column 'f120' at row 1
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 f120	f122	f136	f144	@test_var
 1	Test 3.5.8.5-case	00152	0000099999	1*0000099999
 A	Test 3.5.8.5-case	00125	0000000007	1*0000099999
@@ -378,7 +378,7 @@ values ('e', 'Test 3.5.8.5-case', 200, 8);
 Warnings:
 Warning	1265	Data truncated for column 'f120' at row 1
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 f120	f122	f136	f144	@test_var
 1	Test 3.5.8.5-case	00152	0000099999	1=eight
 1	Test 3.5.8.5-case	00200	0000000008	1=eight
@@ -388,7 +388,7 @@ C	Test 3.5.8.5-case	00200	0000000001	1=eight
 Insert into tb3 (f120, f122, f136, f144) 
 values ('f', 'Test 3.5.8.5-case', 100, 8);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 f120	f122	f136	f144	@test_var
 1	Test 3.5.8.5-case	00152	0000099999	1=eight
 1	Test 3.5.8.5-case	00200	0000000008	1=eight
@@ -500,9 +500,38 @@ drop trigger trg7;
 
 Testcase 3.5.8.6: (requirement void)
 ------------------------------------
+CREATE PROCEDURE sp_01 () BEGIN set @v1=1; END//
+CREATE TRIGGER trg8_1 BEFORE UPDATE ON tb3 FOR EACH ROW
+BEGIN
+CALL sp_01 ();
+END//
+Insert into tb3 (f120, f122, f136) values ('6', 'Test 3.5.8.6-insert', 101);
+update tb3 set f120='S', f136=111,
+f122='Test 3.5.8.6-tr8_1'
+	       where f122='Test 3.5.8.6-insert';
+select f120, f122
+from tb3 where f122  like 'Test 3.5.8.6%' order by f120;
+f120	f122
+S	Test 3.5.8.6-tr8_1
+DROP TRIGGER trg8_1;
+DROP PROCEDURE sp_01;
 
-Testcase 3.5.8.7: (Disabled as a result of bug _____)
------------------------------------------------------
+Testcase 3.5.8.7
+----------------
+Create trigger trg9_1 before update on tb3 for each row
+BEGIN
+Start transaction;
+Set new.f120='U';
+Commit;
+END//
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+Create trigger trg9_2 before delete on tb3 for each row
+BEGIN
+Start transaction;
+Set @var2=old.f120;
+Rollback;
+END//
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
 drop user test_general@localhost;
 drop user test_general;
 drop user test_super@localhost;
diff --git a/mysql-test/suite/funcs_1/r/ndb_trig_09.result b/mysql-test/suite/funcs_1/r/ndb_trig_09.result
index 623036fa28f..ab106f6d772 100644
--- a/mysql-test/suite/funcs_1/r/ndb_trig_09.result
+++ b/mysql-test/suite/funcs_1/r/ndb_trig_09.result
@@ -194,8 +194,9 @@ a	NULL	Test 3.5.9.4	7	999	995.240000000000000000000000000000
 0	0	0	0	0	0
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
-Warnings:
-Warning	1048	Column 'f136' cannot be null
+ERROR 23000: Column 'f136' cannot be null
+Update tb3 Set f122='Test 3.5.9.4-trig', f136=0, f151=DEFAULT, f163=NULL
+where f122='Test 3.5.9.4';
 select f118, f121, f122, f136, f151, f163 from tb3 
 where f122 like 'Test 3.5.9.4-trig' order by f163;
 f118	f121	f122	f136	f151	f163
diff --git a/mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result b/mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result
index 4d063ff2acf..a371d2d4fda 100644
--- a/mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result
+++ b/mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result
@@ -295,8 +295,8 @@ drop table t2;
 drop table t3;
 drop table t4;
 
-Testcase y.y.y.4: Recursive trigger/SP references (disabled bug 11889)
-----------------------------------------------------------------------
+Testcase y.y.y.4: Recursive trigger/SP references
+-------------------------------------------------
 set @sql_mode='traditional';
 create table t1_sp (
 count integer,
diff --git a/mysql-test/suite/funcs_1/r/ndb_views.result b/mysql-test/suite/funcs_1/r/ndb_views.result
index 1f8b00a695b..486887686c9 100644
--- a/mysql-test/suite/funcs_1/r/ndb_views.result
+++ b/mysql-test/suite/funcs_1/r/ndb_views.result
@@ -123,11 +123,7 @@ USE test;
 --------------------------------------------------------------------------------
 
 There are some statements where the ps-protocol is switched off.
-Bug#11589: mysqltest, --ps-protocol, strange output, float/double/real with zerofill
---------------------------------------------------------------------------------
-
-! Attention: The file with the expected results suffers from
-Bug#10713: mysqldump includes database in create view and referenced tables
+Bug#32285: mysqltest, --ps-protocol, strange output, float/double/real with zerofill
 --------------------------------------------------------------------------------
 insert into test.tb2 (f59,f60) values (76710,226546);
 insert into test.tb2 (f59,f60) values(2760,985654);
@@ -403,71 +399,3069 @@ f59
 CREATE or REPLACE VIEW v1 AS select *
 FROM test.tb2 WITH LOCAL CHECK OPTION ;
 select * FROM v1 order by f59,f60,f61,f62,f63,f64 limit 0,50;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-1	1	0000000001	0000000000000000000000000000000000000000000000000000000000000001	0000000001	0000000000000000000000000000000000000000000000000000000000000001	-5	0.000000000000000000000000000000	1	0.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549435e-38	1.17549e-38	1.175494352e-38	01.17549e-38	00000001.175494352e-38	01.17549e-38	00000001.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	1970-01-02 00:00:01	1902	1902	1902	2enum	2set
-2	2	0000000002	0000000000000000000000000000000000000000000000000000000000000002	0000000002	0000000000000000000000000000000000000000000000000000000000000002	-4	1.100000000000000000000000000000	2	1.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494349e-38	1.17549e-38	1.175494353e-38	01.17549e-38	00000001.175494353e-38	01.17549e-38	00000001.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	1970-01-03 00:00:02	1903	1903	1903	1enum	1set,2set
-3	3	0000000003	0000000000000000000000000000000000000000000000000000000000000003	0000000003	0000000000000000000000000000000000000000000000000000000000000003	-3	2.200000000000000000000000000000	3	2.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494348e-38	1.17549e-38	1.175494354e-38	01.17549e-38	00000001.175494354e-38	01.17549e-38	00000001.175494354e-38	1000-01-03	838:59:56	1970-01-04 00:00:03	1970-01-04 00:00:03	1904	1904	1904	2enum	1set
-4	4	0000000004	0000000000000000000000000000000000000000000000000000000000000004	0000000004	0000000000000000000000000000000000000000000000000000000000000004	-2	3.300000000000000000000000000000	4	3.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494347e-38	1.17549e-38	1.175494355e-38	01.17549e-38	00000001.175494355e-38	01.17549e-38	00000001.175494355e-38	1000-01-04	838:59:55	1970-01-05 00:00:04	1970-01-05 00:00:04	1905	1905	1905	1enum	2set
-4	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-5	5	0000000005	0000000000000000000000000000000000000000000000000000000000000005	0000000005	0000000000000000000000000000000000000000000000000000000000000005	-1	4.400000000000000000000000000000	5	4.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494346e-38	1.17549e-38	1.175494356e-38	01.17549e-38	00000001.175494356e-38	01.17549e-38	00000001.175494356e-38	1000-01-05	838:59:54	1970-01-06 00:00:05	1970-01-06 00:00:05	1906	1906	1906	2enum	1set,2set
-6	6	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0	5.500000000000000000000000000000	6	5.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494345e-38	1.17549e-38	1.175494357e-38	01.17549e-38	00000001.175494357e-38	01.17549e-38	00000001.175494357e-38	1000-01-06	838:59:53	1970-01-07 00:00:06	1970-01-07 00:00:06	1907	1907	1907	1enum	1set
-7	7	0000000007	0000000000000000000000000000000000000000000000000000000000000007	0000000007	0000000000000000000000000000000000000000000000000000000000000007	1	6.600000000000000000000000000000	7	6.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494344e-38	1.17549e-38	1.175494358e-38	01.17549e-38	00000001.175494358e-38	01.17549e-38	00000001.175494358e-38	1000-01-07	838:59:52	1970-01-08 00:00:07	1970-01-08 00:00:07	1908	1908	1908	2enum	2set
-8	8	0000000008	0000000000000000000000000000000000000000000000000000000000000008	0000000008	0000000000000000000000000000000000000000000000000000000000000008	2	7.700000000000000000000000000000	8	7.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494343e-38	1.17549e-38	1.175494359e-38	01.17549e-38	00000001.175494359e-38	01.17549e-38	00000001.175494359e-38	1000-01-08	838:59:51	1970-01-09 00:00:08	1970-01-09 00:00:08	1909	1909	1909	1enum	1set,2set
-9	9	0000000009	0000000000000000000000000000000000000000000000000000000000000009	0000000009	0000000000000000000000000000000000000000000000000000000000000009	3	8.800000000000000000000000000000	9	8.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494342e-38	1.17549e-38	1.17549436e-38	01.17549e-38	000000001.17549436e-38	01.17549e-38	000000001.17549436e-38	1000-01-09	838:59:50	1970-01-10 00:00:09	1970-01-10 00:00:09	1910	1910	1910	2enum	1set
-10	10	0000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000010	0000000000000000000000000000000000000000000000000000000000000010	4	9.900000000000000000000000000000	10	9.900000000000000000000000000000	0000000010	000000000000000000000000000000009.900000000000000000000000000000	0000000010	000000000000000000000000000000009.900000000000000000000000000000	-1.175494341e-38	1.175494361e-38	00000001.175494361e-38	00000001.175494361e-38	-1.175494341e-38	1.175494361e-38	00000001.175494361e-38	00000001.175494361e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494341e-38	1.17549e-38	1.175494361e-38	01.17549e-38	00000001.175494361e-38	01.17549e-38	00000001.175494361e-38	1000-01-10	838:59:49	1970-01-11 00:00:10	1970-01-11 00:00:10	1911	1911	1911	1enum	2set
-15	87	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-17	15	0000000016	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-19	18	0000000014	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-22	93	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-24	51654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-27	25	0000000026	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-29	28	0000000024	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-34	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-94	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-107	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-107	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-109	108	0000000104	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-109	108	0000000104	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-195	87	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-207	205	0000000206	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-209	208	0000000204	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-242	79	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-250	87895654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-292	93	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-299	899	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-321	NULL	0000000765	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-323	14376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-340	9984376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-394	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-424	89	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-441	16546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-500	NULL	0000000900	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-500	NULL	0000000900	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-500	NULL	0000000900	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-660	876546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-987	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-2550	775654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-2760	985654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-3330	764376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-3410	996546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-7876	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-9112	NULL	0000008771	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-76710	226546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-569300	9114376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+f59	1
+f60	1
+f61	0000000001
+f62	0000000000000000000000000000000000000000000000000000000000000001
+f63	0000000001
+f64	0000000000000000000000000000000000000000000000000000000000000001
+f65	-5
+f66	0.000000000000000000000000000000
+f67	1
+f68	0.000000000000000000000000000000
+f69	0000000001
+f70	000000000000000000000000000000000.000000000000000000000000000000
+f71	0000000001
+f72	000000000000000000000000000000000.000000000000000000000000000000
+f73	-1.17549435e-38
+f74	1.175494352e-38
+f75	00000001.175494352e-38
+f76	00000001.175494352e-38
+f77	-1.17549435e-38
+f78	1.175494352e-38
+f79	00000001.175494352e-38
+f80	00000001.175494352e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.17549435e-38
+f95	1.17549e-38
+f96	1.175494352e-38
+f97	01.17549e-38
+f98	00000001.175494352e-38
+f99	01.17549e-38
+f100	00000001.175494352e-38
+f101	1000-01-01
+f102	838:59:58
+f103	1970-01-02 00:00:01
+f104	1970-01-02 00:00:01
+f105	1902
+f106	1902
+f107	1902
+f108	2enum
+f109	2set
+f59	2
+f60	2
+f61	0000000002
+f62	0000000000000000000000000000000000000000000000000000000000000002
+f63	0000000002
+f64	0000000000000000000000000000000000000000000000000000000000000002
+f65	-4
+f66	1.100000000000000000000000000000
+f67	2
+f68	1.100000000000000000000000000000
+f69	0000000002
+f70	000000000000000000000000000000001.100000000000000000000000000000
+f71	0000000002
+f72	000000000000000000000000000000001.100000000000000000000000000000
+f73	-1.175494349e-38
+f74	1.175494353e-38
+f75	00000001.175494353e-38
+f76	00000001.175494353e-38
+f77	-1.175494349e-38
+f78	1.175494353e-38
+f79	00000001.175494353e-38
+f80	00000001.175494353e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494349e-38
+f95	1.17549e-38
+f96	1.175494353e-38
+f97	01.17549e-38
+f98	00000001.175494353e-38
+f99	01.17549e-38
+f100	00000001.175494353e-38
+f101	1000-01-02
+f102	838:59:57
+f103	1970-01-03 00:00:02
+f104	1970-01-03 00:00:02
+f105	1903
+f106	1903
+f107	1903
+f108	1enum
+f109	1set,2set
+f59	3
+f60	3
+f61	0000000003
+f62	0000000000000000000000000000000000000000000000000000000000000003
+f63	0000000003
+f64	0000000000000000000000000000000000000000000000000000000000000003
+f65	-3
+f66	2.200000000000000000000000000000
+f67	3
+f68	2.200000000000000000000000000000
+f69	0000000003
+f70	000000000000000000000000000000002.200000000000000000000000000000
+f71	0000000003
+f72	000000000000000000000000000000002.200000000000000000000000000000
+f73	-1.175494348e-38
+f74	1.175494354e-38
+f75	00000001.175494354e-38
+f76	00000001.175494354e-38
+f77	-1.175494348e-38
+f78	1.175494354e-38
+f79	00000001.175494354e-38
+f80	00000001.175494354e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494348e-38
+f95	1.17549e-38
+f96	1.175494354e-38
+f97	01.17549e-38
+f98	00000001.175494354e-38
+f99	01.17549e-38
+f100	00000001.175494354e-38
+f101	1000-01-03
+f102	838:59:56
+f103	1970-01-04 00:00:03
+f104	1970-01-04 00:00:03
+f105	1904
+f106	1904
+f107	1904
+f108	2enum
+f109	1set
+f59	4
+f60	4
+f61	0000000004
+f62	0000000000000000000000000000000000000000000000000000000000000004
+f63	0000000004
+f64	0000000000000000000000000000000000000000000000000000000000000004
+f65	-2
+f66	3.300000000000000000000000000000
+f67	4
+f68	3.300000000000000000000000000000
+f69	0000000004
+f70	000000000000000000000000000000003.300000000000000000000000000000
+f71	0000000004
+f72	000000000000000000000000000000003.300000000000000000000000000000
+f73	-1.175494347e-38
+f74	1.175494355e-38
+f75	00000001.175494355e-38
+f76	00000001.175494355e-38
+f77	-1.175494347e-38
+f78	1.175494355e-38
+f79	00000001.175494355e-38
+f80	00000001.175494355e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494347e-38
+f95	1.17549e-38
+f96	1.175494355e-38
+f97	01.17549e-38
+f98	00000001.175494355e-38
+f99	01.17549e-38
+f100	00000001.175494355e-38
+f101	1000-01-04
+f102	838:59:55
+f103	1970-01-05 00:00:04
+f104	1970-01-05 00:00:04
+f105	1905
+f106	1905
+f107	1905
+f108	1enum
+f109	2set
+f59	4
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	5
+f60	5
+f61	0000000005
+f62	0000000000000000000000000000000000000000000000000000000000000005
+f63	0000000005
+f64	0000000000000000000000000000000000000000000000000000000000000005
+f65	-1
+f66	4.400000000000000000000000000000
+f67	5
+f68	4.400000000000000000000000000000
+f69	0000000005
+f70	000000000000000000000000000000004.400000000000000000000000000000
+f71	0000000005
+f72	000000000000000000000000000000004.400000000000000000000000000000
+f73	-1.175494346e-38
+f74	1.175494356e-38
+f75	00000001.175494356e-38
+f76	00000001.175494356e-38
+f77	-1.175494346e-38
+f78	1.175494356e-38
+f79	00000001.175494356e-38
+f80	00000001.175494356e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494346e-38
+f95	1.17549e-38
+f96	1.175494356e-38
+f97	01.17549e-38
+f98	00000001.175494356e-38
+f99	01.17549e-38
+f100	00000001.175494356e-38
+f101	1000-01-05
+f102	838:59:54
+f103	1970-01-06 00:00:05
+f104	1970-01-06 00:00:05
+f105	1906
+f106	1906
+f107	1906
+f108	2enum
+f109	1set,2set
+f59	6
+f60	6
+f61	0000000006
+f62	0000000000000000000000000000000000000000000000000000000000000006
+f63	0000000006
+f64	0000000000000000000000000000000000000000000000000000000000000006
+f65	0
+f66	5.500000000000000000000000000000
+f67	6
+f68	5.500000000000000000000000000000
+f69	0000000006
+f70	000000000000000000000000000000005.500000000000000000000000000000
+f71	0000000006
+f72	000000000000000000000000000000005.500000000000000000000000000000
+f73	-1.175494345e-38
+f74	1.175494357e-38
+f75	00000001.175494357e-38
+f76	00000001.175494357e-38
+f77	-1.175494345e-38
+f78	1.175494357e-38
+f79	00000001.175494357e-38
+f80	00000001.175494357e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494345e-38
+f95	1.17549e-38
+f96	1.175494357e-38
+f97	01.17549e-38
+f98	00000001.175494357e-38
+f99	01.17549e-38
+f100	00000001.175494357e-38
+f101	1000-01-06
+f102	838:59:53
+f103	1970-01-07 00:00:06
+f104	1970-01-07 00:00:06
+f105	1907
+f106	1907
+f107	1907
+f108	1enum
+f109	1set
+f59	7
+f60	7
+f61	0000000007
+f62	0000000000000000000000000000000000000000000000000000000000000007
+f63	0000000007
+f64	0000000000000000000000000000000000000000000000000000000000000007
+f65	1
+f66	6.600000000000000000000000000000
+f67	7
+f68	6.600000000000000000000000000000
+f69	0000000007
+f70	000000000000000000000000000000006.600000000000000000000000000000
+f71	0000000007
+f72	000000000000000000000000000000006.600000000000000000000000000000
+f73	-1.175494344e-38
+f74	1.175494358e-38
+f75	00000001.175494358e-38
+f76	00000001.175494358e-38
+f77	-1.175494344e-38
+f78	1.175494358e-38
+f79	00000001.175494358e-38
+f80	00000001.175494358e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494344e-38
+f95	1.17549e-38
+f96	1.175494358e-38
+f97	01.17549e-38
+f98	00000001.175494358e-38
+f99	01.17549e-38
+f100	00000001.175494358e-38
+f101	1000-01-07
+f102	838:59:52
+f103	1970-01-08 00:00:07
+f104	1970-01-08 00:00:07
+f105	1908
+f106	1908
+f107	1908
+f108	2enum
+f109	2set
+f59	8
+f60	8
+f61	0000000008
+f62	0000000000000000000000000000000000000000000000000000000000000008
+f63	0000000008
+f64	0000000000000000000000000000000000000000000000000000000000000008
+f65	2
+f66	7.700000000000000000000000000000
+f67	8
+f68	7.700000000000000000000000000000
+f69	0000000008
+f70	000000000000000000000000000000007.700000000000000000000000000000
+f71	0000000008
+f72	000000000000000000000000000000007.700000000000000000000000000000
+f73	-1.175494343e-38
+f74	1.175494359e-38
+f75	00000001.175494359e-38
+f76	00000001.175494359e-38
+f77	-1.175494343e-38
+f78	1.175494359e-38
+f79	00000001.175494359e-38
+f80	00000001.175494359e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494343e-38
+f95	1.17549e-38
+f96	1.175494359e-38
+f97	01.17549e-38
+f98	00000001.175494359e-38
+f99	01.17549e-38
+f100	00000001.175494359e-38
+f101	1000-01-08
+f102	838:59:51
+f103	1970-01-09 00:00:08
+f104	1970-01-09 00:00:08
+f105	1909
+f106	1909
+f107	1909
+f108	1enum
+f109	1set,2set
+f59	9
+f60	9
+f61	0000000009
+f62	0000000000000000000000000000000000000000000000000000000000000009
+f63	0000000009
+f64	0000000000000000000000000000000000000000000000000000000000000009
+f65	3
+f66	8.800000000000000000000000000000
+f67	9
+f68	8.800000000000000000000000000000
+f69	0000000009
+f70	000000000000000000000000000000008.800000000000000000000000000000
+f71	0000000009
+f72	000000000000000000000000000000008.800000000000000000000000000000
+f73	-1.175494342e-38
+f74	1.17549436e-38
+f75	000000001.17549436e-38
+f76	000000001.17549436e-38
+f77	-1.175494342e-38
+f78	1.17549436e-38
+f79	000000001.17549436e-38
+f80	000000001.17549436e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494342e-38
+f95	1.17549e-38
+f96	1.17549436e-38
+f97	01.17549e-38
+f98	000000001.17549436e-38
+f99	01.17549e-38
+f100	000000001.17549436e-38
+f101	1000-01-09
+f102	838:59:50
+f103	1970-01-10 00:00:09
+f104	1970-01-10 00:00:09
+f105	1910
+f106	1910
+f107	1910
+f108	2enum
+f109	1set
+f59	10
+f60	10
+f61	0000000010
+f62	0000000000000000000000000000000000000000000000000000000000000010
+f63	0000000010
+f64	0000000000000000000000000000000000000000000000000000000000000010
+f65	4
+f66	9.900000000000000000000000000000
+f67	10
+f68	9.900000000000000000000000000000
+f69	0000000010
+f70	000000000000000000000000000000009.900000000000000000000000000000
+f71	0000000010
+f72	000000000000000000000000000000009.900000000000000000000000000000
+f73	-1.175494341e-38
+f74	1.175494361e-38
+f75	00000001.175494361e-38
+f76	00000001.175494361e-38
+f77	-1.175494341e-38
+f78	1.175494361e-38
+f79	00000001.175494361e-38
+f80	00000001.175494361e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494341e-38
+f95	1.17549e-38
+f96	1.175494361e-38
+f97	01.17549e-38
+f98	00000001.175494361e-38
+f99	01.17549e-38
+f100	00000001.175494361e-38
+f101	1000-01-10
+f102	838:59:49
+f103	1970-01-11 00:00:10
+f104	1970-01-11 00:00:10
+f105	1911
+f106	1911
+f107	1911
+f108	1enum
+f109	2set
+f59	15
+f60	87
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	17
+f60	15
+f61	0000000016
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	19
+f60	18
+f61	0000000014
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	22
+f60	93
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	24
+f60	51654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	27
+f60	25
+f61	0000000026
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	29
+f60	28
+f61	0000000024
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	34
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	94
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	107
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	107
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	109
+f60	108
+f61	0000000104
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	109
+f60	108
+f61	0000000104
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	195
+f60	87
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	207
+f60	205
+f61	0000000206
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	209
+f60	208
+f61	0000000204
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	242
+f60	79
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	250
+f60	87895654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	292
+f60	93
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	299
+f60	899
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	321
+f60	NULL
+f61	0000000765
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	323
+f60	14376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	340
+f60	9984376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	394
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	424
+f60	89
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	441
+f60	16546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	660
+f60	876546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	987
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	2550
+f60	775654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	2760
+f60	985654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	3330
+f60	764376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	3410
+f60	996546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	7876
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	9112
+f60	NULL
+f61	0000008771
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	76710
+f60	226546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	569300
+f60	9114376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 CREATE or REPLACE VIEW v1 AS select *
 FROM test.tb2 WITH CASCADED CHECK OPTION ;
 select * FROM v1 order by f59,f60,f61,f62,f63,f64 limit 0,10;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-1	1	0000000001	0000000000000000000000000000000000000000000000000000000000000001	0000000001	0000000000000000000000000000000000000000000000000000000000000001	-5	0.000000000000000000000000000000	1	0.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549435e-38	1.17549e-38	1.175494352e-38	01.17549e-38	00000001.175494352e-38	01.17549e-38	00000001.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	1970-01-02 00:00:01	1902	1902	1902	2enum	2set
-2	2	0000000002	0000000000000000000000000000000000000000000000000000000000000002	0000000002	0000000000000000000000000000000000000000000000000000000000000002	-4	1.100000000000000000000000000000	2	1.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494349e-38	1.17549e-38	1.175494353e-38	01.17549e-38	00000001.175494353e-38	01.17549e-38	00000001.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	1970-01-03 00:00:02	1903	1903	1903	1enum	1set,2set
-3	3	0000000003	0000000000000000000000000000000000000000000000000000000000000003	0000000003	0000000000000000000000000000000000000000000000000000000000000003	-3	2.200000000000000000000000000000	3	2.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494348e-38	1.17549e-38	1.175494354e-38	01.17549e-38	00000001.175494354e-38	01.17549e-38	00000001.175494354e-38	1000-01-03	838:59:56	1970-01-04 00:00:03	1970-01-04 00:00:03	1904	1904	1904	2enum	1set
-4	4	0000000004	0000000000000000000000000000000000000000000000000000000000000004	0000000004	0000000000000000000000000000000000000000000000000000000000000004	-2	3.300000000000000000000000000000	4	3.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494347e-38	1.17549e-38	1.175494355e-38	01.17549e-38	00000001.175494355e-38	01.17549e-38	00000001.175494355e-38	1000-01-04	838:59:55	1970-01-05 00:00:04	1970-01-05 00:00:04	1905	1905	1905	1enum	2set
-4	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-5	5	0000000005	0000000000000000000000000000000000000000000000000000000000000005	0000000005	0000000000000000000000000000000000000000000000000000000000000005	-1	4.400000000000000000000000000000	5	4.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494346e-38	1.17549e-38	1.175494356e-38	01.17549e-38	00000001.175494356e-38	01.17549e-38	00000001.175494356e-38	1000-01-05	838:59:54	1970-01-06 00:00:05	1970-01-06 00:00:05	1906	1906	1906	2enum	1set,2set
-6	6	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0	5.500000000000000000000000000000	6	5.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494345e-38	1.17549e-38	1.175494357e-38	01.17549e-38	00000001.175494357e-38	01.17549e-38	00000001.175494357e-38	1000-01-06	838:59:53	1970-01-07 00:00:06	1970-01-07 00:00:06	1907	1907	1907	1enum	1set
-7	7	0000000007	0000000000000000000000000000000000000000000000000000000000000007	0000000007	0000000000000000000000000000000000000000000000000000000000000007	1	6.600000000000000000000000000000	7	6.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494344e-38	1.17549e-38	1.175494358e-38	01.17549e-38	00000001.175494358e-38	01.17549e-38	00000001.175494358e-38	1000-01-07	838:59:52	1970-01-08 00:00:07	1970-01-08 00:00:07	1908	1908	1908	2enum	2set
-8	8	0000000008	0000000000000000000000000000000000000000000000000000000000000008	0000000008	0000000000000000000000000000000000000000000000000000000000000008	2	7.700000000000000000000000000000	8	7.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494343e-38	1.17549e-38	1.175494359e-38	01.17549e-38	00000001.175494359e-38	01.17549e-38	00000001.175494359e-38	1000-01-08	838:59:51	1970-01-09 00:00:08	1970-01-09 00:00:08	1909	1909	1909	1enum	1set,2set
-9	9	0000000009	0000000000000000000000000000000000000000000000000000000000000009	0000000009	0000000000000000000000000000000000000000000000000000000000000009	3	8.800000000000000000000000000000	9	8.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494342e-38	1.17549e-38	1.17549436e-38	01.17549e-38	000000001.17549436e-38	01.17549e-38	000000001.17549436e-38	1000-01-09	838:59:50	1970-01-10 00:00:09	1970-01-10 00:00:09	1910	1910	1910	2enum	1set
+f59	1
+f60	1
+f61	0000000001
+f62	0000000000000000000000000000000000000000000000000000000000000001
+f63	0000000001
+f64	0000000000000000000000000000000000000000000000000000000000000001
+f65	-5
+f66	0.000000000000000000000000000000
+f67	1
+f68	0.000000000000000000000000000000
+f69	0000000001
+f70	000000000000000000000000000000000.000000000000000000000000000000
+f71	0000000001
+f72	000000000000000000000000000000000.000000000000000000000000000000
+f73	-1.17549435e-38
+f74	1.175494352e-38
+f75	00000001.175494352e-38
+f76	00000001.175494352e-38
+f77	-1.17549435e-38
+f78	1.175494352e-38
+f79	00000001.175494352e-38
+f80	00000001.175494352e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.17549435e-38
+f95	1.17549e-38
+f96	1.175494352e-38
+f97	01.17549e-38
+f98	00000001.175494352e-38
+f99	01.17549e-38
+f100	00000001.175494352e-38
+f101	1000-01-01
+f102	838:59:58
+f103	1970-01-02 00:00:01
+f104	1970-01-02 00:00:01
+f105	1902
+f106	1902
+f107	1902
+f108	2enum
+f109	2set
+f59	2
+f60	2
+f61	0000000002
+f62	0000000000000000000000000000000000000000000000000000000000000002
+f63	0000000002
+f64	0000000000000000000000000000000000000000000000000000000000000002
+f65	-4
+f66	1.100000000000000000000000000000
+f67	2
+f68	1.100000000000000000000000000000
+f69	0000000002
+f70	000000000000000000000000000000001.100000000000000000000000000000
+f71	0000000002
+f72	000000000000000000000000000000001.100000000000000000000000000000
+f73	-1.175494349e-38
+f74	1.175494353e-38
+f75	00000001.175494353e-38
+f76	00000001.175494353e-38
+f77	-1.175494349e-38
+f78	1.175494353e-38
+f79	00000001.175494353e-38
+f80	00000001.175494353e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494349e-38
+f95	1.17549e-38
+f96	1.175494353e-38
+f97	01.17549e-38
+f98	00000001.175494353e-38
+f99	01.17549e-38
+f100	00000001.175494353e-38
+f101	1000-01-02
+f102	838:59:57
+f103	1970-01-03 00:00:02
+f104	1970-01-03 00:00:02
+f105	1903
+f106	1903
+f107	1903
+f108	1enum
+f109	1set,2set
+f59	3
+f60	3
+f61	0000000003
+f62	0000000000000000000000000000000000000000000000000000000000000003
+f63	0000000003
+f64	0000000000000000000000000000000000000000000000000000000000000003
+f65	-3
+f66	2.200000000000000000000000000000
+f67	3
+f68	2.200000000000000000000000000000
+f69	0000000003
+f70	000000000000000000000000000000002.200000000000000000000000000000
+f71	0000000003
+f72	000000000000000000000000000000002.200000000000000000000000000000
+f73	-1.175494348e-38
+f74	1.175494354e-38
+f75	00000001.175494354e-38
+f76	00000001.175494354e-38
+f77	-1.175494348e-38
+f78	1.175494354e-38
+f79	00000001.175494354e-38
+f80	00000001.175494354e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494348e-38
+f95	1.17549e-38
+f96	1.175494354e-38
+f97	01.17549e-38
+f98	00000001.175494354e-38
+f99	01.17549e-38
+f100	00000001.175494354e-38
+f101	1000-01-03
+f102	838:59:56
+f103	1970-01-04 00:00:03
+f104	1970-01-04 00:00:03
+f105	1904
+f106	1904
+f107	1904
+f108	2enum
+f109	1set
+f59	4
+f60	4
+f61	0000000004
+f62	0000000000000000000000000000000000000000000000000000000000000004
+f63	0000000004
+f64	0000000000000000000000000000000000000000000000000000000000000004
+f65	-2
+f66	3.300000000000000000000000000000
+f67	4
+f68	3.300000000000000000000000000000
+f69	0000000004
+f70	000000000000000000000000000000003.300000000000000000000000000000
+f71	0000000004
+f72	000000000000000000000000000000003.300000000000000000000000000000
+f73	-1.175494347e-38
+f74	1.175494355e-38
+f75	00000001.175494355e-38
+f76	00000001.175494355e-38
+f77	-1.175494347e-38
+f78	1.175494355e-38
+f79	00000001.175494355e-38
+f80	00000001.175494355e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494347e-38
+f95	1.17549e-38
+f96	1.175494355e-38
+f97	01.17549e-38
+f98	00000001.175494355e-38
+f99	01.17549e-38
+f100	00000001.175494355e-38
+f101	1000-01-04
+f102	838:59:55
+f103	1970-01-05 00:00:04
+f104	1970-01-05 00:00:04
+f105	1905
+f106	1905
+f107	1905
+f108	1enum
+f109	2set
+f59	4
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	5
+f60	5
+f61	0000000005
+f62	0000000000000000000000000000000000000000000000000000000000000005
+f63	0000000005
+f64	0000000000000000000000000000000000000000000000000000000000000005
+f65	-1
+f66	4.400000000000000000000000000000
+f67	5
+f68	4.400000000000000000000000000000
+f69	0000000005
+f70	000000000000000000000000000000004.400000000000000000000000000000
+f71	0000000005
+f72	000000000000000000000000000000004.400000000000000000000000000000
+f73	-1.175494346e-38
+f74	1.175494356e-38
+f75	00000001.175494356e-38
+f76	00000001.175494356e-38
+f77	-1.175494346e-38
+f78	1.175494356e-38
+f79	00000001.175494356e-38
+f80	00000001.175494356e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494346e-38
+f95	1.17549e-38
+f96	1.175494356e-38
+f97	01.17549e-38
+f98	00000001.175494356e-38
+f99	01.17549e-38
+f100	00000001.175494356e-38
+f101	1000-01-05
+f102	838:59:54
+f103	1970-01-06 00:00:05
+f104	1970-01-06 00:00:05
+f105	1906
+f106	1906
+f107	1906
+f108	2enum
+f109	1set,2set
+f59	6
+f60	6
+f61	0000000006
+f62	0000000000000000000000000000000000000000000000000000000000000006
+f63	0000000006
+f64	0000000000000000000000000000000000000000000000000000000000000006
+f65	0
+f66	5.500000000000000000000000000000
+f67	6
+f68	5.500000000000000000000000000000
+f69	0000000006
+f70	000000000000000000000000000000005.500000000000000000000000000000
+f71	0000000006
+f72	000000000000000000000000000000005.500000000000000000000000000000
+f73	-1.175494345e-38
+f74	1.175494357e-38
+f75	00000001.175494357e-38
+f76	00000001.175494357e-38
+f77	-1.175494345e-38
+f78	1.175494357e-38
+f79	00000001.175494357e-38
+f80	00000001.175494357e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494345e-38
+f95	1.17549e-38
+f96	1.175494357e-38
+f97	01.17549e-38
+f98	00000001.175494357e-38
+f99	01.17549e-38
+f100	00000001.175494357e-38
+f101	1000-01-06
+f102	838:59:53
+f103	1970-01-07 00:00:06
+f104	1970-01-07 00:00:06
+f105	1907
+f106	1907
+f107	1907
+f108	1enum
+f109	1set
+f59	7
+f60	7
+f61	0000000007
+f62	0000000000000000000000000000000000000000000000000000000000000007
+f63	0000000007
+f64	0000000000000000000000000000000000000000000000000000000000000007
+f65	1
+f66	6.600000000000000000000000000000
+f67	7
+f68	6.600000000000000000000000000000
+f69	0000000007
+f70	000000000000000000000000000000006.600000000000000000000000000000
+f71	0000000007
+f72	000000000000000000000000000000006.600000000000000000000000000000
+f73	-1.175494344e-38
+f74	1.175494358e-38
+f75	00000001.175494358e-38
+f76	00000001.175494358e-38
+f77	-1.175494344e-38
+f78	1.175494358e-38
+f79	00000001.175494358e-38
+f80	00000001.175494358e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494344e-38
+f95	1.17549e-38
+f96	1.175494358e-38
+f97	01.17549e-38
+f98	00000001.175494358e-38
+f99	01.17549e-38
+f100	00000001.175494358e-38
+f101	1000-01-07
+f102	838:59:52
+f103	1970-01-08 00:00:07
+f104	1970-01-08 00:00:07
+f105	1908
+f106	1908
+f107	1908
+f108	2enum
+f109	2set
+f59	8
+f60	8
+f61	0000000008
+f62	0000000000000000000000000000000000000000000000000000000000000008
+f63	0000000008
+f64	0000000000000000000000000000000000000000000000000000000000000008
+f65	2
+f66	7.700000000000000000000000000000
+f67	8
+f68	7.700000000000000000000000000000
+f69	0000000008
+f70	000000000000000000000000000000007.700000000000000000000000000000
+f71	0000000008
+f72	000000000000000000000000000000007.700000000000000000000000000000
+f73	-1.175494343e-38
+f74	1.175494359e-38
+f75	00000001.175494359e-38
+f76	00000001.175494359e-38
+f77	-1.175494343e-38
+f78	1.175494359e-38
+f79	00000001.175494359e-38
+f80	00000001.175494359e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494343e-38
+f95	1.17549e-38
+f96	1.175494359e-38
+f97	01.17549e-38
+f98	00000001.175494359e-38
+f99	01.17549e-38
+f100	00000001.175494359e-38
+f101	1000-01-08
+f102	838:59:51
+f103	1970-01-09 00:00:08
+f104	1970-01-09 00:00:08
+f105	1909
+f106	1909
+f107	1909
+f108	1enum
+f109	1set,2set
+f59	9
+f60	9
+f61	0000000009
+f62	0000000000000000000000000000000000000000000000000000000000000009
+f63	0000000009
+f64	0000000000000000000000000000000000000000000000000000000000000009
+f65	3
+f66	8.800000000000000000000000000000
+f67	9
+f68	8.800000000000000000000000000000
+f69	0000000009
+f70	000000000000000000000000000000008.800000000000000000000000000000
+f71	0000000009
+f72	000000000000000000000000000000008.800000000000000000000000000000
+f73	-1.175494342e-38
+f74	1.17549436e-38
+f75	000000001.17549436e-38
+f76	000000001.17549436e-38
+f77	-1.175494342e-38
+f78	1.17549436e-38
+f79	000000001.17549436e-38
+f80	000000001.17549436e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494342e-38
+f95	1.17549e-38
+f96	1.17549436e-38
+f97	01.17549e-38
+f98	000000001.17549436e-38
+f99	01.17549e-38
+f100	000000001.17549436e-38
+f101	1000-01-09
+f102	838:59:50
+f103	1970-01-10 00:00:09
+f104	1970-01-10 00:00:09
+f105	1910
+f106	1910
+f107	1910
+f108	2enum
+f109	1set
 CREATE OR REPLACE VIEW v1 AS SELECT F59, F60
 FROM test.tb2 WITH CASCADED CHECK OPTION;
 SELECT * FROM v1 order by f59,f60 limit 0,10;
@@ -931,9 +3925,108 @@ SHOW CREATE VIEW test.v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `tb2`.`f59` AS `f59`,`tb2`.`f60` AS `f60`,`tb2`.`f61` AS `f61`,`tb2`.`f62` AS `f62`,`tb2`.`f63` AS `f63`,`tb2`.`f64` AS `f64`,`tb2`.`f65` AS `f65`,`tb2`.`f66` AS `f66`,`tb2`.`f67` AS `f67`,`tb2`.`f68` AS `f68`,`tb2`.`f69` AS `f69`,`tb2`.`f70` AS `f70`,`tb2`.`f71` AS `f71`,`tb2`.`f72` AS `f72`,`tb2`.`f73` AS `f73`,`tb2`.`f74` AS `f74`,`tb2`.`f75` AS `f75`,`tb2`.`f76` AS `f76`,`tb2`.`f77` AS `f77`,`tb2`.`f78` AS `f78`,`tb2`.`f79` AS `f79`,`tb2`.`f80` AS `f80`,`tb2`.`f81` AS `f81`,`tb2`.`f82` AS `f82`,`tb2`.`f83` AS `f83`,`tb2`.`f84` AS `f84`,`tb2`.`f85` AS `f85`,`tb2`.`f86` AS `f86`,`tb2`.`f87` AS `f87`,`tb2`.`f88` AS `f88`,`tb2`.`f89` AS `f89`,`tb2`.`f90` AS `f90`,`tb2`.`f91` AS `f91`,`tb2`.`f92` AS `f92`,`tb2`.`f93` AS `f93`,`tb2`.`f94` AS `f94`,`tb2`.`f95` AS `f95`,`tb2`.`f96` AS `f96`,`tb2`.`f97` AS `f97`,`tb2`.`f98` AS `f98`,`tb2`.`f99` AS `f99`,`tb2`.`f100` AS `f100`,`tb2`.`f101` AS `f101`,`tb2`.`f102` AS `f102`,`tb2`.`f103` AS `f103`,`tb2`.`f104` AS `f104`,`tb2`.`f105` AS `f105`,`tb2`.`f106` AS `f106`,`tb2`.`f107` AS `f107`,`tb2`.`f108` AS `f108`,`tb2`.`f109` AS `f109` from `tb2` order by `tb2`.`f59` limit 2	latin1	latin1_swedish_ci
 SELECT * FROM test.v1 order by f59,f60,f61,f62,f63,f64,f65;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-1	1	0000000001	0000000000000000000000000000000000000000000000000000000000000001	0000000001	0000000000000000000000000000000000000000000000000000000000000001	-5	0.000000000000000000000000000000	1	0.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549435e-38	1.17549e-38	1.175494352e-38	01.17549e-38	00000001.175494352e-38	01.17549e-38	00000001.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	1970-01-02 00:00:01	1902	1902	1902	2enum	2set
-2	2	0000000002	0000000000000000000000000000000000000000000000000000000000000002	0000000002	0000000000000000000000000000000000000000000000000000000000000002	-4	1.100000000000000000000000000000	2	1.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494349e-38	1.17549e-38	1.175494353e-38	01.17549e-38	00000001.175494353e-38	01.17549e-38	00000001.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	1970-01-03 00:00:02	1903	1903	1903	1enum	1set,2set
+f59	1
+f60	1
+f61	0000000001
+f62	0000000000000000000000000000000000000000000000000000000000000001
+f63	0000000001
+f64	0000000000000000000000000000000000000000000000000000000000000001
+f65	-5
+f66	0.000000000000000000000000000000
+f67	1
+f68	0.000000000000000000000000000000
+f69	0000000001
+f70	000000000000000000000000000000000.000000000000000000000000000000
+f71	0000000001
+f72	000000000000000000000000000000000.000000000000000000000000000000
+f73	-1.17549435e-38
+f74	1.175494352e-38
+f75	00000001.175494352e-38
+f76	00000001.175494352e-38
+f77	-1.17549435e-38
+f78	1.175494352e-38
+f79	00000001.175494352e-38
+f80	00000001.175494352e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.17549435e-38
+f95	1.17549e-38
+f96	1.175494352e-38
+f97	01.17549e-38
+f98	00000001.175494352e-38
+f99	01.17549e-38
+f100	00000001.175494352e-38
+f101	1000-01-01
+f102	838:59:58
+f103	1970-01-02 00:00:01
+f104	1970-01-02 00:00:01
+f105	1902
+f106	1902
+f107	1902
+f108	2enum
+f109	2set
+f59	2
+f60	2
+f61	0000000002
+f62	0000000000000000000000000000000000000000000000000000000000000002
+f63	0000000002
+f64	0000000000000000000000000000000000000000000000000000000000000002
+f65	-4
+f66	1.100000000000000000000000000000
+f67	2
+f68	1.100000000000000000000000000000
+f69	0000000002
+f70	000000000000000000000000000000001.100000000000000000000000000000
+f71	0000000002
+f72	000000000000000000000000000000001.100000000000000000000000000000
+f73	-1.175494349e-38
+f74	1.175494353e-38
+f75	00000001.175494353e-38
+f76	00000001.175494353e-38
+f77	-1.175494349e-38
+f78	1.175494353e-38
+f79	00000001.175494353e-38
+f80	00000001.175494353e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494349e-38
+f95	1.17549e-38
+f96	1.175494353e-38
+f97	01.17549e-38
+f98	00000001.175494353e-38
+f99	01.17549e-38
+f100	00000001.175494353e-38
+f101	1000-01-02
+f102	838:59:57
+f103	1970-01-03 00:00:02
+f104	1970-01-03 00:00:02
+f105	1903
+f106	1903
+f107	1903
+f108	1enum
+f109	1set,2set
 CREATE OR REPLACE VIEW test.v1 AS SELECT F59 FROM tb2;
 SHOW CREATE VIEW test.v1;
 View	Create View	character_set_client	collation_connection
@@ -994,10 +4087,58 @@ Testcase 3.3.1.15
 --------------------------------------------------------------------------------
 Drop table if exists test.v1 ;
 CREATE OR REPLACE view test.v1 as select * from tb2;
-SELECT * FROM test.v1 ORDER BY f59,f60,f61 LIMIT 2;
+SELECT * FROM test.v1;
 f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
 1	1	0000000001	0000000000000000000000000000000000000000000000000000000000000001	0000000001	0000000000000000000000000000000000000000000000000000000000000001	-5	0.000000000000000000000000000000	1	0.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549435e-38	1.17549e-38	1.175494352e-38	01.17549e-38	00000001.175494352e-38	01.17549e-38	00000001.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	1970-01-02 00:00:01	1902	1902	1902	2enum	2set
+10	10	0000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000010	0000000000000000000000000000000000000000000000000000000000000010	4	9.900000000000000000000000000000	10	9.900000000000000000000000000000	0000000010	000000000000000000000000000000009.900000000000000000000000000000	0000000010	000000000000000000000000000000009.900000000000000000000000000000	-1.175494341e-38	1.175494361e-38	00000001.175494361e-38	00000001.175494361e-38	-1.175494341e-38	1.175494361e-38	00000001.175494361e-38	00000001.175494361e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494341e-38	1.17549e-38	1.175494361e-38	01.17549e-38	00000001.175494361e-38	01.17549e-38	00000001.175494361e-38	1000-01-10	838:59:49	1970-01-11 00:00:10	1970-01-11 00:00:10	1911	1911	1911	1enum	2set
+107	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+107	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+109	108	0000000104	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+109	108	0000000104	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+15	87	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+17	15	0000000016	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+19	18	0000000014	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+195	87	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 2	2	0000000002	0000000000000000000000000000000000000000000000000000000000000002	0000000002	0000000000000000000000000000000000000000000000000000000000000002	-4	1.100000000000000000000000000000	2	1.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494349e-38	1.17549e-38	1.175494353e-38	01.17549e-38	00000001.175494353e-38	01.17549e-38	00000001.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	1970-01-03 00:00:02	1903	1903	1903	1enum	1set,2set
+207	205	0000000206	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+209	208	0000000204	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+22	93	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+24	51654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+242	79	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+250	87895654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+2550	775654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+27	25	0000000026	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+2760	985654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+29	28	0000000024	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+292	93	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+299	899	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+3	3	0000000003	0000000000000000000000000000000000000000000000000000000000000003	0000000003	0000000000000000000000000000000000000000000000000000000000000003	-3	2.200000000000000000000000000000	3	2.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494348e-38	1.17549e-38	1.175494354e-38	01.17549e-38	00000001.175494354e-38	01.17549e-38	00000001.175494354e-38	1000-01-03	838:59:56	1970-01-04 00:00:03	1970-01-04 00:00:03	1904	1904	1904	2enum	1set
+321	NULL	0000000765	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+323	14376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+3330	764376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+34	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+340	9984376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+3410	996546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+394	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+4	4	0000000004	0000000000000000000000000000000000000000000000000000000000000004	0000000004	0000000000000000000000000000000000000000000000000000000000000004	-2	3.300000000000000000000000000000	4	3.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494347e-38	1.17549e-38	1.175494355e-38	01.17549e-38	00000001.175494355e-38	01.17549e-38	00000001.175494355e-38	1000-01-04	838:59:55	1970-01-05 00:00:04	1970-01-05 00:00:04	1905	1905	1905	1enum	2set
+4	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+424	89	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+441	16546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+5	5	0000000005	0000000000000000000000000000000000000000000000000000000000000005	0000000005	0000000000000000000000000000000000000000000000000000000000000005	-1	4.400000000000000000000000000000	5	4.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494346e-38	1.17549e-38	1.175494356e-38	01.17549e-38	00000001.175494356e-38	01.17549e-38	00000001.175494356e-38	1000-01-05	838:59:54	1970-01-06 00:00:05	1970-01-06 00:00:05	1906	1906	1906	2enum	1set,2set
+500	NULL	0000000900	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+500	NULL	0000000900	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+500	NULL	0000000900	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+569300	9114376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+6	6	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0	5.500000000000000000000000000000	6	5.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494345e-38	1.17549e-38	1.175494357e-38	01.17549e-38	00000001.175494357e-38	01.17549e-38	00000001.175494357e-38	1000-01-06	838:59:53	1970-01-07 00:00:06	1970-01-07 00:00:06	1907	1907	1907	1enum	1set
+660	876546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+7	7	0000000007	0000000000000000000000000000000000000000000000000000000000000007	0000000007	0000000000000000000000000000000000000000000000000000000000000007	1	6.600000000000000000000000000000	7	6.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494344e-38	1.17549e-38	1.175494358e-38	01.17549e-38	00000001.175494358e-38	01.17549e-38	00000001.175494358e-38	1000-01-07	838:59:52	1970-01-08 00:00:07	1970-01-08 00:00:07	1908	1908	1908	2enum	2set
+76710	226546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+7876	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+8	8	0000000008	0000000000000000000000000000000000000000000000000000000000000008	0000000008	0000000000000000000000000000000000000000000000000000000000000008	2	7.700000000000000000000000000000	8	7.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494343e-38	1.17549e-38	1.175494359e-38	01.17549e-38	00000001.175494359e-38	01.17549e-38	00000001.175494359e-38	1000-01-08	838:59:51	1970-01-09 00:00:08	1970-01-09 00:00:08	1909	1909	1909	1enum	1set,2set
+9	9	0000000009	0000000000000000000000000000000000000000000000000000000000000009	0000000009	0000000000000000000000000000000000000000000000000000000000000009	3	8.800000000000000000000000000000	9	8.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494342e-38	1.17549e-38	1.17549436e-38	01.17549e-38	000000001.17549436e-38	01.17549e-38	000000001.17549436e-38	1000-01-09	838:59:50	1970-01-10 00:00:09	1970-01-10 00:00:09	1910	1910	1910	2enum	1set
+9112	NULL	0000008771	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+94	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+987	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 Drop view test.v1 ;
 
 Testcase 3.3.1.16 + 3.3.1.17 
@@ -1140,17 +4281,17 @@ Drop view if exists test.v1 ;
 Testcase 3.3.1.22 
 --------------------------------------------------------------------------------
 DROP VIEW  IF EXISTS v1;
-CREATE VIEW test.v1( product ) AS SELECT f59*f60 From tb2;
-SELECT * FROM test.v1 WHERE product IS NOT NULL ORDER BY product LIMIT 2;
+CREATE VIEW test.v1( product ) AS SELECT f59*f60 From tb2 WHERE f59 < 3;
+SELECT * FROM test.v1;
 product
 1
 4
 CREATE OR REPLACE VIEW test.v1( product ) AS SELECT 1*2;
-SELECT * FROM test.v1 LIMIT 2;
+SELECT * FROM test.v1;
 product
 2
 CREATE OR REPLACE VIEW test.v1( product ) AS SELECT USER();
-SELECT * FROM test.v1 LIMIT 2;
+SELECT * FROM test.v1;
 product
 root@localhost
 Drop view if exists test.v1 ;
@@ -1228,84 +4369,2631 @@ Testcase 3.3.1.26
 --------------------------------------------------------------------------------
 DROP VIEW  IF EXISTS v1;
 Create view test.v1 AS Select * from test.tb2;
-Select * from test.v1 order by f59, f60, f61 limit 2;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-1	1	0000000001	0000000000000000000000000000000000000000000000000000000000000001	0000000001	0000000000000000000000000000000000000000000000000000000000000001	-5	0.000000000000000000000000000000	1	0.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549435e-38	1.17549e-38	1.175494352e-38	01.17549e-38	00000001.175494352e-38	01.17549e-38	00000001.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	1970-01-02 00:00:01	1902	1902	1902	2enum	2set
-2	2	0000000002	0000000000000000000000000000000000000000000000000000000000000002	0000000002	0000000000000000000000000000000000000000000000000000000000000002	-4	1.100000000000000000000000000000	2	1.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494349e-38	1.17549e-38	1.175494353e-38	01.17549e-38	00000001.175494353e-38	01.17549e-38	00000001.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	1970-01-03 00:00:02	1903	1903	1903	1enum	1set,2set
-Drop view test.v1 ;
-
-Testcase 3.3.1.27 
---------------------------------------------------------------------------------
-DROP VIEW  IF EXISTS test.v1;
-Drop VIEW  IF EXISTS test.v1_1 ;
-Create view test.v1 AS Select * from test.tb2;
-Create view test.v1_1 AS Select F59 from test.v1 ;
-Select * from test.v1_1 order by F59 limit 2;
-F59
-1
-2
-Drop view test.v1 ;
-Drop view test.v1_1 ;
-
-Testcase 3.3.1.28 
---------------------------------------------------------------------------------
-Drop database if exists test2 ;
-create database test2 ;
-Create view test2.v2 AS Select * from test.tb2 limit 50,50;
-use test2 ;
-Create view v1 AS Select * from test.tb2 limit 50 ;
-Select * from v1 order by f59,f60,f61,f62,f63,f64,f65;
+Select * from test.v1;
 f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
 1	1	0000000001	0000000000000000000000000000000000000000000000000000000000000001	0000000001	0000000000000000000000000000000000000000000000000000000000000001	-5	0.000000000000000000000000000000	1	0.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549435e-38	1.17549e-38	1.175494352e-38	01.17549e-38	00000001.175494352e-38	01.17549e-38	00000001.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	1970-01-02 00:00:01	1902	1902	1902	2enum	2set
-2	2	0000000002	0000000000000000000000000000000000000000000000000000000000000002	0000000002	0000000000000000000000000000000000000000000000000000000000000002	-4	1.100000000000000000000000000000	2	1.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494349e-38	1.17549e-38	1.175494353e-38	01.17549e-38	00000001.175494353e-38	01.17549e-38	00000001.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	1970-01-03 00:00:02	1903	1903	1903	1enum	1set,2set
-3	3	0000000003	0000000000000000000000000000000000000000000000000000000000000003	0000000003	0000000000000000000000000000000000000000000000000000000000000003	-3	2.200000000000000000000000000000	3	2.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494348e-38	1.17549e-38	1.175494354e-38	01.17549e-38	00000001.175494354e-38	01.17549e-38	00000001.175494354e-38	1000-01-03	838:59:56	1970-01-04 00:00:03	1970-01-04 00:00:03	1904	1904	1904	2enum	1set
-4	4	0000000004	0000000000000000000000000000000000000000000000000000000000000004	0000000004	0000000000000000000000000000000000000000000000000000000000000004	-2	3.300000000000000000000000000000	4	3.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494347e-38	1.17549e-38	1.175494355e-38	01.17549e-38	00000001.175494355e-38	01.17549e-38	00000001.175494355e-38	1000-01-04	838:59:55	1970-01-05 00:00:04	1970-01-05 00:00:04	1905	1905	1905	1enum	2set
-4	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-5	5	0000000005	0000000000000000000000000000000000000000000000000000000000000005	0000000005	0000000000000000000000000000000000000000000000000000000000000005	-1	4.400000000000000000000000000000	5	4.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494346e-38	1.17549e-38	1.175494356e-38	01.17549e-38	00000001.175494356e-38	01.17549e-38	00000001.175494356e-38	1000-01-05	838:59:54	1970-01-06 00:00:05	1970-01-06 00:00:05	1906	1906	1906	2enum	1set,2set
-6	6	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0	5.500000000000000000000000000000	6	5.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494345e-38	1.17549e-38	1.175494357e-38	01.17549e-38	00000001.175494357e-38	01.17549e-38	00000001.175494357e-38	1000-01-06	838:59:53	1970-01-07 00:00:06	1970-01-07 00:00:06	1907	1907	1907	1enum	1set
-7	7	0000000007	0000000000000000000000000000000000000000000000000000000000000007	0000000007	0000000000000000000000000000000000000000000000000000000000000007	1	6.600000000000000000000000000000	7	6.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494344e-38	1.17549e-38	1.175494358e-38	01.17549e-38	00000001.175494358e-38	01.17549e-38	00000001.175494358e-38	1000-01-07	838:59:52	1970-01-08 00:00:07	1970-01-08 00:00:07	1908	1908	1908	2enum	2set
-8	8	0000000008	0000000000000000000000000000000000000000000000000000000000000008	0000000008	0000000000000000000000000000000000000000000000000000000000000008	2	7.700000000000000000000000000000	8	7.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494343e-38	1.17549e-38	1.175494359e-38	01.17549e-38	00000001.175494359e-38	01.17549e-38	00000001.175494359e-38	1000-01-08	838:59:51	1970-01-09 00:00:08	1970-01-09 00:00:08	1909	1909	1909	1enum	1set,2set
-9	9	0000000009	0000000000000000000000000000000000000000000000000000000000000009	0000000009	0000000000000000000000000000000000000000000000000000000000000009	3	8.800000000000000000000000000000	9	8.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494342e-38	1.17549e-38	1.17549436e-38	01.17549e-38	000000001.17549436e-38	01.17549e-38	000000001.17549436e-38	1000-01-09	838:59:50	1970-01-10 00:00:09	1970-01-10 00:00:09	1910	1910	1910	2enum	1set
 10	10	0000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000010	0000000000000000000000000000000000000000000000000000000000000010	4	9.900000000000000000000000000000	10	9.900000000000000000000000000000	0000000010	000000000000000000000000000000009.900000000000000000000000000000	0000000010	000000000000000000000000000000009.900000000000000000000000000000	-1.175494341e-38	1.175494361e-38	00000001.175494361e-38	00000001.175494361e-38	-1.175494341e-38	1.175494361e-38	00000001.175494361e-38	00000001.175494361e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494341e-38	1.17549e-38	1.175494361e-38	01.17549e-38	00000001.175494361e-38	01.17549e-38	00000001.175494361e-38	1000-01-10	838:59:49	1970-01-11 00:00:10	1970-01-11 00:00:10	1911	1911	1911	1enum	2set
-15	87	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-17	15	0000000016	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-19	18	0000000014	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-22	93	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-24	51654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-27	25	0000000026	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-29	28	0000000024	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-34	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-94	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 107	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 107	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 109	108	0000000104	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 109	108	0000000104	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+15	87	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+17	15	0000000016	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+19	18	0000000014	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 195	87	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+2	2	0000000002	0000000000000000000000000000000000000000000000000000000000000002	0000000002	0000000000000000000000000000000000000000000000000000000000000002	-4	1.100000000000000000000000000000	2	1.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494349e-38	1.17549e-38	1.175494353e-38	01.17549e-38	00000001.175494353e-38	01.17549e-38	00000001.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	1970-01-03 00:00:02	1903	1903	1903	1enum	1set,2set
 207	205	0000000206	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 209	208	0000000204	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+22	93	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+24	51654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 242	79	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 250	87895654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+2550	775654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+27	25	0000000026	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+2760	985654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+29	28	0000000024	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 292	93	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 299	899	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+3	3	0000000003	0000000000000000000000000000000000000000000000000000000000000003	0000000003	0000000000000000000000000000000000000000000000000000000000000003	-3	2.200000000000000000000000000000	3	2.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494348e-38	1.17549e-38	1.175494354e-38	01.17549e-38	00000001.175494354e-38	01.17549e-38	00000001.175494354e-38	1000-01-03	838:59:56	1970-01-04 00:00:03	1970-01-04 00:00:03	1904	1904	1904	2enum	1set
 321	NULL	0000000765	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 323	14376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+3330	764376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+34	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 340	9984376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+3410	996546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 394	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+4	4	0000000004	0000000000000000000000000000000000000000000000000000000000000004	0000000004	0000000000000000000000000000000000000000000000000000000000000004	-2	3.300000000000000000000000000000	4	3.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494347e-38	1.17549e-38	1.175494355e-38	01.17549e-38	00000001.175494355e-38	01.17549e-38	00000001.175494355e-38	1000-01-04	838:59:55	1970-01-05 00:00:04	1970-01-05 00:00:04	1905	1905	1905	1enum	2set
+4	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 424	89	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 441	16546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+5	5	0000000005	0000000000000000000000000000000000000000000000000000000000000005	0000000005	0000000000000000000000000000000000000000000000000000000000000005	-1	4.400000000000000000000000000000	5	4.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494346e-38	1.17549e-38	1.175494356e-38	01.17549e-38	00000001.175494356e-38	01.17549e-38	00000001.175494356e-38	1000-01-05	838:59:54	1970-01-06 00:00:05	1970-01-06 00:00:05	1906	1906	1906	2enum	1set,2set
 500	NULL	0000000900	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 500	NULL	0000000900	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 500	NULL	0000000900	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+569300	9114376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+6	6	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0	5.500000000000000000000000000000	6	5.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494345e-38	1.17549e-38	1.175494357e-38	01.17549e-38	00000001.175494357e-38	01.17549e-38	00000001.175494357e-38	1000-01-06	838:59:53	1970-01-07 00:00:06	1970-01-07 00:00:06	1907	1907	1907	1enum	1set
 660	876546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-987	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-2550	775654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-2760	985654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-3330	764376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-3410	996546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+7	7	0000000007	0000000000000000000000000000000000000000000000000000000000000007	0000000007	0000000000000000000000000000000000000000000000000000000000000007	1	6.600000000000000000000000000000	7	6.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494344e-38	1.17549e-38	1.175494358e-38	01.17549e-38	00000001.175494358e-38	01.17549e-38	00000001.175494358e-38	1000-01-07	838:59:52	1970-01-08 00:00:07	1970-01-08 00:00:07	1908	1908	1908	2enum	2set
+76710	226546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
 7876	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+8	8	0000000008	0000000000000000000000000000000000000000000000000000000000000008	0000000008	0000000000000000000000000000000000000000000000000000000000000008	2	7.700000000000000000000000000000	8	7.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494343e-38	1.17549e-38	1.175494359e-38	01.17549e-38	00000001.175494359e-38	01.17549e-38	00000001.175494359e-38	1000-01-08	838:59:51	1970-01-09 00:00:08	1970-01-09 00:00:08	1909	1909	1909	1enum	1set,2set
+9	9	0000000009	0000000000000000000000000000000000000000000000000000000000000009	0000000009	0000000000000000000000000000000000000000000000000000000000000009	3	8.800000000000000000000000000000	9	8.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494342e-38	1.17549e-38	1.17549436e-38	01.17549e-38	000000001.17549436e-38	01.17549e-38	000000001.17549436e-38	1000-01-09	838:59:50	1970-01-10 00:00:09	1970-01-10 00:00:09	1910	1910	1910	2enum	1set
 9112	NULL	0000008771	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-76710	226546	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-569300	9114376	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+94	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+987	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+Drop view test.v1 ;
+
+Testcase 3.3.1.27 
+--------------------------------------------------------------------------------
+DROP VIEW  IF EXISTS test.v1;
+Drop VIEW  IF EXISTS test.v1_1 ;
+Create view test.v1 AS Select * from test.tb2;
+Create view test.v1_1 AS Select F59 from test.v1 ;
+Select * from test.v1_1 order by F59 limit 2;
+F59
+1
+2
+Drop view test.v1 ;
+Drop view test.v1_1 ;
+
+Testcase 3.3.1.28 
+--------------------------------------------------------------------------------
+Drop database if exists test2 ;
+create database test2 ;
+Create view test2.v2 AS Select * from test.tb2 limit 50,50;
+use test2 ;
+Create view v1 AS Select * from test.tb2 limit 50 ;
+Select * from v1 order by f59,f60,f61,f62,f63,f64,f65;
+f59	1
+f60	1
+f61	0000000001
+f62	0000000000000000000000000000000000000000000000000000000000000001
+f63	0000000001
+f64	0000000000000000000000000000000000000000000000000000000000000001
+f65	-5
+f66	0.000000000000000000000000000000
+f67	1
+f68	0.000000000000000000000000000000
+f69	0000000001
+f70	000000000000000000000000000000000.000000000000000000000000000000
+f71	0000000001
+f72	000000000000000000000000000000000.000000000000000000000000000000
+f73	-1.17549435e-38
+f74	1.175494352e-38
+f75	00000001.175494352e-38
+f76	00000001.175494352e-38
+f77	-1.17549435e-38
+f78	1.175494352e-38
+f79	00000001.175494352e-38
+f80	00000001.175494352e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.17549435e-38
+f95	1.17549e-38
+f96	1.175494352e-38
+f97	01.17549e-38
+f98	00000001.175494352e-38
+f99	01.17549e-38
+f100	00000001.175494352e-38
+f101	1000-01-01
+f102	838:59:58
+f103	1970-01-02 00:00:01
+f104	1970-01-02 00:00:01
+f105	1902
+f106	1902
+f107	1902
+f108	2enum
+f109	2set
+f59	2
+f60	2
+f61	0000000002
+f62	0000000000000000000000000000000000000000000000000000000000000002
+f63	0000000002
+f64	0000000000000000000000000000000000000000000000000000000000000002
+f65	-4
+f66	1.100000000000000000000000000000
+f67	2
+f68	1.100000000000000000000000000000
+f69	0000000002
+f70	000000000000000000000000000000001.100000000000000000000000000000
+f71	0000000002
+f72	000000000000000000000000000000001.100000000000000000000000000000
+f73	-1.175494349e-38
+f74	1.175494353e-38
+f75	00000001.175494353e-38
+f76	00000001.175494353e-38
+f77	-1.175494349e-38
+f78	1.175494353e-38
+f79	00000001.175494353e-38
+f80	00000001.175494353e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494349e-38
+f95	1.17549e-38
+f96	1.175494353e-38
+f97	01.17549e-38
+f98	00000001.175494353e-38
+f99	01.17549e-38
+f100	00000001.175494353e-38
+f101	1000-01-02
+f102	838:59:57
+f103	1970-01-03 00:00:02
+f104	1970-01-03 00:00:02
+f105	1903
+f106	1903
+f107	1903
+f108	1enum
+f109	1set,2set
+f59	3
+f60	3
+f61	0000000003
+f62	0000000000000000000000000000000000000000000000000000000000000003
+f63	0000000003
+f64	0000000000000000000000000000000000000000000000000000000000000003
+f65	-3
+f66	2.200000000000000000000000000000
+f67	3
+f68	2.200000000000000000000000000000
+f69	0000000003
+f70	000000000000000000000000000000002.200000000000000000000000000000
+f71	0000000003
+f72	000000000000000000000000000000002.200000000000000000000000000000
+f73	-1.175494348e-38
+f74	1.175494354e-38
+f75	00000001.175494354e-38
+f76	00000001.175494354e-38
+f77	-1.175494348e-38
+f78	1.175494354e-38
+f79	00000001.175494354e-38
+f80	00000001.175494354e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494348e-38
+f95	1.17549e-38
+f96	1.175494354e-38
+f97	01.17549e-38
+f98	00000001.175494354e-38
+f99	01.17549e-38
+f100	00000001.175494354e-38
+f101	1000-01-03
+f102	838:59:56
+f103	1970-01-04 00:00:03
+f104	1970-01-04 00:00:03
+f105	1904
+f106	1904
+f107	1904
+f108	2enum
+f109	1set
+f59	4
+f60	4
+f61	0000000004
+f62	0000000000000000000000000000000000000000000000000000000000000004
+f63	0000000004
+f64	0000000000000000000000000000000000000000000000000000000000000004
+f65	-2
+f66	3.300000000000000000000000000000
+f67	4
+f68	3.300000000000000000000000000000
+f69	0000000004
+f70	000000000000000000000000000000003.300000000000000000000000000000
+f71	0000000004
+f72	000000000000000000000000000000003.300000000000000000000000000000
+f73	-1.175494347e-38
+f74	1.175494355e-38
+f75	00000001.175494355e-38
+f76	00000001.175494355e-38
+f77	-1.175494347e-38
+f78	1.175494355e-38
+f79	00000001.175494355e-38
+f80	00000001.175494355e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494347e-38
+f95	1.17549e-38
+f96	1.175494355e-38
+f97	01.17549e-38
+f98	00000001.175494355e-38
+f99	01.17549e-38
+f100	00000001.175494355e-38
+f101	1000-01-04
+f102	838:59:55
+f103	1970-01-05 00:00:04
+f104	1970-01-05 00:00:04
+f105	1905
+f106	1905
+f107	1905
+f108	1enum
+f109	2set
+f59	4
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	5
+f60	5
+f61	0000000005
+f62	0000000000000000000000000000000000000000000000000000000000000005
+f63	0000000005
+f64	0000000000000000000000000000000000000000000000000000000000000005
+f65	-1
+f66	4.400000000000000000000000000000
+f67	5
+f68	4.400000000000000000000000000000
+f69	0000000005
+f70	000000000000000000000000000000004.400000000000000000000000000000
+f71	0000000005
+f72	000000000000000000000000000000004.400000000000000000000000000000
+f73	-1.175494346e-38
+f74	1.175494356e-38
+f75	00000001.175494356e-38
+f76	00000001.175494356e-38
+f77	-1.175494346e-38
+f78	1.175494356e-38
+f79	00000001.175494356e-38
+f80	00000001.175494356e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494346e-38
+f95	1.17549e-38
+f96	1.175494356e-38
+f97	01.17549e-38
+f98	00000001.175494356e-38
+f99	01.17549e-38
+f100	00000001.175494356e-38
+f101	1000-01-05
+f102	838:59:54
+f103	1970-01-06 00:00:05
+f104	1970-01-06 00:00:05
+f105	1906
+f106	1906
+f107	1906
+f108	2enum
+f109	1set,2set
+f59	6
+f60	6
+f61	0000000006
+f62	0000000000000000000000000000000000000000000000000000000000000006
+f63	0000000006
+f64	0000000000000000000000000000000000000000000000000000000000000006
+f65	0
+f66	5.500000000000000000000000000000
+f67	6
+f68	5.500000000000000000000000000000
+f69	0000000006
+f70	000000000000000000000000000000005.500000000000000000000000000000
+f71	0000000006
+f72	000000000000000000000000000000005.500000000000000000000000000000
+f73	-1.175494345e-38
+f74	1.175494357e-38
+f75	00000001.175494357e-38
+f76	00000001.175494357e-38
+f77	-1.175494345e-38
+f78	1.175494357e-38
+f79	00000001.175494357e-38
+f80	00000001.175494357e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494345e-38
+f95	1.17549e-38
+f96	1.175494357e-38
+f97	01.17549e-38
+f98	00000001.175494357e-38
+f99	01.17549e-38
+f100	00000001.175494357e-38
+f101	1000-01-06
+f102	838:59:53
+f103	1970-01-07 00:00:06
+f104	1970-01-07 00:00:06
+f105	1907
+f106	1907
+f107	1907
+f108	1enum
+f109	1set
+f59	7
+f60	7
+f61	0000000007
+f62	0000000000000000000000000000000000000000000000000000000000000007
+f63	0000000007
+f64	0000000000000000000000000000000000000000000000000000000000000007
+f65	1
+f66	6.600000000000000000000000000000
+f67	7
+f68	6.600000000000000000000000000000
+f69	0000000007
+f70	000000000000000000000000000000006.600000000000000000000000000000
+f71	0000000007
+f72	000000000000000000000000000000006.600000000000000000000000000000
+f73	-1.175494344e-38
+f74	1.175494358e-38
+f75	00000001.175494358e-38
+f76	00000001.175494358e-38
+f77	-1.175494344e-38
+f78	1.175494358e-38
+f79	00000001.175494358e-38
+f80	00000001.175494358e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494344e-38
+f95	1.17549e-38
+f96	1.175494358e-38
+f97	01.17549e-38
+f98	00000001.175494358e-38
+f99	01.17549e-38
+f100	00000001.175494358e-38
+f101	1000-01-07
+f102	838:59:52
+f103	1970-01-08 00:00:07
+f104	1970-01-08 00:00:07
+f105	1908
+f106	1908
+f107	1908
+f108	2enum
+f109	2set
+f59	8
+f60	8
+f61	0000000008
+f62	0000000000000000000000000000000000000000000000000000000000000008
+f63	0000000008
+f64	0000000000000000000000000000000000000000000000000000000000000008
+f65	2
+f66	7.700000000000000000000000000000
+f67	8
+f68	7.700000000000000000000000000000
+f69	0000000008
+f70	000000000000000000000000000000007.700000000000000000000000000000
+f71	0000000008
+f72	000000000000000000000000000000007.700000000000000000000000000000
+f73	-1.175494343e-38
+f74	1.175494359e-38
+f75	00000001.175494359e-38
+f76	00000001.175494359e-38
+f77	-1.175494343e-38
+f78	1.175494359e-38
+f79	00000001.175494359e-38
+f80	00000001.175494359e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494343e-38
+f95	1.17549e-38
+f96	1.175494359e-38
+f97	01.17549e-38
+f98	00000001.175494359e-38
+f99	01.17549e-38
+f100	00000001.175494359e-38
+f101	1000-01-08
+f102	838:59:51
+f103	1970-01-09 00:00:08
+f104	1970-01-09 00:00:08
+f105	1909
+f106	1909
+f107	1909
+f108	1enum
+f109	1set,2set
+f59	9
+f60	9
+f61	0000000009
+f62	0000000000000000000000000000000000000000000000000000000000000009
+f63	0000000009
+f64	0000000000000000000000000000000000000000000000000000000000000009
+f65	3
+f66	8.800000000000000000000000000000
+f67	9
+f68	8.800000000000000000000000000000
+f69	0000000009
+f70	000000000000000000000000000000008.800000000000000000000000000000
+f71	0000000009
+f72	000000000000000000000000000000008.800000000000000000000000000000
+f73	-1.175494342e-38
+f74	1.17549436e-38
+f75	000000001.17549436e-38
+f76	000000001.17549436e-38
+f77	-1.175494342e-38
+f78	1.17549436e-38
+f79	000000001.17549436e-38
+f80	000000001.17549436e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494342e-38
+f95	1.17549e-38
+f96	1.17549436e-38
+f97	01.17549e-38
+f98	000000001.17549436e-38
+f99	01.17549e-38
+f100	000000001.17549436e-38
+f101	1000-01-09
+f102	838:59:50
+f103	1970-01-10 00:00:09
+f104	1970-01-10 00:00:09
+f105	1910
+f106	1910
+f107	1910
+f108	2enum
+f109	1set
+f59	10
+f60	10
+f61	0000000010
+f62	0000000000000000000000000000000000000000000000000000000000000010
+f63	0000000010
+f64	0000000000000000000000000000000000000000000000000000000000000010
+f65	4
+f66	9.900000000000000000000000000000
+f67	10
+f68	9.900000000000000000000000000000
+f69	0000000010
+f70	000000000000000000000000000000009.900000000000000000000000000000
+f71	0000000010
+f72	000000000000000000000000000000009.900000000000000000000000000000
+f73	-1.175494341e-38
+f74	1.175494361e-38
+f75	00000001.175494361e-38
+f76	00000001.175494361e-38
+f77	-1.175494341e-38
+f78	1.175494361e-38
+f79	00000001.175494361e-38
+f80	00000001.175494361e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494341e-38
+f95	1.17549e-38
+f96	1.175494361e-38
+f97	01.17549e-38
+f98	00000001.175494361e-38
+f99	01.17549e-38
+f100	00000001.175494361e-38
+f101	1000-01-10
+f102	838:59:49
+f103	1970-01-11 00:00:10
+f104	1970-01-11 00:00:10
+f105	1911
+f106	1911
+f107	1911
+f108	1enum
+f109	2set
+f59	15
+f60	87
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	17
+f60	15
+f61	0000000016
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	19
+f60	18
+f61	0000000014
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	22
+f60	93
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	24
+f60	51654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	27
+f60	25
+f61	0000000026
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	29
+f60	28
+f61	0000000024
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	34
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	94
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	107
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	107
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	109
+f60	108
+f61	0000000104
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	109
+f60	108
+f61	0000000104
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	195
+f60	87
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	207
+f60	205
+f61	0000000206
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	209
+f60	208
+f61	0000000204
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	242
+f60	79
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	250
+f60	87895654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	292
+f60	93
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	299
+f60	899
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	321
+f60	NULL
+f61	0000000765
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	323
+f60	14376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	340
+f60	9984376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	394
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	424
+f60	89
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	441
+f60	16546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	660
+f60	876546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	987
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	2550
+f60	775654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	2760
+f60	985654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	3330
+f60	764376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	3410
+f60	996546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	7876
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	9112
+f60	NULL
+f61	0000008771
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	76710
+f60	226546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	569300
+f60	9114376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 Select * from test2.v2 ;
 f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
 Drop view if exists test2.v1 ;
@@ -1896,12 +7584,110 @@ Drop view if exists test.v1 ;
 CREATE VIEW test.v1 AS SELECT f59,f60 FROM test.tb2;
 INSERT INTO test.v1 values(122,432);
 SELECT * FROM test.tb2 where f59 = 122 and f60 = 432 limit 0,20;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-122	432	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+f59	122
+f60	432
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 UPDATE test.v1 SET f59 = 3000 WHERE test.v1.f59 = 122 ;
 SELECT * FROM test.tb2  where f59 = 3000 limit 0,20;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-3000	432	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+f59	3000
+f60	432
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 DELETE FROM test.v1
 where test.v1.f59 = 3000 and test.v1.f60 = 432;
 SELECT * FROM test.tb2 where f59 = 3000 and f60 = 432;
@@ -1926,16 +7712,214 @@ info: Rows matched: 2  Changed: 2  Warnings: 0
 SELECT * FROM test.v1   where f59 = 30 order by f59;
 f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
 SELECT * FROM test.tb2        where f59 = 30 ;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-30	4	0000000004	0000000000000000000000000000000000000000000000000000000000000004	0000000004	0000000000000000000000000000000000000000000000000000000000000004	-2	3.300000000000000000000000000000	4	3.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494347e-38	1.17549e-38	1.175494355e-38	01.17549e-38	00000001.175494355e-38	01.17549e-38	00000001.175494355e-38	1000-01-04	838:59:55	1970-01-05 00:00:04	1970-01-05 00:00:04	1905	1905	1905	1enum	2set
-30	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+f59	30
+f60	4
+f61	0000000004
+f62	0000000000000000000000000000000000000000000000000000000000000004
+f63	0000000004
+f64	0000000000000000000000000000000000000000000000000000000000000004
+f65	-2
+f66	3.300000000000000000000000000000
+f67	4
+f68	3.300000000000000000000000000000
+f69	0000000004
+f70	000000000000000000000000000000003.300000000000000000000000000000
+f71	0000000004
+f72	000000000000000000000000000000003.300000000000000000000000000000
+f73	-1.175494347e-38
+f74	1.175494355e-38
+f75	00000001.175494355e-38
+f76	00000001.175494355e-38
+f77	-1.175494347e-38
+f78	1.175494355e-38
+f79	00000001.175494355e-38
+f80	00000001.175494355e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494347e-38
+f95	1.17549e-38
+f96	1.175494355e-38
+f97	01.17549e-38
+f98	00000001.175494355e-38
+f99	01.17549e-38
+f100	00000001.175494355e-38
+f101	1000-01-04
+f102	838:59:55
+f103	1970-01-05 00:00:04
+f104	1970-01-05 00:00:04
+f105	1905
+f106	1905
+f107	1905
+f108	1enum
+f109	2set
+f59	30
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 UPDATE tb2 SET f59 = 100 where f59 = 30 ;
 affected rows: 2
 info: Rows matched: 2  Changed: 2  Warnings: 0
 SELECT * FROM tb2 where f59 = 100 ;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-100	4	0000000004	0000000000000000000000000000000000000000000000000000000000000004	0000000004	0000000000000000000000000000000000000000000000000000000000000004	-2	3.300000000000000000000000000000	4	3.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494347e-38	1.17549e-38	1.175494355e-38	01.17549e-38	00000001.175494355e-38	01.17549e-38	00000001.175494355e-38	1000-01-04	838:59:55	1970-01-05 00:00:04	1970-01-05 00:00:04	1905	1905	1905	1enum	2set
-100	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+f59	100
+f60	4
+f61	0000000004
+f62	0000000000000000000000000000000000000000000000000000000000000004
+f63	0000000004
+f64	0000000000000000000000000000000000000000000000000000000000000004
+f65	-2
+f66	3.300000000000000000000000000000
+f67	4
+f68	3.300000000000000000000000000000
+f69	0000000004
+f70	000000000000000000000000000000003.300000000000000000000000000000
+f71	0000000004
+f72	000000000000000000000000000000003.300000000000000000000000000000
+f73	-1.175494347e-38
+f74	1.175494355e-38
+f75	00000001.175494355e-38
+f76	00000001.175494355e-38
+f77	-1.175494347e-38
+f78	1.175494355e-38
+f79	00000001.175494355e-38
+f80	00000001.175494355e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494347e-38
+f95	1.17549e-38
+f96	1.175494355e-38
+f97	01.17549e-38
+f98	00000001.175494355e-38
+f99	01.17549e-38
+f100	00000001.175494355e-38
+f101	1000-01-04
+f102	838:59:55
+f103	1970-01-05 00:00:04
+f104	1970-01-05 00:00:04
+f105	1905
+f106	1905
+f107	1905
+f108	1enum
+f109	2set
+f59	100
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 SELECT * FROM test.v1 order by f59 ;
 f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
 drop view if exists test.v1 ;
@@ -9721,13 +15705,2557 @@ Testcase 3.3.1.50 - 3.3.1.53
 --------------------------------------------------------------------------------
 DROP VIEW  IF EXISTS test.v1;
 CREATE VIEW test.v1 AS SELECT * FROM test.tb2;
-SELECT * FROM test.v1 order by f59 limit 5;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-1	1	0000000001	0000000000000000000000000000000000000000000000000000000000000001	0000000001	0000000000000000000000000000000000000000000000000000000000000001	-5	0.000000000000000000000000000000	1	0.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549435e-38	1.17549e-38	1.175494352e-38	01.17549e-38	00000001.175494352e-38	01.17549e-38	00000001.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	1970-01-02 00:00:01	1902	1902	1902	2enum	2set
-2	2	0000000002	0000000000000000000000000000000000000000000000000000000000000002	0000000002	0000000000000000000000000000000000000000000000000000000000000002	-4	1.100000000000000000000000000000	2	1.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494349e-38	1.17549e-38	1.175494353e-38	01.17549e-38	00000001.175494353e-38	01.17549e-38	00000001.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	1970-01-03 00:00:02	1903	1903	1903	1enum	1set,2set
-3	3	0000000003	0000000000000000000000000000000000000000000000000000000000000003	0000000003	0000000000000000000000000000000000000000000000000000000000000003	-3	2.200000000000000000000000000000	3	2.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494348e-38	1.17549e-38	1.175494354e-38	01.17549e-38	00000001.175494354e-38	01.17549e-38	00000001.175494354e-38	1000-01-03	838:59:56	1970-01-04 00:00:03	1970-01-04 00:00:03	1904	1904	1904	2enum	1set
-5	5	0000000005	0000000000000000000000000000000000000000000000000000000000000005	0000000005	0000000000000000000000000000000000000000000000000000000000000005	-1	4.400000000000000000000000000000	5	4.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494346e-38	1.17549e-38	1.175494356e-38	01.17549e-38	00000001.175494356e-38	01.17549e-38	00000001.175494356e-38	1000-01-05	838:59:54	1970-01-06 00:00:05	1970-01-06 00:00:05	1906	1906	1906	2enum	1set,2set
-6	6	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0	5.500000000000000000000000000000	6	5.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494345e-38	1.17549e-38	1.175494357e-38	01.17549e-38	00000001.175494357e-38	01.17549e-38	00000001.175494357e-38	1000-01-06	838:59:53	1970-01-07 00:00:06	1970-01-07 00:00:06	1907	1907	1907	1enum	1set
+SELECT * FROM test.v1 order by f59,f60,f61 ;
+f59	1
+f60	1
+f61	0000000001
+f62	0000000000000000000000000000000000000000000000000000000000000001
+f63	0000000001
+f64	0000000000000000000000000000000000000000000000000000000000000001
+f65	-5
+f66	0.000000000000000000000000000000
+f67	1
+f68	0.000000000000000000000000000000
+f69	0000000001
+f70	000000000000000000000000000000000.000000000000000000000000000000
+f71	0000000001
+f72	000000000000000000000000000000000.000000000000000000000000000000
+f73	-1.17549435e-38
+f74	1.175494352e-38
+f75	00000001.175494352e-38
+f76	00000001.175494352e-38
+f77	-1.17549435e-38
+f78	1.175494352e-38
+f79	00000001.175494352e-38
+f80	00000001.175494352e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.17549435e-38
+f95	1.17549e-38
+f96	1.175494352e-38
+f97	01.17549e-38
+f98	00000001.175494352e-38
+f99	01.17549e-38
+f100	00000001.175494352e-38
+f101	1000-01-01
+f102	838:59:58
+f103	1970-01-02 00:00:01
+f104	1970-01-02 00:00:01
+f105	1902
+f106	1902
+f107	1902
+f108	2enum
+f109	2set
+f59	2
+f60	2
+f61	0000000002
+f62	0000000000000000000000000000000000000000000000000000000000000002
+f63	0000000002
+f64	0000000000000000000000000000000000000000000000000000000000000002
+f65	-4
+f66	1.100000000000000000000000000000
+f67	2
+f68	1.100000000000000000000000000000
+f69	0000000002
+f70	000000000000000000000000000000001.100000000000000000000000000000
+f71	0000000002
+f72	000000000000000000000000000000001.100000000000000000000000000000
+f73	-1.175494349e-38
+f74	1.175494353e-38
+f75	00000001.175494353e-38
+f76	00000001.175494353e-38
+f77	-1.175494349e-38
+f78	1.175494353e-38
+f79	00000001.175494353e-38
+f80	00000001.175494353e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494349e-38
+f95	1.17549e-38
+f96	1.175494353e-38
+f97	01.17549e-38
+f98	00000001.175494353e-38
+f99	01.17549e-38
+f100	00000001.175494353e-38
+f101	1000-01-02
+f102	838:59:57
+f103	1970-01-03 00:00:02
+f104	1970-01-03 00:00:02
+f105	1903
+f106	1903
+f107	1903
+f108	1enum
+f109	1set,2set
+f59	3
+f60	3
+f61	0000000003
+f62	0000000000000000000000000000000000000000000000000000000000000003
+f63	0000000003
+f64	0000000000000000000000000000000000000000000000000000000000000003
+f65	-3
+f66	2.200000000000000000000000000000
+f67	3
+f68	2.200000000000000000000000000000
+f69	0000000003
+f70	000000000000000000000000000000002.200000000000000000000000000000
+f71	0000000003
+f72	000000000000000000000000000000002.200000000000000000000000000000
+f73	-1.175494348e-38
+f74	1.175494354e-38
+f75	00000001.175494354e-38
+f76	00000001.175494354e-38
+f77	-1.175494348e-38
+f78	1.175494354e-38
+f79	00000001.175494354e-38
+f80	00000001.175494354e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494348e-38
+f95	1.17549e-38
+f96	1.175494354e-38
+f97	01.17549e-38
+f98	00000001.175494354e-38
+f99	01.17549e-38
+f100	00000001.175494354e-38
+f101	1000-01-03
+f102	838:59:56
+f103	1970-01-04 00:00:03
+f104	1970-01-04 00:00:03
+f105	1904
+f106	1904
+f107	1904
+f108	2enum
+f109	1set
+f59	5
+f60	5
+f61	0000000005
+f62	0000000000000000000000000000000000000000000000000000000000000005
+f63	0000000005
+f64	0000000000000000000000000000000000000000000000000000000000000005
+f65	-1
+f66	4.400000000000000000000000000000
+f67	5
+f68	4.400000000000000000000000000000
+f69	0000000005
+f70	000000000000000000000000000000004.400000000000000000000000000000
+f71	0000000005
+f72	000000000000000000000000000000004.400000000000000000000000000000
+f73	-1.175494346e-38
+f74	1.175494356e-38
+f75	00000001.175494356e-38
+f76	00000001.175494356e-38
+f77	-1.175494346e-38
+f78	1.175494356e-38
+f79	00000001.175494356e-38
+f80	00000001.175494356e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494346e-38
+f95	1.17549e-38
+f96	1.175494356e-38
+f97	01.17549e-38
+f98	00000001.175494356e-38
+f99	01.17549e-38
+f100	00000001.175494356e-38
+f101	1000-01-05
+f102	838:59:54
+f103	1970-01-06 00:00:05
+f104	1970-01-06 00:00:05
+f105	1906
+f106	1906
+f107	1906
+f108	2enum
+f109	1set,2set
+f59	6
+f60	6
+f61	0000000006
+f62	0000000000000000000000000000000000000000000000000000000000000006
+f63	0000000006
+f64	0000000000000000000000000000000000000000000000000000000000000006
+f65	0
+f66	5.500000000000000000000000000000
+f67	6
+f68	5.500000000000000000000000000000
+f69	0000000006
+f70	000000000000000000000000000000005.500000000000000000000000000000
+f71	0000000006
+f72	000000000000000000000000000000005.500000000000000000000000000000
+f73	-1.175494345e-38
+f74	1.175494357e-38
+f75	00000001.175494357e-38
+f76	00000001.175494357e-38
+f77	-1.175494345e-38
+f78	1.175494357e-38
+f79	00000001.175494357e-38
+f80	00000001.175494357e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494345e-38
+f95	1.17549e-38
+f96	1.175494357e-38
+f97	01.17549e-38
+f98	00000001.175494357e-38
+f99	01.17549e-38
+f100	00000001.175494357e-38
+f101	1000-01-06
+f102	838:59:53
+f103	1970-01-07 00:00:06
+f104	1970-01-07 00:00:06
+f105	1907
+f106	1907
+f107	1907
+f108	1enum
+f109	1set
+f59	7
+f60	7
+f61	0000000007
+f62	0000000000000000000000000000000000000000000000000000000000000007
+f63	0000000007
+f64	0000000000000000000000000000000000000000000000000000000000000007
+f65	1
+f66	6.600000000000000000000000000000
+f67	7
+f68	6.600000000000000000000000000000
+f69	0000000007
+f70	000000000000000000000000000000006.600000000000000000000000000000
+f71	0000000007
+f72	000000000000000000000000000000006.600000000000000000000000000000
+f73	-1.175494344e-38
+f74	1.175494358e-38
+f75	00000001.175494358e-38
+f76	00000001.175494358e-38
+f77	-1.175494344e-38
+f78	1.175494358e-38
+f79	00000001.175494358e-38
+f80	00000001.175494358e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494344e-38
+f95	1.17549e-38
+f96	1.175494358e-38
+f97	01.17549e-38
+f98	00000001.175494358e-38
+f99	01.17549e-38
+f100	00000001.175494358e-38
+f101	1000-01-07
+f102	838:59:52
+f103	1970-01-08 00:00:07
+f104	1970-01-08 00:00:07
+f105	1908
+f106	1908
+f107	1908
+f108	2enum
+f109	2set
+f59	8
+f60	8
+f61	0000000008
+f62	0000000000000000000000000000000000000000000000000000000000000008
+f63	0000000008
+f64	0000000000000000000000000000000000000000000000000000000000000008
+f65	2
+f66	7.700000000000000000000000000000
+f67	8
+f68	7.700000000000000000000000000000
+f69	0000000008
+f70	000000000000000000000000000000007.700000000000000000000000000000
+f71	0000000008
+f72	000000000000000000000000000000007.700000000000000000000000000000
+f73	-1.175494343e-38
+f74	1.175494359e-38
+f75	00000001.175494359e-38
+f76	00000001.175494359e-38
+f77	-1.175494343e-38
+f78	1.175494359e-38
+f79	00000001.175494359e-38
+f80	00000001.175494359e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494343e-38
+f95	1.17549e-38
+f96	1.175494359e-38
+f97	01.17549e-38
+f98	00000001.175494359e-38
+f99	01.17549e-38
+f100	00000001.175494359e-38
+f101	1000-01-08
+f102	838:59:51
+f103	1970-01-09 00:00:08
+f104	1970-01-09 00:00:08
+f105	1909
+f106	1909
+f107	1909
+f108	1enum
+f109	1set,2set
+f59	9
+f60	9
+f61	0000000009
+f62	0000000000000000000000000000000000000000000000000000000000000009
+f63	0000000009
+f64	0000000000000000000000000000000000000000000000000000000000000009
+f65	3
+f66	8.800000000000000000000000000000
+f67	9
+f68	8.800000000000000000000000000000
+f69	0000000009
+f70	000000000000000000000000000000008.800000000000000000000000000000
+f71	0000000009
+f72	000000000000000000000000000000008.800000000000000000000000000000
+f73	-1.175494342e-38
+f74	1.17549436e-38
+f75	000000001.17549436e-38
+f76	000000001.17549436e-38
+f77	-1.175494342e-38
+f78	1.17549436e-38
+f79	000000001.17549436e-38
+f80	000000001.17549436e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494342e-38
+f95	1.17549e-38
+f96	1.17549436e-38
+f97	01.17549e-38
+f98	000000001.17549436e-38
+f99	01.17549e-38
+f100	000000001.17549436e-38
+f101	1000-01-09
+f102	838:59:50
+f103	1970-01-10 00:00:09
+f104	1970-01-10 00:00:09
+f105	1910
+f106	1910
+f107	1910
+f108	2enum
+f109	1set
+f59	10
+f60	10
+f61	0000000010
+f62	0000000000000000000000000000000000000000000000000000000000000010
+f63	0000000010
+f64	0000000000000000000000000000000000000000000000000000000000000010
+f65	4
+f66	9.900000000000000000000000000000
+f67	10
+f68	9.900000000000000000000000000000
+f69	0000000010
+f70	000000000000000000000000000000009.900000000000000000000000000000
+f71	0000000010
+f72	000000000000000000000000000000009.900000000000000000000000000000
+f73	-1.175494341e-38
+f74	1.175494361e-38
+f75	00000001.175494361e-38
+f76	00000001.175494361e-38
+f77	-1.175494341e-38
+f78	1.175494361e-38
+f79	00000001.175494361e-38
+f80	00000001.175494361e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494341e-38
+f95	1.17549e-38
+f96	1.175494361e-38
+f97	01.17549e-38
+f98	00000001.175494361e-38
+f99	01.17549e-38
+f100	00000001.175494361e-38
+f101	1000-01-10
+f102	838:59:49
+f103	1970-01-11 00:00:10
+f104	1970-01-11 00:00:10
+f105	1911
+f106	1911
+f107	1911
+f108	1enum
+f109	2set
+f59	15
+f60	87
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	17
+f60	15
+f61	0000000016
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	19
+f60	18
+f61	0000000014
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	22
+f60	93
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	24
+f60	51654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	27
+f60	25
+f61	0000000026
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	29
+f60	28
+f61	0000000024
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	34
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	94
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	100
+f60	4
+f61	0000000004
+f62	0000000000000000000000000000000000000000000000000000000000000004
+f63	0000000004
+f64	0000000000000000000000000000000000000000000000000000000000000004
+f65	-2
+f66	3.300000000000000000000000000000
+f67	4
+f68	3.300000000000000000000000000000
+f69	0000000004
+f70	000000000000000000000000000000003.300000000000000000000000000000
+f71	0000000004
+f72	000000000000000000000000000000003.300000000000000000000000000000
+f73	-1.175494347e-38
+f74	1.175494355e-38
+f75	00000001.175494355e-38
+f76	00000001.175494355e-38
+f77	-1.175494347e-38
+f78	1.175494355e-38
+f79	00000001.175494355e-38
+f80	00000001.175494355e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494347e-38
+f95	1.17549e-38
+f96	1.175494355e-38
+f97	01.17549e-38
+f98	00000001.175494355e-38
+f99	01.17549e-38
+f100	00000001.175494355e-38
+f101	1000-01-04
+f102	838:59:55
+f103	1970-01-05 00:00:04
+f104	1970-01-05 00:00:04
+f105	1905
+f106	1905
+f107	1905
+f108	1enum
+f109	2set
+f59	100
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	107
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	107
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	109
+f60	108
+f61	0000000104
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	109
+f60	108
+f61	0000000104
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	195
+f60	87
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	207
+f60	205
+f61	0000000206
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	209
+f60	208
+f61	0000000204
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	242
+f60	79
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	250
+f60	87895654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	292
+f60	93
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	299
+f60	899
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	321
+f60	NULL
+f61	0000000765
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	323
+f60	14376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	340
+f60	9984376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	394
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	424
+f60	89
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	441
+f60	16546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	660
+f60	876546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	987
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	2550
+f60	775654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	2760
+f60	985654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	3330
+f60	764376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	3410
+f60	996546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	7876
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	9112
+f60	NULL
+f61	0000008771
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	76710
+f60	226546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	569300
+f60	9114376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 drop view test.v1 ;
 CREATE VIEW test.v1 AS SELECT F59,F61 FROM test.tb2;
 SELECT * FROM test.v1 order by F59, F61 limit 50;
@@ -9784,28 +18312,2557 @@ F59	F61
 569300	NULL
 drop view test.v1 ;
 CREATE VIEW test.v1 AS SELECT * FROM test.tb2 order by f59, f60, f61;
-SELECT * FROM test.v1 order by f59,f60,f61 limit 20;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-1	1	0000000001	0000000000000000000000000000000000000000000000000000000000000001	0000000001	0000000000000000000000000000000000000000000000000000000000000001	-5	0.000000000000000000000000000000	1	0.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	0000000001	000000000000000000000000000000000.000000000000000000000000000000	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549435e-38	1.175494352e-38	00000001.175494352e-38	00000001.175494352e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549435e-38	1.17549e-38	1.175494352e-38	01.17549e-38	00000001.175494352e-38	01.17549e-38	00000001.175494352e-38	1000-01-01	838:59:58	1970-01-02 00:00:01	1970-01-02 00:00:01	1902	1902	1902	2enum	2set
-2	2	0000000002	0000000000000000000000000000000000000000000000000000000000000002	0000000002	0000000000000000000000000000000000000000000000000000000000000002	-4	1.100000000000000000000000000000	2	1.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	0000000002	000000000000000000000000000000001.100000000000000000000000000000	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.175494349e-38	1.175494353e-38	00000001.175494353e-38	00000001.175494353e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494349e-38	1.17549e-38	1.175494353e-38	01.17549e-38	00000001.175494353e-38	01.17549e-38	00000001.175494353e-38	1000-01-02	838:59:57	1970-01-03 00:00:02	1970-01-03 00:00:02	1903	1903	1903	1enum	1set,2set
-3	3	0000000003	0000000000000000000000000000000000000000000000000000000000000003	0000000003	0000000000000000000000000000000000000000000000000000000000000003	-3	2.200000000000000000000000000000	3	2.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	0000000003	000000000000000000000000000000002.200000000000000000000000000000	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.175494348e-38	1.175494354e-38	00000001.175494354e-38	00000001.175494354e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494348e-38	1.17549e-38	1.175494354e-38	01.17549e-38	00000001.175494354e-38	01.17549e-38	00000001.175494354e-38	1000-01-03	838:59:56	1970-01-04 00:00:03	1970-01-04 00:00:03	1904	1904	1904	2enum	1set
-5	5	0000000005	0000000000000000000000000000000000000000000000000000000000000005	0000000005	0000000000000000000000000000000000000000000000000000000000000005	-1	4.400000000000000000000000000000	5	4.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	0000000005	000000000000000000000000000000004.400000000000000000000000000000	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.175494346e-38	1.175494356e-38	00000001.175494356e-38	00000001.175494356e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494346e-38	1.17549e-38	1.175494356e-38	01.17549e-38	00000001.175494356e-38	01.17549e-38	00000001.175494356e-38	1000-01-05	838:59:54	1970-01-06 00:00:05	1970-01-06 00:00:05	1906	1906	1906	2enum	1set,2set
-6	6	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0000000006	0000000000000000000000000000000000000000000000000000000000000006	0	5.500000000000000000000000000000	6	5.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	0000000006	000000000000000000000000000000005.500000000000000000000000000000	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.175494345e-38	1.175494357e-38	00000001.175494357e-38	00000001.175494357e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494345e-38	1.17549e-38	1.175494357e-38	01.17549e-38	00000001.175494357e-38	01.17549e-38	00000001.175494357e-38	1000-01-06	838:59:53	1970-01-07 00:00:06	1970-01-07 00:00:06	1907	1907	1907	1enum	1set
-7	7	0000000007	0000000000000000000000000000000000000000000000000000000000000007	0000000007	0000000000000000000000000000000000000000000000000000000000000007	1	6.600000000000000000000000000000	7	6.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	0000000007	000000000000000000000000000000006.600000000000000000000000000000	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.175494344e-38	1.175494358e-38	00000001.175494358e-38	00000001.175494358e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494344e-38	1.17549e-38	1.175494358e-38	01.17549e-38	00000001.175494358e-38	01.17549e-38	00000001.175494358e-38	1000-01-07	838:59:52	1970-01-08 00:00:07	1970-01-08 00:00:07	1908	1908	1908	2enum	2set
-8	8	0000000008	0000000000000000000000000000000000000000000000000000000000000008	0000000008	0000000000000000000000000000000000000000000000000000000000000008	2	7.700000000000000000000000000000	8	7.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	0000000008	000000000000000000000000000000007.700000000000000000000000000000	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.175494343e-38	1.175494359e-38	00000001.175494359e-38	00000001.175494359e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494343e-38	1.17549e-38	1.175494359e-38	01.17549e-38	00000001.175494359e-38	01.17549e-38	00000001.175494359e-38	1000-01-08	838:59:51	1970-01-09 00:00:08	1970-01-09 00:00:08	1909	1909	1909	1enum	1set,2set
-9	9	0000000009	0000000000000000000000000000000000000000000000000000000000000009	0000000009	0000000000000000000000000000000000000000000000000000000000000009	3	8.800000000000000000000000000000	9	8.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	0000000009	000000000000000000000000000000008.800000000000000000000000000000	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.175494342e-38	1.17549436e-38	000000001.17549436e-38	000000001.17549436e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494342e-38	1.17549e-38	1.17549436e-38	01.17549e-38	000000001.17549436e-38	01.17549e-38	000000001.17549436e-38	1000-01-09	838:59:50	1970-01-10 00:00:09	1970-01-10 00:00:09	1910	1910	1910	2enum	1set
-10	10	0000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000010	0000000000000000000000000000000000000000000000000000000000000010	4	9.900000000000000000000000000000	10	9.900000000000000000000000000000	0000000010	000000000000000000000000000000009.900000000000000000000000000000	0000000010	000000000000000000000000000000009.900000000000000000000000000000	-1.175494341e-38	1.175494361e-38	00000001.175494361e-38	00000001.175494361e-38	-1.175494341e-38	1.175494361e-38	00000001.175494361e-38	00000001.175494361e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494341e-38	1.17549e-38	1.175494361e-38	01.17549e-38	00000001.175494361e-38	01.17549e-38	00000001.175494361e-38	1000-01-10	838:59:49	1970-01-11 00:00:10	1970-01-11 00:00:10	1911	1911	1911	1enum	2set
-15	87	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-17	15	0000000016	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-19	18	0000000014	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-22	93	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-24	51654	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-27	25	0000000026	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-29	28	0000000024	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-34	41	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-94	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-100	4	0000000004	0000000000000000000000000000000000000000000000000000000000000004	0000000004	0000000000000000000000000000000000000000000000000000000000000004	-2	3.300000000000000000000000000000	4	3.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	0000000004	000000000000000000000000000000003.300000000000000000000000000000	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.175494347e-38	1.175494355e-38	00000001.175494355e-38	00000001.175494355e-38	-1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.17549e-38	1.17549e-38	1.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	01.17549e-38	-1.17549e-38	-1.175494347e-38	1.17549e-38	1.175494355e-38	01.17549e-38	00000001.175494355e-38	01.17549e-38	00000001.175494355e-38	1000-01-04	838:59:55	1970-01-05 00:00:04	1970-01-05 00:00:04	1905	1905	1905	1enum	2set
-100	74	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+SELECT * FROM test.v1 order by f59,f60,f61 ;
+f59	1
+f60	1
+f61	0000000001
+f62	0000000000000000000000000000000000000000000000000000000000000001
+f63	0000000001
+f64	0000000000000000000000000000000000000000000000000000000000000001
+f65	-5
+f66	0.000000000000000000000000000000
+f67	1
+f68	0.000000000000000000000000000000
+f69	0000000001
+f70	000000000000000000000000000000000.000000000000000000000000000000
+f71	0000000001
+f72	000000000000000000000000000000000.000000000000000000000000000000
+f73	-1.17549435e-38
+f74	1.175494352e-38
+f75	00000001.175494352e-38
+f76	00000001.175494352e-38
+f77	-1.17549435e-38
+f78	1.175494352e-38
+f79	00000001.175494352e-38
+f80	00000001.175494352e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.17549435e-38
+f95	1.17549e-38
+f96	1.175494352e-38
+f97	01.17549e-38
+f98	00000001.175494352e-38
+f99	01.17549e-38
+f100	00000001.175494352e-38
+f101	1000-01-01
+f102	838:59:58
+f103	1970-01-02 00:00:01
+f104	1970-01-02 00:00:01
+f105	1902
+f106	1902
+f107	1902
+f108	2enum
+f109	2set
+f59	2
+f60	2
+f61	0000000002
+f62	0000000000000000000000000000000000000000000000000000000000000002
+f63	0000000002
+f64	0000000000000000000000000000000000000000000000000000000000000002
+f65	-4
+f66	1.100000000000000000000000000000
+f67	2
+f68	1.100000000000000000000000000000
+f69	0000000002
+f70	000000000000000000000000000000001.100000000000000000000000000000
+f71	0000000002
+f72	000000000000000000000000000000001.100000000000000000000000000000
+f73	-1.175494349e-38
+f74	1.175494353e-38
+f75	00000001.175494353e-38
+f76	00000001.175494353e-38
+f77	-1.175494349e-38
+f78	1.175494353e-38
+f79	00000001.175494353e-38
+f80	00000001.175494353e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494349e-38
+f95	1.17549e-38
+f96	1.175494353e-38
+f97	01.17549e-38
+f98	00000001.175494353e-38
+f99	01.17549e-38
+f100	00000001.175494353e-38
+f101	1000-01-02
+f102	838:59:57
+f103	1970-01-03 00:00:02
+f104	1970-01-03 00:00:02
+f105	1903
+f106	1903
+f107	1903
+f108	1enum
+f109	1set,2set
+f59	3
+f60	3
+f61	0000000003
+f62	0000000000000000000000000000000000000000000000000000000000000003
+f63	0000000003
+f64	0000000000000000000000000000000000000000000000000000000000000003
+f65	-3
+f66	2.200000000000000000000000000000
+f67	3
+f68	2.200000000000000000000000000000
+f69	0000000003
+f70	000000000000000000000000000000002.200000000000000000000000000000
+f71	0000000003
+f72	000000000000000000000000000000002.200000000000000000000000000000
+f73	-1.175494348e-38
+f74	1.175494354e-38
+f75	00000001.175494354e-38
+f76	00000001.175494354e-38
+f77	-1.175494348e-38
+f78	1.175494354e-38
+f79	00000001.175494354e-38
+f80	00000001.175494354e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494348e-38
+f95	1.17549e-38
+f96	1.175494354e-38
+f97	01.17549e-38
+f98	00000001.175494354e-38
+f99	01.17549e-38
+f100	00000001.175494354e-38
+f101	1000-01-03
+f102	838:59:56
+f103	1970-01-04 00:00:03
+f104	1970-01-04 00:00:03
+f105	1904
+f106	1904
+f107	1904
+f108	2enum
+f109	1set
+f59	5
+f60	5
+f61	0000000005
+f62	0000000000000000000000000000000000000000000000000000000000000005
+f63	0000000005
+f64	0000000000000000000000000000000000000000000000000000000000000005
+f65	-1
+f66	4.400000000000000000000000000000
+f67	5
+f68	4.400000000000000000000000000000
+f69	0000000005
+f70	000000000000000000000000000000004.400000000000000000000000000000
+f71	0000000005
+f72	000000000000000000000000000000004.400000000000000000000000000000
+f73	-1.175494346e-38
+f74	1.175494356e-38
+f75	00000001.175494356e-38
+f76	00000001.175494356e-38
+f77	-1.175494346e-38
+f78	1.175494356e-38
+f79	00000001.175494356e-38
+f80	00000001.175494356e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494346e-38
+f95	1.17549e-38
+f96	1.175494356e-38
+f97	01.17549e-38
+f98	00000001.175494356e-38
+f99	01.17549e-38
+f100	00000001.175494356e-38
+f101	1000-01-05
+f102	838:59:54
+f103	1970-01-06 00:00:05
+f104	1970-01-06 00:00:05
+f105	1906
+f106	1906
+f107	1906
+f108	2enum
+f109	1set,2set
+f59	6
+f60	6
+f61	0000000006
+f62	0000000000000000000000000000000000000000000000000000000000000006
+f63	0000000006
+f64	0000000000000000000000000000000000000000000000000000000000000006
+f65	0
+f66	5.500000000000000000000000000000
+f67	6
+f68	5.500000000000000000000000000000
+f69	0000000006
+f70	000000000000000000000000000000005.500000000000000000000000000000
+f71	0000000006
+f72	000000000000000000000000000000005.500000000000000000000000000000
+f73	-1.175494345e-38
+f74	1.175494357e-38
+f75	00000001.175494357e-38
+f76	00000001.175494357e-38
+f77	-1.175494345e-38
+f78	1.175494357e-38
+f79	00000001.175494357e-38
+f80	00000001.175494357e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494345e-38
+f95	1.17549e-38
+f96	1.175494357e-38
+f97	01.17549e-38
+f98	00000001.175494357e-38
+f99	01.17549e-38
+f100	00000001.175494357e-38
+f101	1000-01-06
+f102	838:59:53
+f103	1970-01-07 00:00:06
+f104	1970-01-07 00:00:06
+f105	1907
+f106	1907
+f107	1907
+f108	1enum
+f109	1set
+f59	7
+f60	7
+f61	0000000007
+f62	0000000000000000000000000000000000000000000000000000000000000007
+f63	0000000007
+f64	0000000000000000000000000000000000000000000000000000000000000007
+f65	1
+f66	6.600000000000000000000000000000
+f67	7
+f68	6.600000000000000000000000000000
+f69	0000000007
+f70	000000000000000000000000000000006.600000000000000000000000000000
+f71	0000000007
+f72	000000000000000000000000000000006.600000000000000000000000000000
+f73	-1.175494344e-38
+f74	1.175494358e-38
+f75	00000001.175494358e-38
+f76	00000001.175494358e-38
+f77	-1.175494344e-38
+f78	1.175494358e-38
+f79	00000001.175494358e-38
+f80	00000001.175494358e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494344e-38
+f95	1.17549e-38
+f96	1.175494358e-38
+f97	01.17549e-38
+f98	00000001.175494358e-38
+f99	01.17549e-38
+f100	00000001.175494358e-38
+f101	1000-01-07
+f102	838:59:52
+f103	1970-01-08 00:00:07
+f104	1970-01-08 00:00:07
+f105	1908
+f106	1908
+f107	1908
+f108	2enum
+f109	2set
+f59	8
+f60	8
+f61	0000000008
+f62	0000000000000000000000000000000000000000000000000000000000000008
+f63	0000000008
+f64	0000000000000000000000000000000000000000000000000000000000000008
+f65	2
+f66	7.700000000000000000000000000000
+f67	8
+f68	7.700000000000000000000000000000
+f69	0000000008
+f70	000000000000000000000000000000007.700000000000000000000000000000
+f71	0000000008
+f72	000000000000000000000000000000007.700000000000000000000000000000
+f73	-1.175494343e-38
+f74	1.175494359e-38
+f75	00000001.175494359e-38
+f76	00000001.175494359e-38
+f77	-1.175494343e-38
+f78	1.175494359e-38
+f79	00000001.175494359e-38
+f80	00000001.175494359e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494343e-38
+f95	1.17549e-38
+f96	1.175494359e-38
+f97	01.17549e-38
+f98	00000001.175494359e-38
+f99	01.17549e-38
+f100	00000001.175494359e-38
+f101	1000-01-08
+f102	838:59:51
+f103	1970-01-09 00:00:08
+f104	1970-01-09 00:00:08
+f105	1909
+f106	1909
+f107	1909
+f108	1enum
+f109	1set,2set
+f59	9
+f60	9
+f61	0000000009
+f62	0000000000000000000000000000000000000000000000000000000000000009
+f63	0000000009
+f64	0000000000000000000000000000000000000000000000000000000000000009
+f65	3
+f66	8.800000000000000000000000000000
+f67	9
+f68	8.800000000000000000000000000000
+f69	0000000009
+f70	000000000000000000000000000000008.800000000000000000000000000000
+f71	0000000009
+f72	000000000000000000000000000000008.800000000000000000000000000000
+f73	-1.175494342e-38
+f74	1.17549436e-38
+f75	000000001.17549436e-38
+f76	000000001.17549436e-38
+f77	-1.175494342e-38
+f78	1.17549436e-38
+f79	000000001.17549436e-38
+f80	000000001.17549436e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494342e-38
+f95	1.17549e-38
+f96	1.17549436e-38
+f97	01.17549e-38
+f98	000000001.17549436e-38
+f99	01.17549e-38
+f100	000000001.17549436e-38
+f101	1000-01-09
+f102	838:59:50
+f103	1970-01-10 00:00:09
+f104	1970-01-10 00:00:09
+f105	1910
+f106	1910
+f107	1910
+f108	2enum
+f109	1set
+f59	10
+f60	10
+f61	0000000010
+f62	0000000000000000000000000000000000000000000000000000000000000010
+f63	0000000010
+f64	0000000000000000000000000000000000000000000000000000000000000010
+f65	4
+f66	9.900000000000000000000000000000
+f67	10
+f68	9.900000000000000000000000000000
+f69	0000000010
+f70	000000000000000000000000000000009.900000000000000000000000000000
+f71	0000000010
+f72	000000000000000000000000000000009.900000000000000000000000000000
+f73	-1.175494341e-38
+f74	1.175494361e-38
+f75	00000001.175494361e-38
+f76	00000001.175494361e-38
+f77	-1.175494341e-38
+f78	1.175494361e-38
+f79	00000001.175494361e-38
+f80	00000001.175494361e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494341e-38
+f95	1.17549e-38
+f96	1.175494361e-38
+f97	01.17549e-38
+f98	00000001.175494361e-38
+f99	01.17549e-38
+f100	00000001.175494361e-38
+f101	1000-01-10
+f102	838:59:49
+f103	1970-01-11 00:00:10
+f104	1970-01-11 00:00:10
+f105	1911
+f106	1911
+f107	1911
+f108	1enum
+f109	2set
+f59	15
+f60	87
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	17
+f60	15
+f61	0000000016
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	19
+f60	18
+f61	0000000014
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	22
+f60	93
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	24
+f60	51654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	27
+f60	25
+f61	0000000026
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	29
+f60	28
+f61	0000000024
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	34
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	94
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	100
+f60	4
+f61	0000000004
+f62	0000000000000000000000000000000000000000000000000000000000000004
+f63	0000000004
+f64	0000000000000000000000000000000000000000000000000000000000000004
+f65	-2
+f66	3.300000000000000000000000000000
+f67	4
+f68	3.300000000000000000000000000000
+f69	0000000004
+f70	000000000000000000000000000000003.300000000000000000000000000000
+f71	0000000004
+f72	000000000000000000000000000000003.300000000000000000000000000000
+f73	-1.175494347e-38
+f74	1.175494355e-38
+f75	00000001.175494355e-38
+f76	00000001.175494355e-38
+f77	-1.175494347e-38
+f78	1.175494355e-38
+f79	00000001.175494355e-38
+f80	00000001.175494355e-38
+f81	-1.17549e-38
+f82	1.17549e-38
+f83	01.17549e-38
+f84	01.17549e-38
+f85	-1.17549e-38
+f86	-1.17549e-38
+f87	1.17549e-38
+f88	1.17549e-38
+f89	01.17549e-38
+f90	01.17549e-38
+f91	01.17549e-38
+f92	01.17549e-38
+f93	-1.17549e-38
+f94	-1.175494347e-38
+f95	1.17549e-38
+f96	1.175494355e-38
+f97	01.17549e-38
+f98	00000001.175494355e-38
+f99	01.17549e-38
+f100	00000001.175494355e-38
+f101	1000-01-04
+f102	838:59:55
+f103	1970-01-05 00:00:04
+f104	1970-01-05 00:00:04
+f105	1905
+f106	1905
+f107	1905
+f108	1enum
+f109	2set
+f59	100
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	107
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	107
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	109
+f60	108
+f61	0000000104
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	109
+f60	108
+f61	0000000104
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	195
+f60	87
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	207
+f60	205
+f61	0000000206
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	209
+f60	208
+f61	0000000204
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	242
+f60	79
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	250
+f60	87895654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	292
+f60	93
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	299
+f60	899
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	321
+f60	NULL
+f61	0000000765
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	323
+f60	14376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	340
+f60	9984376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	394
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	424
+f60	89
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	441
+f60	16546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	500
+f60	NULL
+f61	0000000900
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	660
+f60	876546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	987
+f60	41
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	2550
+f60	775654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	2760
+f60	985654
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	3330
+f60	764376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	3410
+f60	996546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	7876
+f60	74
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	9112
+f60	NULL
+f61	0000008771
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	76710
+f60	226546
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	569300
+f60	9114376
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 drop view test.v1 ;
 CREATE VIEW test.v1 AS SELECT F59,f61 FROM test.tb2;
 SELECT * FROM test.v1 order by f59,f61 desc limit 20;
@@ -10180,8 +21237,57 @@ F59
 ALTER VIEW test.v1 AS  SELECT *
 FROM test.tb2 WHERE test.tb2.f59 = 242 ;
 SELECT * FROM test.v1 order by f59 limit 0,10;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-242	79	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+f59	242
+f60	79
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 Drop view test.v1 ;
 
 Testcase 3.3.1.65, 3.3.1.A4, 3.3.1.66, 3.3.1.67 
@@ -10543,8 +21649,57 @@ Create view test.v1 AS SELECT f59,f60,f61 FROM tb2  ;
 INSERT INTO test.v1 ( f59 , f60 ) values (2005,0101) ;
 affected rows: 1
 SELECT * FROM tb2 where f59 = 2005 and f60 = 0101 ;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-2005	101	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+f59	2005
+f60	101
+f61	NULL
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 SELECT f59,f60 FROM test.v1 where f59 = 2005 and f60 = 0101 ;
 f59	f60
 2005	101
@@ -10560,8 +21715,57 @@ UPDATE test.v1 SET f59 = 8 WHERE f59 = 780 and f60 = 105;
 affected rows: 1
 info: Rows matched: 1  Changed: 1  Warnings: 0
 SELECT * FROM tb2 where f59 = 8 and f60 = 105;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-8	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+f59	8
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 SELECT f59,f60 FROM test.v1 where f59 = 8 and f60 = 105 ;
 f59	f60
 8	105
@@ -10576,11 +21780,210 @@ UPDATE test.v1 SET f59 = 891 WHERE f60 = 105 ;
 affected rows: 4
 info: Rows matched: 4  Changed: 4  Warnings: 0
 SELECT * FROM tb2 where f59 = 891 and f60 = 105;
-f59	f60	f61	f62	f63	f64	f65	f66	f67	f68	f69	f70	f71	f72	f73	f74	f75	f76	f77	f78	f79	f80	f81	f82	f83	f84	f85	f86	f87	f88	f89	f90	f91	f92	f93	f94	f95	f96	f97	f98	f99	f100	f101	f102	f103	f104	f105	f106	f107	f108	f109
-891	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-891	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-891	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
-891	105	0000000106	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7.7	7.7	00000000000000000007.7	00000000000000000008.8	8.8	8.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	0000000008.8	0000000008.8	0000000008.8	8.8	8.8	8.8	8.8	0000000008.8	00000000000000000008.8	0000000008.8	00000000000000000008.8	2000-01-01	00:00:20	0002-02-02 00:00:00	2000-12-31 23:59:59	2000	2000	2000	1enum	1set
+f59	891
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	891
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	891
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
+f59	891
+f60	105
+f61	0000000106
+f62	NULL
+f63	NULL
+f64	NULL
+f65	NULL
+f66	NULL
+f67	NULL
+f68	NULL
+f69	NULL
+f70	NULL
+f71	NULL
+f72	NULL
+f73	NULL
+f74	NULL
+f75	NULL
+f76	NULL
+f77	7.7
+f78	7.7
+f79	00000000000000000007.7
+f80	00000000000000000008.8
+f81	8.8
+f82	8.8
+f83	0000000008.8
+f84	0000000008.8
+f85	8.8
+f86	8.8
+f87	8.8
+f88	8.8
+f89	0000000008.8
+f90	0000000008.8
+f91	0000000008.8
+f92	0000000008.8
+f93	8.8
+f94	8.8
+f95	8.8
+f96	8.8
+f97	0000000008.8
+f98	00000000000000000008.8
+f99	0000000008.8
+f100	00000000000000000008.8
+f101	2000-01-01
+f102	00:00:20
+f103	0002-02-02 00:00:00
+f104	2000-12-31 23:59:59
+f105	2000
+f106	2000
+f107	2000
+f108	1enum
+f109	1set
 SELECT f59,f60 FROM test.v1 where f59 = 891 and f60 = 105 ;
 f59	f60
 891	105
@@ -10929,10 +22332,6 @@ SET @variant4= 'CREATE VIEW v1 AS SELECT f61 FROM t1 GROUP BY f61';
 SET @variant5= 'CREATE VIEW v1 AS SELECT f61 FROM t1 HAVING f61 > 0';
 SET @variant6= 'CREATE VIEW v1 AS SELECT (SELECT f60 FROM t2 WHERE f59=19) AS f61 FROM t1';
 SET @variant7= 'CREATE VIEW v1 AS SELECT f61 FROM v2';
-
-Some server responses suffer from
-Bug#10773 Incorrect message is displayed while updating a view
---------------------------------------------------------------------------------
 SET @variant8= 'CREATE VIEW v1 AS SELECT f59 AS f61 FROM t1 WHERE f60 IN (SELECT f59 FROM t1)';
 SET @variant9= 'CREATE ALGORITHM = TEMPTABLE VIEW v1 (f61) AS select f60 from t1';
 CREATE ALGORITHM = TEMPTABLE VIEW v1 (f61) AS select f60 from t1;
@@ -11464,21 +22863,24 @@ ABC	0
 ABC	1.7320508075689
 CREATE TABLE t2 AS SELECT f1, SQRT(f2) my_sqrt FROM t1;
 SELECT * FROM t2 order by 2;
-f1	my_sqrt
-ABC	0
-ABC	1.73205080756888
+f1	ABC
+my_sqrt	0
+f1	ABC
+my_sqrt	1.73205080756888
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v1;
 SELECT * FROM t2 order by 2;
-f1	my_sqrt
-ABC	0
-ABC	1.73205080756888
+f1	ABC
+my_sqrt	0
+f1	ABC
+my_sqrt	1.73205080756888
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v2;
 SELECT * FROM t2 order by 2;
-f1	my_sqrt
-ABC	0
-ABC	1.73205080756888
+f1	ABC
+my_sqrt	0
+f1	ABC
+my_sqrt	1.73205080756888
 DROP TABLE t1;
 DROP TABLE t2;
 DROP VIEW  v1;
diff --git a/mysql-test/suite/funcs_1/storedproc/storedproc_10.inc b/mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
index 2c2e99dc8f4..e839a86eb26 100755
--- a/mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
+++ b/mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
@@ -21,6 +21,7 @@ let $message= Section 3.1.10 - CALL checks:;
 --source include/show_msg80.inc
 
 
+USE db_storedproc;
 
 # ------------------------------------------------------------------------------
 let $message= Testcase 3.1.10.2 + 3.1.10.5:;
@@ -73,11 +74,12 @@ connect (user2_2, localhost, user_2, , db_storedproc);
 --source suite/funcs_1/include/show_connection.inc
 
 # no privileges exist
---error 1370
+--error ER_PROCACCESS_DENIED_ERROR
 CALL sp31102();
 SELECT fn31105( 9 );
 
 # now 'add' EXECUTE to INVOKER
+--echo connection default;
 connection default;
 USE db_storedproc;
 --source suite/funcs_1/include/show_connection.inc
@@ -97,6 +99,7 @@ SELECT fn31105( 9 );
 disconnect user2_3;
 
 # now 'remove' SELECT from INVOKER
+--echo connection default;
 connection default;
 USE db_storedproc;
 --source suite/funcs_1/include/show_connection.inc
@@ -144,7 +147,7 @@ BEGIN
 END//
 delimiter ;//
 
---error 1305
+--error ER_SP_DOES_NOT_EXIST
 CALL fn1();
 
 # cleanup
@@ -170,7 +173,7 @@ BEGIN
 END//
 delimiter ;//
 
---error 1305
+--error ER_SP_DOES_NOT_EXIST
   SELECT sp1();
 
 # cleanup
@@ -184,26 +187,32 @@ let $message=
 Ensure that the ROW_COUNT() SQL function always returns the correct number of
 rows affected by the execution of a stored procedure.;
 --source include/show_msg80.inc
+# Note(mleich): Information taken from a comments in
+#     Bug#21818 Return value of ROW_COUNT() is incorrect for
+#               ALTER TABLE, LOAD DATA
+#     ROW_COUNT() is -1 following any statement which is not DELETE, INSERT
+#     or UPDATE.
+#     Also, after a CALL statement, ROW_COUNT() will return the value of the
+#     last statement in the stored procedure.
 
 --disable_warnings
 DROP PROCEDURE IF EXISTS sp_ins_1;
 DROP PROCEDURE IF EXISTS sp_ins_3;
 DROP PROCEDURE IF EXISTS sp_upd;
 DROP PROCEDURE IF EXISTS sp_ins_upd;
+DROP PROCEDURE IF EXISTS sp_del;
+DROP PROCEDURE IF EXISTS sp_with_rowcount;
 --enable_warnings
 
 CREATE TABLE temp(f1 CHAR(20),f2 CHAR(25),f3 DATE,f4 INT,f5 CHAR(25),f6 INT);
 INSERT INTO temp SELECT * FROM t10;
 
 delimiter //;
-#FIXME: add to proc: SELECT row_count() 'ins';
 CREATE PROCEDURE sp_ins_1()
 BEGIN
   INSERT INTO temp VALUES ('abc', 'abc', '20051003', 100, 'uvw', 1000);
 END//
 
-
-#FIXME: add to proc: SELECT row_count() 'ins_3';
 CREATE PROCEDURE sp_ins_3()
 BEGIN
   INSERT INTO temp VALUES  ('abc', 'xyz', '19490523',   100, 'uvw', 1000);
@@ -211,26 +220,11 @@ BEGIN
   INSERT INTO temp VALUES  ('abc', 'xyz', '2005-10-24', 100, 'uvw', 1000);
 END//
 
-# FIXME: add to proc:  SELECT row_count() AS 'updated';
 CREATE PROCEDURE sp_upd()
 BEGIN
   UPDATE temp SET temp.f1 = 'updated' WHERE temp.f1 ='abc';
 END//
 
-# FIXME: use commented proc
-# CREATE PROCEDURE sp_ins_upd()
-# BEGIN
-#    BEGIN
-#       INSERT INTO temp VALUES  ('qwe', 'abc', '1989-11-09', 100, 'uvw', 1000);
-#       INSERT INTO temp VALUES  ('qwe', 'xyz', '1998-03-26', 100, 'uvw', 1000);
-#       INSERT INTO temp VALUES  ('qwe', 'abc', '2000-11-09', 100, 'uvw', 1000);
-#       INSERT INTO temp VALUES  ('qwe', 'abc', '2005-11-07', 100, 'uvw', 1000);
-#    END;
-#    SELECT row_count() AS 'insert "qwe"';
-#    SELECT COUNT( f1 ), f1 FROM temp GROUP BY f1;
-#    UPDATE temp SET temp.f1 = 'updated_2' WHERE temp.f1 ='qwe' AND temp.f2 = 'abc';
-#    SELECT row_count() AS 'update "qwe" AND "abc"';
-# END//
 CREATE PROCEDURE sp_ins_upd()
 BEGIN
    BEGIN
@@ -242,31 +236,70 @@ BEGIN
    SELECT COUNT( f1 ), f1 FROM temp GROUP BY f1;
    UPDATE temp SET temp.f1 = 'updated_2' WHERE temp.f1 ='qwe' AND temp.f2 = 'abc';
 END//
+
+CREATE PROCEDURE sp_del()
+BEGIN
+  DELETE FROM temp WHERE temp.f1 ='qwe' OR temp.f1 = 'updated_2';
+END//
+
+CREATE PROCEDURE sp_with_rowcount()
+BEGIN
+   BEGIN
+      INSERT INTO temp VALUES  ('qwe', 'abc', '1989-11-09', 100, 'uvw', 1000),
+                               ('qwe', 'xyz', '1998-03-26', 100, 'uvw', 1000),
+                               ('qwe', 'abc', '2000-11-09', 100, 'uvw', 1000),
+                               ('qwe', 'xyz', '2005-11-07', 100, 'uvw', 1000);
+   END;
+   SELECT row_count() AS 'row_count() after insert';
+   SELECT row_count() AS 'row_count() after select row_count()';
+   SELECT f1,f2,f3 FROM temp ORDER BY f1,f2,f3;
+   UPDATE temp SET temp.f1 = 'updated_2' WHERE temp.f2 = 'abc';
+   SELECT row_count() AS 'row_count() after update';
+   SELECT f1,f2,f3 FROM temp ORDER BY f1,f2,f3;
+   DELETE FROM temp WHERE temp.f1 = 'updated_2';
+   SELECT row_count() AS 'row_count() after delete';
+END//
 delimiter ;//
 
 CALL sp_ins_1();
 SELECT row_count();
-SELECT * FROM temp ORDER BY f4;
+--sorted_result
+SELECT * FROM temp;
 
 CALL sp_ins_3();
-#FIXME: check is 1 correct here? I expect 3 for 3 inserted rows inside the procedure
 SELECT row_count();
-SELECT * FROM temp ORDER BY f4;
+--sorted_result
+SELECT * FROM temp;
 
 CALL sp_upd();
 SELECT row_count();
-SELECT * FROM temp ORDER BY f4;
+--sorted_result
+SELECT * FROM temp;
 
-#FIXME: check is 3 correct here?  I expect 7 for 4 inserted and then 3 updated rows inside the procedure
 CALL sp_ins_upd();
 SELECT row_count();
-SELECT * FROM temp ORDER BY f4;
+--sorted_result
+SELECT * FROM temp;
+
+CALL sp_del();
+SELECT row_count();
+--sorted_result
+SELECT * FROM temp;
+
+DELETE FROM temp;
+CALL sp_with_rowcount();
+SELECT row_count();
+--sorted_result
+SELECT * FROM temp;
+
 
 # cleanup
 DROP PROCEDURE sp_ins_1;
 DROP PROCEDURE sp_ins_3;
 DROP PROCEDURE sp_upd;
 DROP PROCEDURE sp_ins_upd;
+DROP PROCEDURE sp_del;
+DROP PROCEDURE sp_with_rowcount;
 DROP TABLE temp;
 
 
diff --git a/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc b/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
index 49bd5b98401..24153113956 100644
--- a/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
+++ b/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
@@ -1,77 +1,15 @@
 #### suite/funcs_1/storedproc/storedproc_master.inc
-#
+###########################################################################
+# WL4084: Review and fix all disabled test
+# enabled this test.
+# 2007-Oct-04 Hhunger
+############################################################################
 --enable_query_log
 
-let $message= .
-              .                         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@1.1975.1.2, 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).
-              .;
---source include/show_msg80.inc
-
-#FIXME-START-------------------------------------------------------------------
-#
-# remove this section prior releasing the test, then we may stop at the first
-# error we get ('passed' or 'not passed' - that's the question).
---disable_abort_on_error
-
-   # having ALWAYS a .reject from the changing TIME makes it easier to work with
-   # the GUI diff program until the testcase is finished for pushing.
-   #
-   # let $message= FIXME: Show some information when / where the .result has been created;
-   # --source include/show_msg.inc
-   --vertical_results
-   # SELECT version(), @@version_compile_os AS 'vers_comp_os', current_date, current_time;
-
-   let $message= FIXME: There are subtests that are switched off due to known bugs:;
-   --source include/show_msg.inc
-   #set a variable here to be able to switch all crashing sub tests with ONE change HERE.
-   #change the corresponding variable to '1' to enable the crashing parts.
-   --disable_query_log
-
-   let $check_wl2984= 0;
-   eval SELECT $check_wl2984 AS 'WL#2984: DECIMAL and NUMERIC problems with differences on some machines';
-
-   --horizontal_results
-   --enable_query_log
-
-# 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.
-# If this bug is fixed, please
-# 1. set the following variable to 0
-# 2. check, if the test passes
-# 3. remove the workarounds
-let $have_bug_11589= 1;
-if ($have_bug_11589)
-{
-   let $message= There are some statements where the ps-protocol is switched off.
-                 Bug#11589: mysqltest, --ps-protocol, strange output, float/double/real with zerofill;
-   --source include/show_msg80.inc
-}
-
-#
-#FIXME-END---------------------------------------------------------------------
-
-
 # prepare a variable to be able to suppress machine dependant diffs
 #let $SERVER_NAME= `SELECT DISTINCT host FROM mysql.user WHERE host LIKE "%\%" AND host NOT In ("localhost", "127.0.0.1", "%")`;
 # can be used in: --replace_result $SERVER_NAME <SERVER_NAME>
 
-# ------------------------------------------------------------------------------
---source suite/funcs_1/storedproc/load_sp_tb.inc
-
-
 # ==============================================================================
 let $message= Section 3.1.1 - Syntax checks for the CREATE PROCEDURE, CREATE
 FUNCTION, ALTER PROCEDURE, ALTER FUNCTION, DROP PROCEDURE, DROP FUNCTION, SHOW
@@ -90,18 +28,23 @@ let $message= Testcase 4.1.1:
 USE db_storedproc;
 
 --disable_warnings
+--error ER_TOO_LONG_IDENT
 DROP PROCEDURE IF EXISTS sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934;
 --enable_warnings
 
+--error ER_TOO_LONG_IDENT
 CREATE PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934 (f1 char(20) )
             SELECT * from t1 where f2 = f1;
+--error ER_TOO_LONG_IDENT
 CALL sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934('aaaa');
 
 --disable_warnings
+--error ER_TOO_LONG_IDENT
 DROP PROCEDURE IF EXISTS sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde;
 --enable_warnings
 
 delimiter //;
+--error ER_TOO_LONG_IDENT
 CREATE PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde( f1 tinytext ) language sql deterministic sql security definer comment 'this is simple'
   BEGIN
     set @v1 = f1;
@@ -109,6 +52,7 @@ CREATE PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabc
 END//
 delimiter ;//
 
+--error ER_TOO_LONG_IDENT
 CALL sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde( 'abc' );
 
 --replace_column 5 modified 6 created
@@ -170,9 +114,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
--- echo FIXME: Following test contains a known problem that will be checked again
--- echo FIXME: after WL#2984 has been completed: SP definition accepted with m>60 in DECIMAL(m,n)
-#FIXME --error 4711
+--error ER_TOO_BIG_PRECISION
 CREATE PROCEDURE sp1( f1 decimal(256, 30) ) language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
     set @v1 = f1;
@@ -180,8 +122,7 @@ BEGIN
 END//
 DROP PROCEDURE IF EXISTS sp1//
 
-# should fail: 66 is not allowed; maximum is 65.
-#FIXME --error 4711
+--error ER_TOO_BIG_PRECISION
 CREATE PROCEDURE sp1( f1 decimal(66, 30) ) language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
     set @v1 = f1;
@@ -198,28 +139,22 @@ delimiter ;//
 
 CALL sp1( 17976931340000 );
 
-if ($check_wl2984)
+# switched off due to big differences with (e.g....) sol10-sparc-b
+CALL sp1( 1.797693134e+13 );
+--error ER_ILLEGAL_VALUE_FOR_TYPE
+CALL sp1( 1.7976931348623157493578e+308 );
+
+# check all ...E+100 to E-100
+let $digits= 100;
+while ($digits)
 {
-   # switched off due to big differences with (e.g....) sol10-sparc-b
-   CALL sp1( 1.797693134e+13 );
-   CALL sp1( 1.7976931348623157493578e+308 );
-
-   -- echo FIXME: Following test contains a known problem that will be checked again
-   -- echo FIXME: after WL#2984 has been completed:
-   -- echo FIXME: values accepted without warning although m>60 in DECIMAL(m,n)
-
-   # check all ...E+100 to E-100
-   let $digits= 100;
-   while ($digits)
-   {
-      eval CALL sp1( 0.1234567890987654321e+$digits );
-      eval CALL sp1( 0.1234567890987654321e-$digits );
-      dec $digits;
-   }
-   # check the 2 values which cannot be handled easy in the loop:
-   eval CALL sp1( 0.1234567890987654321e+0 );
-   eval CALL sp1( 0.1234567890987654321e-0 );
+   eval CALL sp1( 0.1234567890987654321e+$digits );
+   eval CALL sp1( 0.1234567890987654321e-$digits );
+   dec $digits;
 }
+# check the 2 values which cannot be handled easy in the loop:
+eval CALL sp1( 0.1234567890987654321e+0 );
+eval CALL sp1( 0.1234567890987654321e-0 );
 
 --replace_column 5 modified 6 created
 SHOW PROCEDURE status;
@@ -395,7 +330,7 @@ DROP FUNCTION IF EXISTS fn1;
 
 delimiter //;
 # 1425: Too big scale 63 specified for column ''. Maximum is 30.
---error 1425
+--error ER_TOO_BIG_SCALE
 CREATE FUNCTION fn1( f1 decimal(63, 31) ) returns decimal(63, 31) language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
     set f1 = 1000000 + f1;
@@ -403,7 +338,7 @@ BEGIN
 END//
 delimiter ;//
 
---error 1305
+--error ER_SP_DOES_NOT_EXIST
 SELECT fn1( 1.3326e+8 );
 
 delimiter //;
@@ -430,7 +365,14 @@ CREATE FUNCTION fn1( f1 enum("value1", "value1") ) returns decimal(63, 30)  lang
 END//
 delimiter ;//
 
+# warnings for this select disabled due to diffs with/without --ps-protocol:
+# without ps-protocol the following warning is shown:
+# +Note   1291    Column '' has duplicated value 'value1' in SET
+# +Warning        1265    Data truncated for column 'f1' at row 1
+# Reported as BUG#33396
+--disable_warnings
 SELECT fn1( "value1" );
+--enable_warnings
 
 --replace_column 5 modified 6 created
 SHOW FUNCTION STATUS LIKE 'fn1';
@@ -446,7 +388,14 @@ CREATE FUNCTION fn1( f1 set("value1", "value1") ) returns decimal(63, 30) langua
 END//
 delimiter ;//
 
+# warnings for this select disabled due to diffs with/without --ps-protocol:
+# without ps-protocol the following warning is shown:
+# +Note   1291    Column '' has duplicated value 'value1' in SET
+# +Warning        1265    Data truncated for column 'f1' at row 1
+# Reported as BUG#33396
+--disable_warnings
 SELECT fn1( "value1, value1" );
+--enable_warnings
 
 --replace_column 5 modified 6 created
 SHOW FUNCTION STATUS LIKE 'fn1';
@@ -666,10 +615,12 @@ SELECT f2 into c from t1 where t1.f2=999;
 END//
 delimiter ;//
 
+--disable_warnings
 set @c=1;
 CALL sp7c('xyz', @out_param, @c);
 SELECT @out_param;
 SELECT @c;
+--enable_warnings
 
 # cleanup
 DROP PROCEDURE sp7a;
@@ -697,7 +648,7 @@ let $message= Testcase 4.1.9:
 drop procedure;
 --source include/show_msg80.inc
 
-
+--sorted_result
 --replace_column 13 created 14 modified
 SELECT * from mysql.proc where specific_name='sp9';
 
@@ -705,31 +656,34 @@ SELECT * from mysql.proc where specific_name='sp9';
 DROP PROCEDURE IF EXISTS sp9;
 --enable_warnings
 
+--sorted_result
 --replace_column 13 created 14 modified
 SELECT * from mysql.proc where specific_name='sp9';
 
 CREATE PROCEDURE sp9()SELECT * from t1;
 
+--sorted_result
 --replace_column 13 created 14 modified
 SELECT * from mysql.proc where specific_name='sp9';
 
 DROP PROCEDURE sp9;
 
+--sorted_result
 --replace_column 13 created 14 modified
 SELECT * from mysql.proc where specific_name='sp9';
 
 CREATE PROCEDURE sp9()SELECT * from t1;
 
+--sorted_result
 --replace_column 13 created 14 modified
 SELECT * from mysql.proc where specific_name='sp9';
 
 DROP PROCEDURE IF EXISTS sp9;
 
+--sorted_result
 --replace_column 13 created 14 modified
 SELECT * from mysql.proc where specific_name='sp9';
 
-
-
 # ------------------------------------------------------------------------------
 let $message= Testcase 4.1.10:
               ----------------
@@ -792,6 +746,7 @@ connect (u_1, localhost, user_1, , db_storedproc);
 CALL sp11();
 
 connection default;
+USE db_storedproc;
 --source suite/funcs_1/include/show_connection.inc
 
 alter procedure sp11 sql security invoker;
@@ -801,8 +756,9 @@ SELECT security_type from mysql.proc where specific_name='sp11';
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 connection u_1;
 --source suite/funcs_1/include/show_connection.inc
+USE db_storedproc;
 
---error 1142
+--error ER_TABLEACCESS_DENIED_ERROR
 CALL sp11();
 
 commit work;
@@ -897,900 +853,900 @@ appropriate error message is returned when the name is rejected;
 --source include/show_msg80.inc
 
 
---error 1357
+--error ER_SP_NO_DROP_SP
 CREATE PROCEDURE sp1()
 DROP PROCEDURE sp1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE !_sp1( f1 char(20) )
 SELECT * from t1 where f2 = f1;
 
-#FIXME: this was what I found in this file ... :
-#CREATE PROCEDURE !_sp1( f1 char(20) )
-#    SELECT * from t1 where f2 = f1; ^a^kcd '/usr/mysql/mysql-test/t'
-#/t'ql/mysql-test
-#t]# t@localhost t
-
---error 0,1064
 CREATE PROCEDURE function()
    SELECT * from t1 where f2=f1;
 DROP PROCEDURE function;
 
---error 1064
+--error ER_PARSE_ERROR
+CREATE PROCEDURE accessible()
+   SELECT * from t1 where f2=f1;
+
+--error ER_PARSE_ERROR
 CREATE PROCEDURE add()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE all()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE alter()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE analyze()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE and()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE as()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE asc()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE asensitive()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE before()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE between()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE bigint()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE binary()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE blob()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE both()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE by()
    SELECT * from t1 where f2=f1;
 
---error 1064
-CREATE PROCEDURE CALL()
+--error ER_PARSE_ERROR
+CREATE PROCEDURE call()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE cascade()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE case()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE change()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE char()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE character()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE check()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE collate()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE column()
    SELECT * from t1 where f2=f1;
 
---error 1064
-CREATE PROCEDURE columns()
-   SELECT * from t1 where f2=f1;
-DROP PROCEDURE columns;
-
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE condition()
    SELECT * from t1 where f2=f1;
 
---error 1064
-CREATE PROCEDURE connection()
-   SELECT * from t1 where f2=f1;
-
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE constraint()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE continue()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE convert()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE create()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE cross()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE current_date()
   SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE current_time()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE current_timestamp()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE current_user()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE cursor()
   SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE database()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE databases()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE day_hour()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE day_microsecond()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE day_minute()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE day_second()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE dec()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE decimal()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE declare()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE default()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE delayed()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE delete()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE desc()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE describe()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE deterministic()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE distinct()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE distinctrow()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE div()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE double()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE drop()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE dual()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE each()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE else()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE elseif()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE enclosed()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE escaped()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE exists()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE exit()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE explain()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE false()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE fetch()
    SELECT * from t1 where f2=f1;
 
---error 1064
+#--error ER_PARSE_ERROR
 CREATE PROCEDURE fields()
    SELECT * from t1 where f2=f1;
 DROP PROCEDURE fields;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE float()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE for()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE force()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE foreign()
    SELECT * from t1 where f2=f1;
 
---error 1064
-CREATE PROCEDURE found()
-   SELECT * from t1 where f2=f1;
-DROP PROCEDURE found;
-
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE from()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE fulltext()
    SELECT * from t1 where f2=f1;
 
---error 1064
-CREATE PROCEDURE goto()
-   SELECT * from t1 where f2=f1;
-DROP PROCEDURE goto;
-
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE grant()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE group()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE having()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE high_priority()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE hour_microsecond()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE hour_minute()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE hour_second()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE if()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE ignore()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE in()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE index()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE infile()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE inner()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE inout()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE insensitive()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE insert()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE int()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
+CREATE PROCEDURE int1()
+   SELECT * from t1 where f2=f1;
+
+--error ER_PARSE_ERROR
+CREATE PROCEDURE int2()
+   SELECT * from t1 where f2=f1;
+
+--error ER_PARSE_ERROR
+CREATE PROCEDURE int3()
+   SELECT * from t1 where f2=f1;
+
+--error ER_PARSE_ERROR
+CREATE PROCEDURE int4()
+   SELECT * from t1 where f2=f1;
+
+--error ER_PARSE_ERROR
+CREATE PROCEDURE int8()
+   SELECT * from t1 where f2=f1;
+
+--error ER_PARSE_ERROR
 CREATE PROCEDURE integer()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE interval()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE into()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE is()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE iterate()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE join()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE key()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE keys()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE kill()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE leading()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE leave()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE left()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE like()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE limit()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
+CREATE PROCEDURE linear()
+   SELECT * from t1 where f2=f1;
+
+--error ER_PARSE_ERROR
 CREATE PROCEDURE lines()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE load()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE localtime()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE localtimestamp()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE lock()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE long()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE longblob()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE longtext()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE loop()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE low_priority()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
+CREATE PROCEDURE master_ssl_verify_server_cert()
+   SELECT * from t1 where f2=f1;
+
+--error ER_PARSE_ERROR
 CREATE PROCEDURE match()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE mediumblob()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE mediumint()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE mediumtext()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE middleint()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE minute_microsecond()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE minute_second()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE mod()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE modifies()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE natural()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE not()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE no_write_to_binlog()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE null()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE numeric()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE on()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE optimize()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE option()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE optionally()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE or()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE order()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE out()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE outer()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE outfile()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE precision()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE primary()
    SELECT * from t1 where f2=f1;
 
---error 1064
-CREATE PROCEDURE privileges()
-   SELECT * from t1 where f2=f1;
-DROP PROCEDURE privileges;
-
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE procedure()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE purge()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
+CREATE PROCEDURE range()
+   SELECT * from t1 where f2=f1;
+
+--error ER_PARSE_ERROR
 CREATE PROCEDURE read()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE reads()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE real()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE references()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE regexp()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
+CREATE PROCEDURE release()
+   SELECT * from t1 where f2=f1;
+
+--error ER_PARSE_ERROR
 CREATE PROCEDURE rename()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE repeat()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE replace()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE require()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE restrict()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE return()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE revoke()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE right()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE rlike()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE schema()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE schemas()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE second_microsecond()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE select()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sensitive()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE separator()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE set()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE show()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE smallint()
    SELECT * from t1 where f2=f1;
 
---error 1064
-CREATE PROCEDURE soname()
-   SELECT * from t1 where f2=f1;
-
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE spatial()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE specific()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sql()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sqlexception()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sqlstate()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sqlwarning()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sql_big_result()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sql_calc_found_rows()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sql_small_result()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE ssl()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE starting()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE straight_join()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE table()
    SELECT * from t1 where f2=f1;
 
---error 1064
-CREATE PROCEDURE tables()
-   SELECT * from t1 where f2=f1;
-DROP PROCEDURE tables;
-
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE terminated()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE then()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE tinyblob()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE tinyint()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE tinytext()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE to()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE trailing()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE trigger()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE true()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE undo()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE union()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE unique()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE unlock()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE unsigned()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE update()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE usage()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE use()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE using()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE utc_date()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE utc_time()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE utc_timestamp()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE values()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE varbinary()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE varchar()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE varcharacter()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE varying()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE when()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE where()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE while()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE with()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE write()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE xor()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE year_month()
    SELECT * from t1 where f2=f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE zerofill()
    SELECT * from t1 where f2=f1;
 
@@ -1803,635 +1759,619 @@ error message is returned when the name is rejected;
 --source include/show_msg80.inc
 
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION !_fn1(f1 char) returns char
     return f1;
 
---error 1064
+--disable_warnings
+--error ER_PARSE_ERROR
 CREATE FUNCTION char(f1 char) returns char
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION char binary(f1 char binary) returns char binary
     return f1;
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION char ascii(f1 char ascii) returns char ascii
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION char not null(f1 char not null) returns char not null
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION char binary not null(f1 char binary not null) returns char binary not null
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION char ascii not null(f1 char ascii not null) returns char ascii not null
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION tinytext(f1 tinytext) returns tinytext
     return f1;
 
---error 1064
+#--error ER_PARSE_ERROR
 CREATE FUNCTION text(f1 text) returns text
     return f1;
   DROP FUNCTION text;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION mediumtext(f1 mediumtext) returns mediumtext
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION longtext(f1 longtext) returns longtext
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION tinytext not null(f1 tinytext not null) returns tinytext not null
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION text not null(f1 text not null) returns text not null
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION mediumtext not null(f1 mediumtext not null) returns mediumtext not null
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION longtext not null(f1 longtext not null) returns longtext not null
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION tinyblob(f1 tinyblob) returns tinyblob
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION blob(f1 blob) returns blob
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION mediumblob(f1 mediumblob) returns mediumblob
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION longblob(f1 longblob) returns longblob
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION tinyblob not null(f1 tinyblob not null) returns tinyblob not null
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION blob not null(f1 blob not null) returns blob not null
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION mediumblob not null(f1 mediumblob not null) returns mediumblob not null
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION longblob not null(f1 longblob not null) returns longblob not null
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION binary(f1 binary) returns binary
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION binary not null(f1 binary not null) returns binary not null
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION tinyint(f1 tinyint) returns tinyint
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION tinyint unsigned(f1 tinyint unsigned) returns tinyint unsigned
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION tinyint zerofill(f1 tinyint zerofill) returns tinyint zerofill
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION tinyint unsigned zerofill(f1 tinyint unsigned zerofill) returns tinyint unsigned zerofill
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION smallint(f1 smallint) returns smallint
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION smallint unsigned(f1 smallint unsigned) returns smallint unsigned
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION smallint zerofill(f1 smallint zerofill) returns smallint zerofill
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION smallint unsigned zerofill(f1 smallint unsigned zerofill) returns smallint unsigned zerofill
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION mediumint(f1 mediumint) returns mediumint
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION mediumint unsigned(f1 mediumint unsigned) returns mediumint unsigned
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION mediumint zerofill(f1 mediumint zerofill) returns mediumint zerofill
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION mediumint unsigned zerofill(f1 mediumint unsigned zerofill) returns mediumint unsigned zerofill
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION int(f1 int) returns int
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
+CREATE FUNCTION int1(f1 int1) returns int1
+    return f1;
+
+--error ER_PARSE_ERROR
+CREATE FUNCTION int2(f1 int2) returns int2
+    return f1;
+
+--error ER_PARSE_ERROR
+CREATE FUNCTION int3(f1 int3) returns int3
+    return f1;
+
+--error ER_PARSE_ERROR
+CREATE FUNCTION int4(f1 int4) returns int4
+    return f1;
+
+--error ER_PARSE_ERROR
+CREATE FUNCTION int8(f1 int8) returns int8
+    return f1;
+
+--error ER_PARSE_ERROR
 CREATE FUNCTION int unsigned(f1 int unsigned) returns int unsigned
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION int zerofill(f1 int zerofill) returns int zerofill
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION int unsigned zerofill(f1 int unsigned zerofill) returns int unsigned zerofill
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION bigint(f1 bigint) returns bigint
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION bigint unsigned(f1 bigint unsigned) returns bigint unsigned
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION bigint zerofill(f1 bigint zerofill) returns bigint zerofill
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION bigint unsigned zerofill(f1 bigint unsigned zerofill) returns bigint unsigned zerofill
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION decimal(f1 decimal) returns decimal
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION decimal unsigned(f1 decimal unsigned) returns decimal unsigned
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION decimal zerofill(f1 decimal zerofill) returns decimal zerofill
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION decimal unsigned zerofill(f1 decimal unsigned zerofill) returns decimal unsigned zerofill
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION numeric(f1 numeric) returns numeric
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION numeric unsigned(f1 numeric unsigned) returns numeric unsigned
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION numeric zerofill(f1 numeric zerofill) returns numeric zerofill
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION numeric unsigned zerofill(f1 numeric unsigned zerofill) returns numeric unsigned zerofill
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION real(f1 real) returns real
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION real unsigned(f1 real unsigned) returns real unsigned
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION real zerofill(f1 real zerofill) returns real zerofill
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION real unsigned zerofill(f1 real unsigned zerofill) returns real unsigned zerofill
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION float(f1 float) returns float
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION float unsigned(f1 float unsigned) returns float unsigned
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION float zerofill(f1 float zerofill) returns float zerofill
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION float unsigned zerofill(f1 float unsigned zerofill) returns float unsigned zerofill
     return f1;
 
-#FIXME check this is OK:--error 1064
 CREATE FUNCTION date(f1 date) returns date
     return f1;
 DROP FUNCTION date;
 
-#FIXME check this is OK:--error 1064
 CREATE FUNCTION time(f1 time) returns time
     return f1;
 DROP FUNCTION time;
 
-#FIXME check this is OK:--error 1064
 CREATE FUNCTION datetime(f1 datetime) returns datetime
     return f1;
 DROP FUNCTION datetime;
 
-#FIXME check this is OK:--error 1064
 CREATE FUNCTION timestamp(f1 timestamp) returns timestamp
     return f1;
 DROP FUNCTION timestamp;
 
-#FIXME check this is OK:--error 1064
 CREATE FUNCTION year(f1 year) returns year
     return f1;
 DROP FUNCTION year;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION year(3)(f1 year(3)) returns year(3)
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION year(4)(f1 year(4)) returns year(4)
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION enum("1enum", "2enum")(f1 enum("1enum", "2enum")) returns enum("1enum", "2enum")
     return f1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION set("1set", "2set")(f1 set("1set", "2set")) returns set("1set", "2set")
     return f1;
+--enable_warnings
+
+DROP FUNCTION IF EXISTS fn1;
+CREATE FUNCTION fn1(f1 char ) returns char
+    return f1;
+
+DROP FUNCTION IF EXISTS fn1;
+--error ER_NOT_SUPPORTED_YET
+CREATE FUNCTION fn1(f1 char binary ) returns char binary
+    return f1;
+
+DROP FUNCTION IF EXISTS fn1;
+CREATE FUNCTION fn1(f1 char ascii ) returns char ascii
+    return f1;
+
+DROP FUNCTION IF EXISTS fn1;
+--error ER_PARSE_ERROR
+CREATE FUNCTION fn1(f1 char not null ) returns char not null
+    return f1;
 
+DROP FUNCTION IF EXISTS fn1;
+--error ER_PARSE_ERROR
+CREATE FUNCTION fn1(f1 char binary not null ) returns char binary not null
+    return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(char f1 ) returns char
+--error ER_PARSE_ERROR
+CREATE FUNCTION fn1(f1 char ascii not null ) returns char ascii not null
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(char binary f1 ) returns char binary
+CREATE FUNCTION fn1(f1 tinytext ) returns tinytext
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(char ascii f1 ) returns char ascii
+CREATE FUNCTION fn1(f1 text ) returns text
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(char not null f1 ) returns char not null
+CREATE FUNCTION fn1(f1 mediumtext ) returns mediumtext
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(char binary not null f1 ) returns char binary not null
+CREATE FUNCTION fn1(f1 longtext ) returns longtext
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(char ascii not null f1 ) returns char ascii not null
+--error ER_PARSE_ERROR
+CREATE FUNCTION fn1(f1 tinytext not null ) returns tinytext not null
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(tinytext f1 ) returns tinytext
+--error ER_PARSE_ERROR
+CREATE FUNCTION fn1(f1 text not null ) returns text not null
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(text f1 ) returns text
+--error ER_PARSE_ERROR
+CREATE FUNCTION fn1(f1 mediumtext not null ) returns mediumtext not null
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(mediumtext f1 ) returns mediumtext
+--error ER_PARSE_ERROR
+CREATE FUNCTION fn1(f1 longtext not null ) returns longtext not null
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(longtext f1 ) returns longtext
+CREATE FUNCTION fn1(f1 tinyblob ) returns tinyblob
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(tinytext not null f1 ) returns tinytext not null
+CREATE FUNCTION fn1(f1 blob ) returns blob
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(text not null f1 ) returns text not null
+CREATE FUNCTION fn1(f1 mediumblob ) returns mediumblob
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(mediumtext not null f1 ) returns mediumtext not null
+CREATE FUNCTION fn1(f1 longblob ) returns longblob
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(longtext not null f1 ) returns longtext not null
+--error ER_PARSE_ERROR
+CREATE FUNCTION fn1(f1 tinyblob not null ) returns tinyblob not null
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(tinyblob f1 ) returns tinyblob
+--error ER_PARSE_ERROR
+CREATE FUNCTION fn1(f1 blob not null ) returns blob not null
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(blob f1 ) returns blob
+--error ER_PARSE_ERROR
+CREATE FUNCTION fn1(f1 mediumblob not null ) returns mediumblob not null
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(mediumblob f1 ) returns mediumblob
+--error ER_PARSE_ERROR
+CREATE FUNCTION fn1(f1 longblob not null ) returns longblob not null
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(longblob f1 ) returns longblob
+CREATE FUNCTION fn1(f1 binary ) returns binary
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(tinyblob not null f1 ) returns tinyblob not null
+--error ER_PARSE_ERROR
+CREATE FUNCTION fn1(f1 binary not null ) returns binary not null
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(blob not null f1 ) returns blob not null
+CREATE FUNCTION fn1(f1 tinyint ) returns tinyint
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(mediumblob not null f1 ) returns mediumblob not null
+CREATE FUNCTION fn1(f1 tinyint unsigned ) returns tinyint unsigned
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(longblob not null f1 ) returns longblob not null
+CREATE FUNCTION fn1(f1 tinyint zerofill ) returns tinyint zerofill
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(binary f1 ) returns binary
+CREATE FUNCTION fn1(f1 tinyint unsigned zerofill ) returns tinyint unsigned zerofill
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(binary not null f1 ) returns binary not null
+CREATE FUNCTION fn1(f1 smallint ) returns smallint
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(tinyint f1 ) returns tinyint
+CREATE FUNCTION fn1(f1 smallint unsigned ) returns smallint unsigned
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(tinyint unsigned f1 ) returns tinyint unsigned
+CREATE FUNCTION fn1(f1 smallint zerofill ) returns smallint zerofill
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(tinyint zerofill f1 ) returns tinyint zerofill
+CREATE FUNCTION fn1(f1 smallint unsigned zerofill ) returns smallint unsigned zerofill
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(tinyint unsigned zerofill f1 ) returns tinyint unsigned zerofill
+CREATE FUNCTION fn1(f1 mediumint ) returns mediumint
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(smallint f1 ) returns smallint
+CREATE FUNCTION fn1(f1 mediumint unsigned ) returns mediumint unsigned
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(smallint unsigned f1 ) returns smallint unsigned
+CREATE FUNCTION fn1(f1 mediumint zerofill ) returns mediumint zerofill
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(smallint zerofill f1 ) returns smallint zerofill
+CREATE FUNCTION fn1(f1 mediumint unsigned zerofill ) returns mediumint unsigned zerofill
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(smallint unsigned zerofill f1 ) returns smallint unsigned zerofill
+CREATE FUNCTION fn1(f1 int ) returns int
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(mediumint f1 ) returns mediumint
+CREATE FUNCTION fn1(f1 int unsigned ) returns int unsigned
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(mediumint unsigned f1 ) returns mediumint unsigned
+CREATE FUNCTION fn1(f1 int1 unsigned ) returns int1 unsigned
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(mediumint zerofill f1 ) returns mediumint zerofill
+CREATE FUNCTION fn1(f1 int2 unsigned ) returns int2 unsigned
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(mediumint unsigned zerofill f1 ) returns mediumint unsigned zerofill
+CREATE FUNCTION fn1(f1 int3 unsigned ) returns int3 unsigned
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(int f1 ) returns int
+CREATE FUNCTION fn1(f1 int4 unsigned ) returns int4 unsigned
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(int unsigned f1 ) returns int unsigned
+CREATE FUNCTION fn1(f1 int8 unsigned ) returns int8 unsigned
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(int zerofill f1 ) returns int zerofill
+CREATE FUNCTION fn1(f1 int zerofill ) returns int zerofill
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(int unsigned zerofill f1 ) returns int unsigned zerofill
+CREATE FUNCTION fn1(f1 int unsigned zerofill ) returns int unsigned zerofill
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(bigint f1 ) returns bigint
+CREATE FUNCTION fn1(f1 bigint ) returns bigint
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(bigint unsigned f1 ) returns bigint unsigned
+CREATE FUNCTION fn1(f1 bigint unsigned ) returns bigint unsigned
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(bigint zerofill f1 ) returns bigint zerofill
+CREATE FUNCTION fn1(f1 bigint zerofill ) returns bigint zerofill
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(bigint unsigned zerofill f1 ) returns bigint unsigned zerofill
+CREATE FUNCTION fn1(f1 bigint unsigned zerofill ) returns bigint unsigned zerofill
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(decimal f1 ) returns decimal
+CREATE FUNCTION fn1(f1 decimal ) returns decimal
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(decimal unsigned f1 ) returns decimal unsigned
+CREATE FUNCTION fn1(f1 decimal unsigned ) returns decimal unsigned
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(decimal zerofill f1 ) returns decimal zerofill
+CREATE FUNCTION fn1(f1 decimal zerofill ) returns decimal zerofill
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(decimal unsigned zerofill f1 ) returns decimal unsigned zerofill
+CREATE FUNCTION fn1(f1 decimal unsigned zerofill ) returns decimal unsigned zerofill
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(numeric f1 ) returns numeric
+CREATE FUNCTION fn1(f1 numeric ) returns numeric
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(numeric unsigned f1 ) returns numeric unsigned
+CREATE FUNCTION fn1(f1 numeric unsigned ) returns numeric unsigned
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(numeric zerofill f1 ) returns numeric zerofill
+CREATE FUNCTION fn1(f1 numeric zerofill ) returns numeric zerofill
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(numeric unsigned zerofill f1 ) returns numeric unsigned zerofill
+CREATE FUNCTION fn1(f1 numeric unsigned zerofill ) returns numeric unsigned zerofill
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(real f1 ) returns real
+CREATE FUNCTION fn1(f1 real ) returns real
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(real unsigned f1 ) returns real unsigned
+CREATE FUNCTION fn1(f1 real unsigned ) returns real unsigned
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(real zerofill f1 ) returns real zerofill
+CREATE FUNCTION fn1(f1 real zerofill ) returns real zerofill
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(real unsigned zerofill f1 ) returns real unsigned zerofill
+CREATE FUNCTION fn1(f1 real unsigned zerofill ) returns real unsigned zerofill
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(float f1 ) returns float
+CREATE FUNCTION fn1(f1 float ) returns float
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(float unsigned f1 ) returns float unsigned
+CREATE FUNCTION fn1(f1 float unsigned ) returns float unsigned
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(float zerofill f1 ) returns float zerofill
+CREATE FUNCTION fn1(f1 float zerofill ) returns float zerofill
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(float unsigned zerofill f1 ) returns float unsigned zerofill
+CREATE FUNCTION fn1(f1 float unsigned zerofill ) returns float unsigned zerofill
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(date f1 ) returns date
+CREATE FUNCTION fn1(f1 date ) returns date
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(time f1 ) returns time
+CREATE FUNCTION fn1(f1 time ) returns time
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(datetime f1 ) returns datetime
+CREATE FUNCTION fn1(f1 datetime ) returns datetime
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(timestamp f1 ) returns timestamp
+CREATE FUNCTION fn1(f1 timestamp ) returns timestamp
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(year f1 ) returns year
+CREATE FUNCTION fn1(f1 year ) returns year
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(year(3) f1 ) returns year(3)
+--error ER_PARSE_ERROR
+CREATE FUNCTION fn1(f1 year(f1 3) ) returns year(3)
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(year(4) f1 ) returns year(4)
+--error ER_PARSE_ERROR
+CREATE FUNCTION fn1(f1 year(f1 4) ) returns year(4)
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(enum("1enum", "2enum") f1 ) returns enum("1enum", "2enum")
+--error ER_PARSE_ERROR
+CREATE FUNCTION fn1(f1 enum(f1 "1enum", "2enum") ) returns enum("1enum", "2enum")
     return f1;
 
 DROP FUNCTION IF EXISTS fn1;
---error 1064
-CREATE FUNCTION fn1(set("1set", "2set") f1 ) returns set("1set", "2set")
+--error ER_PARSE_ERROR
+CREATE FUNCTION fn1(f1 set(f1 "1set", "2set") ) returns set("1set", "2set")
     return f1;
 
 
@@ -2444,7 +2384,7 @@ appropriate error message;
 
 DROP PROCEDURE IF EXISTS sp16;
 
---error 1305
+--error ER_SP_DOES_NOT_EXIST
 CALL sp16( 'xyz' );
 
 CREATE DATABASE db1;
@@ -2458,7 +2398,7 @@ BEGIN
 END//
 delimiter ;//
 
---error 1305
+--error ER_SP_DOES_NOT_EXIST
 CALL db_storedproc.sp16();
 
 # cleanup
@@ -2501,15 +2441,15 @@ SELECT db_storedproc.sp1( 'a' );
 DROP FUNCTION db_storedproc.sp1;
 USE db_storedproc;
 
---error 1305
+--error ER_SP_DOES_NOT_EXIST
 SELECT sp1('a');
 
 DROP PROCEDURE sp1;
 
---error 1305
+--error ER_SP_DOES_NOT_EXIST
 CALL sp1();
 
---error 1305
+--error ER_SP_DOES_NOT_EXIST
 SELECT sp1('a');
 
 # cleanup
@@ -2546,9 +2486,11 @@ DROP DATABASE IF EXISTS db1;
 CREATE DATABASE db1;
 USE db1;
 alter procedure db_storedproc.sp1 sql security invoker;
+--sorted_result
 SELECT name, type, security_type from mysql.proc where db LIKE 'db_storedproc%' and specific_name='sp1';
 
 alter function db_storedproc.sp1 sql security invoker;
+--sorted_result
 SELECT name, type, security_type from mysql.proc where db LIKE 'db_storedproc%' and specific_name='sp1';
 
 CALL db_storedproc.sp1();
@@ -2562,7 +2504,7 @@ CALL db_storedproc.sp1();
 SELECT db_storedproc.sp1();
 
 alter function sp1 sql security definer;
-
+--sorted_result
 SELECT name, type, security_type from mysql.proc where db LIKE 'db_storedproc%' and specific_name='sp1';
 CALL db_storedproc.sp1();
 
@@ -2624,6 +2566,7 @@ SELECT db_storedproc.sp1();
 alter procedure db_storedproc_3122.sp1 sql security invoker;
 alter function sp1 sql security invoker;
 
+--sorted_result
 SELECT db, name, type, security_type from mysql.proc where db LIKE 'db_storedproc%' and specific_name='sp1';
 
 CALL db_storedproc.sp1();
@@ -2701,20 +2644,20 @@ CREATE DATABASE db1;
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1 () set @x=1;
 
---error 1304
+--error ER_SP_ALREADY_EXISTS
 CREATE PROCEDURE sp1 () set @x=2;
 
 CALL sp1();
 SELECT @x;
 USE db1;
---error 1304
+--error ER_SP_ALREADY_EXISTS
 CREATE PROCEDURE db_storedproc.sp1 () set @x=3;
 CALL db_storedproc.sp1();
   SELECT @x;
 
 DROP PROCEDURE IF EXISTS db_storedproc.sp1;
 CREATE PROCEDURE db_storedproc.sp1 () set @x=1;
---error 1304
+--error ER_SP_ALREADY_EXISTS
 CREATE PROCEDURE db_storedproc.sp1 () set @x=2;
 CALL db_storedproc.sp1();
 SELECT @x;
@@ -2738,16 +2681,16 @@ DROP DATABASE IF EXISTS db1;
 CREATE DATABASE db1;
 DROP FUNCTION IF EXISTS fn1;
 CREATE FUNCTION fn1 () returns int return 1;
---error 1304
+--error ER_SP_ALREADY_EXISTS
 CREATE FUNCTION fn1 () returns int return 2;
 SELECT fn1();
 USE db1;
---error 1304
+--error ER_SP_ALREADY_EXISTS
 CREATE FUNCTION db_storedproc.fn1 () returns int return 3;
 SELECT db_storedproc.fn1();
 DROP FUNCTION IF EXISTS db_storedproc.fn1;
 CREATE FUNCTION db_storedproc.fn1 () returns int return 1;
---error 1304
+--error ER_SP_ALREADY_EXISTS
 CREATE FUNCTION db_storedproc.fn1 () returns int return 2;
 SELECT db_storedproc.fn1();
 
@@ -2818,7 +2761,7 @@ error message is returned when the name is rejected. (invalid func name);
 --source include/show_msg80.inc
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION !_fn1( f1 char(20) ) returns int
 BEGIN
    SELECT * from t1 where f2 = f1;
@@ -2827,7 +2770,7 @@ END//
 delimiter ;//
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION fn1( f1 char(20) ) return int
 BEGIN
    SELECT * from t1 where f2 = f1;
@@ -2838,20 +2781,20 @@ delimiter ;//
 CREATE FUNCTION fn1() returns int
   return 'a';
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION procedure() returns int
   return 1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION fn1(a char) returns int lang sql return 1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION fn1(a char) returns int deterministic( return 1);
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION fn1(a char) returns int non deterministic return 1;
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE FUNCTION fn1(a char) returns int not deterministic comment 'abc' language sql sql security refiner return 1;
 
 # clean up
@@ -2924,7 +2867,7 @@ DROP PROCEDURE IF EXISTS sp1;
 
 # missing BEGIN
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( cnt int(20) )
     SELECT count(*) into cnt from t2;
     set @count = cnt;
@@ -2932,7 +2875,7 @@ CREATE PROCEDURE sp1( cnt int(20) )
 END//
 delimiter ;//
 
---error 1305
+--error ER_SP_DOES_NOT_EXIST
 CALL sp1( 10 );
 
 --disable_warnings
@@ -2941,7 +2884,7 @@ DROP PROCEDURE IF EXISTS sp1;
 
 # wrong order of BEGIN and END
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( cnt int(20) )
 END
     SELECT count(*) into cnt from t2;
@@ -2950,7 +2893,7 @@ END
 BEGIN//
 delimiter ;//
 
---error 1305
+--error ER_SP_DOES_NOT_EXIST
 CALL sp1( 10 );
 
 --disable_warnings
@@ -2959,7 +2902,7 @@ DROP PROCEDURE IF EXISTS sp1;
 
 # invalid usage of BEGIN + END
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( cnt int(20) )
 BEGIN
    SELECT count(*) into cnt from t2;
@@ -3003,7 +2946,19 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1()
+  accessible:BEGIN
+    SELECT @x;
+END//
+delimiter ;//
+
+--disable_warnings
+DROP PROCEDURE IF EXISTS sp1;
+--enable_warnings
+
+delimiter //;
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   add:BEGIN
     SELECT @x;
@@ -3015,7 +2970,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   all:BEGIN
     SELECT @x;
@@ -3027,7 +2982,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_SP_BADSTATEMENT
 CREATE PROCEDURE sp1()
   alter:BEGIN
     SELECT @x;
@@ -3039,7 +2994,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   analyze:BEGIN
     SELECT @x;
@@ -3051,7 +3006,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   and:BEGIN
     SELECT @x;
@@ -3063,7 +3018,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   as:BEGIN
     SELECT @x;
@@ -3075,7 +3030,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   asc:BEGIN
     SELECT @x;
@@ -3087,7 +3042,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   asensitive:BEGIN
     SELECT @x;
@@ -3099,7 +3054,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   before:BEGIN
     SELECT @x;
@@ -3111,7 +3066,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   between:BEGIN
     SELECT @x;
@@ -3123,7 +3078,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   bigint:BEGIN
     SELECT @x;
@@ -3135,7 +3090,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   binary:BEGIN
     SELECT @x;
@@ -3147,7 +3102,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   blob:BEGIN
     SELECT @x;
@@ -3159,7 +3114,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   both:BEGIN
     SELECT @x;
@@ -3171,7 +3126,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   by:BEGIN
     SELECT @x;
@@ -3183,9 +3138,9 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
-  CALL:BEGIN
+  call:BEGIN
     SELECT @x;
 END//
 delimiter ;//
@@ -3195,7 +3150,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   cascade:BEGIN
     SELECT @x;
@@ -3207,7 +3162,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   case:BEGIN
     SELECT @x;
@@ -3219,7 +3174,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   change:BEGIN
     SELECT @x;
@@ -3231,7 +3186,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   char:BEGIN
     SELECT @x;
@@ -3243,7 +3198,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   character:BEGIN
     SELECT @x;
@@ -3255,7 +3210,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   check:BEGIN
     SELECT @x;
@@ -3267,7 +3222,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   collate:BEGIN
     SELECT @x;
@@ -3279,7 +3234,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   column:BEGIN
     SELECT @x;
@@ -3291,19 +3246,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
-#FIXME: is it OK that this now succeeds? --error 1064
-CREATE PROCEDURE sp1()
-  columns:BEGIN
-    SELECT @x;
-END//
-delimiter ;//
-
---disable_warnings
-DROP PROCEDURE IF EXISTS sp1;
---enable_warnings
-
-delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   condition:BEGIN
     SELECT @x;
@@ -3315,19 +3258,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
-CREATE PROCEDURE sp1()
-  connection:BEGIN
-    SELECT @x;
-END//
-delimiter ;//
-
---disable_warnings
-DROP PROCEDURE IF EXISTS sp1;
---enable_warnings
-
-delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   constraint:BEGIN
     SELECT @x;
@@ -3339,7 +3270,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   continue:BEGIN
     SELECT @x;
@@ -3351,7 +3282,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   convert:BEGIN
     SELECT @x;
@@ -3363,7 +3294,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   create:BEGIN
     SELECT @x;
@@ -3375,7 +3306,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   cross:BEGIN
     SELECT @x;
@@ -3387,7 +3318,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   current_date:BEGIN
     SELECT @x;
@@ -3399,7 +3330,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   current_time:BEGIN
     SELECT @x;
@@ -3411,7 +3342,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   current_timestamp:BEGIN
     SELECT @x;
@@ -3423,7 +3354,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   current_user:BEGIN
     SELECT @x;
@@ -3435,7 +3366,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   cursor:BEGIN
     SELECT @x;
@@ -3447,7 +3378,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   database:BEGIN
     SELECT @x;
@@ -3459,7 +3390,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   databases:BEGIN
     SELECT @x;
@@ -3471,7 +3402,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   day_hour:BEGIN
     SELECT @x;
@@ -3483,7 +3414,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   day_microsecond:BEGIN
     SELECT @x;
@@ -3495,7 +3426,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   day_minute:BEGIN
     SELECT @x;
@@ -3507,7 +3438,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   day_second:BEGIN
     SELECT @x;
@@ -3519,7 +3450,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   dec:BEGIN
     SELECT @x;
@@ -3531,7 +3462,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   decimal:BEGIN
     SELECT @x;
@@ -3543,7 +3474,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   declare:BEGIN
     SELECT @x;
@@ -3555,7 +3486,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   default:BEGIN
     SELECT @x;
@@ -3567,7 +3498,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   delayed:BEGIN
     SELECT @x;
@@ -3579,7 +3510,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   delete:BEGIN
     SELECT @x;
@@ -3591,7 +3522,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   desc:BEGIN
     SELECT @x;
@@ -3603,7 +3534,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   describe:BEGIN
     SELECT @x;
@@ -3615,7 +3546,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   deterministic:BEGIN
     SELECT @x;
@@ -3627,7 +3558,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   distinct:BEGIN
     SELECT @x;
@@ -3639,7 +3570,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   distinctrow:BEGIN
     SELECT @x;
@@ -3651,7 +3582,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   div:BEGIN
     SELECT @x;
@@ -3663,7 +3594,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   double:BEGIN
     SELECT @x;
@@ -3675,7 +3606,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 drop:BEGIN
     SELECT @x;
@@ -3687,7 +3618,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   dual:BEGIN
     SELECT @x;
@@ -3699,7 +3630,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   each:BEGIN
     SELECT @x;
@@ -3711,7 +3642,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   else:BEGIN
     SELECT @x;
@@ -3723,7 +3654,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   elseif:BEGIN
     SELECT @x;
@@ -3735,7 +3666,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   enclosed:BEGIN
     SELECT @x;
@@ -3747,7 +3678,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   escaped:BEGIN
     SELECT @x;
@@ -3759,7 +3690,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   exists:BEGIN
     SELECT @x;
@@ -3771,7 +3702,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   exit:BEGIN
     SELECT @x;
@@ -3783,7 +3714,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   explain:BEGIN
     SELECT @x;
@@ -3795,7 +3726,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   false:BEGIN
     SELECT @x;
@@ -3807,7 +3738,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   fetch:BEGIN
     SELECT @x;
@@ -3819,9 +3750,9 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
-#FIXME: is it OK that this now succeeds? --error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
-  fields:BEGIN
+  float:BEGIN
     SELECT @x;
 END//
 delimiter ;//
@@ -3831,9 +3762,9 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
-  float:BEGIN
+  float4:BEGIN
     SELECT @x;
 END//
 delimiter ;//
@@ -3843,9 +3774,9 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
-  for:BEGIN
+  float8:BEGIN
     SELECT @x;
 END//
 delimiter ;//
@@ -3855,9 +3786,9 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
-  force:BEGIN
+  for:BEGIN
     SELECT @x;
 END//
 delimiter ;//
@@ -3867,9 +3798,9 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
-  foreign:BEGIN
+  force:BEGIN
     SELECT @x;
 END//
 delimiter ;//
@@ -3879,9 +3810,9 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
-#FIXME: is it OK that this now succeeds? --error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
-  found:BEGIN
+  foreign:BEGIN
     SELECT @x;
 END//
 delimiter ;//
@@ -3891,7 +3822,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   from:BEGIN
     SELECT @x;
@@ -3903,7 +3834,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   fulltext:BEGIN
     SELECT @x;
@@ -3915,19 +3846,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
-#FIXME: is it OK that this now succeeds? --error 1064
-CREATE PROCEDURE sp1()
-  goto:BEGIN
-    SELECT @x;
-END//
-delimiter ;//
-
---disable_warnings
-DROP PROCEDURE IF EXISTS sp1;
---enable_warnings
-
-delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   grant:BEGIN
     SELECT @x;
@@ -3939,7 +3858,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   group:BEGIN
     SELECT @x;
@@ -3951,7 +3870,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   having:BEGIN
     SELECT @x;
@@ -3963,7 +3882,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   high_priority:BEGIN
     SELECT @x;
@@ -3975,7 +3894,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   hour_microsecond:BEGIN
     SELECT @x;
@@ -3987,7 +3906,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   hour_minute:BEGIN
     SELECT @x;
@@ -3999,7 +3918,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   hour_second:BEGIN
     SELECT @x;
@@ -4011,7 +3930,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   if:BEGIN
     SELECT @x;
@@ -4023,7 +3942,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   ignore:BEGIN
     SELECT @x;
@@ -4035,7 +3954,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   in:BEGIN
     SELECT @x;
@@ -4047,7 +3966,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   index:BEGIN
     SELECT @x;
@@ -4059,7 +3978,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   infile:BEGIN
     SELECT @x;
@@ -4071,7 +3990,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   inner:BEGIN
     SELECT @x;
@@ -4083,7 +4002,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   inout:BEGIN
     SELECT @x;
@@ -4095,7 +4014,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   insensitive:BEGIN
     SELECT @x;
@@ -4107,7 +4026,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   insert:BEGIN
     SELECT @x;
@@ -4119,7 +4038,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   int:BEGIN
     SELECT @x;
@@ -4131,7 +4050,67 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1()
+  int1:BEGIN
+    SELECT @x;
+END//
+delimiter ;//
+
+--disable_warnings
+DROP PROCEDURE IF EXISTS sp1;
+--enable_warnings
+
+delimiter //;
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1()
+  int2:BEGIN
+    SELECT @x;
+END//
+delimiter ;//
+
+--disable_warnings
+DROP PROCEDURE IF EXISTS sp1;
+--enable_warnings
+
+delimiter //;
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1()
+  int3:BEGIN
+    SELECT @x;
+END//
+delimiter ;//
+
+--disable_warnings
+DROP PROCEDURE IF EXISTS sp1;
+--enable_warnings
+
+delimiter //;
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1()
+  int4:BEGIN
+    SELECT @x;
+END//
+delimiter ;//
+
+--disable_warnings
+DROP PROCEDURE IF EXISTS sp1;
+--enable_warnings
+
+delimiter //;
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1()
+  int8:BEGIN
+    SELECT @x;
+END//
+delimiter ;//
+
+--disable_warnings
+DROP PROCEDURE IF EXISTS sp1;
+--enable_warnings
+
+delimiter //;
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   integer:BEGIN
     SELECT @x;
@@ -4143,7 +4122,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   interval:BEGIN
     SELECT @x;
@@ -4155,7 +4134,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   into:BEGIN
     SELECT @x;
@@ -4167,7 +4146,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   is:BEGIN
     SELECT @x;
@@ -4179,7 +4158,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   iterate:BEGIN
     SELECT @x;
@@ -4191,7 +4170,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   join:BEGIN
     SELECT @x;
@@ -4203,7 +4182,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   key:BEGIN
     SELECT @x;
@@ -4215,7 +4194,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   keys:BEGIN
     SELECT @x;
@@ -4227,7 +4206,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   kill:BEGIN
     SELECT @x;
@@ -4239,7 +4218,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   leading:BEGIN
     SELECT @x;
@@ -4251,7 +4230,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   leave:BEGIN
     SELECT @x;
@@ -4263,7 +4242,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   left:BEGIN
     SELECT @x;
@@ -4275,7 +4254,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   like:BEGIN
     SELECT @x;
@@ -4287,7 +4266,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   limit:BEGIN
     SELECT @x;
@@ -4299,7 +4278,19 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1()
+  linear:BEGIN
+    SELECT @x;
+END//
+delimiter ;//
+
+--disable_warnings
+DROP PROCEDURE IF EXISTS sp1;
+--enable_warnings
+
+delimiter //;
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   lines:BEGIN
     SELECT @x;
@@ -4311,7 +4302,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   load:BEGIN
     SELECT @x;
@@ -4323,7 +4314,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   localtime:BEGIN
     SELECT @x;
@@ -4335,7 +4326,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   localtimestamp:BEGIN
     SELECT @x;
@@ -4347,7 +4338,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   lock:BEGIN
     SELECT @x;
@@ -4359,7 +4350,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   long:BEGIN
     SELECT @x;
@@ -4371,7 +4362,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   longblob:BEGIN
     SELECT @x;
@@ -4383,7 +4374,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   longtext:BEGIN
     SELECT @x;
@@ -4395,7 +4386,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   loop:BEGIN
     SELECT @x;
@@ -4407,7 +4398,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   low_priority:BEGIN
     SELECT @x;
@@ -4419,7 +4410,19 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1()
+  master_ssl_verify_server_cert:BEGIN
+    SELECT @x;
+END//
+delimiter ;//
+
+--disable_warnings
+DROP PROCEDURE IF EXISTS sp1;
+--enable_warnings
+
+delimiter //;
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   match:BEGIN
     SELECT @x;
@@ -4431,7 +4434,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   mediumblob:BEGIN
     SELECT @x;
@@ -4443,7 +4446,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   mediumint:BEGIN
     SELECT @x;
@@ -4455,7 +4458,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   mediumtext:BEGIN
     SELECT @x;
@@ -4467,7 +4470,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   middleint:BEGIN
     SELECT @x;
@@ -4479,7 +4482,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   minute_microsecond:BEGIN
     SELECT @x;
@@ -4491,7 +4494,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   minute_second:BEGIN
     SELECT @x;
@@ -4503,7 +4506,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   mod:BEGIN
     SELECT @x;
@@ -4515,7 +4518,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   modifies:BEGIN
     SELECT @x;
@@ -4527,7 +4530,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   natural:BEGIN
     SELECT @x;
@@ -4539,7 +4542,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   not:BEGIN
     SELECT @x;
@@ -4551,7 +4554,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   no_write_to_binlog:BEGIN
     SELECT @x;
@@ -4563,7 +4566,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   null:BEGIN
     SELECT @x;
@@ -4576,7 +4579,7 @@ DROP PROCEDURE IF EXISTS sp1;
 
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   numeric:BEGIN
     SELECT @x;
@@ -4588,7 +4591,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   on:BEGIN
     SELECT @x;
@@ -4600,7 +4603,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   optimize:BEGIN
     SELECT @x;
@@ -4612,7 +4615,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   option:BEGIN
     SELECT @x;
@@ -4624,7 +4627,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   optionally:BEGIN
     SELECT @x;
@@ -4636,7 +4639,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   or:BEGIN
     SELECT @x;
@@ -4648,7 +4651,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   order:BEGIN
     SELECT @x;
@@ -4660,7 +4663,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   out:BEGIN
     SELECT @x;
@@ -4672,7 +4675,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   outer:BEGIN
     SELECT @x;
@@ -4684,7 +4687,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   outfile:BEGIN
     SELECT @x;
@@ -4696,7 +4699,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   precision:BEGIN
     SELECT @x;
@@ -4708,7 +4711,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   primary:BEGIN
     SELECT @x;
@@ -4720,9 +4723,9 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
-#FIXME: is it OK that this now succeeds? --error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
-  privileges:BEGIN
+  procedure:BEGIN
     SELECT @x;
 END//
 delimiter ;//
@@ -4732,9 +4735,9 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
-  procedure:BEGIN
+  purge:BEGIN
     SELECT @x;
 END//
 delimiter ;//
@@ -4744,9 +4747,9 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
-  purge:BEGIN
+  range:BEGIN
     SELECT @x;
 END//
 delimiter ;//
@@ -4756,7 +4759,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   read:BEGIN
     SELECT @x;
@@ -4768,7 +4771,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   reads:BEGIN
     SELECT @x;
@@ -4780,7 +4783,31 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1()
+  read_only:BEGIN
+    SELECT @x;
+END//
+delimiter ;//
+
+--disable_warnings
+DROP PROCEDURE IF EXISTS sp1;
+--enable_warnings
+
+delimiter //;
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1()
+  read_write:BEGIN
+    SELECT @x;
+END//
+delimiter ;//
+
+--disable_warnings
+DROP PROCEDURE IF EXISTS sp1;
+--enable_warnings
+
+delimiter //;
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   real:BEGIN
     SELECT @x;
@@ -4792,7 +4819,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   references:BEGIN
     SELECT @x;
@@ -4804,7 +4831,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   regexp:BEGIN
     SELECT @x;
@@ -4816,7 +4843,19 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1()
+  release:BEGIN
+    SELECT @x;
+END//
+delimiter ;//
+
+--disable_warnings
+DROP PROCEDURE IF EXISTS sp1;
+--enable_warnings
+
+delimiter //;
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   rename:BEGIN
     SELECT @x;
@@ -4828,7 +4867,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   repeat:BEGIN
     SELECT @x;
@@ -4840,7 +4879,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   replace:BEGIN
     SELECT @x;
@@ -4852,7 +4891,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   require:BEGIN
     SELECT @x;
@@ -4864,7 +4903,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   restrict:BEGIN
     SELECT @x;
@@ -4876,7 +4915,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   return:BEGIN
     SELECT @x;
@@ -4888,7 +4927,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   revoke:BEGIN
     SELECT @x;
@@ -4900,7 +4939,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   right:BEGIN
     SELECT @x;
@@ -4912,7 +4951,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   rlike:BEGIN
     SELECT @x;
@@ -4924,7 +4963,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   schema:BEGIN
     SELECT @x;
@@ -4936,7 +4975,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   schemas:BEGIN
     SELECT @x;
@@ -4948,7 +4987,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   second_microsecond:BEGIN
     SELECT @x;
@@ -4960,7 +4999,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   select:BEGIN
     SELECT @x;
@@ -4972,7 +5011,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   sensitive:BEGIN
     SELECT @x;
@@ -4984,7 +5023,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   separator:BEGIN
     SELECT @x;
@@ -4996,7 +5035,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   set:BEGIN
     SELECT @x;
@@ -5008,7 +5047,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   show:BEGIN
     SELECT @x;
@@ -5020,7 +5059,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   smallint:BEGIN
     SELECT @x;
@@ -5032,19 +5071,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
-CREATE PROCEDURE sp1()
-  soname:BEGIN
-    SELECT @x;
-END//
-delimiter ;//
-
---disable_warnings
-DROP PROCEDURE IF EXISTS sp1;
---enable_warnings
-
-delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   spatial:BEGIN
     SELECT @x;
@@ -5056,7 +5083,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   specific:BEGIN
     SELECT @x;
@@ -5068,7 +5095,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   sql:BEGIN
     SELECT @x;
@@ -5080,7 +5107,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   sqlexception:BEGIN
     SELECT @x;
@@ -5092,7 +5119,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   sqlstate:BEGIN
     SELECT @x;
@@ -5103,9 +5130,8 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
-
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   sqlwarning:BEGIN
     SELECT @x;
@@ -5116,9 +5142,8 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
-
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   sql_big_result:BEGIN
     SELECT @x;
@@ -5130,7 +5155,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   sql_calc_found_rows:BEGIN
     SELECT @x;
@@ -5142,7 +5167,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   sql_small_result:BEGIN
     SELECT @x;
@@ -5154,7 +5179,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   ssl:BEGIN
     SELECT @x;
@@ -5166,7 +5191,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   starting:BEGIN
     SELECT @x;
@@ -5178,7 +5203,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   straight_join:BEGIN
     SELECT @x;
@@ -5190,7 +5215,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   table:BEGIN
     SELECT @x;
@@ -5202,19 +5227,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
-#FIXME: is it OK that this now succeeds? --error 1064
-CREATE PROCEDURE sp1()
-  tables:BEGIN
-    SELECT @x;
-END//
-delimiter ;//
-
---disable_warnings
-DROP PROCEDURE IF EXISTS sp1;
---enable_warnings
-
-delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   terminated:BEGIN
     SELECT @x;
@@ -5226,7 +5239,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   then:BEGIN
     SELECT @x;
@@ -5238,7 +5251,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   tinyblob:BEGIN
     SELECT @x;
@@ -5250,7 +5263,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   tinyint:BEGIN
     SELECT @x;
@@ -5262,7 +5275,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   tinytext:BEGIN
     SELECT @x;
@@ -5274,7 +5287,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   to:BEGIN
     SELECT @x;
@@ -5285,9 +5298,8 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
-
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   trailing:BEGIN
     SELECT @x;
@@ -5299,7 +5311,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   trigger:BEGIN
     SELECT @x;
@@ -5311,7 +5323,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   true:BEGIN
     SELECT @x;
@@ -5323,7 +5335,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   undo:BEGIN
     SELECT @x;
@@ -5335,7 +5347,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   union:BEGIN
     SELECT @x;
@@ -5347,7 +5359,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   unique:BEGIN
     SELECT @x;
@@ -5359,7 +5371,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1314
+--error ER_SP_BADSTATEMENT
 CREATE PROCEDURE sp1()
   unlock:BEGIN
     SELECT @x;
@@ -5371,7 +5383,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   unsigned:BEGIN
     SELECT @x;
@@ -5383,7 +5395,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   update:BEGIN
     SELECT @x;
@@ -5395,7 +5407,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   usage:BEGIN
     SELECT @x;
@@ -5407,7 +5419,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   use:BEGIN
     SELECT @x;
@@ -5419,7 +5431,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   using:BEGIN
     SELECT @x;
@@ -5431,7 +5443,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   utc_date:BEGIN
     SELECT @x;
@@ -5443,7 +5455,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   utc_time:BEGIN
     SELECT @x;
@@ -5455,7 +5467,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   utc_timestamp:BEGIN
     SELECT @x;
@@ -5467,7 +5479,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   values:BEGIN
     SELECT @x;
@@ -5479,7 +5491,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   varbinary:BEGIN
     SELECT @x;
@@ -5491,7 +5503,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   varchar:BEGIN
     SELECT @x;
@@ -5503,7 +5515,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   varcharacter:BEGIN
     SELECT @x;
@@ -5515,7 +5527,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   varying:BEGIN
     SELECT @x;
@@ -5527,7 +5539,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   when:BEGIN
     SELECT @x;
@@ -5539,7 +5551,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   where:BEGIN
     SELECT @x;
@@ -5551,7 +5563,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   while:BEGIN
     SELECT @x;
@@ -5563,7 +5575,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   with:BEGIN
     SELECT @x;
@@ -5575,7 +5587,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   write:BEGIN
     SELECT @x;
@@ -5587,7 +5599,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   xor:BEGIN
     SELECT @x;
@@ -5599,7 +5611,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   year_month:BEGIN
     SELECT @x;
@@ -5611,7 +5623,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
   zerofill:BEGIN
     SELECT @x;
@@ -5663,7 +5675,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1310
+--error ER_SP_LABEL_MISMATCH
 CREATE PROCEDURE sp1( )
 begin1_label: BEGIN
     declare x char;
@@ -5716,7 +5728,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare x char;
@@ -5736,7 +5748,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 begin_label BEGIN
    declare x char;
@@ -5757,7 +5769,7 @@ DROP PROCEDURE IF EXISTS sp6;
 --enable_warnings
 
 delimiter //;
---error 1309
+--error ER_SP_LABEL_REDEFINE
 CREATE PROCEDURE sp6( )
 begin_samelabel: BEGIN
     declare x char;
@@ -5788,10 +5800,8 @@ a stored procedure (with the declare statement) may only be properly defined;
 DROP PROCEDURE IF EXISTS sp6;
 --enable_warnings
 
--- echo FIXME: Following test contains a known problem that will be checked again
--- echo FIXME: after WL#2984 has been completed: DECIMAL(255,255) is not rejected
-
 delimiter //;
+--error ER_TOO_BIG_SCALE
 CREATE PROCEDURE sp6( )
 BEGIN
     declare x char default 'a';
@@ -5842,7 +5852,7 @@ DROP PROCEDURE IF EXISTS sp6;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp6( )
 BEGIN
     declare x default '0' char;
@@ -5855,7 +5865,7 @@ DROP PROCEDURE IF EXISTS sp6;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp6( )
 BEGIN
     declare x char, integer default '0';
@@ -5868,7 +5878,7 @@ DROP PROCEDURE IF EXISTS sp6;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp6( )
 BEGIN
     declare x1, x2 char, integer default '0', 1;
@@ -5881,7 +5891,7 @@ DROP PROCEDURE IF EXISTS sp6;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
    declare char x;
@@ -5895,7 +5905,7 @@ DROP PROCEDURE IF EXISTS sp6;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
    declare char x, y1 integer default 0;
@@ -5909,7 +5919,7 @@ DROP PROCEDURE IF EXISTS sp6;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp6( )
 BEGIN
     declare x default 'a' char;
@@ -5921,7 +5931,7 @@ DROP PROCEDURE IF EXISTS sp6;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp6( )
 BEGIN
     declare condition notable for sqlstate '42s22';
@@ -5933,7 +5943,7 @@ DROP PROCEDURE IF EXISTS sp6;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp6( )
 BEGIN
     declare condition for notable sqlstate '42s22';
@@ -5945,7 +5955,7 @@ DROP PROCEDURE IF EXISTS sp6;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp6( )
 BEGIN
     declare condition for sqlstate notable '42s22';
@@ -5957,7 +5967,7 @@ DROP PROCEDURE IF EXISTS sp6;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp6( )
 BEGIN
     declare condition for sqlstate '42s22' notable;
@@ -5969,7 +5979,7 @@ DROP PROCEDURE IF EXISTS sp6;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp6( )
 BEGIN
     declare cursor cur1 for SELECT f1 from db_storedproc.t2;
@@ -5981,7 +5991,7 @@ DROP PROCEDURE IF EXISTS sp6;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp6( )
 BEGIN
     declare cursor for cur1 SELECT f1 from db_storedproc.t2;
@@ -5993,7 +6003,7 @@ DROP PROCEDURE IF EXISTS sp6;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp6( )
 BEGIN
     declare cursor for SELECT cur1 f1 from db_storedproc.t2;
@@ -6005,7 +6015,7 @@ DROP PROCEDURE IF EXISTS sp6;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp6( )
 BEGIN
     declare handler continue for sqlstate '02000' set @x2 = 1;
@@ -6017,7 +6027,7 @@ DROP PROCEDURE IF EXISTS sp6;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp6( )
 BEGIN
     declare handler exit for sqlstate '02000' set @x2 = 1;
@@ -6029,7 +6039,7 @@ DROP PROCEDURE IF EXISTS sp6;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp6( )
 BEGIN
     declare handler undo for sqlstate '02000' set @x2 = 1;
@@ -6041,7 +6051,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare char x;
@@ -6054,7 +6064,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare char binary  x;
@@ -6067,7 +6077,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare char ascii  x;
@@ -6080,7 +6090,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare tinytext  x;
@@ -6093,7 +6103,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare  x;
@@ -6106,7 +6116,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare mediumtext  x;
@@ -6119,7 +6129,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare longtext  x;
@@ -6132,7 +6142,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare tinyblob  x;
@@ -6145,7 +6155,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare blob x;
@@ -6158,7 +6168,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare mediumblob  x;
@@ -6171,7 +6181,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare longblob  x;
@@ -6184,7 +6194,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare binary  x;
@@ -6197,7 +6207,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare tinyint  x;
@@ -6210,7 +6220,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare tinyint unsigned  x;
@@ -6223,7 +6233,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare tinyint zerofill  x;
@@ -6236,7 +6246,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare tinyint unsigned zerofill  x;
@@ -6249,7 +6259,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare smallint  x;
@@ -6262,7 +6272,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare smallint unsigned   x;
@@ -6275,7 +6285,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare smallint zerofill  x;
@@ -6288,7 +6298,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare smallint unsigned zerofill  x;
@@ -6301,7 +6311,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare mediumint  x;
@@ -6314,7 +6324,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare mediumint unsigned  x;
@@ -6327,7 +6337,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare mediumint zerofill  x;
@@ -6340,7 +6350,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare mediumint unsigned zerofill  x;
@@ -6353,7 +6363,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare int  x;
@@ -6366,7 +6376,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare int unsigned  x;
@@ -6379,7 +6389,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare int zerofill  x;
@@ -6392,7 +6402,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare int unsigned zerofill  x;
@@ -6405,7 +6415,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare bigint  x;
@@ -6418,7 +6428,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare bigint unsigned  x;
@@ -6432,7 +6442,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare bigint zerofill  x;
@@ -6445,7 +6455,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare bigint unsigned zerofill  x;
@@ -6458,7 +6468,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare decimal  x;
@@ -6471,7 +6481,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare decimal unsigned  x;
@@ -6484,7 +6494,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare decimal zerofill  x;
@@ -6497,7 +6507,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare decimal unsigned zerofill not null  x;
@@ -6510,7 +6520,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare decimal (0) not null  x;
@@ -6523,7 +6533,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare decimal (64) not null  x;
@@ -6536,7 +6546,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare decimal (0) unsigned not null  x;
@@ -6549,7 +6559,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare decimal (64) unsigned not null  x;
@@ -6562,7 +6572,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare decimal (0) zerofill not null  x;
@@ -6575,7 +6585,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare decimal (64) zerofill not null  x;
@@ -6588,7 +6598,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare decimal (0) unsigned zerofill not null  x;
@@ -6601,7 +6611,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare decimal (64) unsigned zerofill not null  x;
@@ -6614,7 +6624,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare decimal (00) not null  x;
@@ -6627,7 +6637,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare decimal (63, 30) not null  x;
@@ -6640,7 +6650,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare decimal (00) unsigned not null  x;
@@ -6653,7 +6663,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare decimal (63, 30) unsigned not null  x;
@@ -6666,7 +6676,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare decimal (00) zerofill not null  x;
@@ -6679,7 +6689,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare decimal (63, 30) zerofill not null  x;
@@ -6692,7 +6702,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare decimal (00) unsigned zerofill not null  x;
@@ -6705,7 +6715,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare decimal (63, 30) unsigned zerofill not null  x;
@@ -6718,7 +6728,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare numeric not null  x;
@@ -6731,7 +6741,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare numeric unsigned not null  x;
@@ -6744,7 +6754,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare numeric zerofill not null  x;
@@ -6757,7 +6767,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare numeric unsigned zerofill not null  x;
@@ -6770,7 +6780,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare numeric (0) not null  x;
@@ -6783,7 +6793,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare numeric (64) not nul x;
@@ -6796,7 +6806,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare numeric (0) unsigned  x;
@@ -6809,7 +6819,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare numeric (64) unsigned  x;
@@ -6822,7 +6832,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare numeric (0) zerofill  x;
@@ -6835,7 +6845,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare numeric (64) zerofill  x;
@@ -6848,7 +6858,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare numeric (0) unsigned zerofill  x;
@@ -6861,7 +6871,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare numeric (64) unsigned zerofill  x;
@@ -6874,7 +6884,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare numeric (00)  x;
@@ -6887,7 +6897,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare numeric (63, 30)  x;
@@ -6901,7 +6911,7 @@ DROP PROCEDURE IF EXISTS sp1;
 
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare numeric (00) unsigned  x;
@@ -6914,7 +6924,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare numeric (63, 30) unsigned  x;
@@ -6927,7 +6937,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare numeric (00) zerofill  x;
@@ -6940,7 +6950,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare numeric (63, 30) zerofill  x;
@@ -6953,7 +6963,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare numeric (00) unsigned zerofill  x;
@@ -6966,7 +6976,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare numeric (63, 30) unsigned zerofill  x;
@@ -6979,7 +6989,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare real  x;
@@ -6992,7 +7002,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare real unsigned  x;
@@ -7005,7 +7015,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare real zerofill  x;
@@ -7018,7 +7028,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare real unsigned zerofill  x;
@@ -7031,7 +7041,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare double  x;
@@ -7044,7 +7054,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare double unsigned  x;
@@ -7057,7 +7067,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare double zerofill  x;
@@ -7070,7 +7080,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare double unsigned zerofill  x;
@@ -7083,7 +7093,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare float not null  x;
@@ -7096,7 +7106,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare float unsigned not null  x;
@@ -7109,7 +7119,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare float zerofill not null  x;
@@ -7122,7 +7132,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare float unsigned zerofill not null  x;
@@ -7135,7 +7145,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare float(0) not null  x;
@@ -7148,7 +7158,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare float(23) not null  x;
@@ -7161,7 +7171,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare float(0) unsigned not null  x;
@@ -7174,7 +7184,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare float(23) unsigned not null  x;
@@ -7187,7 +7197,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare float(0) zerofill not null  x;
@@ -7200,7 +7210,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare float(23) zerofill not null  x;
@@ -7213,7 +7223,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare float(0) unsigned zerofill not null  x;
@@ -7226,7 +7236,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare float(23) unsigned zerofill not null  x;
@@ -7239,7 +7249,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare float(24) not null  x;
@@ -7252,7 +7262,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare float(53) not null  x;
@@ -7265,7 +7275,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare float(24) unsigned not null  x;
@@ -7278,7 +7288,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare float(53) unsigned not null  x;
@@ -7291,7 +7301,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare float(24) zerofill not null  x;
@@ -7304,7 +7314,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare float(53) zerofill not null  x;
@@ -7317,7 +7327,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare float(24) unsigned zerofill not null  x;
@@ -7330,7 +7340,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare float(53) unsigned zerofill not null  x;
@@ -7343,7 +7353,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare date not null  x;
@@ -7356,7 +7366,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare time not null  x;
@@ -7369,7 +7379,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare datetime not null  x;
@@ -7382,7 +7392,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare timestamp not null  x;
@@ -7395,7 +7405,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare year not null  x;
@@ -7408,7 +7418,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare year(3) not null  x;
@@ -7421,7 +7431,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare year(4) not null  x;
@@ -7434,7 +7444,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare enum("1enum", "2enum") not null  x;
@@ -7447,7 +7457,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare set("1set", "2set") not nul x;
@@ -7468,20 +7478,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1337
-CREATE PROCEDURE sp1()
-BEGIN
-   declare continue handler for sqlstate '23000' set @x2 = 1;
-   declare x char;
-END//
-delimiter ;//
-
---disable_warnings
-DROP PROCEDURE IF EXISTS sp1;
---enable_warnings
-
-delimiter //;
---error 1337
+--error ER_SP_VARCOND_AFTER_CURSHNDLR
 CREATE PROCEDURE sp1()
 BEGIN
    declare continue handler for sqlstate '23000' set @x2 = 1;
@@ -7494,7 +7491,7 @@ DROP PROCEDURE IF EXISTS sp6;
 --enable_warnings
 
 delimiter //;
---error 1337
+--error ER_SP_VARCOND_AFTER_CURSHNDLR
 CREATE PROCEDURE sp6( )
 BEGIN
     declare cursor1 cursor for SELECT f1 from tb1;
@@ -7507,7 +7504,7 @@ DROP PROCEDURE IF EXISTS sp6;
 --enable_warnings
 
 delimiter //;
---error 1337
+--error ER_SP_VARCOND_AFTER_CURSHNDLR
 CREATE PROCEDURE sp6( )
 BEGIN
     declare cursor1 cursor for SELECT f1 from tb1;
@@ -7520,7 +7517,7 @@ DROP PROCEDURE IF EXISTS sp6;
 --enable_warnings
 
 delimiter //;
---error 1338
+--error ER_SP_CURSOR_AFTER_HANDLER
 CREATE PROCEDURE sp6( )
 BEGIN
     declare sqlcondition condition for sqlstate '02000';
@@ -7536,27 +7533,21 @@ Ensure that the declare statement can declare multiple variables both separately
 and all at once from a variable list. (multiple declaration);
 --source include/show_msg80.inc
 
-#FIXME 4.2.15: switched off until bug is fixed:
-#FIXME 4.2.15: Bug #14376 MySQL crash on scoped variable (re)initialization
+--disable_warnings
+DROP PROCEDURE IF EXISTS sp1;
+--enable_warnings
+
 delimiter //;
-if (0)
-{
-   --disable_warnings
-   DROP PROCEDURE IF EXISTS sp_14376//
-   --enable_warnings
-   #--error 4711
-   CREATE PROCEDURE sp_14376()
+CREATE PROCEDURE sp1()
    BEGIN
       DECLARE x1 CHAR(100) DEFAULT 'outer';
       BEGIN
          DECLARE x1 CHAR(100) DEFAULT x1;
       END;
    END//
-   CALL sp_14376()//
-   DROP PROCEDURE sp_14376()//
-}
 delimiter ;//
 
+CALL sp1();
 
 --disable_warnings
 DROP PROCEDURE IF EXISTS sp1;
@@ -8022,9 +8013,6 @@ BEGIN
 END//
 delimiter ;//
 
--- echo FIXME: Following test contains a known problem that will be checked again
--- echo FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
-
 CALL sp1();
 
 --disable_warnings
@@ -8054,9 +8042,6 @@ BEGIN
 END//
 delimiter ;//
 
--- echo FIXME: Following test contains a known problem that will be checked again
--- echo FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
-
 CALL sp1();
 
 --disable_warnings
@@ -8071,9 +8056,6 @@ BEGIN
 END//
 delimiter ;//
 
--- echo FIXME: Following test contains a known problem that will be checked again
--- echo FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
-
 CALL sp1();
 
 --disable_warnings
@@ -8088,9 +8070,6 @@ BEGIN
 END//
 delimiter ;//
 
--- echo FIXME: Following test contains a known problem that will be checked again
--- echo FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
-
 CALL sp1();
 
 --disable_warnings
@@ -8105,9 +8084,6 @@ BEGIN
 END//
 delimiter ;//
 
--- echo FIXME: Following test contains a known problem that will be checked again
--- echo FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
-
 CALL sp1();
 
 --disable_warnings
@@ -8122,9 +8098,6 @@ BEGIN
 END//
 delimiter ;//
 
--- echo FIXME: Following test contains a known problem that will be checked again
--- echo FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
-
 CALL sp1();
 
 --disable_warnings
@@ -8417,7 +8390,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
    declare @x char;
@@ -8430,7 +8403,19 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1()
+BEGIN
+    declare accessible char;
+END//
+delimiter ;//
+
+--disable_warnings
+DROP PROCEDURE IF EXISTS sp1;
+--enable_warnings
+
+delimiter //;
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare add char;
@@ -8442,7 +8427,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare all char;
@@ -8454,7 +8439,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare alter char;
@@ -8466,7 +8451,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare analyze char;
@@ -8478,7 +8463,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare and char;
@@ -8490,7 +8475,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare as char;
@@ -8502,7 +8487,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare asc char;
@@ -8514,7 +8499,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare asensitive char;
@@ -8526,7 +8511,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare before char;
@@ -8538,7 +8523,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare between char;
@@ -8550,7 +8535,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare bigint char;
@@ -8562,7 +8547,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare binary char;
@@ -8574,7 +8559,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare blob char;
@@ -8586,7 +8571,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare both char;
@@ -8598,7 +8583,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare by char;
@@ -8610,10 +8595,10 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
-    declare CALL char;
+    declare call char;
 END//
 delimiter ;//
 
@@ -8622,7 +8607,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare cascade char;
@@ -8634,7 +8619,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare case char;
@@ -8646,7 +8631,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare change char;
@@ -8658,7 +8643,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare char char;
@@ -8670,7 +8655,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare character char;
@@ -8682,7 +8667,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare check char;
@@ -8694,7 +8679,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare collate char;
@@ -8706,7 +8691,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare column char;
@@ -8717,21 +8702,8 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
-#FIXME: check why _was_ this switched off
-delimiter //;
-#FIXME check this is OK:--error 1064
-CREATE PROCEDURE sp1()
-BEGIN
-   declare columns char;
-END//
-delimiter ;//
-
---disable_warnings
-DROP PROCEDURE IF EXISTS sp1;
---enable_warnings
-
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare condition char;
@@ -8743,19 +8715,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
-CREATE PROCEDURE sp1()
-BEGIN
-    declare connection char;
-END//
-delimiter ;//
-
---disable_warnings
-DROP PROCEDURE IF EXISTS sp1;
---enable_warnings
-
-delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare constraint char;
@@ -8767,7 +8727,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare continue char;
@@ -8779,7 +8739,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare convert char;
@@ -8791,7 +8751,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare create char;
@@ -8803,7 +8763,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare cross char;
@@ -8815,7 +8775,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare current_date char;
@@ -8827,7 +8787,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare current_time char;
@@ -8839,7 +8799,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare current_timestamp char;
@@ -8851,7 +8811,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare current_user char;
@@ -8863,7 +8823,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare cursor char;
@@ -8875,7 +8835,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare database char;
@@ -8887,7 +8847,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare databases char;
@@ -8899,7 +8859,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare day_hour char;
@@ -8911,7 +8871,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare day_microsecond char;
@@ -8923,7 +8883,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare day_minute char;
@@ -8935,7 +8895,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare day_second char;
@@ -8947,7 +8907,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare dec char;
@@ -8959,7 +8919,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare decimal char;
@@ -8971,7 +8931,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare declare char;
@@ -8983,7 +8943,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare default char;
@@ -8995,7 +8955,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare delayed char;
@@ -9007,7 +8967,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare delete char;
@@ -9019,7 +8979,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare desc char;
@@ -9031,7 +8991,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare describe char;
@@ -9043,7 +9003,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare deterministic char;
@@ -9055,7 +9015,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare distinct char;
@@ -9067,7 +9027,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare distinctrow char;
@@ -9079,7 +9039,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare div char;
@@ -9091,7 +9051,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare double char;
@@ -9103,7 +9063,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare drop char;
@@ -9115,7 +9075,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare dual char;
@@ -9127,7 +9087,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare each char;
@@ -9139,7 +9099,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare else char;
@@ -9151,7 +9111,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare elseif char;
@@ -9163,7 +9123,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare enclosed char;
@@ -9175,7 +9135,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare escaped char;
@@ -9187,7 +9147,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare exists char;
@@ -9199,7 +9159,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare exit char;
@@ -9211,7 +9171,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare explain char;
@@ -9223,7 +9183,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare false char;
@@ -9235,7 +9195,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare fetch char;
@@ -9246,12 +9206,11 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
-#FIXME: check why _was_ this switched off
 delimiter //;
-#FIXME check this is OK:--error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
-    declare fields char;
+    declare float char;
 END//
 delimiter ;//
 
@@ -9260,10 +9219,10 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
-    declare float char;
+    declare float4 char;
 END//
 delimiter ;//
 
@@ -9272,10 +9231,10 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
-    declare for char;
+    declare float8 char;
 END//
 delimiter ;//
 
@@ -9284,10 +9243,10 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
-    declare force char;
+    declare for char;
 END//
 delimiter ;//
 
@@ -9296,10 +9255,10 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
-    declare foreign char;
+    declare force char;
 END//
 delimiter ;//
 
@@ -9307,12 +9266,11 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
-#FIXME: check why _was_ this switched off
 delimiter //;
-#FIXME check this is OK:--error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
-    declare found char;
+    declare foreign char;
 END//
 delimiter ;//
 
@@ -9321,7 +9279,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare from char;
@@ -9333,7 +9291,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare fulltext char;
@@ -9345,19 +9303,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
-#FIXME check this is OK:--error 1064
-CREATE PROCEDURE sp1()
-BEGIN
-    declare goto char;
-END//
-delimiter ;//
-
---disable_warnings
-DROP PROCEDURE IF EXISTS sp1;
---enable_warnings
-
-delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare grant char;
@@ -9369,7 +9315,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare group char;
@@ -9381,7 +9327,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare having char;
@@ -9393,7 +9339,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare high_priority char;
@@ -9405,7 +9351,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare hour_microsecond char;
@@ -9417,7 +9363,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare hour_minute char;
@@ -9429,7 +9375,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare hour_second char;
@@ -9441,7 +9387,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare if char;
@@ -9453,7 +9399,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare ignore char;
@@ -9465,7 +9411,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare in char;
@@ -9477,7 +9423,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare index char;
@@ -9489,7 +9435,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare infile char;
@@ -9501,7 +9447,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare inner char;
@@ -9513,7 +9459,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare inout char;
@@ -9525,7 +9471,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare insensitive char;
@@ -9537,7 +9483,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare insert char;
@@ -9549,7 +9495,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare int char;
@@ -9561,7 +9507,67 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1()
+BEGIN
+    declare int1 char;
+END//
+delimiter ;//
+
+--disable_warnings
+DROP PROCEDURE IF EXISTS sp1;
+--enable_warnings
+
+delimiter //;
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1()
+BEGIN
+    declare int2 char;
+END//
+delimiter ;//
+
+--disable_warnings
+DROP PROCEDURE IF EXISTS sp1;
+--enable_warnings
+
+delimiter //;
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1()
+BEGIN
+    declare int3 char;
+END//
+delimiter ;//
+
+--disable_warnings
+DROP PROCEDURE IF EXISTS sp1;
+--enable_warnings
+
+delimiter //;
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1()
+BEGIN
+    declare int4 char;
+END//
+delimiter ;//
+
+--disable_warnings
+DROP PROCEDURE IF EXISTS sp1;
+--enable_warnings
+
+delimiter //;
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1()
+BEGIN
+    declare int8 char;
+END//
+delimiter ;//
+
+--disable_warnings
+DROP PROCEDURE IF EXISTS sp1;
+--enable_warnings
+
+delimiter //;
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare integer char;
@@ -9573,7 +9579,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare interval char;
@@ -9585,7 +9591,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare into char;
@@ -9597,7 +9603,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare is char;
@@ -9609,7 +9615,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare iterate char;
@@ -9621,7 +9627,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare join char;
@@ -9633,7 +9639,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare key char;
@@ -9645,7 +9651,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare keys char;
@@ -9657,7 +9663,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare kill char;
@@ -9669,7 +9675,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare leading char;
@@ -9681,7 +9687,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare leave char;
@@ -9693,7 +9699,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare left char;
@@ -9705,7 +9711,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare like char;
@@ -9717,7 +9723,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare limit char;
@@ -9729,7 +9735,19 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1()
+BEGIN
+    declare linear char;
+END//
+delimiter ;//
+
+--disable_warnings
+DROP PROCEDURE IF EXISTS sp1;
+--enable_warnings
+
+delimiter //;
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare lines char;
@@ -9741,7 +9759,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare load char;
@@ -9753,7 +9771,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare localtime char;
@@ -9765,7 +9783,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare localtimestamp char;
@@ -9777,7 +9795,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare lock char;
@@ -9789,7 +9807,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare long char;
@@ -9801,7 +9819,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare longblob char;
@@ -9813,7 +9831,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare longtext char;
@@ -9825,7 +9843,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare loop char;
@@ -9837,7 +9855,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare low_priority char;
@@ -9849,7 +9867,19 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1()
+BEGIN
+    declare master_ssl_verify_server_cert char;
+END//
+delimiter ;//
+
+--disable_warnings
+DROP PROCEDURE IF EXISTS sp1;
+--enable_warnings
+
+delimiter //;
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare match char;
@@ -9861,7 +9891,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare mediumblob char;
@@ -9873,7 +9903,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare mediumint char;
@@ -9885,7 +9915,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare mediumtext char;
@@ -9897,7 +9927,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare middleint char;
@@ -9909,7 +9939,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare minute_microsecond char;
@@ -9921,7 +9951,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare minute_second char;
@@ -9933,7 +9963,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare mod char;
@@ -9945,7 +9975,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare modifies char;
@@ -9957,7 +9987,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare natural char;
@@ -9969,7 +9999,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare not char;
@@ -9981,7 +10011,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare no_write_to_binlog char;
@@ -9993,7 +10023,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare null char;
@@ -10005,7 +10035,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare numeric char;
@@ -10017,7 +10047,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare on char;
@@ -10029,7 +10059,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare optimize char;
@@ -10041,7 +10071,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare option char;
@@ -10053,7 +10083,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare optionally char;
@@ -10065,7 +10095,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare or char;
@@ -10077,7 +10107,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare order char;
@@ -10089,7 +10119,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare out char;
@@ -10101,7 +10131,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare outer char;
@@ -10113,7 +10143,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare outfile char;
@@ -10125,7 +10155,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
-#FIXME check this is OK:--error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare precision char;
@@ -10137,7 +10167,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare primary char;
@@ -10149,10 +10179,10 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
-#FIXME check this is OK:--error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
-   declare privileges char;
+    declare procedure char;
 END//
 delimiter ;//
 
@@ -10161,10 +10191,10 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
-    declare procedure char;
+    declare purge char;
 END//
 delimiter ;//
 
@@ -10173,10 +10203,10 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
-    declare purge char;
+    declare range char;
 END//
 delimiter ;//
 
@@ -10185,7 +10215,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare read char;
@@ -10197,7 +10227,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare reads char;
@@ -10209,7 +10239,32 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+# FIXME 31947
+#--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1()
+BEGIN
+    declare read_only char;
+END//
+delimiter ;//
+
+--disable_warnings
+DROP PROCEDURE IF EXISTS sp1;
+--enable_warnings
+
+delimiter //;
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1()
+BEGIN
+    declare read_write char;
+END//
+delimiter ;//
+
+--disable_warnings
+DROP PROCEDURE IF EXISTS sp1;
+--enable_warnings
+
+delimiter //;
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare real char;
@@ -10221,7 +10276,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare references char;
@@ -10233,7 +10288,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare regexp char;
@@ -10245,7 +10300,19 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1()
+BEGIN
+    declare release char;
+END//
+delimiter ;//
+
+--disable_warnings
+DROP PROCEDURE IF EXISTS sp1;
+--enable_warnings
+
+delimiter //;
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare rename char;
@@ -10257,7 +10324,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare repeat char;
@@ -10269,7 +10336,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare replace char;
@@ -10278,7 +10345,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
    declare require char;
@@ -10287,7 +10354,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare restrict char;
@@ -10297,7 +10364,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare return char;
@@ -10307,7 +10374,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare revoke char;
@@ -10317,7 +10384,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare right char;
@@ -10327,7 +10394,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare rlike char;
@@ -10337,7 +10404,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare schema char;
@@ -10347,7 +10414,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare schemas char;
@@ -10357,7 +10424,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare second_microsecond char;
@@ -10367,7 +10434,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare SELECT char;
@@ -10377,7 +10444,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare sensitive char;
@@ -10387,7 +10454,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare separator char;
@@ -10397,7 +10464,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare set char;
@@ -10407,7 +10474,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare show char;
@@ -10417,7 +10484,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare smallint char;
@@ -10427,17 +10494,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
-#FIXME check this is OK:--error 1064
-CREATE PROCEDURE sp1()
-BEGIN
-    declare soname char;
-END//
-delimiter ;//
-
-DROP PROCEDURE IF EXISTS sp1;
-
-delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare spatial char;
@@ -10447,7 +10504,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare specific char;
@@ -10457,7 +10514,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare sql char;
@@ -10467,7 +10524,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare sqlexception char;
@@ -10477,7 +10534,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare sqlstate char;
@@ -10487,7 +10544,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare sqlwarning char;
@@ -10497,7 +10554,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare sql_big_result char;
@@ -10507,7 +10564,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare sql_calc_found_rows char;
@@ -10517,7 +10574,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare sql_small_result char;
@@ -10527,7 +10584,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare ssl char;
@@ -10537,7 +10594,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare starting char;
@@ -10547,7 +10604,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare straight_join char;
@@ -10557,7 +10614,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare table char;
@@ -10566,19 +10623,8 @@ delimiter ;//
 
 DROP PROCEDURE IF EXISTS sp1;
 
-#FIXME: check why _was_ this switched off
-delimiter //;
-#FIXME check this is OK:--error 1064
-CREATE PROCEDURE sp1()
-BEGIN
-   declare tables char;
-END//
-delimiter ;//
-
-DROP PROCEDURE IF EXISTS sp1;
-
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare terminated char;
@@ -10588,7 +10634,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare then char;
@@ -10598,7 +10644,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare tinyblob char;
@@ -10608,7 +10654,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare tinyint char;
@@ -10618,7 +10664,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare tinytext char;
@@ -10628,7 +10674,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare to char;
@@ -10638,7 +10684,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare trailing char;
@@ -10647,7 +10693,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare trigger char;
@@ -10656,7 +10702,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare true char;
@@ -10666,7 +10712,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare undo char;
@@ -10676,7 +10722,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare union char;
@@ -10686,7 +10732,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare unique char;
@@ -10696,7 +10742,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare unlock char;
@@ -10706,7 +10752,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare unsigned char;
@@ -10716,7 +10762,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare update char;
@@ -10726,7 +10772,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare usage char;
@@ -10736,17 +10782,17 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
-    declare USE char;
+    declare use char;
 END//
 delimiter ;//
 
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare using char;
@@ -10756,7 +10802,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare utc_date char;
@@ -10766,7 +10812,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare utc_time char;
@@ -10776,7 +10822,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare utc_timestamp char;
@@ -10786,7 +10832,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare values char;
@@ -10796,7 +10842,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare varbinary char;
@@ -10806,7 +10852,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare varchar char;
@@ -10816,7 +10862,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare varcharacter char;
@@ -10826,7 +10872,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare varying char;
@@ -10836,7 +10882,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare when char;
@@ -10846,7 +10892,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare where char;
@@ -10856,7 +10902,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare while char;
@@ -10866,7 +10912,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare with char;
@@ -10876,7 +10922,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare write char;
@@ -10886,7 +10932,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare xor char;
@@ -10896,7 +10942,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare year_month char;
@@ -10906,7 +10952,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare zerofill char;
@@ -11053,7 +11099,7 @@ DROP PROCEDURE sp1;
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare @x char;
@@ -11063,7 +11109,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare x char1;
@@ -11072,7 +11118,18 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1( )
+BEGIN
+    declare accessible condition for sqlstate '02000';
+    declare exit handler for add set @var2 = 1;
+END//
+delimiter ;//
+
+DROP PROCEDURE IF EXISTS sp1;
+
+delimiter //;
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare add condition for sqlstate '02000';
@@ -11083,7 +11140,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare all condition for sqlstate '02000';
@@ -11094,7 +11151,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare alter condition for sqlstate '02000';
@@ -11105,7 +11162,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare analyze condition for sqlstate '02000';
@@ -11116,7 +11173,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare and condition for sqlstate '02000';
@@ -11127,7 +11184,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare as condition for sqlstate '02000';
@@ -11138,7 +11195,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare asc condition for sqlstate '02000';
@@ -11149,7 +11206,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare asensitive condition for sqlstate '02000';
@@ -11160,7 +11217,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare before condition for sqlstate '02000';
@@ -11171,7 +11228,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare between condition for sqlstate '02000';
@@ -11182,7 +11239,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare bigint condition for sqlstate '02000';
@@ -11193,7 +11250,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare binary condition for sqlstate '02000';
@@ -11204,7 +11261,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare blob condition for sqlstate '02000';
@@ -11215,7 +11272,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare both condition for sqlstate '02000';
@@ -11226,7 +11283,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare by condition for sqlstate '02000';
@@ -11237,10 +11294,10 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 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//
 delimiter ;//
@@ -11248,7 +11305,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare cascade condition for sqlstate '02000';
@@ -11259,7 +11316,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare case condition for sqlstate '02000';
@@ -11270,7 +11327,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare change condition for sqlstate '02000';
@@ -11281,7 +11338,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare char condition for sqlstate '02000';
@@ -11292,7 +11349,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare character condition for sqlstate '02000';
@@ -11303,7 +11360,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare check condition for sqlstate '02000';
@@ -11314,7 +11371,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+#--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare collate condition for sqlstate '02000';
@@ -11325,7 +11382,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare column condition for sqlstate '02000';
@@ -11334,19 +11391,8 @@ END//
 delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
-#FIXME: check why this is switched off
-#--error 1064
-#delimiter //;
-#CREATE PROCEDURE sp1( )
-# BEGIN
-#   declare columns condition for sqlstate '02000';
-#   declare exit handler for columns set @var2 = 1;
-#END//
-#delimiter ;//
-#DROP PROCEDURE IF EXISTS sp1;
-
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare condition condition for sqlstate '02000';
@@ -11356,7 +11402,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+#--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare connection condition for sqlstate '02000';
@@ -11366,7 +11412,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare constraint condition for sqlstate '02000';
@@ -11377,7 +11423,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare continue condition for sqlstate '02000';
@@ -11388,7 +11434,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare convert condition for sqlstate '02000';
@@ -11399,7 +11445,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare create condition for sqlstate '02000';
@@ -11410,7 +11456,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare cross condition for sqlstate '02000';
@@ -11421,7 +11467,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare current_date condition for sqlstate '02000';
@@ -11432,7 +11478,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare current_time condition for sqlstate '02000';
@@ -11443,7 +11489,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare current_timestamp condition for sqlstate '02000';
@@ -11454,7 +11500,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare current_user condition for sqlstate '02000';
@@ -11465,7 +11511,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare cursor condition for sqlstate '02000';
@@ -11476,7 +11522,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare database condition for sqlstate '02000';
@@ -11487,7 +11533,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare databases condition for sqlstate '02000';
@@ -11498,7 +11544,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare day_hour condition for sqlstate '02000';
@@ -11509,7 +11555,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare day_microsecond condition for sqlstate '02000';
@@ -11520,7 +11566,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare day_minute condition for sqlstate '02000';
@@ -11531,7 +11577,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare day_second condition for sqlstate '02000';
@@ -11542,7 +11588,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare dec condition for sqlstate '02000';
@@ -11553,7 +11599,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare decimal condition for sqlstate '02000';
@@ -11564,7 +11610,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare declare condition for sqlstate '02000';
@@ -11575,7 +11621,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare default condition for sqlstate '02000';
@@ -11586,7 +11632,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare delayed condition for sqlstate '02000';
@@ -11597,7 +11643,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare delete condition for sqlstate '02000';
@@ -11608,7 +11654,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare desc condition for sqlstate '02000';
@@ -11619,7 +11665,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare describe condition for sqlstate '02000';
@@ -11630,7 +11676,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare deterministic condition for sqlstate '02000';
@@ -11641,7 +11687,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare distinct condition for sqlstate '02000';
@@ -11652,7 +11698,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare distinctrow condition for sqlstate '02000';
@@ -11663,7 +11709,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare div condition for sqlstate '02000';
@@ -11674,7 +11720,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare double condition for sqlstate '02000';
@@ -11685,7 +11731,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare drop condition for sqlstate '02000';
@@ -11696,7 +11742,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare dual condition for sqlstate '02000';
@@ -11707,7 +11753,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare each condition for sqlstate '02000';
@@ -11718,7 +11764,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare else condition for sqlstate '02000';
@@ -11729,7 +11775,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare elseif condition for sqlstate '02000';
@@ -11740,7 +11786,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare enclosed condition for sqlstate '02000';
@@ -11751,7 +11797,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare escaped condition for sqlstate '02000';
@@ -11762,7 +11808,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare exists condition for sqlstate '02000';
@@ -11773,7 +11819,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare exit condition for sqlstate '02000';
@@ -11784,7 +11830,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare explain condition for sqlstate '02000';
@@ -11795,7 +11841,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare false condition for sqlstate '02000';
@@ -11806,7 +11852,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare fetch condition for sqlstate '02000';
@@ -11817,17 +11863,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
-#FIXME check this is OK:--error 1064
-CREATE PROCEDURE sp1( )
- BEGIN
-   declare fields condition for sqlstate '02000';
-   declare exit handler for fields set @var2 = 1;
-END//
-delimiter ;//
-DROP PROCEDURE IF EXISTS sp1;
-
-delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare float condition for sqlstate '02000';
@@ -11838,85 +11874,84 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
-    declare for condition for sqlstate '02000';
-    declare exit handler for for set @var2 = 1;
+    declare float4 condition for sqlstate '02000';
+    declare exit handler for add set @var2 = 1;
 END//
 delimiter ;//
 
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
-    declare force condition for sqlstate '02000';
-    declare exit handler for force set @var2 = 1;
+    declare float8 condition for sqlstate '02000';
+    declare exit handler for add set @var2 = 1;
 END//
 delimiter ;//
 
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
-    declare foreign condition for sqlstate '02000';
-    declare exit handler for foreign set @var2 = 1;
+    declare for condition for sqlstate '02000';
+    declare exit handler for for set @var2 = 1;
 END//
 delimiter ;//
 
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
-#FIXME: check why _was_ this switched off
-#FIXME check this is OK:--error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
-   declare found condition for sqlstate '02000';
-   declare exit handler for found set @var2 = 1;
+    declare force condition for sqlstate '02000';
+    declare exit handler for force set @var2 = 1;
 END//
 delimiter ;//
 
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
-    declare from condition for sqlstate '02000';
-    declare exit handler for from set @var2 = 1;
+    declare foreign condition for sqlstate '02000';
+    declare exit handler for foreign set @var2 = 1;
 END//
 delimiter ;//
 
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
-    declare fulltext condition for sqlstate '02000';
-    declare exit handler for fulltext set @var2 = 1;
+    declare from condition for sqlstate '02000';
+    declare exit handler for from set @var2 = 1;
 END//
 delimiter ;//
 
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
-#FIXME check this is OK:--error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
-    declare goto condition for sqlstate '02000';
-    declare exit handler for goto set @var2 = 1;
+    declare fulltext condition for sqlstate '02000';
+    declare exit handler for fulltext set @var2 = 1;
 END//
 delimiter ;//
 
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare grant condition for sqlstate '02000';
@@ -11927,7 +11962,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare group condition for sqlstate '02000';
@@ -11938,7 +11973,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare having condition for sqlstate '02000';
@@ -11949,7 +11984,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare high_priority condition for sqlstate '02000';
@@ -11960,7 +11995,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare hour_microsecond condition for sqlstate '02000';
@@ -11971,7 +12006,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare hour_minute condition for sqlstate '02000';
@@ -11982,7 +12017,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare hour_second condition for sqlstate '02000';
@@ -11993,7 +12028,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare if condition for sqlstate '02000';
@@ -12004,7 +12039,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare ignore condition for sqlstate '02000';
@@ -12015,7 +12050,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare in condition for sqlstate '02000';
@@ -12026,7 +12061,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare index condition for sqlstate '02000';
@@ -12037,7 +12072,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare infile condition for sqlstate '02000';
@@ -12048,7 +12083,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare inner condition for sqlstate '02000';
@@ -12059,7 +12094,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare inout condition for sqlstate '02000';
@@ -12070,7 +12105,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare insensitive condition for sqlstate '02000';
@@ -12081,7 +12116,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare insert condition for sqlstate '02000';
@@ -12092,7 +12127,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare int condition for sqlstate '02000';
@@ -12103,7 +12138,62 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1( )
+BEGIN
+    declare int1 condition for sqlstate '02000';
+    declare exit handler for int set @var2 = 1;
+END//
+delimiter ;//
+
+DROP PROCEDURE IF EXISTS sp1;
+
+delimiter //;
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1( )
+BEGIN
+    declare int2 condition for sqlstate '02000';
+    declare exit handler for int set @var2 = 1;
+END//
+delimiter ;//
+
+DROP PROCEDURE IF EXISTS sp1;
+
+delimiter //;
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1( )
+BEGIN
+    declare int3 condition for sqlstate '02000';
+    declare exit handler for int set @var2 = 1;
+END//
+delimiter ;//
+
+DROP PROCEDURE IF EXISTS sp1;
+
+delimiter //;
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1( )
+BEGIN
+    declare int4 condition for sqlstate '02000';
+    declare exit handler for int set @var2 = 1;
+END//
+delimiter ;//
+
+DROP PROCEDURE IF EXISTS sp1;
+
+delimiter //;
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1( )
+BEGIN
+    declare int8 condition for sqlstate '02000';
+    declare exit handler for int set @var2 = 1;
+END//
+delimiter ;//
+
+DROP PROCEDURE IF EXISTS sp1;
+
+delimiter //;
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare integer condition for sqlstate '02000';
@@ -12114,7 +12204,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare interval condition for sqlstate '02000';
@@ -12125,7 +12215,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare into condition for sqlstate '02000';
@@ -12136,7 +12226,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare is condition for sqlstate '02000';
@@ -12147,7 +12237,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare iterate condition for sqlstate '02000';
@@ -12158,7 +12248,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare join condition for sqlstate '02000';
@@ -12169,7 +12259,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare key condition for sqlstate '02000';
@@ -12180,7 +12270,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare keys condition for sqlstate '02000';
@@ -12191,7 +12281,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare kill condition for sqlstate '02000';
@@ -12202,7 +12292,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare leading condition for sqlstate '02000';
@@ -12213,7 +12303,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare leave condition for sqlstate '02000';
@@ -12224,7 +12314,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare left condition for sqlstate '02000';
@@ -12235,7 +12325,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare like condition for sqlstate '02000';
@@ -12246,7 +12336,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare limit condition for sqlstate '02000';
@@ -12257,7 +12347,18 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1( )
+BEGIN
+    declare linear condition for sqlstate '02000';
+    declare exit handler for int set @var2 = 1;
+END//
+delimiter ;//
+
+DROP PROCEDURE IF EXISTS sp1;
+
+delimiter //;
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare lines condition for sqlstate '02000';
@@ -12268,7 +12369,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare load condition for sqlstate '02000';
@@ -12279,7 +12380,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare localtime condition for sqlstate '02000';
@@ -12290,7 +12391,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare localtimestamp condition for sqlstate '02000';
@@ -12301,7 +12402,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare lock condition for sqlstate '02000';
@@ -12312,7 +12413,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare long condition for sqlstate '02000';
@@ -12323,7 +12424,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare longblob condition for sqlstate '02000';
@@ -12334,7 +12435,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare longtext condition for sqlstate '02000';
@@ -12345,7 +12446,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare loop condition for sqlstate '02000';
@@ -12356,7 +12457,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare low_priority condition for sqlstate '02000';
@@ -12367,7 +12468,18 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1( )
+BEGIN
+    declare master_ssl_verify_server_cert condition for sqlstate '02000';
+    declare exit handler for int set @var2 = 1;
+END//
+delimiter ;//
+
+DROP PROCEDURE IF EXISTS sp1;
+
+delimiter //;
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare match condition for sqlstate '02000';
@@ -12378,7 +12490,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare mediumblob condition for sqlstate '02000';
@@ -12389,7 +12501,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare mediumint condition for sqlstate '02000';
@@ -12400,7 +12512,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare mediumtext condition for sqlstate '02000';
@@ -12411,7 +12523,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare middleint condition for sqlstate '02000';
@@ -12422,7 +12534,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare minute_microsecond condition for sqlstate '02000';
@@ -12433,7 +12545,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare minute_second condition for sqlstate '02000';
@@ -12444,7 +12556,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare mod condition for sqlstate '02000';
@@ -12455,7 +12567,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare modifies condition for sqlstate '02000';
@@ -12466,7 +12578,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare natural condition for sqlstate '02000';
@@ -12477,7 +12589,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare not condition for sqlstate '02000';
@@ -12488,7 +12600,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare no_write_to_binlog condition for sqlstate '02000';
@@ -12499,7 +12611,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare null condition for sqlstate '02000';
@@ -12510,7 +12622,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare numeric condition for sqlstate '02000';
@@ -12521,7 +12633,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare on condition for sqlstate '02000';
@@ -12532,7 +12644,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare optimize condition for sqlstate '02000';
@@ -12543,7 +12655,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare option condition for sqlstate '02000';
@@ -12554,7 +12666,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare optionally condition for sqlstate '02000';
@@ -12565,7 +12677,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare or condition for sqlstate '02000';
@@ -12576,7 +12688,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare order condition for sqlstate '02000';
@@ -12587,7 +12699,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare out condition for sqlstate '02000';
@@ -12598,7 +12710,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare outer condition for sqlstate '02000';
@@ -12609,7 +12721,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare outfile condition for sqlstate '02000';
@@ -12620,7 +12732,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare precision condition for sqlstate '02000';
@@ -12631,7 +12743,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare primary condition for sqlstate '02000';
@@ -12642,41 +12754,40 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
-#FIXME: why was this switched off ?
-#FIXME check this is OK:--error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
-   declare privileges condition for sqlstate '02000';
-   declare exit handler for privileges set @var2 = 1;
+    declare procedure condition for sqlstate '02000';
+    declare exit handler for procedure set @var2 = 1;
 END//
 delimiter ;//
 
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
-    declare procedure condition for sqlstate '02000';
-    declare exit handler for procedure set @var2 = 1;
+    declare purge condition for sqlstate '02000';
+    declare exit handler for purge set @var2 = 1;
 END//
 delimiter ;//
 
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
-    declare purge condition for sqlstate '02000';
-    declare exit handler for purge set @var2 = 1;
+    declare range condition for sqlstate '02000';
+    declare exit handler for int set @var2 = 1;
 END//
 delimiter ;//
 
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare read condition for sqlstate '02000';
@@ -12687,7 +12798,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare reads condition for sqlstate '02000';
@@ -12698,7 +12809,29 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1( )
+BEGIN
+    declare read_only condition for sqlstate '02000';
+    declare exit handler for int set @var2 = 1;
+END//
+delimiter ;//
+
+DROP PROCEDURE IF EXISTS sp1;
+
+delimiter //;
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1( )
+BEGIN
+    declare read_write condition for sqlstate '02000';
+    declare exit handler for int set @var2 = 1;
+END//
+delimiter ;//
+
+DROP PROCEDURE IF EXISTS sp1;
+
+delimiter //;
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare real condition for sqlstate '02000';
@@ -12709,7 +12842,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare references condition for sqlstate '02000';
@@ -12720,7 +12853,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare regexp condition for sqlstate '02000';
@@ -12731,7 +12864,18 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1( )
+BEGIN
+    declare release condition for sqlstate '02000';
+    declare exit handler for int set @var2 = 1;
+END//
+delimiter ;//
+
+DROP PROCEDURE IF EXISTS sp1;
+
+delimiter //;
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare rename condition for sqlstate '02000';
@@ -12742,7 +12886,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare repeat condition for sqlstate '02000';
@@ -12753,7 +12897,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare replace condition for sqlstate '02000';
@@ -12764,7 +12908,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare require condition for sqlstate '02000';
@@ -12775,7 +12919,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare restrict condition for sqlstate '02000';
@@ -12786,7 +12930,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare return condition for sqlstate '02000';
@@ -12797,7 +12941,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare revoke condition for sqlstate '02000';
@@ -12808,7 +12952,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare right condition for sqlstate '02000';
@@ -12819,7 +12963,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare rlike condition for sqlstate '02000';
@@ -12830,7 +12974,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare schema condition for sqlstate '02000';
@@ -12841,7 +12985,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare schemas condition for sqlstate '02000';
@@ -12852,7 +12996,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare second_microsecond condition for sqlstate '02000';
@@ -12863,10 +13007,10 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 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//
 delimiter ;//
@@ -12874,7 +13018,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare sensitive condition for sqlstate '02000';
@@ -12885,7 +13029,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare separator condition for sqlstate '02000';
@@ -12896,7 +13040,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare set condition for sqlstate '02000';
@@ -12907,7 +13051,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare show condition for sqlstate '02000';
@@ -12918,7 +13062,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare smallint condition for sqlstate '02000';
@@ -12929,18 +13073,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
-CREATE PROCEDURE sp1( )
-BEGIN
-    declare soname condition for sqlstate '02000';
-    declare exit handler for soname set @var2 = 1;
-END//
-delimiter ;//
-
-DROP PROCEDURE IF EXISTS sp1;
-
-delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare spatial condition for sqlstate '02000';
@@ -12951,7 +13084,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare specific condition for sqlstate '02000';
@@ -12962,7 +13095,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare sql condition for sqlstate '02000';
@@ -12973,7 +13106,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare sqlexception condition for sqlstate '02000';
@@ -12984,7 +13117,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare sqlstate condition for sqlstate '02000';
@@ -12995,7 +13128,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare sqlwarning condition for sqlstate '02000';
@@ -13006,7 +13139,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare sql_big_result condition for sqlstate '02000';
@@ -13017,7 +13150,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare sql_calc_found_rows condition for sqlstate '02000';
@@ -13028,7 +13161,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare sql_small_result condition for sqlstate '02000';
@@ -13039,7 +13172,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare ssl condition for sqlstate '02000';
@@ -13050,7 +13183,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare starting condition for sqlstate '02000';
@@ -13061,7 +13194,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare straight_join condition for sqlstate '02000';
@@ -13072,7 +13205,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare table condition for sqlstate '02000';
@@ -13083,19 +13216,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
-#FIXME: why was this switched off ?
-#FIXME check this is OK:--error 1064
-CREATE PROCEDURE sp1( )
-BEGIN
-   declare tables condition for sqlstate '02000';
-   declare exit handler for tables set @var2 = 1;
-END//
-delimiter ;//
-
-DROP PROCEDURE IF EXISTS sp1;
-
-delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare terminated condition for sqlstate '02000';
@@ -13106,7 +13227,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare then condition for sqlstate '02000';
@@ -13117,7 +13238,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare tinyblob condition for sqlstate '02000';
@@ -13128,7 +13249,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare tinyint condition for sqlstate '02000';
@@ -13139,7 +13260,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare tinytext condition for sqlstate '02000';
@@ -13150,7 +13271,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare to condition for sqlstate '02000';
@@ -13161,7 +13282,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare trailing condition for sqlstate '02000';
@@ -13172,7 +13293,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare trigger condition for sqlstate '02000';
@@ -13183,7 +13304,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare true condition for sqlstate '02000';
@@ -13194,7 +13315,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare undo condition for sqlstate '02000';
@@ -13205,7 +13326,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare union condition for sqlstate '02000';
@@ -13216,7 +13337,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare unique condition for sqlstate '02000';
@@ -13227,7 +13348,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare unlock condition for sqlstate '02000';
@@ -13238,7 +13359,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare unsigned condition for sqlstate '02000';
@@ -13249,7 +13370,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare update condition for sqlstate '02000';
@@ -13260,7 +13381,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare usage condition for sqlstate '02000';
@@ -13271,10 +13392,10 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
-    declare USE condition for sqlstate '02000';
+    declare use condition for sqlstate '02000';
     declare exit handler for USE set @var2 = 1;
 END//
 delimiter ;//
@@ -13282,7 +13403,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare using condition for sqlstate '02000';
@@ -13293,7 +13414,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare utc_date condition for sqlstate '02000';
@@ -13304,7 +13425,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare utc_time condition for sqlstate '02000';
@@ -13315,7 +13436,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare utc_timestamp condition for sqlstate '02000';
@@ -13326,7 +13447,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare values condition for sqlstate '02000';
@@ -13337,7 +13458,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare varbinary condition for sqlstate '02000';
@@ -13348,7 +13469,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare varchar condition for sqlstate '02000';
@@ -13359,7 +13480,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare varcharacter condition for sqlstate '02000';
@@ -13370,7 +13491,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare varying condition for sqlstate '02000';
@@ -13381,7 +13502,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare when condition for sqlstate '02000';
@@ -13392,7 +13513,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare where condition for sqlstate '02000';
@@ -13403,7 +13524,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare while condition for sqlstate '02000';
@@ -13414,7 +13535,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare with condition for sqlstate '02000';
@@ -13425,7 +13546,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare write condition for sqlstate '02000';
@@ -13436,7 +13557,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare xor condition for sqlstate '02000';
@@ -13447,7 +13568,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare year_month condition for sqlstate '02000';
@@ -13458,7 +13579,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare zerofill condition for sqlstate '02000';
@@ -13507,7 +13628,7 @@ DROP PROCEDURE sp1;
 DROP PROCEDURE IF EXISTS handler1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE handler1()
 BEGIN
     declare undo handler for sqlstate '23000' set @x2 = 1;
@@ -13531,7 +13652,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS handler1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE handler1()
 BEGIN
     declare continueinv handler for sqlstate '2300' set @x2 = 1;
@@ -13555,7 +13676,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS handler1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE handler1()
 BEGIN
     declare undoinv handler for sqlstate '2300' set @x2 = 1;
@@ -13579,7 +13700,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS handler1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE handler1 ()
 BEGIN
     declare exitinv handler for sqlstate '2300' set @x2 = 1;
@@ -13599,7 +13720,17 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1( )
+BEGIN
+    declare accessible handler for sqlstate '02000' set @var2 = 1;
+END//
+delimiter ;//
+
+DROP PROCEDURE IF EXISTS sp1;
+
+delimiter //;
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare add handler for sqlstate '02000' set @var2 = 1;
@@ -13609,7 +13740,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare all handler for sqlstate '02000' set @var2 = 1;
@@ -13619,7 +13750,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare alter handler for sqlstate '02000' set @var2 = 1;
@@ -13629,7 +13760,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare analyze handler for sqlstate '02000' set @var2 = 1;
@@ -13639,7 +13770,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare and handler for sqlstate '02000' set @var2 = 1;
@@ -13649,7 +13780,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare as handler for sqlstate '02000' set @var2 = 1;
@@ -13659,7 +13790,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare asc handler for sqlstate '02000' set @var2 = 1;
@@ -13669,7 +13800,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare asensitive handler for sqlstate '02000' set @var2 = 1;
@@ -13679,7 +13810,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare before handler for sqlstate '02000' set @var2 = 1;
@@ -13689,7 +13820,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare between handler for sqlstate '02000' set @var2 = 1;
@@ -13699,7 +13830,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare bigint handler for sqlstate '02000' set @var2 = 1;
@@ -13709,7 +13840,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare binary handler for sqlstate '02000' set @var2 = 1;
@@ -13719,7 +13850,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare blob handler for sqlstate '02000' set @var2 = 1;
@@ -13729,7 +13860,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare both handler for sqlstate '02000' set @var2 = 1;
@@ -13739,7 +13870,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare by handler for sqlstate '02000' set @var2 = 1;
@@ -13749,17 +13880,17 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
-    declare CALL handler for sqlstate '02000' set @var2 = 1;
+    declare call handler for sqlstate '02000' set @var2 = 1;
 END//
 delimiter ;//
 
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare cascade handler for sqlstate '02000' set @var2 = 1;
@@ -13769,7 +13900,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare case handler for sqlstate '02000' set @var2 = 1;
@@ -13779,7 +13910,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare change handler for sqlstate '02000' set @var2 = 1;
@@ -13789,7 +13920,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare char handler for sqlstate '02000' set @var2 = 1;
@@ -13799,7 +13930,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare character handler for sqlstate '02000' set @var2 = 1;
@@ -13809,7 +13940,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare check handler for sqlstate '02000' set @var2 = 1;
@@ -13819,7 +13950,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare collate handler for sqlstate '02000' set @var2 = 1;
@@ -13829,7 +13960,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare column handler for sqlstate '02000' set @var2 = 1;
@@ -13839,17 +13970,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
-CREATE PROCEDURE sp1( )
-BEGIN
-    declare columns handler for sqlstate '02000' set @var2 = 1;
-END//
-delimiter ;//
-
-DROP PROCEDURE IF EXISTS sp1;
-
-delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare condition handler for sqlstate '02000' set @var2 = 1;
@@ -13859,37 +13980,27 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
-    declare connection handler for sqlstate '02000' set @var2 = 1;
+    declare constraint handler for sqlstate '02000' set @var2 = 1;
 END//
 delimiter ;//
 
 DROP PROCEDURE IF EXISTS sp1;
 
+--error ER_PARSE_ERROR
 delimiter //;
---error 1064
 CREATE PROCEDURE sp1( )
-BEGIN
-    declare constraint handler for sqlstate '02000' set @var2 = 1;
+ BEGIN
+   declare continue handler for sqlstate '02000' set @var2 = 1;
 END//
 delimiter ;//
 
 DROP PROCEDURE IF EXISTS sp1;
 
-#FIXME: check why this is switched off
-#--error 1064
-#delimiter //;
-#CREATE PROCEDURE sp1( )
-# BEGIN
-#   declare continue handler for sqlstate '02000' set @var2 = 1;
-#END//
-#delimiter ;//
-#DROP PROCEDURE IF EXISTS sp1;
-
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare convert handler for sqlstate '02000' set @var2 = 1;
@@ -13899,7 +14010,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare create handler for sqlstate '02000' set @var2 = 1;
@@ -13909,7 +14020,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare cross handler for sqlstate '02000' set @var2 = 1;
@@ -13919,7 +14030,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare current_date handler for sqlstate '02000' set @var2 = 1;
@@ -13929,7 +14040,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare current_time handler for sqlstate '02000' set @var2 = 1;
@@ -13939,7 +14050,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare current_timestamp handler for sqlstate '02000' set @var2 = 1;
@@ -13949,7 +14060,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare current_user handler for sqlstate '02000' set @var2 = 1;
@@ -13959,7 +14070,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare cursor handler for sqlstate '02000' set @var2 = 1;
@@ -13969,7 +14080,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare database handler for sqlstate '02000' set @var2 = 1;
@@ -13979,7 +14090,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare databases handler for sqlstate '02000' set @var2 = 1;
@@ -13989,7 +14100,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare day_hour handler for sqlstate '02000' set @var2 = 1;
@@ -13999,7 +14110,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare day_microsecond handler for sqlstate '02000' set @var2 = 1;
@@ -14009,7 +14120,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare day_minute handler for sqlstate '02000' set @var2 = 1;
@@ -14019,7 +14130,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare day_second handler for sqlstate '02000' set @var2 = 1;
@@ -14029,7 +14140,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare dec handler for sqlstate '02000' set @var2 = 1;
@@ -14039,7 +14150,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare decimal handler for sqlstate '02000' set @var2 = 1;
@@ -14049,7 +14160,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare declare handler for sqlstate '02000' set @var2 = 1;
@@ -14059,7 +14170,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare default handler for sqlstate '02000' set @var2 = 1;
@@ -14069,7 +14180,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare delayed handler for sqlstate '02000' set @var2 = 1;
@@ -14079,7 +14190,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare delete handler for sqlstate '02000' set @var2 = 1;
@@ -14089,7 +14200,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare desc handler for sqlstate '02000' set @var2 = 1;
@@ -14099,7 +14210,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare describe handler for sqlstate '02000' set @var2 = 1;
@@ -14109,7 +14220,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare deterministic handler for sqlstate '02000' set @var2 = 1;
@@ -14119,7 +14230,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare distinct handler for sqlstate '02000' set @var2 = 1;
@@ -14129,7 +14240,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare distinctrow handler for sqlstate '02000' set @var2 = 1;
@@ -14139,7 +14250,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare div handler for sqlstate '02000' set @var2 = 1;
@@ -14149,7 +14260,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare double handler for sqlstate '02000' set @var2 = 1;
@@ -14159,7 +14270,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare drop handler for sqlstate '02000' set @var2 = 1;
@@ -14169,7 +14280,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare dual handler for sqlstate '02000' set @var2 = 1;
@@ -14179,7 +14290,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare each handler for sqlstate '02000' set @var2 = 1;
@@ -14189,7 +14300,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare else handler for sqlstate '02000' set @var2 = 1;
@@ -14199,7 +14310,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare elseif handler for sqlstate '02000' set @var2 = 1;
@@ -14209,7 +14320,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare enclosed handler for sqlstate '02000' set @var2 = 1;
@@ -14219,7 +14330,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare escaped handler for sqlstate '02000' set @var2 = 1;
@@ -14229,7 +14340,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare exists handler for sqlstate '02000' set @var2 = 1;
@@ -14238,58 +14349,48 @@ delimiter ;//
 
 DROP PROCEDURE IF EXISTS sp1;
 
-#FIXME: check why this is switched off
-#--error 1064
-#delimiter //;
-#CREATE PROCEDURE sp1( )
-# BEGIN
-#   declare exit handler for sqlstate '02000' set @var2 = 1;
-#END//
-#delimiter ;//
-#DROP PROCEDURE IF EXISTS sp1;
-
+--error ER_PARSE_ERROR
 delimiter //;
---error 1064
 CREATE PROCEDURE sp1( )
-BEGIN
-    declare explain handler for sqlstate '02000' set @var2 = 1;
+ BEGIN
+   declare exit handler for sqlstate '02000' set @var2 = 1;
 END//
 delimiter ;//
 
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
-    declare false handler for sqlstate '02000' set @var2 = 1;
+    declare explain handler for sqlstate '02000' set @var2 = 1;
 END//
 delimiter ;//
 
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
-    declare fetch handler for sqlstate '02000' set @var2 = 1;
+    declare false handler for sqlstate '02000' set @var2 = 1;
 END//
 delimiter ;//
 
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
-    declare fields handler for sqlstate '02000' set @var2 = 1;
+    declare fetch handler for sqlstate '02000' set @var2 = 1;
 END//
 delimiter ;//
 
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare float handler for sqlstate '02000' set @var2 = 1;
@@ -14299,77 +14400,77 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
-    declare for handler for sqlstate '02000' set @var2 = 1;
+    declare float4 handler for sqlstate '02000' set @var2 = 1;
 END//
 delimiter ;//
 
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
-    declare force handler for sqlstate '02000' set @var2 = 1;
+    declare float8 handler for sqlstate '02000' set @var2 = 1;
 END//
 delimiter ;//
 
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
-    declare foreign handler for sqlstate '02000' set @var2 = 1;
+    declare for handler for sqlstate '02000' set @var2 = 1;
 END//
 delimiter ;//
 
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
-    declare found handler for sqlstate '02000' set @var2 = 1;
+    declare force handler for sqlstate '02000' set @var2 = 1;
 END//
 delimiter ;//
 
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
-    declare from handler for sqlstate '02000' set @var2 = 1;
+    declare foreign handler for sqlstate '02000' set @var2 = 1;
 END//
 delimiter ;//
 
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
-    declare fulltext handler for sqlstate '02000' set @var2 = 1;
+    declare from handler for sqlstate '02000' set @var2 = 1;
 END//
 delimiter ;//
 
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
-    declare goto handler for sqlstate '02000' set @var2 = 1;
+    declare fulltext handler for sqlstate '02000' set @var2 = 1;
 END//
 delimiter ;//
 
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare grant handler for sqlstate '02000' set @var2 = 1;
@@ -14379,7 +14480,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare group handler for sqlstate '02000' set @var2 = 1;
@@ -14389,7 +14490,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare having handler for sqlstate '02000' set @var2 = 1;
@@ -14399,7 +14500,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare high_priority handler for sqlstate '02000' set @var2 = 1;
@@ -14409,7 +14510,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare hour_microsecond handler for sqlstate '02000' set @var2 = 1;
@@ -14419,7 +14520,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare hour_minute handler for sqlstate '02000' set @var2 = 1;
@@ -14429,7 +14530,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare hour_second handler for sqlstate '02000' set @var2 = 1;
@@ -14439,7 +14540,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare if handler for sqlstate '02000' set @var2 = 1;
@@ -14449,7 +14550,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare ignore handler for sqlstate '02000' set @var2 = 1;
@@ -14459,7 +14560,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare in handler for sqlstate '02000' set @var2 = 1;
@@ -14469,7 +14570,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare index handler for sqlstate '02000' set @var2 = 1;
@@ -14479,7 +14580,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare infile handler for sqlstate '02000' set @var2 = 1;
@@ -14489,7 +14590,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare inner handler for sqlstate '02000' set @var2 = 1;
@@ -14499,7 +14600,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare inout handler for sqlstate '02000' set @var2 = 1;
@@ -14509,7 +14610,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare insensitive handler for sqlstate '02000' set @var2 = 1;
@@ -14519,7 +14620,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare insert handler for sqlstate '02000' set @var2 = 1;
@@ -14529,7 +14630,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare int handler for sqlstate '02000' set @var2 = 1;
@@ -14539,7 +14640,57 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1( )
+BEGIN
+    declare int1 handler for sqlstate '02000' set @var2 = 1;
+END//
+delimiter ;//
+
+DROP PROCEDURE IF EXISTS sp1;
+
+delimiter //;
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1( )
+BEGIN
+    declare int2 handler for sqlstate '02000' set @var2 = 1;
+END//
+delimiter ;//
+
+DROP PROCEDURE IF EXISTS sp1;
+
+delimiter //;
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1( )
+BEGIN
+    declare int3 handler for sqlstate '02000' set @var2 = 1;
+END//
+delimiter ;//
+
+DROP PROCEDURE IF EXISTS sp1;
+
+delimiter //;
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1( )
+BEGIN
+    declare int4 handler for sqlstate '02000' set @var2 = 1;
+END//
+delimiter ;//
+
+DROP PROCEDURE IF EXISTS sp1;
+
+delimiter //;
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1( )
+BEGIN
+    declare int8 handler for sqlstate '02000' set @var2 = 1;
+END//
+delimiter ;//
+
+DROP PROCEDURE IF EXISTS sp1;
+
+delimiter //;
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare integer handler for sqlstate '02000' set @var2 = 1;
@@ -14549,7 +14700,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare interval handler for sqlstate '02000' set @var2 = 1;
@@ -14559,7 +14710,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare into handler for sqlstate '02000' set @var2 = 1;
@@ -14569,7 +14720,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare is handler for sqlstate '02000' set @var2 = 1;
@@ -14579,7 +14730,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare iterate handler for sqlstate '02000' set @var2 = 1;
@@ -14589,7 +14740,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare join handler for sqlstate '02000' set @var2 = 1;
@@ -14599,7 +14750,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare key handler for sqlstate '02000' set @var2 = 1;
@@ -14609,7 +14760,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare keys handler for sqlstate '02000' set @var2 = 1;
@@ -14619,7 +14770,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare kill handler for sqlstate '02000' set @var2 = 1;
@@ -14629,7 +14780,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare leading handler for sqlstate '02000' set @var2 = 1;
@@ -14639,7 +14790,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare leave handler for sqlstate '02000' set @var2 = 1;
@@ -14649,7 +14800,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare left handler for sqlstate '02000' set @var2 = 1;
@@ -14659,7 +14810,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare like handler for sqlstate '02000' set @var2 = 1;
@@ -14669,7 +14820,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare limit handler for sqlstate '02000' set @var2 = 1;
@@ -14679,7 +14830,17 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1( )
+BEGIN
+    declare linear handler for sqlstate '02000' set @var2 = 1;
+END//
+delimiter ;//
+
+DROP PROCEDURE IF EXISTS sp1;
+
+delimiter //;
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare lines handler for sqlstate '02000' set @var2 = 1;
@@ -14689,7 +14850,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare load handler for sqlstate '02000' set @var2 = 1;
@@ -14699,7 +14860,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare localtime handler for sqlstate '02000' set @var2 = 1;
@@ -14709,7 +14870,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare localtimestamp handler for sqlstate '02000' set @var2 = 1;
@@ -14719,7 +14880,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare lock handler for sqlstate '02000' set @var2 = 1;
@@ -14729,7 +14890,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare long handler for sqlstate '02000' set @var2 = 1;
@@ -14739,7 +14900,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare longblob handler for sqlstate '02000' set @var2 = 1;
@@ -14749,7 +14910,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare longtext handler for sqlstate '02000' set @var2 = 1;
@@ -14759,7 +14920,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare loop handler for sqlstate '02000' set @var2 = 1;
@@ -14769,7 +14930,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare low_priority handler for sqlstate '02000' set @var2 = 1;
@@ -14779,7 +14940,17 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1( )
+BEGIN
+    declare master_ssl_verify_server_cert handler for sqlstate '02000' set @var2 = 1;
+END//
+delimiter ;//
+
+DROP PROCEDURE IF EXISTS sp1;
+
+delimiter //;
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare match handler for sqlstate '02000' set @var2 = 1;
@@ -14789,7 +14960,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare mediumblob handler for sqlstate '02000' set @var2 = 1;
@@ -14799,7 +14970,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare mediumint handler for sqlstate '02000' set @var2 = 1;
@@ -14809,7 +14980,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare mediumtext handler for sqlstate '02000' set @var2 = 1;
@@ -14819,7 +14990,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare middleint handler for sqlstate '02000' set @var2 = 1;
@@ -14829,7 +15000,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare minute_microsecond handler for sqlstate '02000' set @var2 = 1;
@@ -14839,7 +15010,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare minute_second handler for sqlstate '02000' set @var2 = 1;
@@ -14849,7 +15020,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare mod handler for sqlstate '02000' set @var2 = 1;
@@ -14859,7 +15030,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare modifies handler for sqlstate '02000' set @var2 = 1;
@@ -14869,7 +15040,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare natural handler for sqlstate '02000' set @var2 = 1;
@@ -14879,7 +15050,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare not handler for sqlstate '02000' set @var2 = 1;
@@ -14889,7 +15060,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare no_write_to_binlog handler for sqlstate '02000' set @var2 = 1;
@@ -14899,7 +15070,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare null handler for sqlstate '02000' set @var2 = 1;
@@ -14909,7 +15080,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare numeric handler for sqlstate '02000' set @var2 = 1;
@@ -14919,7 +15090,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare on handler for sqlstate '02000' set @var2 = 1;
@@ -14929,7 +15100,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare optimize handler for sqlstate '02000' set @var2 = 1;
@@ -14939,7 +15110,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare option handler for sqlstate '02000' set @var2 = 1;
@@ -14949,7 +15120,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare optionally handler for sqlstate '02000' set @var2 = 1;
@@ -14959,7 +15130,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare or handler for sqlstate '02000' set @var2 = 1;
@@ -14969,7 +15140,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare order handler for sqlstate '02000' set @var2 = 1;
@@ -14979,7 +15150,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare out handler for sqlstate '02000' set @var2 = 1;
@@ -14989,7 +15160,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare outer handler for sqlstate '02000' set @var2 = 1;
@@ -14999,7 +15170,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare outfile handler for sqlstate '02000' set @var2 = 1;
@@ -15009,7 +15180,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare precision handler for sqlstate '02000' set @var2 = 1;
@@ -15019,7 +15190,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare primary handler for sqlstate '02000' set @var2 = 1;
@@ -15029,7 +15200,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare privileges handler for sqlstate '02000' set @var2 = 1;
@@ -15039,7 +15210,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare procedure handler for sqlstate '02000' set @var2 = 1;
@@ -15049,7 +15220,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare purge handler for sqlstate '02000' set @var2 = 1;
@@ -15059,7 +15230,17 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1( )
+BEGIN
+    declare range handler for sqlstate '02000' set @var2 = 1;
+END//
+delimiter ;//
+
+DROP PROCEDURE IF EXISTS sp1;
+
+delimiter //;
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare read handler for sqlstate '02000' set @var2 = 1;
@@ -15069,7 +15250,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare reads handler for sqlstate '02000' set @var2 = 1;
@@ -15079,7 +15260,27 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1( )
+BEGIN
+    declare read_only handler for sqlstate '02000' set @var2 = 1;
+END//
+delimiter ;//
+
+DROP PROCEDURE IF EXISTS sp1;
+
+delimiter //;
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1( )
+BEGIN
+    declare read_write handler for sqlstate '02000' set @var2 = 1;
+END//
+delimiter ;//
+
+DROP PROCEDURE IF EXISTS sp1;
+
+delimiter //;
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare real handler for sqlstate '02000' set @var2 = 1;
@@ -15089,7 +15290,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare references handler for sqlstate '02000' set @var2 = 1;
@@ -15099,7 +15300,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare regexp handler for sqlstate '02000' set @var2 = 1;
@@ -15109,7 +15310,17 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
+CREATE PROCEDURE sp1( )
+BEGIN
+    declare release handler for sqlstate '02000' set @var2 = 1;
+END//
+delimiter ;//
+
+DROP PROCEDURE IF EXISTS sp1;
+
+delimiter //;
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare rename handler for sqlstate '02000' set @var2 = 1;
@@ -15119,7 +15330,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare repeat handler for sqlstate '02000' set @var2 = 1;
@@ -15129,7 +15340,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare replace handler for sqlstate '02000' set @var2 = 1;
@@ -15139,7 +15350,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare require handler for sqlstate '02000' set @var2 = 1;
@@ -15149,7 +15360,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare restrict handler for sqlstate '02000' set @var2 = 1;
@@ -15159,7 +15370,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare return handler for sqlstate '02000' set @var2 = 1;
@@ -15169,7 +15380,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare revoke handler for sqlstate '02000' set @var2 = 1;
@@ -15179,7 +15390,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare right handler for sqlstate '02000' set @var2 = 1;
@@ -15189,7 +15400,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare rlike handler for sqlstate '02000' set @var2 = 1;
@@ -15199,7 +15410,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare schema handler for sqlstate '02000' set @var2 = 1;
@@ -15209,7 +15420,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare schemas handler for sqlstate '02000' set @var2 = 1;
@@ -15219,7 +15430,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare second_microsecond handler for sqlstate '02000' set @var2 = 1;
@@ -15229,17 +15440,17 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
-    declare SELECT handler for sqlstate '02000' set @var2 = 1;
+    declare select handler for sqlstate '02000' set @var2 = 1;
 END//
 delimiter ;//
 
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare sensitive handler for sqlstate '02000' set @var2 = 1;
@@ -15249,7 +15460,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare separator handler for sqlstate '02000' set @var2 = 1;
@@ -15259,7 +15470,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare set handler for sqlstate '02000' set @var2 = 1;
@@ -15269,7 +15480,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare show handler for sqlstate '02000' set @var2 = 1;
@@ -15279,7 +15490,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare smallint handler for sqlstate '02000' set @var2 = 1;
@@ -15289,17 +15500,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
-CREATE PROCEDURE sp1( )
-BEGIN
-    declare soname handler for sqlstate '02000' set @var2 = 1;
-END//
-delimiter ;//
-
-DROP PROCEDURE IF EXISTS sp1;
-
-delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare spatial handler for sqlstate '02000' set @var2 = 1;
@@ -15309,7 +15510,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare specific handler for sqlstate '02000' set @var2 = 1;
@@ -15319,7 +15520,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare sql handler for sqlstate '02000' set @var2 = 1;
@@ -15329,7 +15530,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare sqlexception handler for sqlstate '02000' set @var2 = 1;
@@ -15339,7 +15540,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare sqlstate handler for sqlstate '02000' set @var2 = 1;
@@ -15349,7 +15550,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare sqlwarning handler for sqlstate '02000' set @var2 = 1;
@@ -15359,7 +15560,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare sql_big_result handler for sqlstate '02000' set @var2 = 1;
@@ -15369,7 +15570,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare sql_calc_found_rows handler for sqlstate '02000' set @var2 = 1;
@@ -15379,7 +15580,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare sql_small_result handler for sqlstate '02000' set @var2 = 1;
@@ -15389,7 +15590,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare ssl handler for sqlstate '02000' set @var2 = 1;
@@ -15399,7 +15600,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare starting handler for sqlstate '02000' set @var2 = 1;
@@ -15409,7 +15610,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare straight_join handler for sqlstate '02000' set @var2 = 1;
@@ -15419,7 +15620,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare table handler for sqlstate '02000' set @var2 = 1;
@@ -15429,17 +15630,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
-CREATE PROCEDURE sp1( )
-BEGIN
-    declare tables handler for sqlstate '02000' set @var2 = 1;
-END//
-delimiter ;//
-
-DROP PROCEDURE IF EXISTS sp1;
-
-delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare terminated handler for sqlstate '02000' set @var2 = 1;
@@ -15449,7 +15640,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare then handler for sqlstate '02000' set @var2 = 1;
@@ -15459,7 +15650,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare tinyblob handler for sqlstate '02000' set @var2 = 1;
@@ -15469,7 +15660,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare tinyint handler for sqlstate '02000' set @var2 = 1;
@@ -15479,7 +15670,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare tinytext handler for sqlstate '02000' set @var2 = 1;
@@ -15489,7 +15680,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare to handler for sqlstate '02000' set @var2 = 1;
@@ -15499,7 +15690,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare trailing handler for sqlstate '02000' set @var2 = 1;
@@ -15509,7 +15700,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare trigger handler for sqlstate '02000' set @var2 = 1;
@@ -15519,7 +15710,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare true handler for sqlstate '02000' set @var2 = 1;
@@ -15529,7 +15720,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare undo handler for sqlstate '02000' set @var2 = 1;
@@ -15539,7 +15730,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare union handler for sqlstate '02000' set @var2 = 1;
@@ -15549,7 +15740,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare unique handler for sqlstate '02000' set @var2 = 1;
@@ -15559,7 +15750,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare unlock handler for sqlstate '02000' set @var2 = 1;
@@ -15569,7 +15760,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare unsigned handler for sqlstate '02000' set @var2 = 1;
@@ -15579,7 +15770,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare update handler for sqlstate '02000' set @var2 = 1;
@@ -15589,7 +15780,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare usage handler for sqlstate '02000' set @var2 = 1;
@@ -15599,17 +15790,17 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
-    declare USE handler for sqlstate '02000' set @var2 = 1;
+    declare use handler for sqlstate '02000' set @var2 = 1;
 END//
 delimiter ;//
 
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare using handler for sqlstate '02000' set @var2 = 1;
@@ -15619,7 +15810,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare utc_date handler for sqlstate '02000' set @var2 = 1;
@@ -15629,7 +15820,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare utc_time handler for sqlstate '02000' set @var2 = 1;
@@ -15639,7 +15830,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare utc_timestamp handler for sqlstate '02000' set @var2 = 1;
@@ -15649,7 +15840,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare values handler for sqlstate '02000' set @var2 = 1;
@@ -15659,7 +15850,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare varbinary handler for sqlstate '02000' set @var2 = 1;
@@ -15669,7 +15860,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare varchar handler for sqlstate '02000' set @var2 = 1;
@@ -15679,7 +15870,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare varcharacter handler for sqlstate '02000' set @var2 = 1;
@@ -15689,7 +15880,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare varying handler for sqlstate '02000' set @var2 = 1;
@@ -15699,7 +15890,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare when handler for sqlstate '02000' set @var2 = 1;
@@ -15709,7 +15900,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare where handler for sqlstate '02000' set @var2 = 1;
@@ -15719,7 +15910,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare while handler for sqlstate '02000' set @var2 = 1;
@@ -15729,7 +15920,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare with handler for sqlstate '02000' set @var2 = 1;
@@ -15739,7 +15930,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare write handler for sqlstate '02000' set @var2 = 1;
@@ -15749,7 +15940,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare xor handler for sqlstate '02000' set @var2 = 1;
@@ -15759,7 +15950,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare year_month handler for sqlstate '02000' set @var2 = 1;
@@ -15769,7 +15960,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
 BEGIN
     declare zerofill handler for sqlstate '02000' set @var2 = 1;
@@ -16240,6 +16431,7 @@ delimiter ;//
 
 CALL sp1();
 
+--disable_warnings
 
 DROP PROCEDURE IF EXISTS sp1;
 
@@ -16782,7 +16974,7 @@ CALL sp1();
 
 # cleanup
 DROP PROCEDURE sp1;
-
+--enable_warnings
 
 # ------------------------------------------------------------------------------
 let $message= Testcase 4.2.38:;
@@ -16823,7 +17015,7 @@ let $message= Testcase 4.2.39:;
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1332
+--error ER_SP_DUP_COND
 CREATE PROCEDURE sp1()
 BEGIN
     declare cond1 condition for sqlstate '42000';
@@ -16844,7 +17036,7 @@ let $message= Testcase 4.2.41:;
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1407
+--error ER_SP_BAD_SQLSTATE
 CREATE PROCEDURE sp1()
 BEGIN
     declare cond1 condition for sqlstate '1';
@@ -16858,7 +17050,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1407
+--error ER_SP_BAD_SQLSTATE
 CREATE PROCEDURE sp1()
 BEGIN
     declare cond1 condition for sqlstate '12';
@@ -16872,7 +17064,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1407
+--error ER_SP_BAD_SQLSTATE
 CREATE PROCEDURE sp1()
 BEGIN
     declare cond1 condition for sqlstate '123';
@@ -16886,7 +17078,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1407
+--error ER_SP_BAD_SQLSTATE
 CREATE PROCEDURE sp1()
 BEGIN
     declare cond1 condition for sqlstate '1234';
@@ -16900,7 +17092,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1407
+--error ER_SP_BAD_SQLSTATE
 CREATE PROCEDURE sp1()
 BEGIN
     declare cond1 condition for sqlstate '123456';
@@ -16915,7 +17107,7 @@ let $message= Testcase 4.2.42:;
 --source include/show_msg80.inc
 
 # testcase: ensure that the declare  condition for statement cannot declare a
-#            condition for an invalid sqlstate. (bug associated) (Bug#8760)
+#            condition for an invalid sqlstate.
 
 
 --disable_warnings
@@ -16923,7 +17115,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1407
+--error ER_SP_BAD_SQLSTATE
 CREATE PROCEDURE sp1()
 BEGIN
     declare cond1 condition for sqlstate 'abcdefghi';
@@ -16937,7 +17129,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1407
+--error ER_SP_BAD_SQLSTATE
 CREATE PROCEDURE sp1()
 BEGIN
     declare cond1 condition for sqlstate '42000test';
@@ -16951,7 +17143,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1407
+--error ER_SP_BAD_SQLSTATE
 CREATE PROCEDURE sp1()
 BEGIN
     declare cond1 condition for sqlstate '00000@#$%^&';
@@ -16965,7 +17157,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1407
+--error ER_SP_BAD_SQLSTATE
 CREATE PROCEDURE sp1()
 BEGIN
     declare cond1 condition for sqlstate '123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890';
@@ -16979,7 +17171,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1407
+--error ER_SP_BAD_SQLSTATE
 CREATE PROCEDURE sp1()
 BEGIN
     declare cond1 condition for sqlstate 'null';
@@ -16993,7 +17185,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1407
+--error ER_SP_BAD_SQLSTATE
 CREATE PROCEDURE sp1()
 BEGIN
     declare cond1 condition for sqlstate ' ';
@@ -17007,7 +17199,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp1()
 BEGIN
     declare cond1 condition for sqlstate 1234567890;
@@ -17021,7 +17213,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1407
+--error ER_SP_BAD_SQLSTATE
 CREATE PROCEDURE sp1()
 BEGIN
     declare cond1 condition for sqlstate '2005-03-03';
@@ -17036,7 +17228,7 @@ let $message= Testcase 4.2.43:;
 --source include/show_msg80.inc
 
 # testcase: ensure that the declare  condition for statement cannot declare a
-#            condition for the successful completion sqlstate: 00000. (bug associated)
+#            condition for the successful completion sqlstate: 00000.
 
 --disable_warnings
 DROP PROCEDURE IF EXISTS sp1;
@@ -17070,7 +17262,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1413
+--error ER_SP_DUP_HANDLER
 CREATE PROCEDURE handler1 ()
 BEGIN
       declare continue handler for sqlstate '23000' set @varr1 = 5;
@@ -17081,7 +17273,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS handler1;
 
 delimiter //;
---error 1413
+--error ER_SP_DUP_HANDLER
 CREATE PROCEDURE handler1 ()
 BEGIN
       declare mycondition condition for sqlstate '23000';
@@ -17096,14 +17288,14 @@ let $message= Testcase 4.2.46:;
 --source include/show_msg80.inc
 
 # testcase: ensure that every sqlstate value declared with a declare  handler for
-#            statement is a character string that is 5 characters long (bug associated).
+#            statement is a character string that is 5 characters long.
 
 --disable_warnings
 DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1407
+--error ER_SP_BAD_SQLSTATE
 CREATE PROCEDURE sp1()
 BEGIN
     declare continue handler for sqlstate '1' set @var2 = 1;
@@ -17115,7 +17307,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1407
+--error ER_SP_BAD_SQLSTATE
 CREATE PROCEDURE sp1()
 BEGIN
     declare continue handler for sqlstate '12' set @var2 = 1;
@@ -17127,7 +17319,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1407
+--error ER_SP_BAD_SQLSTATE
 CREATE PROCEDURE sp1()
 BEGIN
     declare continue handler for sqlstate '123' set @var2 = 1;
@@ -17139,7 +17331,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1407
+--error ER_SP_BAD_SQLSTATE
 CREATE PROCEDURE sp1()
 BEGIN
     declare continue handler for sqlstate '1234' set @var2 = 1;
@@ -17151,7 +17343,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1407
+--error ER_SP_BAD_SQLSTATE
 CREATE PROCEDURE sp1()
 BEGIN
     declare continue handler for sqlstate '123456' set @var2 = 1;
@@ -17164,14 +17356,14 @@ let $message= Testcase 4.2.47:;
 --source include/show_msg80.inc
 
 # testcase: ensure that the declare  handler for statement cannot declare a condition
-#            for an invalid sqlstate. (bug associated)
+#            for an invalid sqlstate.
 
 --disable_warnings
 DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1407
+--error ER_SP_BAD_SQLSTATE
 CREATE PROCEDURE sp1()
 BEGIN
     declare continue handler for sqlstate '42s0200test'  set @var2 = 1;
@@ -17189,7 +17381,7 @@ let $message= Testcase 4.2.48:;
 --source include/show_msg80.inc
 
 # testcase: ensure that the declare  handler for statement cannot declare a condition
-#            for the successful completion sqlstate:  00000. (bug associated)
+#            for the successful completion sqlstate:  00000.
 
 --disable_warnings
 DROP PROCEDURE IF EXISTS sp1;
@@ -17222,7 +17414,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1333
+--error ER_SP_DUP_CURS
 CREATE PROCEDURE sp1( )
 BEGIN
     declare done int default 0;
@@ -17237,11 +17429,11 @@ BEGIN
     BEGIN
       open cur1;
       set count = count - 1;
-      while count <> 0 do
+      while count > 0 do
         fetch cur1 into newf1, newlf1, newf3, newsal;
         set count = count - 1;
-            END while;
-            close cur1;
+      END while;
+      close cur1;
     END;
 END//
 delimiter ;//
@@ -17258,7 +17450,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1323
+--error ER_SP_BAD_CURSOR_SELECT
 CREATE PROCEDURE sp1( )
 BEGIN
     declare done int default 0;
@@ -17272,12 +17464,12 @@ BEGIN
     BEGIN
       open cur1;
       set count = count - 1;
-      while count <> 0 do
+      while count > 0 do
         fetch cur1 into newf1, newlf1, newf3, newsal;
         set count = count - 1;
-            END while;
-            close cur1;
-        END;
+      END while;
+      close cur1;
+      END;
 END//
 delimiter ;//
 
@@ -17303,7 +17495,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1324
+--error ER_SP_CURSOR_MISMATCH
 CREATE PROCEDURE sp1( )
 BEGIN
     declare done int default 0;
@@ -17316,7 +17508,7 @@ BEGIN
     BEGIN
       open cur1;
       set count = count - 1;
-            while count <> 0 do
+      while count > 0 do
         fetch cur1 into newf1, newf2, newf4, newf3;
         set count = count - 1;
       END while;
@@ -17345,7 +17537,7 @@ BEGIN
       BEGIN
         open cur1;
         set count = count - 1;
-        while count <> 0 do
+        while count > 0 do
           fetch cur1 into newf1, newf2, newf3, newf4;
           set count = count - 1;
         END while;
@@ -17355,8 +17547,7 @@ BEGIN
 END//
 delimiter ;//
 
-#suppressed (Bug# 8892)
---error 1325
+--error ER_SP_CURSOR_ALREADY_OPEN
 CALL sp1();
 
 
@@ -17383,7 +17574,7 @@ BEGIN
       open cur1;
       open cur1;
       set count = count - 1;
-      while count <> 0 do
+      while count > 0 do
         fetch cur1 into newf1, newf2, newf4, newf3;
         set count = count - 1;
       END while;
@@ -17392,7 +17583,7 @@ BEGIN
 END//
 delimiter ;//
 
---error 1325
+--error ER_SP_CURSOR_ALREADY_OPEN
 CALL sp1();
 
 # cleanup
@@ -17423,7 +17614,7 @@ BEGIN
     BEGIN
       open cur2;
       set count = count - 1;
-      while count <> 0 do
+      while count > 0 do
         fetch cur1 into newf1, newf2, newf4, newf3;
         set count = count - 1;
       END while;
@@ -17432,7 +17623,7 @@ BEGIN
 END//
 delimiter ;//
 
---error 1326
+--error ER_SP_CURSOR_NOT_OPEN
 CALL sp1();
 
 # cleanup
@@ -17466,7 +17657,7 @@ BEGIN
     declare continue handler for sqlstate '02000' set done = 1;
     BEGIN
       set count = count - 1;
-      while count <> 0 do
+      while count > 0 do
         fetch cur1 into newf1, newf2, newf4, newf3;
         set count = count - 1;
       END while;
@@ -17476,7 +17667,7 @@ BEGIN
 END//
 delimiter ;//
 
---error 1326
+--error ER_SP_CURSOR_NOT_OPEN
 CALL sp1();
 
 DROP PROCEDURE IF EXISTS sp1;
@@ -17485,7 +17676,7 @@ delimiter //;
 CREATE PROCEDURE sp1( )
 BEGIN
     declare done int default 0;
-    declare count integer default 0;
+    declare count integer default 10;
     declare newf1 char(20);
     declare newf2 char(20);
     declare newf3 char(20);
@@ -17496,18 +17687,18 @@ BEGIN
     BEGIN
       declare cur1 cursor for SELECT f1, f2, f3, f4 from t2;
       set count = count - 1;
-      while count <> 0 do
+      while count > 0 do
         fetch cur1 into newf1, newf2, newf3, newf4;
         set count = count - 1;
       END while;
       open cur1;
       close cur1;
-          END;
+    END;
     close cur1;
 END//
 delimiter ;//
 
---error 1326
+--error ER_SP_CURSOR_NOT_OPEN
 CALL sp1();
 
 # cleanup
@@ -17538,15 +17729,15 @@ BEGIN
       open cur1;
       close cur1;
       set count = count - 1;
-          while count <> 0 do
+      while count > 0 do
           fetch cur1 into newf1, newf2, newf4, newf3;
-              set count = count - 1;
+          set count = count - 1;
       END while;
-        END;
+    END;
 END//
 delimiter ;//
 
---error 1326
+--error ER_SP_CURSOR_NOT_OPEN
 CALL sp1();
 
 DROP PROCEDURE IF EXISTS sp1;
@@ -17555,7 +17746,7 @@ delimiter //;
 CREATE PROCEDURE sp1( )
 BEGIN
     declare done int default 0;
-    declare count integer default 0;
+    declare count integer default 20;
     declare newf1 char(20);
     declare newf2 char(20);
     declare newf3 char(20);
@@ -17572,7 +17763,7 @@ BEGIN
 END//
 delimiter ;//
 
---error 1326
+--error ER_SP_CURSOR_NOT_OPEN
 CALL sp1();
 
 # cleanup
@@ -17597,13 +17788,13 @@ BEGIN
     declare done int default 0;
     declare count integer default 20;
     declare newf2 char(20);
-    declare newf1 date;
+    declare newf1 int1;
     declare cur1 cursor for SELECT f1, f3 from t2 limit 20, 10;
     declare continue handler for sqlstate '02000' set done = 1;
     BEGIN
       open cur1;
       set count = count - 1;
-      while count <> 0 do
+      while count > 0 do
         fetch cur1 into newf1, newf2;
         set @x = newf1;
         set @y = newf2;
@@ -17615,8 +17806,8 @@ BEGIN
 END//
 delimiter ;//
 
-#FIXME check that here NO error occurs: suppressed for bug (Bug# 8702)
-#--error 1146
+#This test seems to make no sense, as always NULL may be set.
+#--error ER_SP_CURSOR_NOT_OPEN
 CALL sp1();
 
 # cleanup
@@ -17647,7 +17838,7 @@ BEGIN
       close cur1;
       open cur1;
       set count = count - 1;
-      while count <> 0 do
+      while count > 0 do
         fetch cur1 into newf1, newf2, newf4, newf3;
         set count = count - 1;
       END while;
@@ -17656,7 +17847,7 @@ BEGIN
 END//
 delimiter ;//
 
---error 1326
+--error ER_SP_CURSOR_NOT_OPEN
 CALL sp1();
 
 DROP PROCEDURE IF EXISTS sp1;
@@ -17680,7 +17871,7 @@ BEGIN
 END//
 delimiter ;//
 
---error 1326
+--error ER_SP_CURSOR_NOT_OPEN
 CALL sp1();
 
 # cleanup
@@ -17716,9 +17907,7 @@ CREATE PROCEDURE sp1( )
 END//
 delimiter ;//
 
-#FIXME check this error, in 5.0.11 the error occurs. Is this wanted?
-# suppressed for bug (Bug#8756)
---error 1329
+--error ER_SP_FETCH_NO_DATA
 CALL sp1();
 
 # cleanup
@@ -17755,9 +17944,7 @@ BEGIN
 END//
 delimiter ;//
 
-#FIXME check this error, in 5.0.11 the error occurs. Is this wanted?
-##suppressed for bug (Bug#8756)
---error 1329
+--error ER_SP_FETCH_NO_DATA
 CALL sp1();
 
 # cleanup
@@ -17788,7 +17975,7 @@ BEGIN
     BEGIN
       open cur1;
       set count = count - 1;
-      while count <> 0 do
+      while count > 0 do
         fetch cur1 into newf1, newf2, newf4, newf3;
         set count = count - 1;
       END while;
@@ -17798,7 +17985,7 @@ BEGIN
 END//
 delimiter ;//
 
---error 1326
+--error ER_SP_CURSOR_NOT_OPEN
 CALL sp1();
 
 # cleanup
@@ -17829,15 +18016,17 @@ BEGIN
     declare continue handler for sqlstate '02000' set done = 1;
     BEGIN
       open cur1;
-      set count = count - 1;
-      while count <> 0 do
+#      set count = count - 1;
+#      while count > 0 do
         fetch cur1 into newf1, newf2, newf4, newf3;
-        set count = count - 1;
-      END while;
+#        set count = count - 1;
+#      END while;
     END;
+    fetch cur1 into newf1, newf2, newf4, newf3;
 END//
 delimiter ;//
 
+#--error ER_SP_FETCH_NO_DATA
 CALL sp1();
 
 # cleanup
@@ -17881,7 +18070,7 @@ BEGIN
       set count = 10;
       BEGIN
         open cur2;
-        while count <> 0 do
+        while count > 0 do
           fetch cur1 into newf1, newf2, newf4, newf3;
           set count = count - 1;
         END while;
@@ -17890,7 +18079,8 @@ BEGIN
       close cur1;
     END;
     BEGIN
-      while count <> 0 do
+      set count = 10;
+      while count > 0 do
         fetch cur2 into newf21, newf22, newf24, newf23;
         set count = count - 1;
       END while;
@@ -17902,7 +18092,7 @@ delimiter ;//
 
 CALL sp1();
 
-SELECT * from temp1;
+SELECT count(*) from temp1;
 SELECT * from temp2;
 
 # cleanup
@@ -17934,8 +18124,7 @@ eval CREATE TABLE res_t3_itisalongname_1381742_itsaverylongname_1381742(
          middleinitial CHAR,
          lastname VARCHAR(50),
          age_averylongfieldname_averylongname_1234569 int,
-         COMMENT TEXT) ENGINE=innodb;
-#        COMMENT TEXT) ENGINE=$engine_type;
+         COMMENT TEXT) ENGINE=$engine_type;
 
 INSERT INTO res_t3_itisalongname_1381742_itsaverylongname_1381742
       VALUES('a', 'aaaaaaaaaabbbbbbbbc', 0, 'default');
@@ -18052,6 +18241,7 @@ END//
 delimiter ;//
 
 CALL sp2( 'insert' );
+--sorted_result
 SELECT * from t3 where f3 <=5 && f3 >= 0;
 
 SELECT count(*) from t3;
@@ -18081,7 +18271,7 @@ DROP PROCEDURE IF EXISTS sp3;
 create table res_t3_itisalongname_1381742_itsaverylongname_1381742 (name char, address varchar(50), age_averylongfieldname_averylongname_1234569 smallint);
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp3( action char(20) )
 BEGIN
 label1: case
@@ -18099,7 +18289,7 @@ DROP PROCEDURE IF EXISTS sp3;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp3( action char(20) )
 BEGIN
 label1: BEGIN
@@ -18119,7 +18309,7 @@ DROP PROCEDURE IF EXISTS sp3;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp3( action char(20) )
 BEGIN
 case
@@ -18139,7 +18329,7 @@ DROP PROCEDURE IF EXISTS sp3;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp3( action char(20) )
 BEGIN
 declare v1 char(20);
@@ -18178,8 +18368,9 @@ BEGIN
             BEGIN
                insert into res_t3_itisalongname_1381742_itsaverylongname_1381742
                   values('xxxxxxxxxxxxxxxxxxx', '1231230981(*&(*&)(*&(', count);
-               if done=1 then
-                  set count=10;
+               set count = count + 1;
+               if count= 10 then
+                  set done=1;
                END if;
             END;
             END while label2;
@@ -18195,8 +18386,7 @@ BEGIN
 END//
 delimiter ;//
 
-# results in lost connection hence suppressed--error 2013
-#CALL sp3('insert');
+CALL sp3('insert');
 
 # cleanup
 DROP PROCEDURE sp3;
@@ -18214,7 +18404,7 @@ DROP PROCEDURE IF EXISTS sp4;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp4()
 BEGIN
 declare count int;
@@ -18236,7 +18426,7 @@ DROP PROCEDURE IF EXISTS sp4;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp4()
 BEGIN
 declare count int;
@@ -18257,7 +18447,7 @@ DROP PROCEDURE IF EXISTS sp4;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp4()
 BEGIN
 declare count int;
@@ -18278,7 +18468,7 @@ DROP PROCEDURE IF EXISTS sp4;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp4()
 BEGIN
 declare count int;
@@ -18299,7 +18489,7 @@ DROP PROCEDURE IF EXISTS sp4;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp4()
 BEGIN
   declare i int default 10;
@@ -18347,7 +18537,7 @@ BEGIN
 END//
 delimiter ;//
 
---error 1054
+--error ER_BAD_FIELD_ERROR
 CALL sp4();
 
 # cleanup
@@ -18365,7 +18555,7 @@ DROP PROCEDURE IF EXISTS sp5;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp5()
 BEGIN
   declare count integer default 1;
@@ -18384,7 +18574,7 @@ DROP PROCEDURE IF EXISTS sp5;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp5(count int)
 BEGIN
   when case count = 1 then
@@ -18400,7 +18590,7 @@ DROP PROCEDURE IF EXISTS sp5;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp5(count int)
 BEGIN
   END case;
@@ -18417,7 +18607,7 @@ DROP PROCEDURE IF EXISTS sp5;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp5(count int)
 BEGIN
   when count = 1 then
@@ -18440,7 +18630,7 @@ DROP PROCEDURE IF EXISTS sp6;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp6()
 BEGIN
   declare count1 integer default 1;
@@ -18457,7 +18647,7 @@ DROP PROCEDURE IF EXISTS sp6;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp6()
 BEGIN
   declare count1 integer default 1;
@@ -18474,7 +18664,7 @@ DROP PROCEDURE IF EXISTS sp6;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp6()
 BEGIN
   declare count1 integer default 1;
@@ -18491,7 +18681,7 @@ DROP PROCEDURE IF EXISTS sp6;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp6()
 BEGIN
   declare count1 integer default 1;
@@ -18507,7 +18697,7 @@ DROP PROCEDURE IF EXISTS sp6;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp6()
 BEGIN
   declare count1 integer default 1;
@@ -18529,15 +18719,14 @@ CREATE PROCEDURE sp6()
 BEGIN
   declare count1 integer default 1;
   label1: repeat
-    set count1 = count1;
+    set count1 = count1-1;
   until count1 < 0
   END repeat label1;
   SELECT count1;
 END//
 delimiter ;//
 
-# results in lost connection hence suppressed--error 2013
-# CALL sp6();
+CALL sp6();
 
 # cleanup
 DROP PROCEDURE sp6;
@@ -18555,7 +18744,7 @@ DROP PROCEDURE IF EXISTS sp7;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp7()
 BEGIN
   label1: loop
@@ -18572,7 +18761,7 @@ DROP PROCEDURE IF EXISTS sp7;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp7()
 BEGIN
   label1: END loop;
@@ -18589,7 +18778,7 @@ DROP PROCEDURE IF EXISTS sp7;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp7()
 BEGIN
   label1: iterate label1;
@@ -18615,7 +18804,7 @@ DROP PROCEDURE IF EXISTS sp8;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp8()
 BEGIN
   declare v1 int default 5;
@@ -18630,7 +18819,7 @@ DROP PROCEDURE IF EXISTS sp8;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp8()
 BEGIN
   declare v1 int default 5;
@@ -18645,7 +18834,7 @@ DROP PROCEDURE IF EXISTS sp8;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp8()
 BEGIN
   declare v1 int default 5;
@@ -18655,11 +18844,6 @@ BEGIN
 END//
 delimiter ;//
 
-
-
-
-
-
 # ------------------------------------------------------------------------------
 let $message= Testcase 4.3.12:;
 --source include/show_msg80.inc
@@ -18674,7 +18858,7 @@ DROP PROCEDURE IF EXISTS sp12;
 create table res_t3_itisalongname_1381742_itsaverylongname_1381742( f1 char(20), f2 varchar(20), f3 smallint);
 
 delimiter //;
---error 1310
+--error ER_SP_LABEL_MISMATCH
 CREATE PROCEDURE sp12( )
 BEGIN
   declare count1 integer default 1;
@@ -18750,7 +18934,7 @@ DROP PROCEDURE IF EXISTS sp14;
 create table res_t3_itisalongname_1381742_itsaverylongname_1381742( f1 char(20), f2 varchar(20), f3 smallint);
 
 delimiter //;
---error 1308
+--error ER_SP_LILABEL_MISMATCH
 CREATE PROCEDURE sp14( )
 BEGIN
     declare count1 integer default 1;
@@ -18782,7 +18966,7 @@ DROP PROCEDURE IF EXISTS sp15;
 create table res_t3_itisalongname_1381742_itsaverylongname_1381742( f1 char(20), f2 varchar(20), f3 smallint);
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp15( )
 BEGIN
     declare count1 integer default 1;
@@ -18810,7 +18994,7 @@ DROP PROCEDURE IF EXISTS sp16;
 delete from res_t3_itisalongname_1381742_itsaverylongname_1381742;
 
 delimiter //;
---error 1309
+--error ER_SP_LABEL_REDEFINE
 CREATE PROCEDURE sp16( )
 BEGIN
     declare count1 integer default 1;
@@ -18833,7 +19017,7 @@ DROP PROCEDURE IF EXISTS sp16;
 --enable_warnings
 
 delimiter //;
---error 1309
+--error ER_SP_LABEL_REDEFINE
 CREATE PROCEDURE sp16( )
 BEGIN
   declare count1 integer default 1;
@@ -18880,7 +19064,7 @@ DROP PROCEDURE IF EXISTS sp18;
 delete from res_t3_itisalongname_1381742_itsaverylongname_1381742;
 
 delimiter //;
---error 1310
+--error ER_SP_LABEL_MISMATCH
 CREATE PROCEDURE sp18( )
 BEGIN
     declare count1 integer default 1;
@@ -18941,7 +19125,7 @@ DROP PROCEDURE IF EXISTS sp20;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp20( )
 BEGIN
     declare count1 integer default 1;
@@ -18976,7 +19160,7 @@ DROP PROCEDURE IF EXISTS sp22;
 --enable_warnings
 
 delimiter //;
---error 1310
+--error ER_SP_LABEL_MISMATCH
 CREATE PROCEDURE sp22( )
 BEGIN
     declare count1 integer default 1;
@@ -19008,7 +19192,7 @@ DROP PROCEDURE IF EXISTS sp23;
 --enable_warnings
 
 delimiter //;
---error 1064
+--error ER_PARSE_ERROR
 CREATE PROCEDURE sp23( )
 BEGIN
     declare count1 integer default 1;
@@ -19111,7 +19295,7 @@ let $message= Testcase 4.4.2:;
 DROP FUNCTION IF EXISTS fn1;
 DROP FUNCTION IF EXISTS fn11;
 DROP DATABASE IF EXISTS d40402;
---enable warnings
+--enable_warnings
 
 delimiter //;
 CREATE FUNCTION fn1(n int) returns int
@@ -19218,7 +19402,7 @@ DROP DATABASE IF EXISTS d1;
   USE d1;
 
 delimiter //;
---error 1314
+--error ER_SP_BADSTATEMENT
 CREATE PROCEDURE sp3()
 BEGIN
     USE d1;
@@ -19261,7 +19445,6 @@ DROP DATABASE d1;
   USE d1;
   create table t44(a char(5), b char(10));
 
-#FIXME: check why here no rows are shown
 --replace_column 13 modified 14 created
   SELECT * from mysql.proc where specific_name = 'sp4';
 
@@ -19455,45 +19638,26 @@ let $procvar01_30=  1.00e+30;
 let $procvar01_36=  1.00e+36;
 let $procvar01_40=  1.00e+40;
 
-let $bug_dec_num= 1;
-
-eval SELECT $bug_dec_num as 'bug_dec_num';
-
-if ($bug_dec_num)
-{
-   let $message=
-   .
-   FIXME:  There are differences with datatypes DECIMAL and NUMERIC if large
-   FIXME:  exponent values are used. The diffs are shown only on some machines like
-   FIXME:  AIX52 and HPUX11. Until this has been solved we use numbers that
-   FIXME:  *should* be equal to the exponent representation but have no exponents
-   FIXME:  and use the specified count of *0*s instead.
-   FIXME:  In the source file these tests are marked with the comment  hpux11
-   .;
-   --source include/show_msg80.inc
-   # FIXME values above changed to values below to fix DECIMAL/NUMERIC issues on hpux11
-
-   #################123456789-123456789-123456789-123456789-
-   let $plus_20=   100000000000000000000;
-   let $plus_24=   1000000000000000000000000;
-   let $plus_30=   1000000000000000000000000000000;
-   let $plus_36=   1000000000000000000000000000000000000;
-   let $plus_40=   10000000000000000000000000000000000000000;
-   let $minus_30= -1000000000000000000000000000000;
-   let $minus_36= -1000000000000000000000000000000000000;
-   let $minus_40= -10000000000000000000000000000000000000000;
-
-   let $procvar_m00=   -1.00e+22;
-   let $procvar_00=     1.00e+22;
-   let $procvar01_m30= $procvar_m00;
-   let $procvar01_m36= $procvar_m00;
-   let $procvar01_m40= $procvar_m00;
-   let $procvar01_20=  $procvar_00;
-   let $procvar01_24=  $procvar_00;
-   let $procvar01_30=  $procvar_00;
-   let $procvar01_36=  $procvar_00;
-   let $procvar01_40=  $procvar_00;
-}
+#################123456789-123456789-123456789-123456789-
+let $plus_20=   100000000000000000000;
+let $plus_24=   1000000000000000000000000;
+let $plus_30=   1000000000000000000000000000000;
+let $plus_36=   1000000000000000000000000000000000000;
+let $plus_40=   10000000000000000000000000000000000000000;
+let $minus_30= -1000000000000000000000000000000;
+let $minus_36= -1000000000000000000000000000000000000;
+let $minus_40= -10000000000000000000000000000000000000000;
+
+let $procvar_m00=   -1.00e+22;
+let $procvar_00=     1.00e+22;
+let $procvar01_m30= $procvar_m00;
+let $procvar01_m36= $procvar_m00;
+let $procvar01_m40= $procvar_m00;
+let $procvar01_20=  $procvar_00;
+let $procvar01_24=  $procvar_00;
+let $procvar01_30=  $procvar_00;
+let $procvar01_36=  $procvar_00;
+let $procvar01_40=  $procvar_00;
 let $procvar03= -9.22e+18;
 let $procvar05= -9.22e+18;
 let $procvar07= -9.22e+18;
@@ -19548,10 +19712,7 @@ BEGIN
 END//
 delimiter ;//
 
-if ($have_bug_11589)
-{
 --disable_ps_protocol
-}
 SELECT fn3(1.84e+17);
 --enable_ps_protocol
 
@@ -19567,14 +19728,10 @@ BEGIN
 END//
 delimiter ;//
 
-if ($have_bug_11589)
-{
 --disable_ps_protocol
-}
 SELECT fn4(-9.22e+15);
 --enable_ps_protocol
 
-
 --disable_warnings
 DROP FUNCTION IF EXISTS fn5;
 --enable_warnings
@@ -19693,7 +19850,6 @@ delimiter ;//
 
 SELECT fn12(999999999);
 
-
 --disable_warnings
 DROP FUNCTION IF EXISTS fn13;
 --enable_warnings
@@ -19797,10 +19953,8 @@ BEGIN
 END//
 delimiter ;//
 
-#FIXME hpux11
 eval SELECT fn19_du( $plus_20 );
 
-
 --disable_warnings
 DROP FUNCTION IF EXISTS fn20_duz;
 --enable_warnings
@@ -19813,10 +19967,8 @@ BEGIN
 END//
 delimiter ;//
 
-#FIXME hpux11
 eval SELECT fn20_duz( $plus_24 );
 
-
 --disable_warnings
 DROP FUNCTION IF EXISTS fn21_d_z;
 --enable_warnings
@@ -19916,7 +20068,9 @@ BEGIN
 END//
 delimiter ;//
 
+--disable_ps_protocol
 SELECT fn27(1.00e+00);
+--enable_ps_protocol
 
 
 --disable_warnings
@@ -19931,13 +20085,16 @@ BEGIN
 END//
 delimiter ;//
 
+--disable_ps_protocol
 SELECT fn28(1.00e+00);
+--enable_ps_protocol
 
 
 --disable_warnings
 DROP FUNCTION IF EXISTS fn29;
 --enable_warnings
 
+
 delimiter //;
 CREATE FUNCTION fn29( f1 float) returns float
 BEGIN
@@ -19976,7 +20133,9 @@ BEGIN
 END//
 delimiter ;//
 
+--disable_ps_protocol
 SELECT fn31(1.00e+00);
+--enable_ps_protocol
 
 
 --disable_warnings
@@ -19991,7 +20150,9 @@ BEGIN
 END//
 delimiter ;//
 
+--disable_ps_protocol
 SELECT fn32(1.00e+00);
+--enable_ps_protocol
 
 
 --disable_warnings
@@ -20036,7 +20197,9 @@ BEGIN
 END//
 delimiter ;//
 
+--disable_ps_protocol
 SELECT fn35(1.00e+00);
+--enable_ps_protocol
 
 
 --disable_warnings
@@ -20051,7 +20214,9 @@ BEGIN
 END//
 delimiter ;//
 
+--disable_ps_protocol
 SELECT fn36(1.00e+00);
+--enable_ps_protocol
 
 
 --disable_warnings
@@ -20096,7 +20261,9 @@ BEGIN
 END//
 delimiter ;//
 
+--disable_ps_protocol
 SELECT fn39(1.00e+00);
+--enable_ps_protocol
 
 
 --disable_warnings
@@ -20111,7 +20278,9 @@ BEGIN
 END//
 delimiter ;//
 
+--disable_ps_protocol
 SELECT fn40(1.00e+00);
+--enable_ps_protocol
 
 
 --disable_warnings
@@ -20155,7 +20324,9 @@ BEGIN
 END//
 delimiter ;//
 
+--disable_ps_protocol
 SELECT fn43(1.00e+00);
+--enable_ps_protocol
 
 
 --disable_warnings
@@ -20170,7 +20341,9 @@ BEGIN
 END//
 delimiter ;//
 
+--disable_ps_protocol
 SELECT fn44(1.00e+00);
+--enable_ps_protocol
 
 
 --disable_warnings
@@ -20214,7 +20387,9 @@ BEGIN
 END//
 delimiter ;//
 
+--disable_ps_protocol
 SELECT fn47(1.00e+00);
+--enable_ps_protocol
 
 
 --disable_warnings
@@ -20229,7 +20404,9 @@ BEGIN
 END//
 delimiter ;//
 
+--disable_ps_protocol
 SELECT fn48(1.00e+00);
+--enable_ps_protocol
 
 
 --disable_warnings
@@ -20289,10 +20466,7 @@ BEGIN
 END//
 delimiter ;//
 
-if ($have_bug_11589)
-{
 --disable_ps_protocol
-}
 SELECT fn52(2.15e+08);
 --enable_ps_protocol
 
@@ -20352,13 +20526,7 @@ BEGIN
 END//
 delimiter ;//
 
-if ($have_bug_11589)
-{
---disable_ps_protocol
-}
 SELECT fn56(-8388601);
---enable_ps_protocol
-
 
 --disable_warnings
 DROP FUNCTION IF EXISTS fn57;
@@ -20709,7 +20877,9 @@ BEGIN
 END//
 delimiter ;//
 
+--disable_ps_protocol
 SELECT fn79(1.1);
+--enable_ps_protocol
 
 
 --disable_warnings
@@ -20724,7 +20894,9 @@ BEGIN
 END//
 delimiter ;//
 
+--disable_ps_protocol
 SELECT fn80(1.1);
+--enable_ps_protocol
 
 
 --disable_warnings
@@ -20784,13 +20956,7 @@ BEGIN
 END//
 delimiter ;//
 
-if ($have_bug_11589)
-{
---disable_ps_protocol
-}
 SELECT fn84(-32601);
---enable_ps_protocol
-
 
 --disable_warnings
 DROP FUNCTION IF EXISTS fn85;
@@ -20849,62 +21015,44 @@ BEGIN
 END//
 delimiter ;//
 
-if ($have_bug_11589)
-{
---disable_ps_protocol
-}
 SELECT fn88(-101);
---enable_ps_protocol
 
 --disable_warnings
 DROP FUNCTION IF EXISTS fn89;
 --enable_warnings
 
-
-#FIXME why was fn89 switched off ?
 delimiter //;
-#FIXME: check whether this error 1064 is OK!
---error 1064
 CREATE FUNCTION fn89( f1 enum('1enum', '2enum')) returns enum('1enum', '2enum')
 BEGIN
- if f1 eq "1enum" then
-   set f1 = '2enum';
-  else
-   set f1 = '1enum';
- END if;
- return f1;
+ IF f1 = '1enum' THEN
+   SET f1 = '2enum';
+  ELSE
+   SET f1 = '1enum';
+ END IF;
+ RETURN f1;
 END//
 delimiter ;//
 
-#FIXME: this is OK as long as the error 1064 above is OK!
---error 1305
 SELECT fn89( '1enum');
 
 --disable_warnings
 DROP FUNCTION IF EXISTS fn90;
 --enable_warnings
 
-
-#FIXME: wah was fn90 switched off ?
 delimiter //;
-#FIXME: check whether this error 1064 is OK!
---error 1064
-CREATE FUNCTION fn90( f1 set("1set", "2set")) returns set("1set", "2set")
+CREATE FUNCTION fn90( f1 set('1set', '2set')) returns set('1set', '2set')
 BEGIN
-   if(f1 == "1set") then
-      set f1 = "2set";
-   else
-      set f1 = "1set";
-   END if;
-   return f1;
+   IF f1 = '1set' THEN
+      SET f1 = '2set';
+   ELSE
+      SET f1 = '1set';
+   END IF;
+   RETURN f1;
 END//
 delimiter ;//
 
-#FIXME: this is OK as long as the error 1064 above is OK!
---error 1305
 SELECT fn90( '1set');
 
-
 --disable_warnings
 DROP FUNCTION IF EXISTS fn91;
 --enable_warnings
@@ -20986,17 +21134,13 @@ DROP FUNCTION IF EXISTS fn96;
 --enable_warnings
 
 delimiter //;
-#FIXME: check whether this error 1064 is OK!
-#--error 1064
-CREATE FUNCTION fn96( f1 char binary) returns char binary
+CREATE FUNCTION fn96( f1 binary) returns binary(2)
 BEGIN
   set f1 = concat('a', f1);
   return f1;
 END//
 delimiter ;//
 
-#FIXME: this is OK as long as the error 1064 above is OK!
-#--error 1305
 SELECT fn96( 'h');
 
 
@@ -21090,9 +21234,7 @@ SELECT fn102(1982);
 DROP FUNCTION IF EXISTS fn103;
 --enable_warnings
 
-#FIXME Bug: (Bug#10499)
 delimiter //;
-#--error 1178
 CREATE FUNCTION fn103( f1 geometrycollection) returns geometrycollection
 BEGIN
   set f1 = f1;
@@ -21100,7 +21242,6 @@ BEGIN
 END//
 delimiter ;//
 
-#FIXME Bug: (Bug#10499)
 SELECT fn103('\0\0\0\0
\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0?\0\0\0\0\0\0?\0\0\0\0\0\04@\0\0\0\0\0\0?\0\0\0\0\0\04@\0\0\0\0\0\04@\0\0\0\0\0\0?\0\0\0\0\0\04@\0\0\0\0\0\0?\0\0\0\0\0\0?\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0@');
 
 
@@ -21108,9 +21249,7 @@ SELECT fn103('\0\0\0\0
\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0?\0\0\0\0\0\0?\0\0\0\0\0
 DROP FUNCTION IF EXISTS fn104;
 --enable_warnings
 
-#FIXME Bug: (Bug#10499)
 delimiter //;
-#--error 1178
 CREATE FUNCTION fn104( f1 linestring) returns linestring
 BEGIN
   set f1 = f1;
@@ -21118,7 +21257,6 @@ BEGIN
 END//
 delimiter ;//
 
-#FIXME Bug: (Bug#10499)
 SELECT fn104('\0\0\0\0
\0\0\0\0\0\0\0\0\0\0\0\0?\0\0\0\0\0\0?\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@');
 
 
@@ -21126,9 +21264,7 @@ SELECT fn104('\0\0\0\0
\0\0\0\0\0\0\0\0\0\0\0\0?\0\0\0\0\0\0?\0\0\0\0\0\0\0@\0
 DROP FUNCTION IF EXISTS fn105;
 --enable_warnings
 
-#FIXME Bug: (Bug#10499)
 delimiter //;
-#--error 1178
 CREATE FUNCTION fn105( f1 point) returns point
 BEGIN
   set f1 = f1;
@@ -21136,7 +21272,6 @@ BEGIN
 END//
 delimiter ;//
 
-#FIXME Bug: (Bug#10499)
 SELECT fn105('\0\0\0\0

\0\0\0\0\0\0\0\0\04@\0\0\0\0\0\04@');
 
 
@@ -21144,9 +21279,7 @@ SELECT fn105('\0\0\0\0

\0\0\0\0\0\0\0\0\04@\0\0\0\0\0\04@');
 DROP FUNCTION IF EXISTS fn106;
 --enable_warnings
 
-#FIXME Bug: (Bug#10499)
 delimiter //;
-#--error 1178
 CREATE FUNCTION fn106( f1 polygon) returns polygon
 BEGIN
   set f1 = f1;
@@ -21154,7 +21287,6 @@ BEGIN
 END//
 delimiter ;//
 
-#FIXME Bug: (Bug#10499)
 SELECT fn106('\0\0\0\0
\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0?\0\0\0\0\0\0?\0\0\0\0\0\04@\0\0\0\0\0\0?\0\0\0\0\0\04@\0\0\0\0\0\04@\0\0\0\0\0\0?\0\0\0\0\0\04@\0\0\0\0\0\0?\0\0\0\0\0\0?\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0 @\0\0\0\0\0\0@\0\0\0\0\0\0@');
 
 
@@ -21260,10 +21392,6 @@ BEGIN
 END//
 delimiter ;//
 
--- echo FIXME: Following test contains a known problem that will be checked again
--- echo FIXME: after WL#2984 has been completed:
--- echo FIXME: default (10) for DECIMAL not checked, decimal digits shown although not defined
-
 CALL sp5(-1.00e+09);
 
 
@@ -21279,10 +21407,6 @@ BEGIN
 END//
 delimiter ;//
 
--- echo FIXME: Following test contains a known problem that will be checked again
--- echo FIXME: after WL#2984 has been completed:
--- echo FIXME: decimal digits shown although not defined
-
 CALL sp6(-1.00e+09);
 
 --disable_warnings
@@ -21326,10 +21450,6 @@ BEGIN
 END//
 delimiter ;//
 
--- echo FIXME: Following test contains a known problem that will be checked again
--- echo FIXME: after WL#2984 has been completed:
--- echo FIXME: decimal digits shown although not defined
-
 CALL sp9(-1.00e+09);
 
 --disable_warnings
@@ -21344,10 +21464,6 @@ BEGIN
 END//
 delimiter ;//
 
--- echo FIXME: Following test contains a known problem that will be checked again
--- echo FIXME: after WL#2984 has been completed:
--- echo FIXME: decimal digits shown although not defined
-
 CALL sp10(-1.00e+09);
 
 --disable_warnings
@@ -21362,10 +21478,6 @@ BEGIN
 END//
 delimiter ;//
 
--- echo FIXME: Following test contains a known problem that will be checked again
--- echo FIXME: after WL#2984 has been completed:
--- echo FIXME: decimal digits shown although not defined
-
 CALL sp11(99999999999);
 
 --disable_warnings
@@ -21380,10 +21492,6 @@ BEGIN
 END//
 delimiter ;//
 
--- echo FIXME: Following test contains a known problem that will be checked again
--- echo FIXME: after WL#2984 has been completed:
--- echo FIXME: decimal digits shown although not defined
-
 CALL sp12(999999999);
 
 --disable_warnings
@@ -21398,10 +21506,6 @@ BEGIN
 END//
 delimiter ;//
 
--- echo FIXME: Following test contains a known problem that will be checked again
--- echo FIXME: after WL#2984 has been completed:
--- echo FIXME: decimal digits shown although not defined
-
 CALL sp13(-1.00e+09);
 
 --disable_warnings
@@ -21416,10 +21520,6 @@ BEGIN
 END//
 delimiter ;//
 
--- echo FIXME: Following test contains a known problem that will be checked again
--- echo FIXME: after WL#2984 has been completed:
--- echo FIXME: wrong number of decimal digits shown
-
 CALL sp14(-1.00e+21);
 
 
@@ -21435,10 +21535,6 @@ BEGIN
 END//
 delimiter ;//
 
--- echo FIXME: Following test contains a known problem that will be checked again
--- echo FIXME: after WL#2984 has been completed:
--- echo FIXME: wrong number of decimal digits shown
-
 CALL sp15(1.00e+16);
 
 
@@ -21454,10 +21550,6 @@ BEGIN
 END//
 delimiter ;//
 
--- echo FIXME: Following test contains a known problem that will be checked again
--- echo FIXME: after WL#2984 has been completed:
--- echo FIXME: wrong number of decimal digits shown
-
 CALL sp16(1.00e+16);
 
 
@@ -21473,10 +21565,6 @@ BEGIN
 END//
 delimiter ;//
 
--- echo FIXME: Following test contains a known problem that will be checked again
--- echo FIXME: after WL#2984 has been completed:
--- echo FIXME: wrong number of decimal digits shown
-
 CALL sp17(-1.00e+21);
 
 --disable_warnings
@@ -21491,8 +21579,7 @@ BEGIN
 END//
 delimiter ;//
 
-# hpux11
-#CALL sp18_d(-1.00e+30);
+CALL sp18_d(-1.00e+30);
 eval CALL sp18_d( $minus_30 );
 
 --disable_warnings
@@ -21507,10 +21594,9 @@ BEGIN
 END//
 delimiter ;//
 
-# hpux11
-#CALL sp19_du(1.00e+20);
+CALL sp19_du(1.00e+20);
 eval CALL sp19_du( $plus_20 );
-#CALL sp19_du(1.00e+24);
+CALL sp19_du(1.00e+24);
 eval CALL sp19_du( $plus_24 );
 
 --disable_warnings
@@ -21525,14 +21611,9 @@ BEGIN
 END//
 delimiter ;//
 
--- echo FIXME: Following test contains a known problem that will be checked again
--- echo FIXME: after WL#2984 has been completed:
--- echo FIXME: decimal digits shown although not defined
-
-# hpux11
-#CALL sp20_duz(1.00e+20);
+CALL sp20_duz(1.00e+20);
 eval CALL sp20_duz( $plus_20 );
-#CALL sp20_duz(1.00e+24);
+CALL sp20_duz(1.00e+24);
 eval CALL sp20_duz( $plus_24 );
 
 --disable_warnings
@@ -21547,10 +21628,6 @@ BEGIN
 END//
 delimiter ;//
 
--- echo FIXME: Following test contains a known problem that will be checked again
--- echo FIXME: after WL#2984 has been completed:
--- echo FIXME: decimal digits shown although not defined
-
 CALL sp21(1.00e+00);
 
 --disable_warnings
@@ -21565,10 +21642,6 @@ BEGIN
 END//
 delimiter ;//
 
--- echo FIXME: Following test contains a known problem that will be checked again
--- echo FIXME: after WL#2984 has been completed:
--- echo FIXME: decimal digits shown although not defined
-
 CALL sp22(1.00e+00);
 
 --disable_warnings
@@ -21583,10 +21656,6 @@ BEGIN
 END//
 delimiter ;//
 
--- echo FIXME: Following test contains a known problem that will be checked again
--- echo FIXME: after WL#2984 has been completed:
--- echo FIXME: decimal digits shown although not defined
-
 CALL sp23(1.00e+00);
 
 --disable_warnings
@@ -21601,10 +21670,6 @@ BEGIN
 END//
 delimiter ;//
 
--- echo FIXME: Following test contains a known problem that will be checked again
--- echo FIXME: after WL#2984 has been completed:
--- echo FIXME: decimal digits shown although not defined
-
 CALL sp24(-1.00e+09);
 
 --disable_warnings
@@ -22196,8 +22261,7 @@ BEGIN
 END//
 delimiter ;//
 
-# hpux11
-#CALL sp66_n(-1e+36);
+CALL sp66_n(-1e+36);
 eval CALL sp66_n( $minus_36 );
 
 --disable_warnings
@@ -22212,8 +22276,7 @@ BEGIN
 END//
 delimiter ;//
 
-# hpux11
-#CALL sp67_nu(1e+36);
+CALL sp67_nu(1e+36);
 eval CALL sp67_nu( $plus_36 );
 
 
@@ -22229,8 +22292,7 @@ BEGIN
 END//
 delimiter ;//
 
-# hpux11
-#CALL sp68_nuz(1e+36);
+CALL sp68_nuz(1e+36);
 eval CALL sp68_nuz( $plus_36 );
 
 
@@ -22246,8 +22308,7 @@ BEGIN
 END//
 delimiter ;//
 
-# hpux11
-#CALL sp69_n_z(-1e+36);
+CALL sp69_n_z(-1e+36);
 eval CALL sp69_n_z( $minus_36 );
 
 
@@ -22263,8 +22324,7 @@ BEGIN
 END//
 delimiter ;//
 
-# hpux11
-#CALL sp70_n(-1e+40);
+CALL sp70_n(-1e+40);
 eval CALL sp70_n( $minus_40 );
 
 
@@ -22280,8 +22340,7 @@ BEGIN
 END//
 delimiter ;//
 
-# hpux11
-#CALL sp71_nu(1.00e+40);
+CALL sp71_nu(1.00e+40);
 eval CALL sp71_nu( $plus_40 );
 
 
@@ -22297,8 +22356,7 @@ BEGIN
 END//
 delimiter ;//
 
-# hpux11
-#CALL sp72_nuz(1.00e+40);
+CALL sp72_nuz(1.00e+40);
 eval CALL sp72_nuz( $plus_40 );
 
 
@@ -22314,8 +22372,7 @@ BEGIN
 END//
 delimiter ;//
 
-# hpux11
-#CALL sp73_n_z(1.00e+40);
+CALL sp73_n_z(1.00e+40);
 eval CALL sp73_n_z( $plus_40 );
 
 
@@ -22533,31 +22590,27 @@ CALL sp88(-101);
 DROP PROCEDURE IF EXISTS sp89;
 --enable_warnings
 
-#FIXME: check why this is switched off
-#delimiter //;
-#CREATE PROCEDURE sp89( f1 enum("1enum", "2enum"))
-#BEGIN
-# if(f1 == "1enum") { set f1 = "2enum"; } else { set f1 = "1enum"; }
-# SELECT f1;
-#END//
-#delimiter ;//
+delimiter //;
+CREATE PROCEDURE sp89( f1 enum('1enum', '2enum'))
+BEGIN
+ IF f1 = '1enum' THEN set f1 = '2enum'; ELSE  set f1 = '1enum'; END IF;
+END//
+delimiter ;//
 
-#CALL sp89( '1enum');
+CALL sp89( '1enum');
 
 --disable_warnings
 DROP PROCEDURE IF EXISTS sp90;
 --enable_warnings
 
-#FIXME: check why this is switched off
-#delimiter //;
-#CREATE PROCEDURE sp90( f1 set("1set", "2set"))
-#BEGIN
-# if(f1 == "1set") { set f1 = "2set"; } else { set f1 = "1set"; }
-# SELECT f1;
-#END//
-#delimiter ;//
+delimiter //;
+CREATE PROCEDURE sp90( f1 set('1set', '2set'))
+BEGIN
+ IF f1 = '1set' THEN  set f1 = '2set';  ELSE set f1 = '1set'; END IF;
+END//
+delimiter ;//
 
-#CALL sp90( '1set');
+CALL sp90( '1set');
 
 --disable_warnings
 DROP PROCEDURE IF EXISTS sp91;
@@ -23094,10 +23147,6 @@ BEGIN
 END//
 delimiter ;//
 
-#let $message= FIXME: CALL of spexecute07 temporarily switched off due to differences
-#              FIXME: between Linux and Solaris;
-#--source include/show_msg80.inc
-#FIXME CALL spexecute07();
 CALL spexecute07();
 DROP PROCEDURE spexecute07;
 DROP PROCEDURE sp07;
@@ -24864,7 +24913,6 @@ BEGIN
 END//
 delimiter ;//
 
-#FIXME: check later again with E+40
 CALL spexecute52();
 DROP PROCEDURE spexecute52;
 DROP PROCEDURE sp52;
@@ -24903,7 +24951,6 @@ BEGIN
 END//
 delimiter ;//
 
-#FIXME: check later again with E+40
 CALL spexecute53();
 DROP PROCEDURE spexecute53;
 DROP PROCEDURE sp53;
@@ -24942,7 +24989,6 @@ BEGIN
 END//
 delimiter ;//
 
-#FIXME: check later again with E+40
 CALL spexecute54();
 DROP PROCEDURE spexecute54;
 DROP PROCEDURE sp54;
@@ -24981,7 +25027,6 @@ BEGIN
 END//
 delimiter ;//
 
-#FIXME: check later again with E+40
 CALL spexecute55();
 DROP PROCEDURE spexecute55;
 DROP PROCEDURE sp55;
@@ -25516,7 +25561,6 @@ BEGIN
 END//
 delimiter ;//
 
-#FIXME: hpux11 - check later again with E+40
 CALL spexecute69();
 DROP PROCEDURE spexecute69;
 DROP PROCEDURE sp69;
@@ -25593,7 +25637,6 @@ BEGIN
 END//
 delimiter ;//
 
-#FIXME: hpux11 - check later again with E+40
 CALL spexecute71();
 DROP PROCEDURE spexecute71;
 DROP PROCEDURE sp71;
@@ -26394,7 +26437,6 @@ BEGIN
 END//
 delimiter ;//
 
-#FIXME: hpux11 - check later again with E+40
 CALL spexecute92();
 DROP PROCEDURE spexecute92;
 DROP PROCEDURE sp92;
@@ -26433,7 +26475,6 @@ BEGIN
 END//
 delimiter ;//
 
-#FIXME: hpux11 - check later again with E+40
 CALL spexecute93();
 DROP PROCEDURE spexecute93;
 DROP PROCEDURE sp93;
@@ -26839,8 +26880,6 @@ check for combination of server sql modes
 DROP PROCEDURE IF EXISTS sp4;
 --enable_warnings
 
-#FIXME 4.7.4: check it is correct that having a blank after the comma lets this fail:
---error 1231
 set @@sql_mode = 'ansi, error_for_division_by_zero';
 
 # now set the corrent value:
@@ -26986,7 +27025,7 @@ BEGIN
 END//
 delimiter ;//
 
---error 1305
+--error ER_SP_DOES_NOT_EXIST
 SHOW CREATE FUNCTION sp6;
 
 # cleanup
@@ -27031,7 +27070,7 @@ let $message= Testcase 4.8.5:;
 DROP PROCEDURE IF EXISTS sp7;
 --enable_warnings
 
---error 1305
+--error ER_SP_DOES_NOT_EXIST
   show CREATE PROCEDURE sp7;
 
 
@@ -27068,7 +27107,7 @@ CREATE FUNCTION fn1 (i1 real) returns real
 END//
 delimiter ;//
 
---error 1305
+--error ER_SP_DOES_NOT_EXIST
   show CREATE PROCEDURE fn1;
 
 # cleanup
@@ -27153,7 +27192,7 @@ CREATE FUNCTION fn1 (x int) returns int
 END//
 delimiter ;//
 
---error 1305
+--error ER_SP_DOES_NOT_EXIST
   show CREATE PROCEDURE fn1;
 
 # cleanup
@@ -27181,7 +27220,7 @@ delimiter ;//
 
 DROP FUNCTION fn1;
 
---error 1305
+--error ER_SP_DOES_NOT_EXIST
   show CREATE FUNCTION fn1;
 
 
@@ -27196,7 +27235,7 @@ let $message= Testcase 4.8.13:;
 
 --disable_warnings
 DROP FUNCTION IF EXISTS f1000;
---enable warnings
+--enable_warnings
 
 SHOW FUNCTION STATUS LIKE 'f1000';
 
@@ -27210,7 +27249,7 @@ let $message= Testcase 4.8.14:;
 
 --disable_warnings
 DROP PROCEDURE IF EXISTS sp1;
---enable_warnibgs
+--enable_warnings
 
 delimiter //;
 CREATE PROCEDURE sp1()
@@ -27219,7 +27258,7 @@ BEGIN
 END//
 delimiter ;//
 
---error 1305
+--error ER_SP_DOES_NOT_EXIST
   show CREATE FUNCTION sp1;
 
 # cleanup
@@ -27341,7 +27380,6 @@ delimiter ;//
   alter function fn1 sql security invoker;
   alter function fn1 comment 'this is a function 3242#@%$#@';
 
-#FIXME: check why here no rows are shown
 --replace_column 5 modified 6 created
   show  function status like 'fn1';
 
@@ -27397,7 +27435,7 @@ delimiter ;//
 
 DROP PROCEDURE sp6;
 
---error 1305
+--error ER_SP_DOES_NOT_EXIST
   show CREATE PROCEDURE sp6;
 
 # ------------------------------------------------------------------------------
@@ -27446,7 +27484,7 @@ delimiter ;//
 
 DROP FUNCTION fn1;
 
---error 1305
+--error ER_SP_DOES_NOT_EXIST
   show CREATE FUNCTION fn1;
 
 
@@ -27471,7 +27509,6 @@ delimiter ;//
 
 DROP FUNCTION fn1;
 
-#FIXME: check why here no rows are shown
 --replace_column 5 modified 6 created
 SHOW FUNCTION STATUS LIKE 'fn1';
 
@@ -27504,6 +27541,7 @@ BEGIN
 END//
 delimiter ;//
 
+--sorted_result
 CALL sp6 (10, 20, 30, 40, 50);
 
 # cleanup
@@ -27640,9 +27678,6 @@ BEGIN
 END//
 delimiter ;//
 
-#FIXME Bug:  (Bug#9079)
-# suppressed: currenlty the table creation from within sproc fails!
-#FIXME check why this NOW works--error 1146
 CALL sp6 (10, 20, 30, 40, 50);
 
 # cleanup
@@ -27661,8 +27696,7 @@ let $message= Testcase 4.9.6:;
 DROP FUNCTION IF EXISTS fn1;
 
 delimiter //;
-#FIXME: check this is OK: failed: 1415: Not allowed to return a result set from a function
---error 1415
+--error ER_SP_NO_RETSET
 CREATE FUNCTION fn1(i1 longtext) returns longtext
 BEGIN
    SELECT * from t9 limit 0, 100;
@@ -27677,8 +27711,7 @@ create table res_t9 (f1 int, f2 char(25), f3 int);
 insert into res_t9 values (10, 'abc', 20);
 
 delimiter //;
-#FIXME: check this is OK: failed: 1422: Explicit or implicit commit is not allowed in stored function or trigger.
---error 1422
+--error ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
 CREATE FUNCTION fn1(i1 longtext) returns longtext
 BEGIN
    delete from res_t9;
@@ -27691,8 +27724,7 @@ DROP FUNCTION IF EXISTS fn1;
 drop table IF EXISTS res_t9;
 
 delimiter //;
-#FIXME: check this is OK: failed: 1422: Explicit or implicit commit is not allowed in stored function or trigger.
---error 1422
+--error ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
 CREATE FUNCTION fn1(i1 longtext) returns longtext
 BEGIN
     create table res_t9 (f1 longtext, f2 longblob, f3 real);
@@ -27707,8 +27739,7 @@ drop  table IF EXISTS res_t9;
 create table res_t9 (f1 int, f2 char(25), f3 int);
 
 delimiter //;
-#FIXME: check this is OK: failed: 1422: Explicit or implicit commit is not allowed in stored function or trigger.
---error 1422
+--error ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
 CREATE FUNCTION fn1(i1 longtext) returns longtext
 BEGIN
    insert into res_t9 values (100, 'abc', 300);
@@ -27724,8 +27755,7 @@ create table res_t9 (f1 int, f2 char(25), f3 int);
 insert into res_t9 values (10, 'abc', 20);
 
 delimiter //;
-#FIXME: check this is OK: failed: 1422: Explicit or implicit commit is not allowed in stored function or trigger.
---error 1422
+--error ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
 CREATE FUNCTION fn1(i1 longtext) returns longtext
 BEGIN
    update res_t9 set f1 = 20;
@@ -28130,7 +28160,6 @@ let $message= Testcase 4.11.11:;
 --source include/show_msg80.inc
 
 # testcase: verify undo handler for sql state 42000 (er_sp_wrong_no_of_args)
-# ?????????????
 
 --disable_warnings
 DROP PROCEDURE IF EXISTS h1;
@@ -28236,10 +28265,14 @@ BEGIN
 END//
 delimiter ;//
 
+CALL h1();
+
 # cleanup
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+--disable_warnings
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
+--enable_warnings
 
 
 
@@ -28279,10 +28312,14 @@ BEGIN
 END//
 delimiter ;//
 
+CALL h1();
+
 # cleanup
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+--disable_warnings
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
+--enable_warnings
 
 
 
@@ -28324,10 +28361,14 @@ BEGIN
 END//
 delimiter ;//
 
+CALL h1();
+
 # cleanup
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+--disable_warnings
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
+--enable_warnings
 
 
 # ------------------------------------------------------------------------------
@@ -28368,12 +28409,14 @@ BEGIN
 END//
 delimiter ;//
 
-CALL h1()
+CALL h1();
 
 # cleanup
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+--disable_warnings
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
+--enable_warnings
 
 
 # ------------------------------------------------------------------------------
@@ -28413,9 +28456,11 @@ delimiter ;//
 CALL h1();
 
 # cleanup
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+--disable_warnings
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
+--enable_warnings
 
 
 # ------------------------------------------------------------------------------
@@ -28455,9 +28500,11 @@ delimiter ;//
 CALL h1();
 
 # cleanup
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+--disable_warnings
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
+--enable_warnings
 
 # ------------------------------------------------------------------------------
 let $message= Testcase 4.11.19:;
@@ -28498,9 +28545,11 @@ delimiter ;//
 CALL h1();
 
 # cleanup
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+--disable_warnings
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
+--enable_warnings
 
 # ------------------------------------------------------------------------------
 let $message= Testcase 4.11.20:;
@@ -28541,9 +28590,11 @@ delimiter ;//
 CALL h1();
 
 # cleanup
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+--disable_warnings
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
+--enable_warnings
 
 
 # ------------------------------------------------------------------------------
@@ -28583,9 +28634,11 @@ delimiter ;//
 CALL h1();
 
 # cleanup
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+--disable_warnings
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
+--enable_warnings
 
 # ------------------------------------------------------------------------------
 let $message= Testcase 4.11.22:;
@@ -28625,9 +28678,11 @@ delimiter ;//
 CALL h1();
 
 # cleanup
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+--disable_warnings
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
+--enable_warnings
 
 # ------------------------------------------------------------------------------
 let $message= Testcase 4.11.23:;
@@ -28668,9 +28723,11 @@ delimiter ;//
 CALL h1();
 
 # cleanup
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+--disable_warnings
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
+--enable_warnings
 
 # ------------------------------------------------------------------------------
 let $message= Testcase 4.11.24:;
@@ -28711,9 +28768,11 @@ delimiter ;//
 CALL h1();
 
 # cleanup
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+--disable_warnings
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
+--enable_warnings
 
 # ------------------------------------------------------------------------------
 let $message= Testcase 4.11.25:;
@@ -28751,9 +28810,11 @@ delimiter ;//
 CALL h1();
 
 # cleanup
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+--disable_warnings
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
+--enable_warnings
 
 
 
@@ -28793,9 +28854,11 @@ delimiter ;//
 CALL h1();
 
 # cleanup
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+--disable_warnings
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
+--enable_warnings
 
 
 # ------------------------------------------------------------------------------
@@ -28834,9 +28897,11 @@ delimiter ;//
 CALL h1();
 
 # cleanup
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+--disable_warnings
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
+--enable_warnings
 
 
 # ------------------------------------------------------------------------------
@@ -28875,9 +28940,11 @@ delimiter ;//
 CALL h1();
 
 # cleanup
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+--disable_warnings
+DROP PROCEDURE IF EXISTS h1;
+drop table IF EXISTS res_t1;
+drop table IF EXISTS res_t2;
+--enable_warnings
 
 
 # ------------------------------------------------------------------------------
@@ -28919,9 +28986,11 @@ delimiter ;//
 CALL h1();
 
 # cleanup
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+--disable_warnings
+DROP PROCEDURE IF EXISTS h1;
+drop table IF EXISTS res_t1;
+drop table IF EXISTS res_t2;
+--enable_warnings
 
 
 # ------------------------------------------------------------------------------
@@ -28963,9 +29032,11 @@ delimiter ;//
 CALL h1();
 
 # cleanup
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+--disable_warnings
+DROP PROCEDURE IF EXISTS h1;
+drop table IF EXISTS res_t1;
+drop table IF EXISTS res_t2;
+--enable_warnings
 
 
 # ------------------------------------------------------------------------------
@@ -29007,9 +29078,11 @@ delimiter ;//
 CALL h1();
 
 # cleanup
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+--disable_warnings
+DROP PROCEDURE IF EXISTS h1;
+drop table IF EXISTS res_t1;
+drop table IF EXISTS res_t2;
+--enable_warnings
 
 
 # ------------------------------------------------------------------------------
@@ -29051,9 +29124,11 @@ delimiter ;//
 CALL h1();
 
 # cleanup
-DROP PROCEDURE h1;
-drop table res_t1;
-drop table res_t2;
+--disable_warnings
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+DROP TABLE IF EXISTS res_t2;
+--enable_warnings
 
 # ------------------------------------------------------------------------------
 let $message= Testcase 4.11.33:;
@@ -29073,7 +29148,7 @@ drop table IF EXISTS res_t1;
   insert into res_t1 values('c', 'd');
 
 delimiter //;
---error 1332
+--error ER_SP_DUP_COND
 CREATE PROCEDURE h1()
 BEGIN
       declare condname condition for sqlstate '20000';
@@ -29092,7 +29167,9 @@ END//
 delimiter ;//
 
 # cleanup
-drop table res_t1;
+--disable_warnings
+DROP TABLE IF EXISTS res_t1;
+--enable_warnings
 
 
 # ------------------------------------------------------------------------------
@@ -29115,7 +29192,7 @@ insert into res_t1 values (1, 'a');
 
 delimiter //;
 
---error 1407
+--error ER_SP_BAD_SQLSTATE
 CREATE PROCEDURE h1 ()
 begin1_label:BEGIN
    declare condname1 condition for sqlstate '020';
@@ -29133,25 +29210,26 @@ begin1_label:BEGIN
    END begin2_label;
 END begin1_label//
 
-# FIXME: same statement except the 3 lines containing 'exit'
-#-# --error 1407
-#-# CREATE PROCEDURE h1 ()
-#-# begin1_label:BEGIN
-#-#    declare condname1 condition for sqlstate '020';
-#-#    declare condname2 condition for sqlstate 'wewe';
-#-#    declare condname3 condition for 9999;
-#-#    set @var2 = 1;
-#-#    insert into res_t1 values (2, 'b');
-#-#    begin2_label: BEGIN
-#-#       declare continue handler for sqlstate '90000023 set @var3= 1;
-#-#       set @var4 = 1;
-#-#       insert into res_t1 values (3, 'c');
-#-#    END begin2_label;
-#-# END begin1_label//
+--error ER_SP_BAD_SQLSTATE
+CREATE PROCEDURE h1 ()
+begin1_label:BEGIN
+   declare condname1 condition for sqlstate '020';
+   declare condname2 condition for sqlstate 'wewe';
+   declare condname3 condition for 9999;
+   set @var2 = 1;
+   insert into res_t1 values (2, 'b');
+   begin2_label: BEGIN
+      declare continue handler for sqlstate '90000023' set @var3= 1;
+      set @var4 = 1;
+      insert into res_t1 values (3, 'c');
+   END begin2_label;
+END begin1_label//
 delimiter ;//
 
 # cleanup
-drop table res_t1;
+--disable_warnings
+DROP TABLE IF EXISTS res_t1;
+--enable_warnings
 
 
 # ------------------------------------------------------------------------------
@@ -29181,7 +29259,9 @@ END//
 delimiter ;//
 
 # cleanup
-DROP PROCEDURE h1;
+--disable_warnings
+DROP PROCEDURE IF EXISTS h1;
+--enable_warnings
 
 
 
@@ -29193,8 +29273,6 @@ let $message= Testcase 4.11.40:;
 --source include/show_msg80.inc
 
 # testcase: ensure that within the same scope, no two handlers may be declared for the same condition
-# Bug (
-
 
 --disable_warnings
 DROP PROCEDURE IF EXISTS h1;
@@ -29207,8 +29285,7 @@ drop table IF EXISTS res_t1;
 # suppressed--error for having two similar handlers in the same scope
 
 delimiter //;
-#FIXME 3.1.11.40: check whether error 1413 is OK
---error 1413
+--error ER_SP_DUP_HANDLER
 CREATE PROCEDURE h1 ()
 BEGIN
     declare x1, x2, x3, x4, x5 int default 0;
@@ -29222,13 +29299,13 @@ BEGIN
 END//
 delimiter ;//
 
-#FIXME 3.1.11.40: CALL h1();
+#CALL h1();
 
 # cleanup
 --disable_warnings
 DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
 --enable_warnings
-drop table res_t1;
 
 
 # ------------------------------------------------------------------------------
@@ -29237,13 +29314,11 @@ let $message= Testcase 4.11.41:;
 
 # testcase: ensure that the declare  handler for statement cannot declare a condition for the successful
 #            completion sqlstate:  00000.
-#FIXME Bug: (Bug#8759)
 
 --disable_warnings
 DROP PROCEDURE IF EXISTS h1;
 --enable_warnings
 
-# supressed should actually fail --error
 delimiter //;
 CREATE PROCEDURE h1 ()
 BEGIN
@@ -29258,8 +29333,12 @@ BEGIN
 END//
 delimiter ;//
 
+CALL h1();
+
 # cleanup
+--disable_warnings
 DROP PROCEDURE IF EXISTS h1;
+--enable_warnings
 
 
 # ------------------------------------------------------------------------------
@@ -29287,7 +29366,7 @@ END//
 delimiter ;//
 
 # table doesn't exist
---error 1146
+--error ER_NO_SUCH_TABLE
 CALL h1();
 SELECT @done, @x;
 
@@ -29316,7 +29395,7 @@ END//
 delimiter ;//
 
 # table doesn't exist
---error 1146
+--error ER_NO_SUCH_TABLE
 CALL h1();
 SELECT @done, @x;
 
@@ -29329,8 +29408,10 @@ CALL h1();
 SELECT @done, @x;
 
 # cleanup
-DROP PROCEDURE h1;
-DROP TABLE res_t1;
+--disable_warnings
+DROP PROCEDURE IF EXISTS h1;
+DROP TABLE IF EXISTS res_t1;
+--enable_warnings
 
 
 # ==============================================================================
diff --git a/mysql-test/suite/funcs_1/t/disabled.def b/mysql-test/suite/funcs_1/t/disabled.def
index 47d50365968..7eab49dfd62 100644
--- a/mysql-test/suite/funcs_1/t/disabled.def
+++ b/mysql-test/suite/funcs_1/t/disabled.def
@@ -10,7 +10,8 @@
 #
 ##############################################################################
 
-innodb_storedproc: (changes of WL#2984, using storeproc_nn instead)
-memory_storedproc: (changes of WL#2984, using storeproc_nn instead)
-myisam_storedproc: (changes of WL#2984, using storeproc_nn instead)
+innodb_storedproc_06 : bug#33464 DROP FUNCTION let server hang
+myisam_storedproc_06 : bug#33464 DROP FUNCTION let server hang
+memory_storedproc_06 : bug#33464 DROP FUNCTION let server hang
+ndb_storedproc_06 :    bug#33464 DROP FUNCTION let server hang
 ndb__datadict: 2007-10-08 mleich Bug#31421 funcs_1: ndb__datadict fails, discrepancy between scripts and expected results
diff --git a/mysql-test/suite/funcs_1/t/innodb__load.test b/mysql-test/suite/funcs_1/t/innodb__load.test
index d03672b31ff..388a3ee6f40 100644
--- a/mysql-test/suite/funcs_1/t/innodb__load.test
+++ b/mysql-test/suite/funcs_1/t/innodb__load.test
@@ -18,11 +18,9 @@ let $engine_type= innodb;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/innodb_tb1.inc
@@ -41,7 +39,5 @@ while ($run)
   
     # These tables are needed for the stored procedure testscases
     --source suite/funcs_1/include/sp_tb.inc
-
-    let $run= 0;
 }
 
diff --git a/mysql-test/suite/funcs_1/t/innodb_bitdata.test b/mysql-test/suite/funcs_1/t/innodb_bitdata.test
index 24d5f077d96..19a66f10732 100644
--- a/mysql-test/suite/funcs_1/t/innodb_bitdata.test
+++ b/mysql-test/suite/funcs_1/t/innodb_bitdata.test
@@ -18,16 +18,12 @@ let $engine_type= innodb;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/innodb_tb4.inc
-
-    let $run= 0;
 }
     
 --source suite/funcs_1/bitdata/bitdata_master.test
diff --git a/mysql-test/suite/funcs_1/t/innodb_cursors.test b/mysql-test/suite/funcs_1/t/innodb_cursors.test
index 8d77045f2e7..6a73cf64890 100644
--- a/mysql-test/suite/funcs_1/t/innodb_cursors.test
+++ b/mysql-test/suite/funcs_1/t/innodb_cursors.test
@@ -18,16 +18,12 @@ let $engine_type= innodb;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/innodb_tb1.inc
-
-    let $run= 0;
 }
 
 --source suite/funcs_1/cursors/cursors_master.test
diff --git a/mysql-test/suite/funcs_1/t/innodb_storedproc.test b/mysql-test/suite/funcs_1/t/innodb_storedproc.test
index cd94577e79b..a675d8e37ef 100644
--- a/mysql-test/suite/funcs_1/t/innodb_storedproc.test
+++ b/mysql-test/suite/funcs_1/t/innodb_storedproc.test
@@ -1,6 +1,9 @@
 #### suite/funcs_1/t/innodb_storedproc.test
 #
 
+--source include/have_innodb.inc
 let $engine_type= innodb;
 
+--source suite/funcs_1/storedproc/load_sp_tb.inc
+
 --source suite/funcs_1/storedproc/storedproc_master.inc
diff --git a/mysql-test/suite/funcs_1/t/innodb_trig_0102.test b/mysql-test/suite/funcs_1/t/innodb_trig_0102.test
index edd706b9e5d..426108de8be 100644
--- a/mysql-test/suite/funcs_1/t/innodb_trig_0102.test
+++ b/mysql-test/suite/funcs_1/t/innodb_trig_0102.test
@@ -18,16 +18,12 @@ let $engine_type= innodb;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/innodb_tb3.inc
-
-    let $run= 0;
 }
     
 --source suite/funcs_1/triggers/triggers_0102.inc
diff --git a/mysql-test/suite/funcs_1/t/innodb_trig_03.test b/mysql-test/suite/funcs_1/t/innodb_trig_03.test
index 5f931e1be47..a4c98609698 100644
--- a/mysql-test/suite/funcs_1/t/innodb_trig_03.test
+++ b/mysql-test/suite/funcs_1/t/innodb_trig_03.test
@@ -18,16 +18,12 @@ let $engine_type= innodb;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/innodb_tb3.inc
-
-    let $run= 0;
 }
     
 --source suite/funcs_1/triggers/triggers_03.inc
diff --git a/mysql-test/suite/funcs_1/t/innodb_trig_03e.test b/mysql-test/suite/funcs_1/t/innodb_trig_03e.test
index 242981e25fa..56024e422fe 100644
--- a/mysql-test/suite/funcs_1/t/innodb_trig_03e.test
+++ b/mysql-test/suite/funcs_1/t/innodb_trig_03e.test
@@ -18,14 +18,11 @@ let $engine_type= innodb;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
-    let $run= 0;
 }
     
 --source suite/funcs_1/triggers/triggers_03e_db_level.inc
diff --git a/mysql-test/suite/funcs_1/t/innodb_trig_0407.test b/mysql-test/suite/funcs_1/t/innodb_trig_0407.test
index da8a074bab6..3035357cc0b 100644
--- a/mysql-test/suite/funcs_1/t/innodb_trig_0407.test
+++ b/mysql-test/suite/funcs_1/t/innodb_trig_0407.test
@@ -18,16 +18,12 @@ let $engine_type= innodb;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/innodb_tb3.inc
-
-    let $run= 0;
 }
     
 --source suite/funcs_1/triggers/triggers_0407.inc
diff --git a/mysql-test/suite/funcs_1/t/innodb_trig_08.test b/mysql-test/suite/funcs_1/t/innodb_trig_08.test
index 05aabe8b0f5..0f264abc13f 100644
--- a/mysql-test/suite/funcs_1/t/innodb_trig_08.test
+++ b/mysql-test/suite/funcs_1/t/innodb_trig_08.test
@@ -18,16 +18,12 @@ let $engine_type= innodb;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/innodb_tb3.inc
-
-    let $run= 0;
 }
     
 --source suite/funcs_1/triggers/triggers_08.inc
diff --git a/mysql-test/suite/funcs_1/t/innodb_trig_09.test b/mysql-test/suite/funcs_1/t/innodb_trig_09.test
index ac21142779e..7d651a11195 100644
--- a/mysql-test/suite/funcs_1/t/innodb_trig_09.test
+++ b/mysql-test/suite/funcs_1/t/innodb_trig_09.test
@@ -18,16 +18,12 @@ let $engine_type= innodb;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/innodb_tb3.inc
-
-    let $run= 0;
 }
     
 --source suite/funcs_1/triggers/triggers_09.inc
diff --git a/mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test b/mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test
index a507a488ca9..75980b3ab68 100644
--- a/mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test
+++ b/mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test
@@ -18,16 +18,12 @@ let $engine_type= innodb;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/innodb_tb3.inc
-
-    let $run= 0;
 }
     
 --source suite/funcs_1/triggers/triggers_1011ext.inc
diff --git a/mysql-test/suite/funcs_1/t/innodb_trig_frkey.test b/mysql-test/suite/funcs_1/t/innodb_trig_frkey.test
index e99273672cd..70d4cba14a3 100644
--- a/mysql-test/suite/funcs_1/t/innodb_trig_frkey.test
+++ b/mysql-test/suite/funcs_1/t/innodb_trig_frkey.test
@@ -18,16 +18,12 @@ let $engine_type= innodb;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/innodb_tb3.inc
-
-    let $run= 0;
 }
     
 --source suite/funcs_1/triggers/trig_frkey.inc
diff --git a/mysql-test/suite/funcs_1/t/innodb_views.test b/mysql-test/suite/funcs_1/t/innodb_views.test
index 1a835779762..6179d95e5ba 100644
--- a/mysql-test/suite/funcs_1/t/innodb_views.test
+++ b/mysql-test/suite/funcs_1/t/innodb_views.test
@@ -21,7 +21,6 @@ eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 let $run= `SELECT @NO_REFRESH = 0`;
 if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/innodb_tb2.inc
@@ -32,7 +31,6 @@ if ($run)
     USE test1;
     --source suite/funcs_1/include/innodb_tb2.inc
     USE test;
-
 }
     
 --source suite/funcs_1/views/views_master.inc
diff --git a/mysql-test/suite/funcs_1/t/memory__load.test b/mysql-test/suite/funcs_1/t/memory__load.test
index 44bd054f420..340875a243a 100644
--- a/mysql-test/suite/funcs_1/t/memory__load.test
+++ b/mysql-test/suite/funcs_1/t/memory__load.test
@@ -16,11 +16,9 @@ let $engine_type= memory;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/memory_tb1.inc
@@ -39,7 +37,5 @@ while ($run)
   
     # These tables are needed for the stored procedure testscases
     --source suite/funcs_1/include/sp_tb.inc
-
-    let $run= 0;
 }
 
diff --git a/mysql-test/suite/funcs_1/t/memory_bitdata.test b/mysql-test/suite/funcs_1/t/memory_bitdata.test
index 3aa30c2d835..faef96a2c3a 100644
--- a/mysql-test/suite/funcs_1/t/memory_bitdata.test
+++ b/mysql-test/suite/funcs_1/t/memory_bitdata.test
@@ -16,16 +16,12 @@ let $engine_type= memory;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/memory_tb4.inc
-
-    let $run= 0;
 }
 
 --source suite/funcs_1/bitdata/bitdata_master.test
diff --git a/mysql-test/suite/funcs_1/t/memory_cursors.test b/mysql-test/suite/funcs_1/t/memory_cursors.test
index 1361c83ecb0..ef33d1776bf 100644
--- a/mysql-test/suite/funcs_1/t/memory_cursors.test
+++ b/mysql-test/suite/funcs_1/t/memory_cursors.test
@@ -16,16 +16,12 @@ let $engine_type= memory;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/memory_tb1.inc
-
-    let $run= 0;
 }
 
 --source suite/funcs_1/cursors/cursors_master.test
diff --git a/mysql-test/suite/funcs_1/t/memory_storedproc.test b/mysql-test/suite/funcs_1/t/memory_storedproc.test
index df73fe6815b..405f4d49fd1 100644
--- a/mysql-test/suite/funcs_1/t/memory_storedproc.test
+++ b/mysql-test/suite/funcs_1/t/memory_storedproc.test
@@ -3,4 +3,6 @@
 
 let $engine_type= memory;
 
+--source suite/funcs_1/storedproc/load_sp_tb.inc
+
 --source suite/funcs_1/storedproc/storedproc_master.inc
diff --git a/mysql-test/suite/funcs_1/t/memory_trig_0102.test b/mysql-test/suite/funcs_1/t/memory_trig_0102.test
index efa739cfb14..a24afb54754 100644
--- a/mysql-test/suite/funcs_1/t/memory_trig_0102.test
+++ b/mysql-test/suite/funcs_1/t/memory_trig_0102.test
@@ -16,16 +16,12 @@ let $engine_type= memory;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/memory_tb3.inc
-
-    let $run= 0;
 }
 
 --source suite/funcs_1/triggers/triggers_0102.inc
diff --git a/mysql-test/suite/funcs_1/t/memory_trig_03.test b/mysql-test/suite/funcs_1/t/memory_trig_03.test
index 76980b6b1b0..4f4b7440213 100644
--- a/mysql-test/suite/funcs_1/t/memory_trig_03.test
+++ b/mysql-test/suite/funcs_1/t/memory_trig_03.test
@@ -16,16 +16,12 @@ let $engine_type= memory;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/memory_tb3.inc
-
-    let $run= 0;
 }
 
 --source suite/funcs_1/triggers/triggers_03.inc
diff --git a/mysql-test/suite/funcs_1/t/memory_trig_03e.test b/mysql-test/suite/funcs_1/t/memory_trig_03e.test
index 58b2eade4a1..6a172df4580 100644
--- a/mysql-test/suite/funcs_1/t/memory_trig_03e.test
+++ b/mysql-test/suite/funcs_1/t/memory_trig_03e.test
@@ -16,14 +16,11 @@ let $engine_type= memory;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
-    let $run= 0;
 }
 
 --source suite/funcs_1/triggers/triggers_03e_db_level.inc
diff --git a/mysql-test/suite/funcs_1/t/memory_trig_0407.test b/mysql-test/suite/funcs_1/t/memory_trig_0407.test
index 05217a7f97f..ac36b2f5a99 100644
--- a/mysql-test/suite/funcs_1/t/memory_trig_0407.test
+++ b/mysql-test/suite/funcs_1/t/memory_trig_0407.test
@@ -16,16 +16,12 @@ let $engine_type= memory;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/memory_tb3.inc
-
-    let $run= 0;
 }
 
 --source suite/funcs_1/triggers/triggers_0407.inc
diff --git a/mysql-test/suite/funcs_1/t/memory_trig_08.test b/mysql-test/suite/funcs_1/t/memory_trig_08.test
index 8caae1ec45f..e857be59dee 100644
--- a/mysql-test/suite/funcs_1/t/memory_trig_08.test
+++ b/mysql-test/suite/funcs_1/t/memory_trig_08.test
@@ -16,16 +16,12 @@ let $engine_type= memory;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/memory_tb3.inc
-
-    let $run= 0;
 }
 
 --source suite/funcs_1/triggers/triggers_08.inc
diff --git a/mysql-test/suite/funcs_1/t/memory_trig_09.test b/mysql-test/suite/funcs_1/t/memory_trig_09.test
index 95a7fefbe90..370e51d0d39 100644
--- a/mysql-test/suite/funcs_1/t/memory_trig_09.test
+++ b/mysql-test/suite/funcs_1/t/memory_trig_09.test
@@ -16,16 +16,12 @@ let $engine_type= memory;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/memory_tb3.inc
-
-    let $run= 0;
 }
 
 --source suite/funcs_1/triggers/triggers_09.inc
diff --git a/mysql-test/suite/funcs_1/t/memory_trig_1011ext.test b/mysql-test/suite/funcs_1/t/memory_trig_1011ext.test
index 726b878854e..3547fd7de9a 100644
--- a/mysql-test/suite/funcs_1/t/memory_trig_1011ext.test
+++ b/mysql-test/suite/funcs_1/t/memory_trig_1011ext.test
@@ -16,16 +16,12 @@ let $engine_type= memory;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/memory_tb3.inc
-
-    let $run= 0;
 }
 
 --source suite/funcs_1/triggers/triggers_1011ext.inc
diff --git a/mysql-test/suite/funcs_1/t/memory_views.test b/mysql-test/suite/funcs_1/t/memory_views.test
index 303d0bb2ac1..eab1800ca48 100644
--- a/mysql-test/suite/funcs_1/t/memory_views.test
+++ b/mysql-test/suite/funcs_1/t/memory_views.test
@@ -19,7 +19,6 @@ eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 let $run= `SELECT @NO_REFRESH = 0`;
 if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/memory_tb2.inc
@@ -30,7 +29,6 @@ if ($run)
     USE test1;
     --source suite/funcs_1/include/memory_tb2.inc
     USE test;
-
 }
 
 --source suite/funcs_1/views/views_master.inc
diff --git a/mysql-test/suite/funcs_1/t/myisam__load.test b/mysql-test/suite/funcs_1/t/myisam__load.test
index b63044f128c..6cac47174cb 100644
--- a/mysql-test/suite/funcs_1/t/myisam__load.test
+++ b/mysql-test/suite/funcs_1/t/myisam__load.test
@@ -16,11 +16,9 @@ let $engine_type= myisam;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/myisam_tb1.inc
@@ -39,7 +37,5 @@ while ($run)
   
     # These tables are needed for the stored procedure testscases
     --source suite/funcs_1/include/sp_tb.inc
-
-    let $run= 0;
 }
 
diff --git a/mysql-test/suite/funcs_1/t/myisam_bitdata.test b/mysql-test/suite/funcs_1/t/myisam_bitdata.test
index 7ee15e02ea0..cfcd2faece4 100644
--- a/mysql-test/suite/funcs_1/t/myisam_bitdata.test
+++ b/mysql-test/suite/funcs_1/t/myisam_bitdata.test
@@ -16,17 +16,14 @@ let $engine_type= myisam;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/myisam_tb4.inc
-
-    let $run= 0;
 }
 
 --source suite/funcs_1/bitdata/bitdata_master.test
 
+
diff --git a/mysql-test/suite/funcs_1/t/myisam_cursors.test b/mysql-test/suite/funcs_1/t/myisam_cursors.test
index 841903148cd..4b23ecba610 100644
--- a/mysql-test/suite/funcs_1/t/myisam_cursors.test
+++ b/mysql-test/suite/funcs_1/t/myisam_cursors.test
@@ -16,9 +16,8 @@ let $engine_type= myisam;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if ($run)
 {
 
     # Create some objects needed in many testcases
diff --git a/mysql-test/suite/funcs_1/t/myisam_storedproc.test b/mysql-test/suite/funcs_1/t/myisam_storedproc.test
index 64fba295907..3925775d4e1 100644
--- a/mysql-test/suite/funcs_1/t/myisam_storedproc.test
+++ b/mysql-test/suite/funcs_1/t/myisam_storedproc.test
@@ -3,4 +3,6 @@
 
 let $engine_type= myisam;
 
+--source suite/funcs_1/storedproc/load_sp_tb.inc
+
 --source suite/funcs_1/storedproc/storedproc_master.inc
diff --git a/mysql-test/suite/funcs_1/t/myisam_trig_0102.test b/mysql-test/suite/funcs_1/t/myisam_trig_0102.test
index 77bde5f99ef..7cba273a4b1 100644
--- a/mysql-test/suite/funcs_1/t/myisam_trig_0102.test
+++ b/mysql-test/suite/funcs_1/t/myisam_trig_0102.test
@@ -16,16 +16,12 @@ let $engine_type= myisam;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/myisam_tb3.inc
-
-    let $run= 0;
 }
 
 --source suite/funcs_1/triggers/triggers_0102.inc
diff --git a/mysql-test/suite/funcs_1/t/myisam_trig_03.test b/mysql-test/suite/funcs_1/t/myisam_trig_03.test
index 6edaaf7d14c..2e14cc7a28f 100644
--- a/mysql-test/suite/funcs_1/t/myisam_trig_03.test
+++ b/mysql-test/suite/funcs_1/t/myisam_trig_03.test
@@ -16,17 +16,14 @@ let $engine_type= myisam;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/myisam_tb3.inc
-
-    let $run= 0;
 }
 
 --source suite/funcs_1/triggers/triggers_03.inc
 
+
diff --git a/mysql-test/suite/funcs_1/t/myisam_trig_03e.test b/mysql-test/suite/funcs_1/t/myisam_trig_03e.test
index b0bc4a495ea..a299f226a9a 100644
--- a/mysql-test/suite/funcs_1/t/myisam_trig_03e.test
+++ b/mysql-test/suite/funcs_1/t/myisam_trig_03e.test
@@ -16,14 +16,11 @@ let $engine_type= myisam;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
-    let $run= 0;
 }
 
 --source suite/funcs_1/triggers/triggers_03e_db_level.inc
diff --git a/mysql-test/suite/funcs_1/t/myisam_trig_0407.test b/mysql-test/suite/funcs_1/t/myisam_trig_0407.test
index a28959b407e..90eb4f75213 100644
--- a/mysql-test/suite/funcs_1/t/myisam_trig_0407.test
+++ b/mysql-test/suite/funcs_1/t/myisam_trig_0407.test
@@ -16,17 +16,14 @@ let $engine_type= myisam;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/myisam_tb3.inc
-
-    let $run= 0;
 }
 
 --source suite/funcs_1/triggers/triggers_0407.inc
 
+
diff --git a/mysql-test/suite/funcs_1/t/myisam_trig_08.test b/mysql-test/suite/funcs_1/t/myisam_trig_08.test
index dda01314052..5ff16ee5190 100644
--- a/mysql-test/suite/funcs_1/t/myisam_trig_08.test
+++ b/mysql-test/suite/funcs_1/t/myisam_trig_08.test
@@ -16,17 +16,14 @@ let $engine_type= myisam;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/myisam_tb3.inc
-
-    let $run= 0;
 }
 
 --source suite/funcs_1/triggers/triggers_08.inc
 
+
diff --git a/mysql-test/suite/funcs_1/t/myisam_trig_09.test b/mysql-test/suite/funcs_1/t/myisam_trig_09.test
index 9f2c932e608..8bd041b31e5 100644
--- a/mysql-test/suite/funcs_1/t/myisam_trig_09.test
+++ b/mysql-test/suite/funcs_1/t/myisam_trig_09.test
@@ -16,17 +16,14 @@ let $engine_type= myisam;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/myisam_tb3.inc
-
-    let $run= 0;
 }
 
 --source suite/funcs_1/triggers/triggers_09.inc
 
+
diff --git a/mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test b/mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test
index b4d29476aa5..7290c22eb84 100644
--- a/mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test
+++ b/mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test
@@ -16,17 +16,14 @@ let $engine_type= myisam;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/myisam_tb3.inc
-
-    let $run= 0;
 }
 
 --source suite/funcs_1/triggers/triggers_1011ext.inc
 
+
diff --git a/mysql-test/suite/funcs_1/t/myisam_views.test b/mysql-test/suite/funcs_1/t/myisam_views.test
index 3fa50a3a2a0..dad532955f5 100644
--- a/mysql-test/suite/funcs_1/t/myisam_views.test
+++ b/mysql-test/suite/funcs_1/t/myisam_views.test
@@ -19,7 +19,6 @@ eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 let $run= `SELECT @NO_REFRESH = 0`;
 if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/myisam_tb2.inc
@@ -30,7 +29,6 @@ if ($run)
     USE test1;
     --source suite/funcs_1/include/myisam_tb2.inc
     USE test;
-
 }
 
 let $message= Attention: The nesting level @max_level in Testcase 3.3.1.A6
@@ -47,3 +45,4 @@ if ($run)
     DROP DATABASE IF EXISTS test1;
 }
 
+
diff --git a/mysql-test/suite/funcs_1/t/ndb__load.test b/mysql-test/suite/funcs_1/t/ndb__load.test
index 4f95065b285..b586dfa4b3a 100644
--- a/mysql-test/suite/funcs_1/t/ndb__load.test
+++ b/mysql-test/suite/funcs_1/t/ndb__load.test
@@ -18,11 +18,9 @@ let $engine_type= ndb;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/ndb_tb1.inc
@@ -41,7 +39,5 @@ while ($run)
   
     # These tables are needed for the stored procedure testscases
     --source suite/funcs_1/include/sp_tb.inc
-
-    let $run= 0;
 }
 
diff --git a/mysql-test/suite/funcs_1/t/ndb_bitdata.test b/mysql-test/suite/funcs_1/t/ndb_bitdata.test
index bd5072e123d..26c454d70f7 100644
--- a/mysql-test/suite/funcs_1/t/ndb_bitdata.test
+++ b/mysql-test/suite/funcs_1/t/ndb_bitdata.test
@@ -1,6 +1,6 @@
 #### suite/funcs_1/t/ndb_bitdata.test
 
-# InnoDB tables should be used
+# NDB tables should be used
 #
 # 1. Check if InnoDB is available
 --source include/have_ndb.inc
@@ -18,16 +18,12 @@ let $engine_type= ndb;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/ndb_tb4.inc
-
-    let $run= 0;
 }
     
 --source suite/funcs_1/bitdata/bitdata_master.test
diff --git a/mysql-test/suite/funcs_1/t/ndb_cursors.test b/mysql-test/suite/funcs_1/t/ndb_cursors.test
index 178622f4f48..fd9060b3e8f 100644
--- a/mysql-test/suite/funcs_1/t/ndb_cursors.test
+++ b/mysql-test/suite/funcs_1/t/ndb_cursors.test
@@ -1,6 +1,6 @@
 #### suite/funcs_1/t/ndb_cursors.test
 
-# Innodb tables should be used
+# NDB tables should be used
 #
 # 1. Check if ndb is available
 --source include/have_ndb.inc
@@ -18,16 +18,12 @@ let $engine_type= ndb;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/ndb_tb1.inc
-
-    let $run= 0;
 }
 
 --source suite/funcs_1/cursors/cursors_master.test
diff --git a/mysql-test/suite/funcs_1/t/ndb_storedproc.test b/mysql-test/suite/funcs_1/t/ndb_storedproc.test
new file mode 100644
index 00000000000..69d214c97ed
--- /dev/null
+++ b/mysql-test/suite/funcs_1/t/ndb_storedproc.test
@@ -0,0 +1,9 @@
+#### suite/funcs_1/t/ndb_storedproc.test
+#
+
+--source include/have_ndb.inc
+let $engine_type= ndb;
+
+--source suite/funcs_1/storedproc/load_sp_tb.inc
+
+--source suite/funcs_1/storedproc/storedproc_master.inc
diff --git a/mysql-test/suite/funcs_1/t/ndb_trig_0102.test b/mysql-test/suite/funcs_1/t/ndb_trig_0102.test
index cda1048631f..b5add9d9806 100644
--- a/mysql-test/suite/funcs_1/t/ndb_trig_0102.test
+++ b/mysql-test/suite/funcs_1/t/ndb_trig_0102.test
@@ -18,16 +18,12 @@ let $engine_type= ndb;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/ndb_tb3.inc
-
-    let $run= 0;
 }
     
 --source suite/funcs_1/triggers/triggers_0102.inc
diff --git a/mysql-test/suite/funcs_1/t/ndb_trig_03.test b/mysql-test/suite/funcs_1/t/ndb_trig_03.test
index e8478d4f0fc..65aa138495d 100644
--- a/mysql-test/suite/funcs_1/t/ndb_trig_03.test
+++ b/mysql-test/suite/funcs_1/t/ndb_trig_03.test
@@ -1,6 +1,6 @@
 #### suite/funcs_1/t/ndb_triggers.test
 
-# InnoDB tables should be used
+# NDB tables should be used
 #
 # 1. Check if NDB is available
 --source include/have_ndb.inc
@@ -18,16 +18,12 @@ let $engine_type= ndb;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/ndb_tb3.inc
-
-    let $run= 0;
 }
     
 --source suite/funcs_1/triggers/triggers_03.inc
diff --git a/mysql-test/suite/funcs_1/t/ndb_trig_03e.test b/mysql-test/suite/funcs_1/t/ndb_trig_03e.test
index 3d6c73cfe24..118ea99e890 100644
--- a/mysql-test/suite/funcs_1/t/ndb_trig_03e.test
+++ b/mysql-test/suite/funcs_1/t/ndb_trig_03e.test
@@ -1,6 +1,6 @@
 #### suite/funcs_1/t/ndb_triggers.test
 
-# InnoDB tables should be used
+# NDB tables should be used
 #
 # 1. Check if NDB is available
 --source include/have_ndb.inc
@@ -18,14 +18,11 @@ let $engine_type= ndb;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
-    let $run= 0;
 }
     
 --source suite/funcs_1/triggers/triggers_03e_db_level.inc
diff --git a/mysql-test/suite/funcs_1/t/ndb_trig_0407.test b/mysql-test/suite/funcs_1/t/ndb_trig_0407.test
index 2825102643c..2c07cf329d9 100644
--- a/mysql-test/suite/funcs_1/t/ndb_trig_0407.test
+++ b/mysql-test/suite/funcs_1/t/ndb_trig_0407.test
@@ -18,16 +18,12 @@ let $engine_type= ndb;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/ndb_tb3.inc
-
-    let $run= 0;
 }
     
 --source suite/funcs_1/triggers/triggers_0407.inc
diff --git a/mysql-test/suite/funcs_1/t/ndb_trig_08.test b/mysql-test/suite/funcs_1/t/ndb_trig_08.test
index 9c763c71b35..497ea523027 100644
--- a/mysql-test/suite/funcs_1/t/ndb_trig_08.test
+++ b/mysql-test/suite/funcs_1/t/ndb_trig_08.test
@@ -18,16 +18,12 @@ let $engine_type= ndb;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/ndb_tb3.inc
-
-    let $run= 0;
 }
     
 --source suite/funcs_1/triggers/triggers_08.inc
diff --git a/mysql-test/suite/funcs_1/t/ndb_trig_09.test b/mysql-test/suite/funcs_1/t/ndb_trig_09.test
index 7cc63e47f8a..d735d125fd0 100644
--- a/mysql-test/suite/funcs_1/t/ndb_trig_09.test
+++ b/mysql-test/suite/funcs_1/t/ndb_trig_09.test
@@ -18,16 +18,12 @@ let $engine_type= ndb;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/ndb_tb3.inc
-
-    let $run= 0;
 }
     
 --source suite/funcs_1/triggers/triggers_09.inc
diff --git a/mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test b/mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test
index 9b0b966deaf..4d298da3260 100644
--- a/mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test
+++ b/mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test
@@ -18,16 +18,12 @@ let $engine_type= ndb;
 
 eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 
-# FIXME Replace the following, when "if" for mysqltest is available
 let $run= `SELECT @NO_REFRESH = 0`;
-while ($run)
+if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/ndb_tb3.inc
-
-    let $run= 0;
 }
     
 --source suite/funcs_1/triggers/triggers_1011ext.inc
diff --git a/mysql-test/suite/funcs_1/t/ndb_views.test b/mysql-test/suite/funcs_1/t/ndb_views.test
index 55b8f4757fe..317c8ffff23 100644
--- a/mysql-test/suite/funcs_1/t/ndb_views.test
+++ b/mysql-test/suite/funcs_1/t/ndb_views.test
@@ -21,7 +21,6 @@ eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
 let $run= `SELECT @NO_REFRESH = 0`;
 if ($run)
 {
-
     # Create some objects needed in many testcases
     USE test;
     --source suite/funcs_1/include/ndb_tb2.inc
@@ -32,7 +31,6 @@ if ($run)
     USE test1;
     --source suite/funcs_1/include/ndb_tb2.inc
     USE test;
-
 }
     
 --source suite/funcs_1/views/views_master.inc
diff --git a/mysql-test/suite/funcs_1/triggers/triggers_03.inc b/mysql-test/suite/funcs_1/triggers/triggers_03.inc
index 4821b47099a..4039699c754 100644
--- a/mysql-test/suite/funcs_1/triggers/triggers_03.inc
+++ b/mysql-test/suite/funcs_1/triggers/triggers_03.inc
@@ -3,6 +3,7 @@
 # Trigger Tests
 # (test case numbering refer to requirement document TP v1.1)
 #======================================================================
+# WL#4084: enable disabled parts. 2007-11-15, hhunger
 
 --disable_abort_on_error
 
@@ -157,16 +158,13 @@ let $message=Testcase 3.5.3.7a:;
 	show grants;
 	select f1 from t1 order by f1;
 
-let $message= Trigger create disabled - should fail - Bug 8884;
---source include/show_msg.inc
-#	--error 1227
-#	create trigger trg4a_1 before INSERT on t1 for each row
-#		set new.f1 = 'trig 3.5.3.7-1a';
+	create trigger trg4a_1 before INSERT on t1 for each row
+		set new.f1 = 'trig 3.5.3.7-1a';
 
 	connection default;
+	--error ER_COLUMNACCESS_DENIED_ERROR
 	insert into t1 (f1) values ('insert 3.5.3.7-1a');
 	select f1 from t1 order by f1;
-	--error 0, 1360
 	drop trigger trg4a_1;
 
 	connection yes_privs_424a;
@@ -213,18 +211,14 @@ let $message= Testcase 3.5.3.7b:;
 	show grants;
 	use priv_db;
 
-let $message= Trigger create disabled - should fail - Bug 8884;
---source include/show_msg.inc
-#	--error 1227
-#	create trigger trg4b_1 before UPDATE on t1 for each row
-#		set new.f1 = 'trig 3.5.3.7-1b';
+	create trigger trg4b_1 before UPDATE on t1 for each row
+		set new.f1 = 'trig 3.5.3.7-1b';
 
 	connection default;
 	insert into t1 (f1) values ('insert 3.5.3.7-1b');
 	select f1 from t1 order by f1;
 	update t1 set  f1 = 'update 3.5.3.7-1b' where f1 = 'insert 3.5.3.7-1b';
 	select f1 from t1 order by f1;
-	--error 0, 1360
 	drop trigger trg4b_1;
 
 	connection yes_privs_424b;
@@ -271,16 +265,12 @@ let $message= Testcase 3.5.3.7c;
 	show grants;
 	use priv_db;
 
-let $message= Trigger create disabled - should fail - Bug 8884;
---source include/show_msg.inc
-#	--error 1227
-#	create trigger trg4c_1 before INSERT on t1 for each row
-#		set new.f1 = 'trig 3.5.3.7-1c';
+	create trigger trg4c_1 before INSERT on t1 for each row
+		set new.f1 = 'trig 3.5.3.7-1c';
 
 	connection default;
 	insert into t1 (f1) values ('insert 3.5.3.7-1c');
 	select f1 from t1 order by f1;
-	--error 0, 1360
 	drop trigger trg4c_1;
 
 	connection yes_privs_424c;
@@ -327,16 +317,12 @@ let $message= Testcase 3.5.3.7d:;
 	connection no_privs_424d;
 	show grants;
 	use priv_db;
-let $message= Trigger create disabled - should fail - Bug 8884;
---source include/show_msg.inc
-#	--error 1227
-#	create trigger trg4d_1 before INSERT on t1 for each row
-#		set new.f1 = 'trig 3.5.3.7-1d';
+	create trigger trg4d_1 before INSERT on t1 for each row
+		set new.f1 = 'trig 3.5.3.7-1d';
 
 	connection default;
 	insert into t1 (f1) values ('insert 3.5.3.7-1d');
 	select f1 from t1 order by f1;
-	--error 0, 1360
 	drop trigger trg4d_1;
 
 	connection yes_privs_424d;
@@ -386,18 +372,14 @@ let $message= Testcase 3.5.3.8a:;
 	use priv_db;
 	show grants;
 
-let $message= Trigger create disabled - should fail - Bug 8887;
---source include/show_msg.inc
-#	--error 1227
-#	create trigger trg5a_1 before INSERT on t1 for each row
-#		set @test_var = new.f1;
+	create trigger trg5a_1 before INSERT on t1 for each row
+		set @test_var = new.f1;
 
 	connection default;
         set @test_var = 'before trig 3.5.3.8-1a';
 	select @test_var;
 	insert into t1 (f1) values ('insert 3.5.3.8-1a');
 	select @test_var;
-	--error 0, 1360
 	drop trigger trg5a_1;
 
 	connection yes_privs_425a;
@@ -446,11 +428,8 @@ let $message= Testcase: 3.5.3.8b;
 	show grants;
 	use priv_db;
 
-let $message= Trigger create disabled - should fail - Bug 8887;
---source include/show_msg.inc
-#	--error 1227
-#	create trigger trg5b_1 before UPDATE on t1 for each row
-#		set @test_var= new.f1;
+	create trigger trg5b_1 before UPDATE on t1 for each row
+		set @test_var= new.f1;
 
 	connection default;
         set @test_var= 'before trig 3.5.3.8-1b';
@@ -458,7 +437,6 @@ let $message= Trigger create disabled - should fail - Bug 8887;
 	select @test_var;
 	update t1 set  f1= 'update 3.5.3.8-1b' where f1 = 'insert 3.5.3.8-1b';
 	select @test_var;
-	--error 0, 1360
 	drop trigger trg5b_1;
 
 	connection yes_privs_425b;
@@ -506,17 +484,13 @@ let $message= Testcase 3.5.3.8c:;
 	show grants;
 	use priv_db;
 
-let $message= Trigger create disabled - should fail - Bug 8887;
---source include/show_msg.inc
-#	--error 1227
-#	create trigger trg5c_1 before INSERT on t1 for each row
-#		set @test_var= new.f1;
+	create trigger trg5c_1 before INSERT on t1 for each row
+		set @test_var= new.f1;
 
 	connection default;
         set @test_var= 'before trig 3.5.3.8-1c';
 	insert into t1 (f1) values ('insert 3.5.3.8-1c');
 	select @test_var;
-	--error 0, 1360
 	drop trigger trg5c_1;
 
 	connection yes_privs_425c;
@@ -561,17 +535,13 @@ let $message=Testcase: 3.5.3.8d:;
 	connection no_privs_425d;
 	show grants;
 	use priv_db;
-let $message= Trigger create disabled - should fail - Bug 8887;
---source include/show_msg.inc
-#	--error 1227
-#	create trigger trg5d_1 before INSERT on t1 for each row
-#		set @test_var= new.f1;
+	create trigger trg5d_1 before INSERT on t1 for each row
+		set @test_var= new.f1;
 
 	connection default;
         set @test_var='before trig 3.5.3.8-1d';
 	insert into t1 (f1) values ('insert 3.5.3.8-1d');
 	select @test_var;
-	--error 0, 1360
 	drop trigger trg5d_1;
 
 	connection yes_privs_425d;
@@ -591,8 +561,7 @@ let $message= Trigger create disabled - should fail - Bug 8887;
 	drop trigger trg5d_2;
 	--enable_warnings
 
-# --- 3.5.3.x - additional tests following the fix to bug 5861 / WL 2818
-#               to test for trigger definer privs in the case of trigger
+# --- 3.5.3.x   to test for trigger definer privs in the case of trigger
 #               actions (insert/update/delete/select) performed on other
 #               tables.
 let $message=Testcase: 3.5.3.x:;
diff --git a/mysql-test/suite/funcs_1/triggers/triggers_08.inc b/mysql-test/suite/funcs_1/triggers/triggers_08.inc
index 4a7ea486248..d63c15b33b5 100644
--- a/mysql-test/suite/funcs_1/triggers/triggers_08.inc
+++ b/mysql-test/suite/funcs_1/triggers/triggers_08.inc
@@ -3,6 +3,7 @@
 # Trigger Tests 
 # (test case numbering refer to requirement document TP v1.1) 
 #======================================================================
+# WL#4084: enable disabled parts, 2007-11-15 hhunger
 
 # General setup for Trigger tests
 let $message= Testcase: 3.5:;
@@ -34,8 +35,6 @@ let $message= Testcase: 3.5:;
 let $message= Testcase 3.5.8.1: (implied in previous tests);
 --source include/show_msg.inc
 
-# OBN - FIXME - Missing 3.5.8.1 need to add
-
 #Section 3.5.8.2
 # Testcase: Ensure that the triggered actions of every trigger never results 
 #           in an unexpected change made to the database.
@@ -111,10 +110,12 @@ let $message= 3.5.8.4 - multiple SQL;
 	Insert into tb3 (f120, f122, f136, f144, f163) 
 		values ('1', 'Test 3.5.8.4', 222, 23456, 1.05);
 	Select f120, f122, f136, f144, f163 from tb3 where f122= 'Test 3.5.8.4';
-# error in ndb
-	select * from db_test.t1_i order by i120;
-	select * from db_test.t1_u order by u120;
-	select * from db_test.t1_d order by d120;
+	--sorted_result
+	select * from db_test.t1_i;
+	--sorted_result
+	select * from db_test.t1_u;
+	--sorted_result
+	select * from db_test.t1_d;
 	select @test_var;
 
 
@@ -320,28 +321,28 @@ let $message= Testcase 3.5.8.5-case:;
 	Insert into tb3 (f120, f122, f136, f144) 
 		values ('a', 'Test 3.5.8.5-case', 5, 7);
 	select f120, f122, f136, f144, @test_var 
-		from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+		from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 	Insert into tb3 (f120, f122, f136, f144) 
 		values ('b', 'Test 3.5.8.5-case', 71,16);
 	select f120, f122, f136, f144, @test_var 
-		from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+		from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 	Insert into tb3 (f120, f122, f136, f144) 
 		values ('c', 'Test 3.5.8.5-case', 80,1);
 	select f120, f122, f136, f144, @test_var 
-		from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+		from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 	Insert into tb3 (f120, f122, f136) 
 		values ('d', 'Test 3.5.8.5-case', 152);
 	select f120, f122, f136, f144, @test_var 
-		from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+		from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 	Insert into tb3 (f120, f122, f136, f144) 
 		values ('e', 'Test 3.5.8.5-case', 200, 8);
 	select f120, f122, f136, f144, @test_var 
-		from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+		from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 	--error 0, 1339
 	Insert into tb3 (f120, f122, f136, f144) 
 		values ('f', 'Test 3.5.8.5-case', 100, 8);
 	select f120, f122, f136, f144, @test_var 
-		from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
+		from tb3 where f122 = 'Test 3.5.8.5-case' order by f120,f136;
 
 	delimiter //;
 	--error 1064
@@ -495,12 +496,25 @@ let $message= Testcase 3.5.8.5-while:;
 #Section 3.5.8.6
 # Test case: Ensure that a trigger definition that includes a CALL to a stored 
 #            procedure fails, at CREATE TRIGGER time, with an appropriate error 
-#            message
-# OBN - requirement void since allowed 
-#       Fails due to Bug 9909 the bug allows the trigger to be created
-#       and fails in execution time
+#            message. Not more valid requirement.
 let $message= Testcase 3.5.8.6: (requirement void);
 --source include/show_msg.inc
+	delimiter //;
+	CREATE PROCEDURE sp_01 () BEGIN set @v1=1; END//
+
+	CREATE TRIGGER trg8_1 BEFORE UPDATE ON tb3 FOR EACH ROW
+	BEGIN
+		CALL sp_01 ();
+	END//
+	delimiter ;//
+	Insert into tb3 (f120, f122, f136) values ('6', 'Test 3.5.8.6-insert', 101);
+	update tb3 set f120='S', f136=111,
+	       f122='Test 3.5.8.6-tr8_1'
+	       where f122='Test 3.5.8.6-insert';
+	select f120, f122
+	       from tb3 where f122  like 'Test 3.5.8.6%' order by f120;
+	DROP TRIGGER trg8_1;
+	DROP PROCEDURE sp_01;
 
 
 #Section 3.5.8.7
@@ -508,25 +522,26 @@ let $message= Testcase 3.5.8.6: (requirement void);
 #            transaction-delimiting statement (e.g. COMMIT, 
 #            ROLLBACK, START TRANSACTION) fails, at CREATE TRIGGER 
 #            time, with an appropriate error message.
-# OBN - Fails due to Bug ____
-let $message= Testcase 3.5.8.7: (Disabled as a result of bug _____);
+let $message= Testcase 3.5.8.7;
 --source include/show_msg.inc
+	
+	delimiter //;
+	--error ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG 
+	Create trigger trg9_1 before update on tb3 for each row
+	BEGIN
+		Start transaction;
+			Set new.f120='U';
+		Commit;
+	END//
 
-#	--error 1314
-#	Create trigger trg9_1 before update on tb3 for each row
-#	BEGIN
-#		Start transaction;
-#			Set new.f120='U';
-#		Commit;
-#	END;
-
-#	--error 1314
-#	Create trigger trg9_2 before delete on tb3 for each row
-#	BEGIN
-#		Start transaction;
-#			Set @var2=old.f120;
-#		Rollback;
-#	END;
+	--error ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG 
+	Create trigger trg9_2 before delete on tb3 for each row
+	BEGIN
+		Start transaction;
+			Set @var2=old.f120;
+		Rollback;
+	END//
+	delimiter ;//
 
 
 # Cleanup section 3.5
diff --git a/mysql-test/suite/funcs_1/triggers/triggers_09.inc b/mysql-test/suite/funcs_1/triggers/triggers_09.inc
index 912c5f50b21..89153322f80 100644
--- a/mysql-test/suite/funcs_1/triggers/triggers_09.inc
+++ b/mysql-test/suite/funcs_1/triggers/triggers_09.inc
@@ -176,9 +176,13 @@ let $message= Testcase 3.5.9.4:;
 		@tr_var_af_136, @tr_var_af_151, @tr_var_af_163;
 --enable_query_log
 
+--error ER_BAD_NULL_ERROR
 	Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
 		 where f122='Test 3.5.9.4';
 
+        Update tb3 Set f122='Test 3.5.9.4-trig', f136=0, f151=DEFAULT, f163=NULL
+                 where f122='Test 3.5.9.4';
+
 	select f118, f121, f122, f136, f151, f163 from tb3 
 		where f122 like 'Test 3.5.9.4-trig' order by f163;
 	select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
diff --git a/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc b/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
index 1b7505260f7..07d04ab56ee 100644
--- a/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
+++ b/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
@@ -3,6 +3,7 @@
 # Trigger Tests
 # (test case numbering refer to requirement document TP v1.1)
 #======================================================================
+# WL#4084: enable disabled parts, 2007-11-15, hhunger
 
 --disable_abort_on_error
 
@@ -271,8 +272,8 @@ let $message= Testcase y.y.y.3: Circular trigger reference;
 	create trigger tr4 after insert on t4
 		for each row insert into t1 (f1) values (new.f4+1);
 
-	# OBN See bug 11896
-	--error 1442
+        # Bug#11896 Partial locking in case of recursive trigger definittions
+	--error ER_CANT_UPDATE_USED_TABLE_IN_SF_OR_TRG
 	insert into t1 values (1);
 	select * from t1 order by f1;
 	select * from t2 order by f2;
@@ -294,7 +295,7 @@ let $message= Testcase y.y.y.3: Circular trigger reference;
 
 #Section y.y.y.4
 # Testcase: create recursive trigger/storedprocedures conditions
-let $message= Testcase y.y.y.4: Recursive trigger/SP references (disabled bug 11889);
+let $message= Testcase y.y.y.4: Recursive trigger/SP references;
 --source include/show_msg.inc
 
 set @sql_mode='traditional';
diff --git a/mysql-test/suite/funcs_1/views/func_view.inc b/mysql-test/suite/funcs_1/views/func_view.inc
index d78cfb4488a..93fdb382039 100644
--- a/mysql-test/suite/funcs_1/views/func_view.inc
+++ b/mysql-test/suite/funcs_1/views/func_view.inc
@@ -5,10 +5,7 @@
 ###################################################
 # 2006-12-08 ML   Maintenance + refinements
 # 2005-09-14 ML   Create this test
-
-let $message= ! Attention: The file with the expected results suffers from
-Bug#10713: mysqldump includes database in create view and referenced tables;
---source include/show_msg80.inc
+# 2007-11-09 HHunger enabled all disabled parts belonging to fixed bugs.
 #
 # 0.  Some notes about this test:
 # #################################################################
@@ -43,14 +40,7 @@ Bug#10713: mysqldump includes database in create view and referenced tables;
 #       which was valid during VIEW creation time. This means some variations
 #       of the SQL mode are needed.
 # 0.1.3 There are much more functions to be tested.
-# 0.1.4 There are problems with the option "--ps-protocol".
-#       Double values with 15 digit mantissa are printed with 14 digit
-#       mantissa (Bug#11589).
-#       I altered the Minimum/Maximum double values to 14 digit mantissa
-#       to avoid these problems. But there are some other unsolved problems
-#       with "--ps-protocol".
---disable_ps_protocol
-# 0.1.5 The result sets of some CAST sub testcases with ugly function parameter
+# 0.1.4 The result sets of some CAST sub testcases with ugly function parameter
 #       column data type combinations must be discussed.
 #
 #
@@ -256,11 +246,9 @@ INSERT INTO t1_values SET
        my_year = '1901',
        my_bigint = -9223372036854775808,
        my_decimal = -9999999999999999999999999999999999.999999999999999999999999999999 ,
-       my_double = -1.7976931348623E+308;
-# Note(ML): Values like
-#           - my_timestamp = '19700101030000' do not work
-#           - my_double = -1.7976931348623157E+308 cause problems with 
-#             --ps-protocol (Bug#11589)
+       my_double = -1.7976931348623E+308; 
+# shortened due to bug#32285
+#       my_double = -1.7976931348623157E+308; 
 #
 # 2.3 record -- everything to "maximum"
 #     numbers, date/time types -> maximum of range
@@ -281,10 +269,8 @@ INSERT INTO t1_values SET
        my_bigint = 9223372036854775807,
        my_decimal = +9999999999999999999999999999999999.999999999999999999999999999999 ,
        my_double = 1.7976931348623E+308;
-# Note(ML): Values like
-#           -  my_timestamp = '20380101030000' do not work
-#           - my_double = 1.7976931348623157E+308 cause problems with
-#             --ps-protocol (Bug#11589)
+# shortened due to bug#32285
+#       my_double = -1.7976931348623157E+308; 
 #
 # 2.4 record -- everything to "magic" value if available or
 #               other interesting value
@@ -430,6 +416,7 @@ eval INSERT INTO t1_values SET select_id = @select_id,
 #
 #
 # 1.1.1. CAST --> BINARY
+--echo ##### 1.1.1. CAST --> BINARY
 let $target_type= BINARY;
 #
 let $col_type= my_char_30;
@@ -459,6 +446,7 @@ let $col_type= my_year;
 
 
 # 1.1.2. CAST --> CHAR
+--echo ##### 1.1.2. CAST --> CHAR
 let $target_type= CHAR;
 #
 let $col_type= my_char_30;
@@ -488,6 +476,7 @@ let $col_type= my_year;
 
 
 # 1.1.3. CAST --> DATE
+--echo ##### 1.1.3. CAST --> DATE
 let $target_type= DATE;
 #
 let $col_type= my_char_30;
@@ -527,6 +516,7 @@ let $col_type= my_year;
 
 
 # 1.1.4. CAST --> DATETIME
+--echo ##### 1.1.4. CAST --> DATETIME
 let $target_type= DATETIME;
 #
 let $col_type= my_char_30;
@@ -566,6 +556,7 @@ let $col_type= my_year;
 
 
 # 1.1.5. CAST --> TIME
+--echo ##### 1.1.5. CAST --> TIME
 let $target_type= TIME;
 #
 let $col_type= my_char_30;
@@ -604,8 +595,8 @@ let $col_type= my_time;
 let $col_type= my_year;
 --source suite/funcs_1/views/fv_cast.inc
 
-
 # 1.1.6. CAST --> DECIMAL
+--echo ##### 1.1.6. CAST --> DECIMAL
 # Set the following to (37,2) since the default was changed to (10,0) - OBN
 let $target_type= DECIMAL(37,2);
 #
@@ -647,6 +638,7 @@ let $col_type= my_year;
 
 
 # 1.1.7. CAST --> SIGNED INTEGER
+--echo ##### 1.1.7. CAST --> SIGNED INTEGER
 let $target_type= SIGNED INTEGER;
 #
 let $message= 
@@ -682,6 +674,7 @@ let $col_type= my_year;
 
 
 # 1.1.8. CAST --> UNSIGNED INTEGER
+--echo ##### 1.1.8. CAST --> UNSIGNED INTEGER
 let $target_type= UNSIGNED INTEGER;
 #
 let $message= 
@@ -703,12 +696,9 @@ let $col_type= my_decimal;
 let $message= some statements disabled because of
 Bug#5913 Traditional mode: BIGINT range not correctly delimited;
 --source include/show_msg80.inc
-if (0)
-{
-# Bugs#8663: cant use bgint unsigned as input to cast
+# Bug#8663 cant use bgint unsigned as input to cast
 let $col_type= my_double;
 --source suite/funcs_1/views/fv_cast.inc
-}
 let $col_type= my_datetime;
 --source suite/funcs_1/views/fv_cast.inc
 let $col_type= my_date;
@@ -1008,38 +998,21 @@ let $col_type= my_varbinary_1000;
 eval SET @my_select = 
 'SELECT LEFT($col_type, 2), $col_type, id FROM t1_values';
 --source suite/funcs_1/views/fv1.inc
-#
-let $message= 
-"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;
---source include/show_msg80.inc
 # Bug#11728 string function LEFT, strange undocumented behaviour, strict mode
 # Bug#10963 LEFT string function returns wrong result with large length
 let $col_type= my_bigint;
-if (0)
-{
-# Bug#10963 LEFT string function returns wrong result with large length
 eval SET @my_select = 
 'SELECT LEFT(''AaBbCcDdEeFfGgHhIiJjÄäÜüÖö'', $col_type), $col_type, id FROM t1_values';
 --source suite/funcs_1/views/fv1.inc
-}
-#
 let $col_type= my_decimal;
 eval SET @my_select =
 'SELECT LEFT(''AaBbCcDdEeFfGgHhIiJjÄäÜüÖö'', $col_type), $col_type, id FROM t1_values';
 --source suite/funcs_1/views/fv1.inc
-#
-if (0)
-{
 # Bug#10963 LEFT string function returns wrong result with large length
 let $col_type= my_double;
 eval SET @my_select =
 'SELECT LEFT(''AaBbCcDdEeFfGgHhIiJjÄäÜüÖö'', $col_type), $col_type, id FROM t1_values';
 --source suite/funcs_1/views/fv1.inc
-}
-
 
 # 3.20.   LENGTH(str)
 let $col_type= my_char_30;
@@ -1260,6 +1233,7 @@ SET sql_mode = '';                                                             #
 let $message= "# The basic preparations end and the main test starts here";
 --source include/show_msg80.inc
 
+--disable_ps_protocol
 
 ##### The tests start here #####################################################
 
@@ -1370,5 +1344,7 @@ while ($select_id)
     dec $select_id ;
 }
 
+--enable_ps_protocol
+
 DROP TABLE t1_selects, t1_modes, t1_values;
 --exec rm $MYSQLTEST_VARDIR/tmp/func_view.dat
diff --git a/mysql-test/suite/funcs_1/views/views_master.inc b/mysql-test/suite/funcs_1/views/views_master.inc
index 6f07d4f38b3..f08082676ed 100644
--- a/mysql-test/suite/funcs_1/views/views_master.inc
+++ b/mysql-test/suite/funcs_1/views/views_master.inc
@@ -4,6 +4,7 @@
 # 2007-10-05 mleich
 #    1. Fix for Bug#31237 Test "ndb_views" fails because of differing order ...
 #    2. Cleanup of test
+# 2007-11-15 hhunger WL#4084: Review and fix all disabled tests ... 
 
 let $message= ! Attention: The file with the expected results is not
               |            thoroughly checked.
@@ -13,25 +14,20 @@ let $message= ! Attention: The file with the expected results is not
 --source include/show_msg80.inc
 
 # 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
-let $have_bug_11589= 1;
-if ($have_bug_11589)
+# 3. remove the workarounds 
+let $have_bug_32285= 1;
+if ($have_bug_32285)
 {
    let $message= There are some statements where the ps-protocol is switched off.
-                 Bug#11589: mysqltest, --ps-protocol, strange output, float/double/real with zerofill;
+                 Bug#32285: mysqltest, --ps-protocol, strange output, float/double/real with zerofill;
    --source include/show_msg80.inc
 }
 
-let $message= ! Attention: The file with the expected results suffers from
-Bug#10713: mysqldump includes database in create view and referenced tables;
---source include/show_msg80.inc
-
-
 # The sub testcases are nearly independend. That is the reason why
 # we do not want to abort after the first error.
 --disable_abort_on_error
@@ -112,7 +108,7 @@ insert into tb2 (f59,f60,f61) values (109,108,104);
 INSERT INTO tb2 (f59,f60) VALUES( 299,899 );
 INSERT INTO tb2 (f59,f60) VALUES( 242,79  );
 INSERT INTO tb2 (f59,f60) VALUES( 424,89  );
-if ($have_bug_11589)
+if ($have_bug_32285)
 {
 --disable_ps_protocol
 }
@@ -225,10 +221,11 @@ Insert into t1  values (500,9866);
     select * FROM v1 order by f59 limit 0,10;
 
 #(15)
-if ($have_bug_11589)
+if ($have_bug_32285)
 {
 --disable_ps_protocol
 }
+--vertical_results
     CREATE or REPLACE VIEW v1 AS select *
     FROM test.tb2 WITH LOCAL CHECK OPTION ;
     select * FROM v1 order by f59,f60,f61,f62,f63,f64 limit 0,50;
@@ -237,6 +234,7 @@ if ($have_bug_11589)
 CREATE or REPLACE VIEW v1 AS select *
     FROM test.tb2 WITH CASCADED CHECK OPTION ;
     select * FROM v1 order by f59,f60,f61,f62,f63,f64 limit 0,10;
+--horizontal_results
 --enable_ps_protocol
 
 #(17)
@@ -814,11 +812,13 @@ CREATE TABLE t1 (f1 BIGINT);
 INSERT INTO t1 VALUES(1);
 CREATE VIEW test.v1 AS SELECT * FROM t1 limit 2;
 SHOW CREATE VIEW test.v1;
+--sorted_result
 SELECT * FROM test.v1;
 # Switch the algorithm
 CREATE OR REPLACE ALGORITHM = TEMPTABLE VIEW test.v1
 AS SELECT * FROM t1 limit 2;
 SHOW CREATE VIEW test.v1;
+--sorted_result
 SELECT * FROM test.v1;
 # Switch the base table
 CREATE OR REPLACE VIEW test.v1 AS SELECT * FROM tb2 order by f59 limit 2;
@@ -827,7 +827,9 @@ if ($have_bug_11589)
 {
 --disable_ps_protocol
 }
+--vertical_results
 SELECT * FROM test.v1 order by f59,f60,f61,f62,f63,f64,f65;
+--horizontal_results
 --enable_ps_protocol
 # Switch the SELECT but not the base table
 CREATE OR REPLACE VIEW test.v1 AS SELECT F59 FROM tb2;
@@ -862,11 +864,12 @@ let $message= Testcase 3.3.1.15 ;
 Drop table if exists test.v1 ;
 --enable_warnings
 CREATE OR REPLACE view test.v1 as select * from tb2;
-if ($have_bug_11589)
+if ($have_bug_32285)
 {
 --disable_ps_protocol
 }
-SELECT * FROM test.v1 ORDER BY f59,f60,f61 LIMIT 2;
+--sorted_result
+SELECT * FROM test.v1;
 --enable_ps_protocol
 Drop view test.v1 ;
 
@@ -1039,12 +1042,15 @@ let $message= Testcase 3.3.1.22 ;
 --disable_warnings
 DROP VIEW  IF EXISTS v1;
 --enable_warnings
-CREATE VIEW test.v1( product ) AS SELECT f59*f60 From tb2;
-SELECT * FROM test.v1 WHERE product IS NOT NULL ORDER BY product LIMIT 2;
+CREATE VIEW test.v1( product ) AS SELECT f59*f60 From tb2 WHERE f59 < 3;
+--sorted_result
+SELECT * FROM test.v1;
 CREATE OR REPLACE VIEW test.v1( product ) AS SELECT 1*2;
-SELECT * FROM test.v1 LIMIT 2;
+--sorted_result
+SELECT * FROM test.v1;
 CREATE OR REPLACE VIEW test.v1( product ) AS SELECT USER();
-SELECT * FROM test.v1 LIMIT 2;
+--sorted_result
+SELECT * FROM test.v1;
 Drop view if exists test.v1 ;
 
 
@@ -1163,7 +1169,8 @@ if ($have_bug_11589)
 {
 --disable_ps_protocol
 }
-Select * from test.v1 order by f59, f60, f61 limit 2;
+--sorted_result
+Select * from test.v1;
 --enable_ps_protocol
 Drop view test.v1 ;
 
@@ -1198,12 +1205,15 @@ create database test2 ;
 Create view test2.v2 AS Select * from test.tb2 limit 50,50;
 use test2 ;
 Create view v1 AS Select * from test.tb2 limit 50 ;
-if ($have_bug_11589)
+if ($have_bug_32285)
 {
 --disable_ps_protocol
 }
+--vertical_results
 Select * from v1 order by f59,f60,f61,f62,f63,f64,f65;
+--horizontal_results
 --enable_ps_protocol
+--sorted_result
 Select * from test2.v2 ;
 Drop view if exists test2.v1 ;
 Drop view if exists test2.v2 ;
@@ -1247,6 +1257,7 @@ INSERT INTO test.t1 VALUES( 445, 765 );
 Create or replace view test.v1
 AS SELECT test.t1.F59, test.tb2.F60
 FROM test.tb2 JOIN test.t1 ON test.tb2.F59 = test.t1.F59     ;
+--sorted_result
 Select * from test.v1;
 Drop view test.v1 ;
 
@@ -1271,6 +1282,7 @@ INSERT INTO t1 VALUES( 445, 765 );
 CREATE VIEW test2.v1
 AS SELECT test.tb2.F59, test.tb2.F60
 FROM test.tb2 INNER JOIN test2.t1 ON tb2.f59 = t1.f59;
+--sorted_result
 Select * from test2.v1;
 
 Use test;
@@ -1585,7 +1597,7 @@ let $message= Testcase 3.3.1.41 ;
 ###############################################################################
 # Testcase 3.3.1.41: Ensure that a view definition within a stored procedure
 #                    definition cannot include references to any of the stored
-#                    procedure’s parameters.
+#                    procedures parameters.
 ###############################################################################
 --disable_warnings
 Drop view if exists test.v1 ;
@@ -1648,20 +1660,24 @@ CREATE VIEW test.v1 AS SELECT f59,f60 FROM test.tb2;
 
 INSERT INTO test.v1 values(122,432);
 
-if ($have_bug_11589)
+if ($have_bug_32285)
 {
 --disable_ps_protocol
 }
+--vertical_results
 SELECT * FROM test.tb2 where f59 = 122 and f60 = 432 limit 0,20;
+--horizontal_results
 --enable_ps_protocol
 
 UPDATE test.v1 SET f59 = 3000 WHERE test.v1.f59 = 122 ;
 
-if ($have_bug_11589)
+if ($have_bug_32285)
 {
 --disable_ps_protocol
 }
+--vertical_results
 SELECT * FROM test.tb2  where f59 = 3000 limit 0,20;
+--horizontal_results
 --enable_ps_protocol
 
 DELETE FROM test.v1
@@ -1712,21 +1728,25 @@ CREATE VIEW test.v1 AS SELECT * FROM test.tb2 where f59 = 04;
 UPDATE test.v1 SET f59 = 30 where F59 = 04 ;
 --disable_info
 SELECT * FROM test.v1   where f59 = 30 order by f59;
-if ($have_bug_11589)
+if ($have_bug_32285)
 {
 --disable_ps_protocol
 }
+--vertical_results
 SELECT * FROM test.tb2        where f59 = 30 ;
+--horizontal_results
 --enable_ps_protocol
 
 --enable_info
 UPDATE tb2 SET f59 = 100 where f59 = 30 ;
 --disable_info
-if ($have_bug_11589)
+if ($have_bug_32285)
 {
 --disable_ps_protocol
 }
+--vertical_results
 SELECT * FROM tb2 where f59 = 100 ;
+--horizontal_results
 --enable_ps_protocol
 SELECT * FROM test.v1 order by f59 ;
 
@@ -1984,10 +2004,10 @@ let $message= Testcase 3.3.1.49A ;
 #       The annoying redundant
 #       eval INSERT INTO t1_results VALUES (@v3_to_v1_options,@statement,
 #                                           @v3_to_v1_violation,$mysql_errno);
-#       could not be put into a file to be sourced because of
+#       could not be put into a file to be sourced because of the closed 
 #       Bug#10267 mysqltest, wrong number of loops when a script is sourced
 #                 within a loop
-#
+# To be implemented later.
 
 USE test;
 --disable_warnings
@@ -2298,11 +2318,13 @@ DROP VIEW  IF EXISTS test.v1;
 #                    AS SELECT * FROM <table name>.
 ###############################################################################
 CREATE VIEW test.v1 AS SELECT * FROM test.tb2;
-if ($have_bug_11589)
+if ($have_bug_32285)
 {
 --disable_ps_protocol
 }
-SELECT * FROM test.v1 order by f59 limit 5;
+--vertical_results
+SELECT * FROM test.v1 order by f59,f60,f61 ;
+--horizontal_results
 --enable_ps_protocol
 drop view test.v1 ;
 ###############################################################################
@@ -2327,7 +2349,9 @@ if ($have_bug_11589)
 {
 --disable_ps_protocol
 }
-SELECT * FROM test.v1 order by f59,f60,f61 limit 20;
+--vertical_results
+SELECT * FROM test.v1 order by f59,f60,f61 ;
+--horizontal_results
 --enable_ps_protocol
 drop view test.v1 ;
 ###############################################################################
@@ -2684,11 +2708,13 @@ SELECT * FROM test.v1 order by f59 limit 0,10;
 
 ALTER VIEW test.v1 AS  SELECT *
 FROM test.tb2 WHERE test.tb2.f59 = 242 ;
-if ($have_bug_11589)
+if ($have_bug_32285)
 {
 --disable_ps_protocol
 }
+--vertical_results
 SELECT * FROM test.v1 order by f59 limit 0,10;
+--horizontal_results
 --enable_ps_protocol
 
 Drop view test.v1 ;
@@ -3165,11 +3191,13 @@ Create view test.v1 AS SELECT f59,f60,f61 FROM tb2  ;
 INSERT INTO test.v1 ( f59 , f60 ) values (2005,0101) ;
 --disable_info
 
-if ($have_bug_11589)
+if ($have_bug_32285)
 {
 --disable_ps_protocol
 }
+--vertical_results
 SELECT * FROM tb2 where f59 = 2005 and f60 = 0101 ;
+--horizontal_results
 --enable_ps_protocol
 SELECT f59,f60 FROM test.v1 where f59 = 2005 and f60 = 0101 ;
 DELETE FROM tb2 where f59 = 2005 and f60 = 0101 ;
@@ -3194,11 +3222,13 @@ CREATE VIEW test.v1 AS SELECT f59,f60,f61 FROM tb2  ;
 UPDATE test.v1 SET f59 = 8 WHERE f59 = 780 and f60 = 105;
 --disable_info
 
-if ($have_bug_11589)
+if ($have_bug_32285)
 {
 --disable_ps_protocol
 }
+--vertical_results
 SELECT * FROM tb2 where f59 = 8 and f60 = 105;
+--horizontal_results
 --enable_ps_protocol
 SELECT f59,f60 FROM test.v1 where f59 = 8 and f60 = 105 ;
 
@@ -3222,11 +3252,13 @@ CREATE VIEW test.v1 AS SELECT f59,f60,f61 FROM tb2 ;
 UPDATE test.v1 SET f59 = 891 WHERE f60 = 105 ;
 --disable_info
 
-if ($have_bug_11589)
+if ($have_bug_32285)
 {
 --disable_ps_protocol
 }
+--vertical_results
 SELECT * FROM tb2 where f59 = 891 and f60 = 105;
+--horizontal_results
 --enable_ps_protocol
 SELECT f59,f60 FROM test.v1 where f59 = 891 and f60 = 105 ;
 
@@ -3779,23 +3811,6 @@ SET @variant6= 'CREATE VIEW v1 AS SELECT (SELECT f60 FROM t2 WHERE f59=19) AS f6
 # For a WHERE clause sub query that refers to a table also referenced in a
 # FROM clause 3.3.2.18
 SET @variant7= 'CREATE VIEW v1 AS SELECT f61 FROM v2';
-# Attention: The attempt to UPDATE the next VIEW fails like expected,
-#            but the error message
-#                ERROR 1093 (HY000) : You can't specify target table 'v1' for
-#                update in FORM clause"
-#            is wrong.
-#            The server must deliver ERROR 1288 (ER_NON_UPDATABLE_TABLE).
-#            Bug#10773 Incorrect message is displayed while updating a view
-# mleich FIXME: Remove the comment above, replace
-#                  --error ER_NON_UPDATABLE_TABLE,ER_UPDATE_TABLE_USED
-#               with
-#                  --error ER_NON_UPDATABLE_TABLE
-#               and update the file with expected results when the
-#               Bug#10773 is fixed.
-# For a reference to a non-updateable view 3.3.2.19
-let $message= Some server responses suffer from
-Bug#10773 Incorrect message is displayed while updating a view;
---source include/show_msg80.inc
 SET @variant8= 'CREATE VIEW v1 AS SELECT f59 AS f61 FROM t1 WHERE f60 IN (SELECT f59 FROM t1)';
 # For ALGORITHM = TEMPTABLE          3.3.2.20
 SET @variant9= 'CREATE ALGORITHM = TEMPTABLE VIEW v1 (f61) AS select f60 from t1';
@@ -3819,9 +3834,7 @@ while ($num)
    UPDATE v1 SET f61=1007;
    --error ER_NON_UPDATABLE_TABLE
    DELETE FROM v1;
-
    DROP VIEW v1;
-
    dec $num;
 }
 
@@ -3997,27 +4010,33 @@ DESCRIBE v2;
 SELECT * FROM v2 order by 2;
 # - What will be the content of base table created with AS SELECT ?
 CREATE TABLE t2 AS SELECT f1, SQRT(f2) my_sqrt FROM t1;
-if ($have_bug_11589)
+if ($have_bug_32285)
 {
 --disable_ps_protocol
 }
+--vertical_results
 SELECT * FROM t2 order by 2;
+--horizontal_results
 --enable_ps_protocol
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v1;
-if ($have_bug_11589)
+if ($have_bug_32285)
 {
 --disable_ps_protocol
 }
+--vertical_results
 SELECT * FROM t2 order by 2;
+--horizontal_results
 --enable_ps_protocol
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v2;
-if ($have_bug_11589)
+if ($have_bug_32285)
 {
 --disable_ps_protocol
 }
+--vertical_results
 SELECT * FROM t2 order by 2;
+--horizontal_results
 --enable_ps_protocol
 #
 DROP TABLE t1;
diff --git a/mysql-test/suite/ndb/r/ndb_auto_increment.result b/mysql-test/suite/ndb/r/ndb_auto_increment.result
index 5740ed38242..78612b35113 100644
--- a/mysql-test/suite/ndb/r/ndb_auto_increment.result
+++ b/mysql-test/suite/ndb/r/ndb_auto_increment.result
@@ -421,10 +421,10 @@ select * from t1 order by a;
 a
 1
 20
-21
 33
 34
 35
+65
 insert into t1 values (100);
 insert into t1 values (NULL);
 insert into t1 values (NULL);
@@ -432,11 +432,11 @@ select * from t1 order by a;
 a
 1
 20
-21
-22
 33
 34
 35
+65
+66
 100
 101
 set auto_increment_offset = @old_auto_increment_offset;
diff --git a/mysql-test/suite/ndb/r/ndb_autoinc.result b/mysql-test/suite/ndb/r/ndb_autoinc.result
new file mode 100644
index 00000000000..fe9d36393ad
--- /dev/null
+++ b/mysql-test/suite/ndb/r/ndb_autoinc.result
@@ -0,0 +1,37 @@
+DROP TABLE IF EXISTS t1,t2,t3;
+USE test;
+CREATE TABLE t1 (
+id INT AUTO_INCREMENT,
+PRIMARY KEY(id)
+) ENGINE=NDBCLUSTER;
+CREATE TABLE t2 (
+id INT AUTO_INCREMENT,
+KEY(id)
+) ENGINE=NDBCLUSTER;
+ERROR HY000: Can't create table 'test.t2' (errno: 4335)
+SHOW TABLES;
+Tables_in_test
+t1
+CREATE TABLE t3 (
+id INT AUTO_INCREMENT,
+KEY(id)
+) ENGINE=MYISAM;
+ALTER TABLE t3
+ENGINE NDBCLUSTER;
+SHOW CREATE TABLE t3;
+Table	Create Table
+t3	CREATE TABLE `t3` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  KEY `id` (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+ALTER TABLE t3
+ADD PRIMARY KEY (id);
+SHOW CREATE TABLE t3;
+Table	Create Table
+t3	CREATE TABLE `t3` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  PRIMARY KEY (`id`),
+  KEY `id` (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+DROP TABLE t1, t3;
+End of 5.1 tests
diff --git a/mysql-test/suite/ndb/r/ndb_bug31477.result b/mysql-test/suite/ndb/r/ndb_bug31477.result
new file mode 100644
index 00000000000..002a928b485
--- /dev/null
+++ b/mysql-test/suite/ndb/r/ndb_bug31477.result
@@ -0,0 +1,98 @@
+drop table if exists t1;
+create table t1(a int primary key, b int, c int, unique(b)) engine = ndb;
+insert into t1 values (2,2,2);
+insert into t1 values (3,3,3);
+insert into t1 values (4,4,4);
+begin;
+insert into t1 values (1,1,1);
+begin;
+update t1 set c = 2 where b = 1;
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+rollback;
+rollback;
+drop table t1;
+create table t1(a int primary key, b int, c int, key(b)) engine = ndb;
+insert into t1 values (2,2,2);
+insert into t1 values (3,3,3);
+insert into t1 values (4,4,4);
+begin;
+insert into t1 values (1,1,1);
+begin;
+update t1 set c = 2 where b = 1;
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+rollback;
+rollback;
+drop table t1;
+--con1
+create table t1(a int primary key, b int, c int, key(b)) engine = ndb;
+insert into t1 values (1,1,1);
+insert into t1 values (2,2,2);
+insert into t1 values (3,3,3);
+insert into t1 values (4,4,4);
+begin;
+update t1 set c = 10 where a = 1;
+update t1 set c = 20 where a = 1;
+update t1 set c = 30 where a = 1;
+--con1 c=30
+select * from t1 where b >= 1 order by b;
+a	b	c
+1	1	30
+2	2	2
+3	3	3
+4	4	4
+--con2 c=1
+select * from t1 where b >= 1 order by b;
+a	b	c
+1	1	1
+2	2	2
+3	3	3
+4	4	4
+--con1
+delete from t1 where a = 1;
+--con1 c=none
+select * from t1 where b >= 1 order by b;
+a	b	c
+2	2	2
+3	3	3
+4	4	4
+--con2 c=1
+select * from t1 where b >= 1 order by b;
+a	b	c
+1	1	1
+2	2	2
+3	3	3
+4	4	4
+--con1
+commit;
+--con1 c=none
+select * from t1 where b >= 1 order by b;
+a	b	c
+2	2	2
+3	3	3
+4	4	4
+--con2 c=none
+select * from t1 where b >= 1 order by b;
+a	b	c
+2	2	2
+3	3	3
+4	4	4
+--con1
+begin;
+insert into t1 values (1,1,1);
+update t1 set c = 10 where a = 1;
+update t1 set c = 20 where a = 1;
+update t1 set c = 30 where a = 1;
+--con1 c=30
+select * from t1 where b >= 1 order by b;
+a	b	c
+1	1	30
+2	2	2
+3	3	3
+4	4	4
+--con2 c=none
+select * from t1 where b >= 1 order by b;
+a	b	c
+2	2	2
+3	3	3
+4	4	4
+drop table t1;
diff --git a/mysql-test/suite/ndb/r/ndb_condition_pushdown.result b/mysql-test/suite/ndb/r/ndb_condition_pushdown.result
index 1d61e2c59c2..4b6f5031fb2 100644
--- a/mysql-test/suite/ndb/r/ndb_condition_pushdown.result
+++ b/mysql-test/suite/ndb/r/ndb_condition_pushdown.result
@@ -1904,6 +1904,12 @@ a	b	d
 10	1	4369
 20	2	8738
 50	5	21845
+-- big filter just below limit
+a	b	d
+10	1	4369
+20	2	8738
+50	5	21845
+-- big filter just above limit
 a	b	d
 10	1	4369
 20	2	8738
diff --git a/mysql-test/suite/ndb/r/ndb_dd_basic.result b/mysql-test/suite/ndb/r/ndb_dd_basic.result
index f04905b8d13..41e3d10fe5b 100644
--- a/mysql-test/suite/ndb/r/ndb_dd_basic.result
+++ b/mysql-test/suite/ndb/r/ndb_dd_basic.result
@@ -406,6 +406,16 @@ a	b	c
 1	7	7
 2	2	2
 3	3	3
+DELETE FROM t1;
+INSERT INTO t1 VALUES (3,'1','1');
+BEGIN;
+UPDATE t1 SET b = b + 2 WHERE A = 3;
+DELETE FROM t1 WHERE A = 3;
+INSERT INTO t1 VALUES (3,'0','0');
+COMMIT;
+SELECT * from t1 ORDER BY 1;
+a	b	c
+3	0	0
 DROP TABLE t1;
 CREATE TABLE t1 (
 a INT NOT NULL PRIMARY KEY,
@@ -501,6 +511,18 @@ f1	f2
 111111	aaaaaa
 222222	bbbbbb
 drop table test.t1;
+CREATE TABLE t1 (
+id int unsigned NOT NULL,
+c1 int unsigned NOT NULL,
+c2 int DEFAULT NULL,
+PRIMARY KEY using hash (id),
+UNIQUE KEY c1 using hash (c1))
+TABLESPACE ts1 STORAGE DISK ENGINE=ndbcluster;
+insert into t1 values(1, 1, 3);
+insert into t1 values(2, 2, 3);
+update t1 set c1 = 1 where id = 2;
+ERROR 23000: Duplicate entry '1' for key 'c1'
+drop table t1;
 ALTER TABLESPACE ts1 
 DROP DATAFILE 'datafile.dat' 
 ENGINE = NDB;
diff --git a/mysql-test/suite/ndb/r/ndb_partition_key.result b/mysql-test/suite/ndb/r/ndb_partition_key.result
index 60e96ce03b6..d87b59d6c0e 100644
--- a/mysql-test/suite/ndb/r/ndb_partition_key.result
+++ b/mysql-test/suite/ndb/r/ndb_partition_key.result
@@ -38,6 +38,23 @@ a	b	c
 1	10	3
 1	11	3
 1	12	3
+select max(b) from t1 where a = 1;
+max(b)
+12
+select b from t1 where a = 1 order by b desc;
+b
+12
+11
+10
+9
+8
+7
+6
+5
+4
+3
+2
+1
 DROP TABLE t1;
 CREATE TABLE t1 (a INT, b CHAR(10) COLLATE latin1_bin, c INT, d INT,
 PRIMARY KEY (a,b,c) USING HASH)
diff --git a/mysql-test/suite/ndb/r/ndb_partition_range.result b/mysql-test/suite/ndb/r/ndb_partition_range.result
index 0c717ed55e9..198898879df 100644
--- a/mysql-test/suite/ndb/r/ndb_partition_range.result
+++ b/mysql-test/suite/ndb/r/ndb_partition_range.result
@@ -46,6 +46,14 @@ a	b	c
 1	1	1
 6	1	1
 10	1	1
+INSERT into t1 values (1, 2, 2);
+select max(b) from t1 where a = 1;
+max(b)
+2
+select b from t1 where a = 1 order by b desc;
+b
+2
+1
 drop table t1;
 CREATE TABLE t1 (
 a int not null,
diff --git a/mysql-test/suite/ndb/r/ndb_restore.result b/mysql-test/suite/ndb/r/ndb_restore.result
index aba6997d218..a33c5c5f31c 100644
--- a/mysql-test/suite/ndb/r/ndb_restore.result
+++ b/mysql-test/suite/ndb/r/ndb_restore.result
@@ -253,21 +253,41 @@ a
 2000
 3000
 10000
-show table status like 't1_c';
-Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-X	X	X	X	X	X	X	X	X	X	3001	X	X	X	X	X	X	X
-show table status like 't2_c';
-Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-X	X	X	X	X	X	X	X	X	X	501	X	X	X	X	X	X	X
-show table status like 't4_c';
-Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-X	X	X	X	X	X	X	X	X	X	290000001	X	X	X	X	X	X	X
-show table status like 't7_c';
-Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-X	X	X	X	X	X	X	X	X	X	29	X	X	X	X	X	X	X
-show table status like 't10_c';
-Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-X	X	X	X	X	X	X	X	X	X	10001	X	X	X	X	X	X	X
+select max(capgoaledatta) from t1_c;
+max(capgoaledatta)
+3000
+select auto_increment from information_schema.tables
+where table_name = 't1_c';
+auto_increment
+3001
+select max(capgotod) from t2_c;
+max(capgotod)
+500
+select auto_increment from information_schema.tables
+where table_name = 't2_c';
+auto_increment
+501
+select max(capfa) from t4_c;
+max(capfa)
+290000000
+select auto_increment from information_schema.tables
+where table_name = 't4_c';
+auto_increment
+290000001
+select max(dardtestard) from t7_c;
+max(dardtestard)
+28
+select auto_increment from information_schema.tables
+where table_name = 't7_c';
+auto_increment
+29
+select max(a) from t10_c;
+max(a)
+10000
+select auto_increment from information_schema.tables
+where table_name = 't10_c';
+auto_increment
+10001
 ALTER TABLE t7_c
 PARTITION BY LINEAR KEY (`dardtestard`);
 CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP;
diff --git a/mysql-test/suite/ndb/t/ndb_autoinc.test b/mysql-test/suite/ndb/t/ndb_autoinc.test
new file mode 100644
index 00000000000..a5ae52c88d7
--- /dev/null
+++ b/mysql-test/suite/ndb/t/ndb_autoinc.test
@@ -0,0 +1,45 @@
+-- source include/have_ndb.inc
+-- source include/not_embedded.inc
+
+--disable_warnings
+DROP TABLE IF EXISTS t1,t2,t3;
+--enable_warnings
+
+USE test;
+
+CREATE TABLE t1 (
+  id INT AUTO_INCREMENT,
+  PRIMARY KEY(id)
+) ENGINE=NDBCLUSTER;
+
+# Test For bug#30417
+--error 1005
+
+CREATE TABLE t2 (
+  id INT AUTO_INCREMENT,
+  KEY(id)
+) ENGINE=NDBCLUSTER;
+
+SHOW TABLES;
+
+CREATE TABLE t3 (
+  id INT AUTO_INCREMENT,
+  KEY(id)
+) ENGINE=MYISAM;
+
+--disable_result_log
+--error 1005
+ALTER TABLE t3
+ENGINE NDBCLUSTER;
+--enable_result_log
+
+SHOW CREATE TABLE t3;
+
+ALTER TABLE t3
+ADD PRIMARY KEY (id);
+
+SHOW CREATE TABLE t3;
+
+DROP TABLE t1, t3;
+
+--echo End of 5.1 tests
diff --git a/mysql-test/suite/ndb/t/ndb_bug31477.test b/mysql-test/suite/ndb/t/ndb_bug31477.test
new file mode 100644
index 00000000000..41c519e56fd
--- /dev/null
+++ b/mysql-test/suite/ndb/t/ndb_bug31477.test
@@ -0,0 +1,109 @@
+--source include/have_ndb.inc
+
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+
+# setup
+
+connect (con1,localhost,root,,test);
+connect (con2,localhost,root,,test);
+
+# unique index
+connection con1;
+create table t1(a int primary key, b int, c int, unique(b)) engine = ndb;
+insert into t1 values (2,2,2);
+insert into t1 values (3,3,3);
+insert into t1 values (4,4,4);
+
+begin;
+insert into t1 values (1,1,1);
+
+connection con2;
+begin;
+--error 1205
+update t1 set c = 2 where b = 1;
+rollback;
+
+connection con1;
+rollback;
+drop table t1;
+# ordered index
+
+connection con1;
+create table t1(a int primary key, b int, c int, key(b)) engine = ndb;
+insert into t1 values (2,2,2);
+insert into t1 values (3,3,3);
+insert into t1 values (4,4,4);
+
+begin;
+insert into t1 values (1,1,1);
+
+connection con2;
+begin;
+--error 1205
+update t1 set c = 2 where b = 1;
+rollback;
+
+connection con1;
+rollback;
+drop table t1;
+
+# multiple versions
+
+--echo --con1
+connection con1;
+create table t1(a int primary key, b int, c int, key(b)) engine = ndb;
+insert into t1 values (1,1,1);
+insert into t1 values (2,2,2);
+insert into t1 values (3,3,3);
+insert into t1 values (4,4,4);
+
+begin;
+update t1 set c = 10 where a = 1;
+update t1 set c = 20 where a = 1;
+update t1 set c = 30 where a = 1;
+
+--echo --con1 c=30
+select * from t1 where b >= 1 order by b;
+--echo --con2 c=1
+connection con2;
+select * from t1 where b >= 1 order by b;
+
+--echo --con1
+connection con1;
+delete from t1 where a = 1;
+
+--echo --con1 c=none
+select * from t1 where b >= 1 order by b;
+--echo --con2 c=1
+connection con2;
+select * from t1 where b >= 1 order by b;
+
+--echo --con1
+connection con1;
+commit;
+
+--echo --con1 c=none
+select * from t1 where b >= 1 order by b;
+--echo --con2 c=none
+connection con2;
+select * from t1 where b >= 1 order by b;
+
+--echo --con1
+connection con1;
+begin;
+insert into t1 values (1,1,1);
+update t1 set c = 10 where a = 1;
+update t1 set c = 20 where a = 1;
+update t1 set c = 30 where a = 1;
+
+--echo --con1 c=30
+select * from t1 where b >= 1 order by b;
+--echo --con2 c=none
+connection con2;
+select * from t1 where b >= 1 order by b;
+
+# this fails with "no such table" via con2 ???
+connection con1;
+drop table t1;
diff --git a/mysql-test/suite/ndb/t/ndb_condition_pushdown.test b/mysql-test/suite/ndb/t/ndb_condition_pushdown.test
index 9e6a5e90e40..a56c9dda01c 100644
--- a/mysql-test/suite/ndb/t/ndb_condition_pushdown.test
+++ b/mysql-test/suite/ndb/t/ndb_condition_pushdown.test
@@ -1753,6 +1753,7 @@ set engine_condition_pushdown = 1;
 SELECT fname, lname FROM t1 WHERE (fname like 'Y%') or (lname like 'F%');
 
 # bug#29390 (scan filter is too large, discarded)
+# bug#34107 (previous limit was too large for TUP)
 
 drop table t1;
 
@@ -1771,9 +1772,11 @@ select a,b,d from t1
     where b in (0,1,2,5)
     order by b;
 
+--echo -- big filter just below limit
 --disable_query_log
 select a,b,d from t1
     where b in (
+0,1,2,5,0,1,2,5,0,1,
 0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
 0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
 0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
@@ -1904,745 +1907,15 @@ select a,b,d from t1
 0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
 0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
 0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
-0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
+0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2)
+    order by b;
+--enable_query_log
+
+--echo -- big filter just above limit
+--disable_query_log
+select a,b,d from t1
+    where b in (
+0,1,2,5,0,1,2,5,0,1,2,
 0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
 0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
 0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,5,0,1,2,
diff --git a/mysql-test/suite/ndb/t/ndb_dd_basic.test b/mysql-test/suite/ndb/t/ndb_dd_basic.test
index 8c83c2febe5..0fb793e2142 100644
--- a/mysql-test/suite/ndb/t/ndb_dd_basic.test
+++ b/mysql-test/suite/ndb/t/ndb_dd_basic.test
@@ -346,6 +346,16 @@ UPDATE t1 SET c = '6' WHERE b = '7';
 SELECT * FROM t1 ORDER BY 1;
 UPDATE t1 SET c = '7' WHERE c = '6';
 SELECT * FROM t1 ORDER BY 1;
+
+DELETE FROM t1;
+INSERT INTO t1 VALUES (3,'1','1');
+BEGIN;
+UPDATE t1 SET b = b + 2 WHERE A = 3;
+DELETE FROM t1 WHERE A = 3;
+INSERT INTO t1 VALUES (3,'0','0');
+COMMIT;
+SELECT * from t1 ORDER BY 1;
+
 DROP TABLE t1;
 
 ########################
@@ -439,6 +449,21 @@ select f2 from test.t1 order by f2;
 select f1,f2 from test.t1 order by f1;
 drop table test.t1;
 
+# bug#34118 hash index trigger and do not update any disk attr
+CREATE TABLE t1 (
+id int unsigned NOT NULL,
+c1 int unsigned NOT NULL,
+c2 int DEFAULT NULL,
+PRIMARY KEY using hash (id),
+UNIQUE KEY c1 using hash (c1))
+TABLESPACE ts1 STORAGE DISK ENGINE=ndbcluster;
+
+insert into t1 values(1, 1, 3);
+insert into t1 values(2, 2, 3);
+--error ER_DUP_ENTRY
+update t1 set c1 = 1 where id = 2;
+drop table t1;
+
 ###################
 # Test Cleanup
 ###################
diff --git a/mysql-test/suite/ndb/t/ndb_partition_key.test b/mysql-test/suite/ndb/t/ndb_partition_key.test
index 78e2c9d15c2..df351ea42c7 100644
--- a/mysql-test/suite/ndb/t/ndb_partition_key.test
+++ b/mysql-test/suite/ndb/t/ndb_partition_key.test
@@ -38,6 +38,10 @@ insert into t1 values
 
 select * from t1 order by b;
 
+# BUG#33061: ORDER BY DESC becomes ASC in NDB partition pruning to one partition
+select max(b) from t1 where a = 1;
+select b from t1 where a = 1 order by b desc;
+
 DROP TABLE t1;
 
 #
diff --git a/mysql-test/suite/ndb/t/ndb_partition_range.test b/mysql-test/suite/ndb/t/ndb_partition_range.test
index 7952ba502d2..778e552c6d8 100644
--- a/mysql-test/suite/ndb/t/ndb_partition_range.test
+++ b/mysql-test/suite/ndb/t/ndb_partition_range.test
@@ -48,6 +48,11 @@ select * from t1 where a=21 order by a;
 select * from t1 where a in (1,6,10,21) order by a;
 select * from t1 where b=1 and a in (1,6,10,21) order by a;
 
+# BUG#33061: ORDER BY DESC becomes ASC in NDB partition pruning to one partition
+INSERT into t1 values (1, 2, 2);
+select max(b) from t1 where a = 1;
+select b from t1 where a = 1 order by b desc;
+
 drop table t1;
 
 #
diff --git a/mysql-test/suite/ndb/t/ndb_restore.test b/mysql-test/suite/ndb/t/ndb_restore.test
index 18efa66ebe0..c8b07fd351a 100644
--- a/mysql-test/suite/ndb/t/ndb_restore.test
+++ b/mysql-test/suite/ndb/t/ndb_restore.test
@@ -246,16 +246,21 @@ select count(*)
 select * from t10_c order by a;
 # Bug #27775 cont'd
 # - auto inc info should be correct
---replace_column 1 X 2 X 3 X 4 X 5 X 6 X 7 X 8 X 9 X 10 X 12 X 13 X 14 X 15 X 16 X 17 X 18 X
-show table status like 't1_c';
---replace_column 1 X 2 X 3 X 4 X 5 X 6 X 7 X 8 X 9 X 10 X 12 X 13 X 14 X 15 X 16 X 17 X 18 X
-show table status like 't2_c'; 
---replace_column 1 X 2 X 3 X 4 X 5 X 6 X 7 X 8 X 9 X 10 X 12 X 13 X 14 X 15 X 16 X 17 X 18 X
-show table status like 't4_c'; 
---replace_column 1 X 2 X 3 X 4 X 5 X 6 X 7 X 8 X 9 X 10 X 12 X 13 X 14 X 15 X 16 X 17 X 18 X
-show table status like 't7_c'; 
---replace_column 1 X 2 X 3 X 4 X 5 X 6 X 7 X 8 X 9 X 10 X 12 X 13 X 14 X 15 X 16 X 17 X 18 X
-show table status like 't10_c';
+select max(capgoaledatta) from t1_c;
+select auto_increment from information_schema.tables
+where table_name = 't1_c';
+select max(capgotod) from t2_c;
+select auto_increment from information_schema.tables
+where table_name = 't2_c';
+select max(capfa) from t4_c;
+select auto_increment from information_schema.tables
+where table_name = 't4_c';
+select max(dardtestard) from t7_c;
+select auto_increment from information_schema.tables
+where table_name = 't7_c';
+select max(a) from t10_c;
+select auto_increment from information_schema.tables
+where table_name = 't10_c';
 
 #
 # Try Partitioned tables as well
diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result b/mysql-test/suite/ndb_team/r/rpl_ndb_dd_advance.result
index 7f26313894c..7f26313894c 100644
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result
+++ b/mysql-test/suite/ndb_team/r/rpl_ndb_dd_advance.result
diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result b/mysql-test/suite/ndb_team/r/rpl_ndb_extraColMaster.result
index 194e6a375f3..97300e7131b 100644
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result
+++ b/mysql-test/suite/ndb_team/r/rpl_ndb_extraColMaster.result
@@ -440,23 +440,21 @@ f1	f2	f3	f4
 select * from t4 order by f1;
 f1	f2	f3	f4
 1	1	1	first
-select * from t31 order by f1;
+select * from t31 order by f3;
 f1	f2	f3	f4
-1	1	5	fifth
-1	1	3	third
 1	1	1	first
-1	1	6	sixth
 1	1	2	second
+1	1	3	third
 1	1	4	fourth
+1	1	5	fifth
+1	1	6	sixth
 
 ** Do updates master **
 
 update t31 set f5=555555555555555 where f3=6;
 update t31 set f2=2 where f3=2;
 update t31 set f1=NULL where f3=1;
-update t31 set f3=NULL, f27=NULL, f35='f35 new value' where f3=3;
-Warnings:
-Warning	1048	Column 'f3' cannot be null
+update t31 set f3=0, f27=NULL, f35='f35 new value' where f3=3;
 
 ** Delete from Master **
 
@@ -563,7 +561,7 @@ Replicate_Do_Table
 Replicate_Ignore_Table	
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1534
+Last_Errno	1535
 Last_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -581,7 +579,7 @@ Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
 Last_IO_Errno	#
 Last_IO_Error	#
-Last_SQL_Errno	1534
+Last_SQL_Errno	1535
 Last_SQL_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
@@ -638,7 +636,7 @@ Replicate_Do_Table
 Replicate_Ignore_Table	
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1534
+Last_Errno	1535
 Last_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -656,7 +654,7 @@ Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
 Last_IO_Errno	#
 Last_IO_Error	#
-Last_SQL_Errno	1534
+Last_SQL_Errno	1535
 Last_SQL_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
@@ -1581,23 +1579,21 @@ f1	f2	f3	f4
 select * from t4 order by f1;
 f1	f2	f3	f4
 1	1	1	first
-select * from t31 order by f1;
+select * from t31 order by f3;
 f1	f2	f3	f4
-1	1	5	fifth
-1	1	3	third
 1	1	1	first
-1	1	6	sixth
 1	1	2	second
+1	1	3	third
 1	1	4	fourth
+1	1	5	fifth
+1	1	6	sixth
 
 ** Do updates master **
 
 update t31 set f5=555555555555555 where f3=6;
 update t31 set f2=2 where f3=2;
 update t31 set f1=NULL where f3=1;
-update t31 set f3=NULL, f27=NULL, f35='f35 new value' where f3=3;
-Warnings:
-Warning	1048	Column 'f3' cannot be null
+update t31 set f3=0, f27=NULL, f35='f35 new value' where f3=3;
 
 ** Delete from Master **
 
@@ -1704,7 +1700,7 @@ Replicate_Do_Table
 Replicate_Ignore_Table	
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1534
+Last_Errno	1535
 Last_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -1722,7 +1718,7 @@ Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
 Last_IO_Errno	#
 Last_IO_Error	#
-Last_SQL_Errno	1534
+Last_SQL_Errno	1535
 Last_SQL_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
@@ -1779,7 +1775,7 @@ Replicate_Do_Table
 Replicate_Ignore_Table	
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1534
+Last_Errno	1535
 Last_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -1797,7 +1793,7 @@ Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
 Last_IO_Errno	#
 Last_IO_Error	#
-Last_SQL_Errno	1534
+Last_SQL_Errno	1535
 Last_SQL_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_mix_innodb.result b/mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result
index 625d06de44b..eba1222ea33 100644
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_mix_innodb.result
+++ b/mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result
@@ -20,13 +20,27 @@ from mysql.ndb_apply_status;
 @log_name:=log_name	@start_pos:=start_pos	@end_pos:=end_pos
 <log_name>	<start_pos>	<end_pos>
 
+# Now check that that is in the apply_status table is consistant
+# with what is in the binlog
+
+# since insert is done with transactional engine, expect a BEGIN
+# at <start_pos>
+
 show binlog events from <start_pos> limit 1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	<start_pos>	Query	1	#	use `test`; insert into t1 values (1,2)
+master-bin.000001	<start_pos>	Query	1	#	use `test`; BEGIN
+
+# Now the insert, one step after
 
 show binlog events from <start_pos> limit 1,1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Xid	1	445	COMMIT /* XID */
+master-bin.000001	#	Query	1	#	use `test`; insert into t1 values (1,2)
+
+# and the COMMIT should be at <end_pos>
+
+show binlog events from <start_pos> limit 2,1;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Xid	1	<end_pos>	COMMIT /* XID */
 
 begin;
 insert into t1 values (2,3);
diff --git a/mysql-test/suite/ndb_team/t/disabled.def b/mysql-test/suite/ndb_team/t/disabled.def
index 8ff2d29147d..714f1014a10 100644
--- a/mysql-test/suite/ndb_team/t/disabled.def
+++ b/mysql-test/suite/ndb_team/t/disabled.def
@@ -15,3 +15,6 @@ ndb_autodiscover2        : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t
 # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
 #ndb_autodiscover3        : bug#21806
 #ndb_autodiscover3         : Bug#20872 2007-07-15 ingo master*.err: miscellaneous error messages
+#rpl_ndb_extraColMaster   : BUG#30854 : Tables name show as binary in slave err msg on vm-win2003-64-b and Solaris
+#rpl_ndb_mix_innodb       : Bug #32720   Test rpl_ndb_mix_innodb fails on SPARC and PowerPC
+#rpl_ndb_dd_advance	 : Bug #30222  	rpl_ndb_dd_advance.test fails
diff --git a/mysql-test/suite/ndb_team/t/ndb_autodiscover.test b/mysql-test/suite/ndb_team/t/ndb_autodiscover.test
index 06d47693c10..e25bf4518a8 100644
--- a/mysql-test/suite/ndb_team/t/ndb_autodiscover.test
+++ b/mysql-test/suite/ndb_team/t/ndb_autodiscover.test
@@ -491,6 +491,7 @@ select * from t1;
 select * from t1;
 --exec $NDB_MGM --no-defaults -e "all start" > /dev/null
 --exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults > /dev/null
+--source include/ndb_wait_connected.inc
 use test;
 drop database test_only_ndb_tables;
 
diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_advance.test b/mysql-test/suite/ndb_team/t/rpl_ndb_dd_advance.test
index a7e00262f5c..a7e00262f5c 100644
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_advance.test
+++ b/mysql-test/suite/ndb_team/t/rpl_ndb_dd_advance.test
diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_extraColMaster.test b/mysql-test/suite/ndb_team/t/rpl_ndb_extraColMaster.test
index d78eda7eef1..d78eda7eef1 100644
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_extraColMaster.test
+++ b/mysql-test/suite/ndb_team/t/rpl_ndb_extraColMaster.test
diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb-master.opt b/mysql-test/suite/ndb_team/t/rpl_ndb_mix_innodb-master.opt
index 3596fc4d3bd..3596fc4d3bd 100644
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb-master.opt
+++ b/mysql-test/suite/ndb_team/t/rpl_ndb_mix_innodb-master.opt
diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb.test b/mysql-test/suite/ndb_team/t/rpl_ndb_mix_innodb.test
index b730bcc08e0..b730bcc08e0 100644
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb.test
+++ b/mysql-test/suite/ndb_team/t/rpl_ndb_mix_innodb.test
diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_2innodb.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_2innodb.result
index f8ec4624062..c5e9ff2721b 100644
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_2innodb.result
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_2innodb.result
@@ -4,7 +4,14 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
-SET storage_engine=ndb;
+set @@global.slave_exec_mode= 'IDEMPOTENT';
+CREATE TABLE mysql.ndb_apply_status
+( server_id INT UNSIGNED NOT NULL,
+epoch BIGINT UNSIGNED NOT NULL,
+log_name VARCHAR(255) BINARY NOT NULL,
+start_pos BIGINT UNSIGNED NOT NULL,
+end_pos BIGINT UNSIGNED NOT NULL,
+PRIMARY KEY USING HASH (server_id)) ENGINE=INNODB;
 --- Doing pre test cleanup --- 
 DROP TABLE IF EXISTS t1;
 --- Start test 1 Basic testing ---
@@ -27,7 +34,7 @@ t1	CREATE TABLE `t1` (
   `y` year(4) DEFAULT NULL,
   `t` date DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () 
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1
 --- Show table on slave ---
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -100,7 +107,7 @@ t1	CREATE TABLE `t1` (
   `y` year(4) DEFAULT NULL,
   `t` date DEFAULT NULL,
   PRIMARY KEY (`id`,`total`)
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () 
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1
 --- Make sure that our tables on slave are still same engine ---
 --- and that the alter statements replicated correctly ---
 SHOW CREATE TABLE t1;
@@ -186,7 +193,7 @@ t1	CREATE TABLE `t1` (
   `total` bigint(20) unsigned DEFAULT NULL,
   `y` year(4) DEFAULT NULL,
   `t` date DEFAULT NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY RANGE (YEAR(t)) (PARTITION p0 VALUES LESS THAN (1901) ENGINE = ndbcluster, PARTITION p1 VALUES LESS THAN (1946) ENGINE = ndbcluster, PARTITION p2 VALUES LESS THAN (1966) ENGINE = ndbcluster, PARTITION p3 VALUES LESS THAN (1986) ENGINE = ndbcluster, PARTITION p4 VALUES LESS THAN (2005) ENGINE = ndbcluster, PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ndbcluster)
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (YEAR(t)) (PARTITION p0 VALUES LESS THAN (1901) ENGINE = ndbcluster, PARTITION p1 VALUES LESS THAN (1946) ENGINE = ndbcluster, PARTITION p2 VALUES LESS THAN (1966) ENGINE = ndbcluster, PARTITION p3 VALUES LESS THAN (1986) ENGINE = ndbcluster, PARTITION p4 VALUES LESS THAN (2005) ENGINE = ndbcluster, PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ndbcluster) */
 --- Show table on slave --
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -200,7 +207,7 @@ t1	CREATE TABLE `t1` (
   `total` bigint(20) unsigned DEFAULT NULL,
   `y` year(4) DEFAULT NULL,
   `t` date DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 PARTITION BY RANGE (YEAR(t)) (PARTITION p0 VALUES LESS THAN (1901) ENGINE = InnoDB, PARTITION p1 VALUES LESS THAN (1946) ENGINE = InnoDB, PARTITION p2 VALUES LESS THAN (1966) ENGINE = InnoDB, PARTITION p3 VALUES LESS THAN (1986) ENGINE = InnoDB, PARTITION p4 VALUES LESS THAN (2005) ENGINE = InnoDB, PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = InnoDB)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (YEAR(t)) (PARTITION p0 VALUES LESS THAN (1901) ENGINE = InnoDB, PARTITION p1 VALUES LESS THAN (1946) ENGINE = InnoDB, PARTITION p2 VALUES LESS THAN (1966) ENGINE = InnoDB, PARTITION p3 VALUES LESS THAN (1986) ENGINE = InnoDB, PARTITION p4 VALUES LESS THAN (2005) ENGINE = InnoDB, PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */
 --- Perform basic operation on master ---
 --- and ensure replicated correctly ---
 "--- Insert into t1 --" as "";
@@ -258,7 +265,7 @@ t1	CREATE TABLE `t1` (
   `y` year(4) DEFAULT NULL,
   `t` date NOT NULL DEFAULT '0000-00-00',
   PRIMARY KEY (`t`,`id`)
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY RANGE (YEAR(t)) (PARTITION p0 VALUES LESS THAN (1901) ENGINE = ndbcluster, PARTITION p1 VALUES LESS THAN (1946) ENGINE = ndbcluster, PARTITION p2 VALUES LESS THAN (1966) ENGINE = ndbcluster, PARTITION p3 VALUES LESS THAN (1986) ENGINE = ndbcluster, PARTITION p4 VALUES LESS THAN (2005) ENGINE = ndbcluster, PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ndbcluster)
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (YEAR(t)) (PARTITION p0 VALUES LESS THAN (1901) ENGINE = ndbcluster, PARTITION p1 VALUES LESS THAN (1946) ENGINE = ndbcluster, PARTITION p2 VALUES LESS THAN (1966) ENGINE = ndbcluster, PARTITION p3 VALUES LESS THAN (1986) ENGINE = ndbcluster, PARTITION p4 VALUES LESS THAN (2005) ENGINE = ndbcluster, PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ndbcluster) */
 --- Make sure that our tables on slave are still same engine ---
 --- and that the alter statements replicated correctly ---
 SHOW CREATE TABLE t1;
@@ -274,7 +281,7 @@ t1	CREATE TABLE `t1` (
   `y` year(4) DEFAULT NULL,
   `t` date NOT NULL DEFAULT '0000-00-00',
   PRIMARY KEY (`t`,`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 PARTITION BY RANGE (YEAR(t)) (PARTITION p0 VALUES LESS THAN (1901) ENGINE = InnoDB, PARTITION p1 VALUES LESS THAN (1946) ENGINE = InnoDB, PARTITION p2 VALUES LESS THAN (1966) ENGINE = InnoDB, PARTITION p3 VALUES LESS THAN (1986) ENGINE = InnoDB, PARTITION p4 VALUES LESS THAN (2005) ENGINE = InnoDB, PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = InnoDB)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (YEAR(t)) (PARTITION p0 VALUES LESS THAN (1901) ENGINE = InnoDB, PARTITION p1 VALUES LESS THAN (1946) ENGINE = InnoDB, PARTITION p2 VALUES LESS THAN (1966) ENGINE = InnoDB, PARTITION p3 VALUES LESS THAN (1986) ENGINE = InnoDB, PARTITION p4 VALUES LESS THAN (2005) ENGINE = InnoDB, PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */
 --- Perform basic operation on master ---
 --- and ensure replicated correctly ---
 "--- Insert into t1 --" as "";
@@ -299,11 +306,11 @@ UPDATE t1 SET b1 = 0, t="2006-02-22" WHERE id = 412;
 --- Check the update on master --- 
 SELECT id,hex(b1),vc,bc,d,f,total,y,t FROM t1 WHERE id = 412;
 id	hex(b1)	vc	bc	d	f	total	y	t
-412	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2006-02-22
+412	0	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2006-02-22
 --- Check Update on slave ---
 SELECT id,hex(b1),vc,bc,d,f,total,y,t FROM t1 WHERE id = 412;
 id	hex(b1)	vc	bc	d	f	total	y	t
-412	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2006-02-22
+412	0	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2006-02-22
 --- Remove a record from t1 on master ---
 DELETE FROM t1 WHERE id = 42;
 --- Show current count on master for t1 ---
@@ -342,7 +349,7 @@ t1	CREATE TABLE `t1` (
   `total` bigint(20) unsigned DEFAULT NULL,
   `y` year(4) DEFAULT NULL,
   `t` date DEFAULT NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY LIST (id) (PARTITION p0 VALUES IN (2,4) ENGINE = ndbcluster, PARTITION p1 VALUES IN (42,142) ENGINE = ndbcluster, PARTITION p2 VALUES IN (412) ENGINE = ndbcluster)
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (id) (PARTITION p0 VALUES IN (2,4) ENGINE = ndbcluster, PARTITION p1 VALUES IN (42,142) ENGINE = ndbcluster, PARTITION p2 VALUES IN (412) ENGINE = ndbcluster) */
 --- Show table on slave ---
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -356,7 +363,7 @@ t1	CREATE TABLE `t1` (
   `total` bigint(20) unsigned DEFAULT NULL,
   `y` year(4) DEFAULT NULL,
   `t` date DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 PARTITION BY LIST (id) (PARTITION p0 VALUES IN (2,4) ENGINE = InnoDB, PARTITION p1 VALUES IN (42,142) ENGINE = InnoDB, PARTITION p2 VALUES IN (412) ENGINE = InnoDB)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (id) (PARTITION p0 VALUES IN (2,4) ENGINE = InnoDB, PARTITION p1 VALUES IN (42,142) ENGINE = InnoDB, PARTITION p2 VALUES IN (412) ENGINE = InnoDB) */
 --- Perform basic operation on master ---
 --- and ensure replicated correctly ---
 "--- Insert into t1 --" as "";
@@ -414,7 +421,7 @@ t1	CREATE TABLE `t1` (
   `y` year(4) DEFAULT NULL,
   `t` date DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY LIST (id) (PARTITION p0 VALUES IN (2,4) ENGINE = ndbcluster, PARTITION p1 VALUES IN (42,142) ENGINE = ndbcluster, PARTITION p2 VALUES IN (412) ENGINE = ndbcluster)
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (id) (PARTITION p0 VALUES IN (2,4) ENGINE = ndbcluster, PARTITION p1 VALUES IN (42,142) ENGINE = ndbcluster, PARTITION p2 VALUES IN (412) ENGINE = ndbcluster) */
 --- Make sure that our tables on slave are still same engine ---
 --- and that the alter statements replicated correctly ---
 SHOW CREATE TABLE t1;
@@ -430,7 +437,7 @@ t1	CREATE TABLE `t1` (
   `y` year(4) DEFAULT NULL,
   `t` date DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 PARTITION BY LIST (id) (PARTITION p0 VALUES IN (2,4) ENGINE = InnoDB, PARTITION p1 VALUES IN (42,142) ENGINE = InnoDB, PARTITION p2 VALUES IN (412) ENGINE = InnoDB)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (id) (PARTITION p0 VALUES IN (2,4) ENGINE = InnoDB, PARTITION p1 VALUES IN (42,142) ENGINE = InnoDB, PARTITION p2 VALUES IN (412) ENGINE = InnoDB) */
 --- Perform basic operation on master ---
 --- and ensure replicated correctly ---
 "--- Insert into t1 --" as "";
@@ -495,7 +502,7 @@ t1	CREATE TABLE `t1` (
   `total` bigint(20) unsigned DEFAULT NULL,
   `y` year(4) DEFAULT NULL,
   `t` date DEFAULT NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY HASH ( YEAR(t)) PARTITIONS 4 
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH ( YEAR(t)) PARTITIONS 4  */
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -508,7 +515,7 @@ t1	CREATE TABLE `t1` (
   `total` bigint(20) unsigned DEFAULT NULL,
   `y` year(4) DEFAULT NULL,
   `t` date DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 PARTITION BY HASH ( YEAR(t)) PARTITIONS 4 
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH ( YEAR(t)) PARTITIONS 4  */
 --- Perform basic operation on master ---
 --- and ensure replicated correctly ---
 "--- Insert into t1 --" as "";
@@ -533,11 +540,11 @@ UPDATE t1 SET b1 = 0, t="2006-02-22" WHERE id = 412;
 --- Check the update on master --- 
 SELECT id,hex(b1),vc,bc,d,f,total,y,t FROM t1 WHERE id = 412;
 id	hex(b1)	vc	bc	d	f	total	y	t
-412	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2006-02-22
+412	0	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2006-02-22
 --- Check Update on slave ---
 SELECT id,hex(b1),vc,bc,d,f,total,y,t FROM t1 WHERE id = 412;
 id	hex(b1)	vc	bc	d	f	total	y	t
-412	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2006-02-22
+412	0	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2006-02-22
 --- Remove a record from t1 on master ---
 DELETE FROM t1 WHERE id = 42;
 --- Show current count on master for t1 ---
@@ -566,7 +573,7 @@ t1	CREATE TABLE `t1` (
   `y` year(4) DEFAULT NULL,
   `t` date NOT NULL DEFAULT '0000-00-00',
   PRIMARY KEY (`t`,`id`)
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY HASH ( YEAR(t)) PARTITIONS 4 
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH ( YEAR(t)) PARTITIONS 4  */
 --- Make sure that our tables on slave are still same engine ---
 --- and that the alter statements replicated correctly ---
 SHOW CREATE TABLE t1;
@@ -582,7 +589,7 @@ t1	CREATE TABLE `t1` (
   `y` year(4) DEFAULT NULL,
   `t` date NOT NULL DEFAULT '0000-00-00',
   PRIMARY KEY (`t`,`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 PARTITION BY HASH ( YEAR(t)) PARTITIONS 4 
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH ( YEAR(t)) PARTITIONS 4  */
 --- Perform basic operation on master ---
 --- and ensure replicated correctly ---
 "--- Insert into t1 --" as "";
@@ -607,11 +614,11 @@ UPDATE t1 SET b1 = 0, t="2006-02-22" WHERE id = 412;
 --- Check the update on master --- 
 SELECT id,hex(b1),vc,bc,d,f,total,y,t FROM t1 WHERE id = 412;
 id	hex(b1)	vc	bc	d	f	total	y	t
-412	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2006-02-22
+412	0	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2006-02-22
 --- Check Update on slave ---
 SELECT id,hex(b1),vc,bc,d,f,total,y,t FROM t1 WHERE id = 412;
 id	hex(b1)	vc	bc	d	f	total	y	t
-412	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2006-02-22
+412	0	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2006-02-22
 --- Remove a record from t1 on master ---
 DELETE FROM t1 WHERE id = 42;
 --- Show current count on master for t1 ---
@@ -648,7 +655,7 @@ t1	CREATE TABLE `t1` (
   `y` year(4) DEFAULT NULL,
   `t` date DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () PARTITIONS 4 
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY () PARTITIONS 4  */
 --- Show that tables on slave ---
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -663,7 +670,7 @@ t1	CREATE TABLE `t1` (
   `y` year(4) DEFAULT NULL,
   `t` date DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 PARTITION BY KEY () PARTITIONS 4 
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY () PARTITIONS 4  */
 --- Perform basic operation on master ---
 --- and ensure replicated correctly ---
 "--- Insert into t1 --" as "";
@@ -720,7 +727,7 @@ t1	CREATE TABLE `t1` (
   `y` year(4) DEFAULT NULL,
   `t` date DEFAULT NULL,
   PRIMARY KEY (`id`,`total`)
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () PARTITIONS 4 
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY () PARTITIONS 4  */
 --- Make sure that our tables on slave are still right type ---
 --- and that the alter statements replicated correctly ---
 SHOW CREATE TABLE t1;
@@ -736,7 +743,7 @@ t1	CREATE TABLE `t1` (
   `y` year(4) DEFAULT NULL,
   `t` date DEFAULT NULL,
   PRIMARY KEY (`id`,`total`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 PARTITION BY KEY () PARTITIONS 4 
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY () PARTITIONS 4  */
 --- Perform basic operation on master ---
 --- and ensure replicated correctly ---
 "--- Insert into t1 --" as "";
@@ -793,7 +800,7 @@ t1	CREATE TABLE `t1` (
   `y` year(4) DEFAULT NULL,
   `t` date DEFAULT NULL,
   PRIMARY KEY (`id`,`total`)
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () PARTITIONS 4 
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY () PARTITIONS 4  */
 --- Make sure that our tables on slave are still same engine ---
 --- and that the alter statements replicated correctly ---
 SHOW CREATE TABLE t1;
@@ -809,7 +816,7 @@ t1	CREATE TABLE `t1` (
   `y` year(4) DEFAULT NULL,
   `t` date DEFAULT NULL,
   PRIMARY KEY (`id`,`total`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 PARTITION BY KEY () PARTITIONS 4 
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY () PARTITIONS 4  */
 --- Perform basic operation on master ---
 --- and ensure replicated correctly ---
 "--- Insert into t1 --" as "";
@@ -853,3 +860,4 @@ DELETE FROM t1;
 --- End test 5 key partition testing ---
 --- Do Cleanup ---
 DROP TABLE IF EXISTS t1;
+drop table mysql.ndb_apply_status;
diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_2myisam.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_2myisam.result
index 8611d83f3f3..824df733fa9 100644
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_2myisam.result
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_2myisam.result
@@ -4,7 +4,14 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
-SET storage_engine=ndb;
+set @@global.slave_exec_mode= 'IDEMPOTENT';
+CREATE TABLE mysql.ndb_apply_status
+( server_id INT UNSIGNED NOT NULL,
+epoch BIGINT UNSIGNED NOT NULL,
+log_name VARCHAR(255) BINARY NOT NULL,
+start_pos BIGINT UNSIGNED NOT NULL,
+end_pos BIGINT UNSIGNED NOT NULL,
+PRIMARY KEY USING HASH (server_id)) ENGINE=MYISAM;
 --- Doing pre test cleanup --- 
 DROP TABLE IF EXISTS t1;
 --- Start test 1 Basic testing ---
@@ -186,7 +193,7 @@ t1	CREATE TABLE `t1` (
   `total` bigint(20) unsigned DEFAULT NULL,
   `y` year(4) DEFAULT NULL,
   `t` date DEFAULT NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY RANGE (YEAR(t)) (PARTITION p0 VALUES LESS THAN (1901) ENGINE = ndbcluster, PARTITION p1 VALUES LESS THAN (1946) ENGINE = ndbcluster, PARTITION p2 VALUES LESS THAN (1966) ENGINE = ndbcluster, PARTITION p3 VALUES LESS THAN (1986) ENGINE = ndbcluster, PARTITION p4 VALUES LESS THAN (2005) ENGINE = ndbcluster, PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ndbcluster)
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (YEAR(t)) (PARTITION p0 VALUES LESS THAN (1901) ENGINE = ndbcluster, PARTITION p1 VALUES LESS THAN (1946) ENGINE = ndbcluster, PARTITION p2 VALUES LESS THAN (1966) ENGINE = ndbcluster, PARTITION p3 VALUES LESS THAN (1986) ENGINE = ndbcluster, PARTITION p4 VALUES LESS THAN (2005) ENGINE = ndbcluster, PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ndbcluster) */
 --- Show table on slave --
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -200,7 +207,7 @@ t1	CREATE TABLE `t1` (
   `total` bigint(20) unsigned DEFAULT NULL,
   `y` year(4) DEFAULT NULL,
   `t` date DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY RANGE (YEAR(t)) (PARTITION p0 VALUES LESS THAN (1901) ENGINE = MyISAM, PARTITION p1 VALUES LESS THAN (1946) ENGINE = MyISAM, PARTITION p2 VALUES LESS THAN (1966) ENGINE = MyISAM, PARTITION p3 VALUES LESS THAN (1986) ENGINE = MyISAM, PARTITION p4 VALUES LESS THAN (2005) ENGINE = MyISAM, PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (YEAR(t)) (PARTITION p0 VALUES LESS THAN (1901) ENGINE = MyISAM, PARTITION p1 VALUES LESS THAN (1946) ENGINE = MyISAM, PARTITION p2 VALUES LESS THAN (1966) ENGINE = MyISAM, PARTITION p3 VALUES LESS THAN (1986) ENGINE = MyISAM, PARTITION p4 VALUES LESS THAN (2005) ENGINE = MyISAM, PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
 --- Perform basic operation on master ---
 --- and ensure replicated correctly ---
 "--- Insert into t1 --" as "";
@@ -258,7 +265,7 @@ t1	CREATE TABLE `t1` (
   `y` year(4) DEFAULT NULL,
   `t` date NOT NULL DEFAULT '0000-00-00',
   PRIMARY KEY (`t`,`id`)
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY RANGE (YEAR(t)) (PARTITION p0 VALUES LESS THAN (1901) ENGINE = ndbcluster, PARTITION p1 VALUES LESS THAN (1946) ENGINE = ndbcluster, PARTITION p2 VALUES LESS THAN (1966) ENGINE = ndbcluster, PARTITION p3 VALUES LESS THAN (1986) ENGINE = ndbcluster, PARTITION p4 VALUES LESS THAN (2005) ENGINE = ndbcluster, PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ndbcluster)
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (YEAR(t)) (PARTITION p0 VALUES LESS THAN (1901) ENGINE = ndbcluster, PARTITION p1 VALUES LESS THAN (1946) ENGINE = ndbcluster, PARTITION p2 VALUES LESS THAN (1966) ENGINE = ndbcluster, PARTITION p3 VALUES LESS THAN (1986) ENGINE = ndbcluster, PARTITION p4 VALUES LESS THAN (2005) ENGINE = ndbcluster, PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = ndbcluster) */
 --- Make sure that our tables on slave are still same engine ---
 --- and that the alter statements replicated correctly ---
 SHOW CREATE TABLE t1;
@@ -274,7 +281,7 @@ t1	CREATE TABLE `t1` (
   `y` year(4) DEFAULT NULL,
   `t` date NOT NULL DEFAULT '0000-00-00',
   PRIMARY KEY (`t`,`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY RANGE (YEAR(t)) (PARTITION p0 VALUES LESS THAN (1901) ENGINE = MyISAM, PARTITION p1 VALUES LESS THAN (1946) ENGINE = MyISAM, PARTITION p2 VALUES LESS THAN (1966) ENGINE = MyISAM, PARTITION p3 VALUES LESS THAN (1986) ENGINE = MyISAM, PARTITION p4 VALUES LESS THAN (2005) ENGINE = MyISAM, PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (YEAR(t)) (PARTITION p0 VALUES LESS THAN (1901) ENGINE = MyISAM, PARTITION p1 VALUES LESS THAN (1946) ENGINE = MyISAM, PARTITION p2 VALUES LESS THAN (1966) ENGINE = MyISAM, PARTITION p3 VALUES LESS THAN (1986) ENGINE = MyISAM, PARTITION p4 VALUES LESS THAN (2005) ENGINE = MyISAM, PARTITION p5 VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
 --- Perform basic operation on master ---
 --- and ensure replicated correctly ---
 "--- Insert into t1 --" as "";
@@ -299,11 +306,11 @@ UPDATE t1 SET b1 = 0, t="2006-02-22" WHERE id = 412;
 --- Check the update on master --- 
 SELECT id,hex(b1),vc,bc,d,f,total,y,t FROM t1 WHERE id = 412;
 id	hex(b1)	vc	bc	d	f	total	y	t
-412	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2006-02-22
+412	0	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2006-02-22
 --- Check Update on slave ---
 SELECT id,hex(b1),vc,bc,d,f,total,y,t FROM t1 WHERE id = 412;
 id	hex(b1)	vc	bc	d	f	total	y	t
-412	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2006-02-22
+412	0	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2006-02-22
 --- Remove a record from t1 on master ---
 DELETE FROM t1 WHERE id = 42;
 --- Show current count on master for t1 ---
@@ -342,7 +349,7 @@ t1	CREATE TABLE `t1` (
   `total` bigint(20) unsigned DEFAULT NULL,
   `y` year(4) DEFAULT NULL,
   `t` date DEFAULT NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY LIST (id) (PARTITION p0 VALUES IN (2,4) ENGINE = ndbcluster, PARTITION p1 VALUES IN (42,142) ENGINE = ndbcluster, PARTITION p2 VALUES IN (412) ENGINE = ndbcluster)
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (id) (PARTITION p0 VALUES IN (2,4) ENGINE = ndbcluster, PARTITION p1 VALUES IN (42,142) ENGINE = ndbcluster, PARTITION p2 VALUES IN (412) ENGINE = ndbcluster) */
 --- Show table on slave ---
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -356,7 +363,7 @@ t1	CREATE TABLE `t1` (
   `total` bigint(20) unsigned DEFAULT NULL,
   `y` year(4) DEFAULT NULL,
   `t` date DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY LIST (id) (PARTITION p0 VALUES IN (2,4) ENGINE = MyISAM, PARTITION p1 VALUES IN (42,142) ENGINE = MyISAM, PARTITION p2 VALUES IN (412) ENGINE = MyISAM)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (id) (PARTITION p0 VALUES IN (2,4) ENGINE = MyISAM, PARTITION p1 VALUES IN (42,142) ENGINE = MyISAM, PARTITION p2 VALUES IN (412) ENGINE = MyISAM) */
 --- Perform basic operation on master ---
 --- and ensure replicated correctly ---
 "--- Insert into t1 --" as "";
@@ -414,7 +421,7 @@ t1	CREATE TABLE `t1` (
   `y` year(4) DEFAULT NULL,
   `t` date DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY LIST (id) (PARTITION p0 VALUES IN (2,4) ENGINE = ndbcluster, PARTITION p1 VALUES IN (42,142) ENGINE = ndbcluster, PARTITION p2 VALUES IN (412) ENGINE = ndbcluster)
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (id) (PARTITION p0 VALUES IN (2,4) ENGINE = ndbcluster, PARTITION p1 VALUES IN (42,142) ENGINE = ndbcluster, PARTITION p2 VALUES IN (412) ENGINE = ndbcluster) */
 --- Make sure that our tables on slave are still same engine ---
 --- and that the alter statements replicated correctly ---
 SHOW CREATE TABLE t1;
@@ -430,7 +437,7 @@ t1	CREATE TABLE `t1` (
   `y` year(4) DEFAULT NULL,
   `t` date DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY LIST (id) (PARTITION p0 VALUES IN (2,4) ENGINE = MyISAM, PARTITION p1 VALUES IN (42,142) ENGINE = MyISAM, PARTITION p2 VALUES IN (412) ENGINE = MyISAM)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (id) (PARTITION p0 VALUES IN (2,4) ENGINE = MyISAM, PARTITION p1 VALUES IN (42,142) ENGINE = MyISAM, PARTITION p2 VALUES IN (412) ENGINE = MyISAM) */
 --- Perform basic operation on master ---
 --- and ensure replicated correctly ---
 "--- Insert into t1 --" as "";
@@ -495,7 +502,7 @@ t1	CREATE TABLE `t1` (
   `total` bigint(20) unsigned DEFAULT NULL,
   `y` year(4) DEFAULT NULL,
   `t` date DEFAULT NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY HASH ( YEAR(t)) PARTITIONS 4 
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH ( YEAR(t)) PARTITIONS 4  */
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -508,7 +515,7 @@ t1	CREATE TABLE `t1` (
   `total` bigint(20) unsigned DEFAULT NULL,
   `y` year(4) DEFAULT NULL,
   `t` date DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY HASH ( YEAR(t)) PARTITIONS 4 
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH ( YEAR(t)) PARTITIONS 4  */
 --- Perform basic operation on master ---
 --- and ensure replicated correctly ---
 "--- Insert into t1 --" as "";
@@ -533,11 +540,11 @@ UPDATE t1 SET b1 = 0, t="2006-02-22" WHERE id = 412;
 --- Check the update on master --- 
 SELECT id,hex(b1),vc,bc,d,f,total,y,t FROM t1 WHERE id = 412;
 id	hex(b1)	vc	bc	d	f	total	y	t
-412	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2006-02-22
+412	0	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2006-02-22
 --- Check Update on slave ---
 SELECT id,hex(b1),vc,bc,d,f,total,y,t FROM t1 WHERE id = 412;
 id	hex(b1)	vc	bc	d	f	total	y	t
-412	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2006-02-22
+412	0	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2006-02-22
 --- Remove a record from t1 on master ---
 DELETE FROM t1 WHERE id = 42;
 --- Show current count on master for t1 ---
@@ -566,7 +573,7 @@ t1	CREATE TABLE `t1` (
   `y` year(4) DEFAULT NULL,
   `t` date NOT NULL DEFAULT '0000-00-00',
   PRIMARY KEY (`t`,`id`)
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY HASH ( YEAR(t)) PARTITIONS 4 
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH ( YEAR(t)) PARTITIONS 4  */
 --- Make sure that our tables on slave are still same engine ---
 --- and that the alter statements replicated correctly ---
 SHOW CREATE TABLE t1;
@@ -582,7 +589,7 @@ t1	CREATE TABLE `t1` (
   `y` year(4) DEFAULT NULL,
   `t` date NOT NULL DEFAULT '0000-00-00',
   PRIMARY KEY (`t`,`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY HASH ( YEAR(t)) PARTITIONS 4 
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH ( YEAR(t)) PARTITIONS 4  */
 --- Perform basic operation on master ---
 --- and ensure replicated correctly ---
 "--- Insert into t1 --" as "";
@@ -607,11 +614,11 @@ UPDATE t1 SET b1 = 0, t="2006-02-22" WHERE id = 412;
 --- Check the update on master --- 
 SELECT id,hex(b1),vc,bc,d,f,total,y,t FROM t1 WHERE id = 412;
 id	hex(b1)	vc	bc	d	f	total	y	t
-412	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2006-02-22
+412	0	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2006-02-22
 --- Check Update on slave ---
 SELECT id,hex(b1),vc,bc,d,f,total,y,t FROM t1 WHERE id = 412;
 id	hex(b1)	vc	bc	d	f	total	y	t
-412	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2006-02-22
+412	0	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2006-02-22
 --- Remove a record from t1 on master ---
 DELETE FROM t1 WHERE id = 42;
 --- Show current count on master for t1 ---
@@ -648,7 +655,7 @@ t1	CREATE TABLE `t1` (
   `y` year(4) DEFAULT NULL,
   `t` date DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () PARTITIONS 4 
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY () PARTITIONS 4  */
 --- Show that tables on slave ---
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -663,7 +670,7 @@ t1	CREATE TABLE `t1` (
   `y` year(4) DEFAULT NULL,
   `t` date DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY KEY () PARTITIONS 4 
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY () PARTITIONS 4  */
 --- Perform basic operation on master ---
 --- and ensure replicated correctly ---
 "--- Insert into t1 --" as "";
@@ -720,7 +727,7 @@ t1	CREATE TABLE `t1` (
   `y` year(4) DEFAULT NULL,
   `t` date DEFAULT NULL,
   PRIMARY KEY (`id`,`total`)
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () PARTITIONS 4 
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY () PARTITIONS 4  */
 --- Make sure that our tables on slave are still right type ---
 --- and that the alter statements replicated correctly ---
 SHOW CREATE TABLE t1;
@@ -736,7 +743,7 @@ t1	CREATE TABLE `t1` (
   `y` year(4) DEFAULT NULL,
   `t` date DEFAULT NULL,
   PRIMARY KEY (`id`,`total`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY KEY () PARTITIONS 4 
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY () PARTITIONS 4  */
 --- Perform basic operation on master ---
 --- and ensure replicated correctly ---
 "--- Insert into t1 --" as "";
@@ -793,7 +800,7 @@ t1	CREATE TABLE `t1` (
   `y` year(4) DEFAULT NULL,
   `t` date DEFAULT NULL,
   PRIMARY KEY (`id`,`total`)
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () PARTITIONS 4 
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY () PARTITIONS 4  */
 --- Make sure that our tables on slave are still same engine ---
 --- and that the alter statements replicated correctly ---
 SHOW CREATE TABLE t1;
@@ -809,7 +816,7 @@ t1	CREATE TABLE `t1` (
   `y` year(4) DEFAULT NULL,
   `t` date DEFAULT NULL,
   PRIMARY KEY (`id`,`total`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY KEY () PARTITIONS 4 
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY () PARTITIONS 4  */
 --- Perform basic operation on master ---
 --- and ensure replicated correctly ---
 "--- Insert into t1 --" as "";
@@ -853,3 +860,4 @@ DELETE FROM t1;
 --- End test 5 key partition testing ---
 --- Do Cleanup ---
 DROP TABLE IF EXISTS t1;
+drop table mysql.ndb_apply_status;
diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_2ndb.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_2ndb.result
new file mode 100644
index 00000000000..12882b28254
--- /dev/null
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_2ndb.result
@@ -0,0 +1,400 @@
+stop slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+start slave;
+SET storage_engine=ndb;
+
+=== NDB -> NDB ===
+
+--- Doing pre test cleanup --- 
+DROP TABLE IF EXISTS t1;
+--- Create Table Section ---
+CREATE TABLE t1 (id MEDIUMINT NOT NULL, 
+b1 INT, 
+vc VARCHAR(255), 
+bc CHAR(255), 
+d DECIMAL(10,4) DEFAULT 0, 
+f FLOAT DEFAULT 0, 
+total BIGINT UNSIGNED, 
+y YEAR, 
+t DATE, 
+PRIMARY KEY(id));
+--- Show table on master ---
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `id` mediumint(9) NOT NULL,
+  `b1` int(11) DEFAULT NULL,
+  `vc` varchar(255) DEFAULT NULL,
+  `bc` char(255) DEFAULT NULL,
+  `d` decimal(10,4) DEFAULT '0.0000',
+  `f` float DEFAULT '0',
+  `total` bigint(20) unsigned DEFAULT NULL,
+  `y` year(4) DEFAULT NULL,
+  `t` date DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1
+--- Show table on slave ---
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `id` mediumint(9) NOT NULL,
+  `b1` int(11) DEFAULT NULL,
+  `vc` varchar(255) DEFAULT NULL,
+  `bc` char(255) DEFAULT NULL,
+  `d` decimal(10,4) DEFAULT '0.0000',
+  `f` float DEFAULT '0',
+  `total` bigint(20) unsigned DEFAULT NULL,
+  `y` year(4) DEFAULT NULL,
+  `t` date DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1
+STOP SLAVE;
+RESET SLAVE;
+RESET MASTER;
+START SLAVE;
+--- Populate t1 with data ---
+--- Select from t1 on master --- 
+select *
+from t1 
+order by id;
+id	b1	vc	bc	d	f	total	y	t
+2	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1965-11-14
+4	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1985-11-14
+42	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1905-11-14
+142	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1995-11-14
+412	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2005-11-14
+--- Select from t1 on slave ---
+select *
+from t1 
+order by id;
+id	b1	vc	bc	d	f	total	y	t
+2	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1965-11-14
+4	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1985-11-14
+42	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1905-11-14
+142	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1995-11-14
+412	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2005-11-14
+--- Perform basic operation on master ---
+--- and ensure replicated correctly ---
+--- Update t1 on master --
+UPDATE t1 SET b1 = 0, bc='updated', t="2006-02-22" 
+WHERE id < 100 
+ORDER BY id;
+--- Check the update on master --- 
+SELECT *
+FROM t1 
+WHERE id < 100
+ORDER BY id;
+id	b1	vc	bc	d	f	total	y	t
+2	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22
+4	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22
+42	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22
+--- Check Update on slave ---
+SELECT *
+FROM t1 
+WHERE id < 100
+ORDER BY id;
+id	b1	vc	bc	d	f	total	y	t
+2	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22
+4	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22
+42	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22
+--- Remove a record from t1 on master ---
+DELETE FROM t1 WHERE id = 412;
+--- Show current count on master for t1 ---
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+4
+--- Show current count on slave for t1 --- 
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+4
+TRUNCATE TABLE t1;
+--- Check that simple Alter statements are replicated correctly --
+ALTER TABLE t1 DROP PRIMARY KEY;
+ALTER TABLE t1 MODIFY vc char(32);
+--- Show the new improved table on the master ---
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `id` mediumint(9) NOT NULL,
+  `b1` int(11) DEFAULT NULL,
+  `vc` char(32) DEFAULT NULL,
+  `bc` char(255) DEFAULT NULL,
+  `d` decimal(10,4) DEFAULT '0.0000',
+  `f` float DEFAULT '0',
+  `total` bigint(20) unsigned DEFAULT NULL,
+  `y` year(4) DEFAULT NULL,
+  `t` date DEFAULT NULL
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1
+--- Make sure that our tables on slave are still same engine ---
+--- and that the alter statements replicated correctly ---
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `id` mediumint(9) NOT NULL,
+  `b1` int(11) DEFAULT NULL,
+  `vc` char(32) DEFAULT NULL,
+  `bc` char(255) DEFAULT NULL,
+  `d` decimal(10,4) DEFAULT '0.0000',
+  `f` float DEFAULT '0',
+  `total` bigint(20) unsigned DEFAULT NULL,
+  `y` year(4) DEFAULT NULL,
+  `t` date DEFAULT NULL
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1
+STOP SLAVE;
+RESET SLAVE;
+RESET MASTER;
+START SLAVE;
+--- Populate t1 with data ---
+--- Select from t1 on master --- 
+select *
+from t1 
+order by id;
+id	b1	vc	bc	d	f	total	y	t
+2	1	Testing MySQL databases is a coo	Must make it bug free for the customer	654321.4321	15.21	0	1965	1965-11-14
+4	1	Testing MySQL databases is a coo	Must make it bug free for the customer	654321.4321	15.21	0	1965	1985-11-14
+42	1	Testing MySQL databases is a coo	Must make it bug free for the customer	654321.4321	15.21	0	1965	1905-11-14
+142	1	Testing MySQL databases is a coo	Must make it bug free for the customer	654321.4321	15.21	0	1965	1995-11-14
+412	1	Testing MySQL databases is a coo	Must make it bug free for the customer	654321.4321	15.21	0	1965	2005-11-14
+--- Select from t1 on slave ---
+select *
+from t1 
+order by id;
+id	b1	vc	bc	d	f	total	y	t
+2	1	Testing MySQL databases is a coo	Must make it bug free for the customer	654321.4321	15.21	0	1965	1965-11-14
+4	1	Testing MySQL databases is a coo	Must make it bug free for the customer	654321.4321	15.21	0	1965	1985-11-14
+42	1	Testing MySQL databases is a coo	Must make it bug free for the customer	654321.4321	15.21	0	1965	1905-11-14
+142	1	Testing MySQL databases is a coo	Must make it bug free for the customer	654321.4321	15.21	0	1965	1995-11-14
+412	1	Testing MySQL databases is a coo	Must make it bug free for the customer	654321.4321	15.21	0	1965	2005-11-14
+--- Perform basic operation on master ---
+--- and ensure replicated correctly ---
+--- Update t1 on master --
+UPDATE t1 SET b1 = 0, bc='updated', t="2006-02-22" 
+WHERE id < 100 
+ORDER BY id;
+--- Check the update on master --- 
+SELECT *
+FROM t1 
+WHERE id < 100
+ORDER BY id;
+id	b1	vc	bc	d	f	total	y	t
+2	0	Testing MySQL databases is a coo	updated	654321.4321	15.21	0	1965	2006-02-22
+4	0	Testing MySQL databases is a coo	updated	654321.4321	15.21	0	1965	2006-02-22
+42	0	Testing MySQL databases is a coo	updated	654321.4321	15.21	0	1965	2006-02-22
+--- Check Update on slave ---
+SELECT *
+FROM t1 
+WHERE id < 100
+ORDER BY id;
+id	b1	vc	bc	d	f	total	y	t
+2	0	Testing MySQL databases is a coo	updated	654321.4321	15.21	0	1965	2006-02-22
+4	0	Testing MySQL databases is a coo	updated	654321.4321	15.21	0	1965	2006-02-22
+42	0	Testing MySQL databases is a coo	updated	654321.4321	15.21	0	1965	2006-02-22
+--- Remove a record from t1 on master ---
+DELETE FROM t1 WHERE id = 412;
+--- Show current count on master for t1 ---
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+4
+--- Show current count on slave for t1 --- 
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+4
+TRUNCATE TABLE t1;
+--- Check that replication works when slave has more columns than master
+ALTER TABLE t1 ADD PRIMARY KEY(id,total);
+ALTER TABLE t1 MODIFY vc TEXT;
+INSERT INTO t1 VALUES(3,1,'Testing MySQL databases is a cool ',
+'Must make it bug free for the customer',
+654321.4321,15.21,0,1965,"1905-11-14");
+INSERT INTO t1 VALUES(20,1,'Testing MySQL databases is a cool ',
+'Must make it bug free for the customer',
+654321.4321,15.21,0,1965,"1965-11-14");
+INSERT INTO t1 VALUES(50,1,'Testing MySQL databases is a cool ',
+'Must make it bug free for the customer',
+654321.4321,15.21,0,1965,"1985-11-14");
+--- Add columns on slave ---
+ALTER TABLE t1 ADD (u int, v char(16) default 'default');
+UPDATE t1 SET u=7 WHERE id < 50;
+UPDATE t1 SET v='explicit' WHERE id >10;
+--- Show changed table on slave ---
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `id` mediumint(9) NOT NULL,
+  `b1` int(11) DEFAULT NULL,
+  `vc` text,
+  `bc` char(255) DEFAULT NULL,
+  `d` decimal(10,4) DEFAULT '0.0000',
+  `f` float DEFAULT '0',
+  `total` bigint(20) unsigned NOT NULL DEFAULT '0',
+  `y` year(4) DEFAULT NULL,
+  `t` date DEFAULT NULL,
+  `u` int(11) DEFAULT NULL,
+  `v` char(16) DEFAULT 'default',
+  PRIMARY KEY (`id`,`total`)
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1
+SELECT * 
+FROM t1
+ORDER BY id;
+id	b1	vc	bc	d	f	total	y	t	u	v
+3	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1905-11-14	7	default
+20	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1965-11-14	7	explicit
+50	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1985-11-14	NULL	explicit
+STOP SLAVE;
+RESET SLAVE;
+RESET MASTER;
+START SLAVE;
+--- Populate t1 with data ---
+--- Select from t1 on master --- 
+select *
+from t1 
+order by id;
+id	b1	vc	bc	d	f	total	y	t
+2	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1965-11-14
+3	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1905-11-14
+4	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1985-11-14
+20	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1965-11-14
+42	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1905-11-14
+50	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1985-11-14
+142	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1995-11-14
+412	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2005-11-14
+--- Select from t1 on slave ---
+select *
+from t1 
+order by id;
+id	b1	vc	bc	d	f	total	y	t	u	v
+2	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1965-11-14	NULL	NULL
+3	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1905-11-14	7	default
+4	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1985-11-14	NULL	NULL
+20	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1965-11-14	7	explicit
+42	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1905-11-14	NULL	NULL
+50	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1985-11-14	NULL	explicit
+142	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1995-11-14	NULL	NULL
+412	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2005-11-14	NULL	NULL
+--- Perform basic operation on master ---
+--- and ensure replicated correctly ---
+--- Update t1 on master --
+UPDATE t1 SET b1 = 0, bc='updated', t="2006-02-22" 
+WHERE id < 100 
+ORDER BY id;
+--- Check the update on master --- 
+SELECT *
+FROM t1 
+WHERE id < 100
+ORDER BY id;
+id	b1	vc	bc	d	f	total	y	t
+2	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22
+3	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22
+4	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22
+20	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22
+42	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22
+50	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22
+--- Check Update on slave ---
+SELECT *
+FROM t1 
+WHERE id < 100
+ORDER BY id;
+id	b1	vc	bc	d	f	total	y	t	u	v
+2	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22	NULL	NULL
+3	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22	7	default
+4	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22	NULL	NULL
+20	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22	7	explicit
+42	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22	NULL	NULL
+50	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22	NULL	explicit
+--- Remove a record from t1 on master ---
+DELETE FROM t1 WHERE id = 412;
+--- Show current count on master for t1 ---
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+7
+--- Show current count on slave for t1 --- 
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+7
+TRUNCATE TABLE t1;
+TRUNCATE TABLE t1;
+--- Check that replication works when master has more columns than slave
+--- Remove columns on slave ---
+ALTER TABLE t1 DROP COLUMN v;
+ALTER TABLE t1 DROP COLUMN u;
+ALTER TABLE t1 DROP COLUMN t;
+ALTER TABLE t1 DROP COLUMN y;
+--- Show changed table on slave ---
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `id` mediumint(9) NOT NULL,
+  `b1` int(11) DEFAULT NULL,
+  `vc` text,
+  `bc` char(255) DEFAULT NULL,
+  `d` decimal(10,4) DEFAULT '0.0000',
+  `f` float DEFAULT '0',
+  `total` bigint(20) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`,`total`)
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1
+STOP SLAVE;
+RESET SLAVE;
+RESET MASTER;
+START SLAVE;
+--- Populate t1 with data ---
+--- Select from t1 on master --- 
+select *
+from t1 
+order by id;
+id	b1	vc	bc	d	f	total	y	t
+2	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1965-11-14
+4	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1985-11-14
+42	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1905-11-14
+142	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1995-11-14
+412	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2005-11-14
+--- Select from t1 on slave ---
+select *
+from t1 
+order by id;
+id	b1	vc	bc	d	f	total
+2	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0
+4	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0
+42	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0
+142	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0
+412	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0
+--- Perform basic operation on master ---
+--- and ensure replicated correctly ---
+--- Update t1 on master --
+UPDATE t1 SET b1 = 0, bc='updated', t="2006-02-22" 
+WHERE id < 100 
+ORDER BY id;
+--- Check the update on master --- 
+SELECT *
+FROM t1 
+WHERE id < 100
+ORDER BY id;
+id	b1	vc	bc	d	f	total	y	t
+2	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22
+4	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22
+42	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22
+--- Check Update on slave ---
+SELECT *
+FROM t1 
+WHERE id < 100
+ORDER BY id;
+id	b1	vc	bc	d	f	total
+2	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0
+4	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0
+42	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0
+--- Remove a record from t1 on master ---
+DELETE FROM t1 WHERE id = 412;
+--- Show current count on master for t1 ---
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+4
+--- Show current count on slave for t1 --- 
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+4
+TRUNCATE TABLE t1;
+TRUNCATE TABLE t1;
+--- Do Cleanup --
+DROP TABLE IF EXISTS t1;
diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_2other.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_2other.result
index 56b997028e9..84b60b599d8 100644
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_2other.result
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_2other.result
@@ -8,6 +8,14 @@ SET storage_engine=ndb;
 
 === NDB -> MYISAM ===
 
+set @@global.slave_exec_mode= 'IDEMPOTENT';
+CREATE TABLE mysql.ndb_apply_status
+( server_id INT UNSIGNED NOT NULL,
+epoch BIGINT UNSIGNED NOT NULL,
+log_name VARCHAR(255) BINARY NOT NULL,
+start_pos BIGINT UNSIGNED NOT NULL,
+end_pos BIGINT UNSIGNED NOT NULL,
+PRIMARY KEY USING HASH (server_id)) ENGINE=MYISAM;
 SET storage_engine=myisam;
 --- Doing pre test cleanup --- 
 DROP TABLE IF EXISTS t1;
@@ -402,6 +410,7 @@ DROP TABLE IF EXISTS t1;
 
 === NDB -> INNODB ===
 
+alter table mysql.ndb_apply_status engine=innodb;
 SET storage_engine=innodb;
 --- Doing pre test cleanup --- 
 DROP TABLE IF EXISTS t1;
@@ -793,397 +802,4 @@ TRUNCATE TABLE t1;
 TRUNCATE TABLE t1;
 --- Do Cleanup --
 DROP TABLE IF EXISTS t1;
-
-=== NDB -> NDB ===
-
-SET storage_engine=ndb;
---- Doing pre test cleanup --- 
-DROP TABLE IF EXISTS t1;
---- Create Table Section ---
-CREATE TABLE t1 (id MEDIUMINT NOT NULL, 
-b1 INT, 
-vc VARCHAR(255), 
-bc CHAR(255), 
-d DECIMAL(10,4) DEFAULT 0, 
-f FLOAT DEFAULT 0, 
-total BIGINT UNSIGNED, 
-y YEAR, 
-t DATE, 
-PRIMARY KEY(id));
---- Show table on master ---
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `id` mediumint(9) NOT NULL,
-  `b1` int(11) DEFAULT NULL,
-  `vc` varchar(255) DEFAULT NULL,
-  `bc` char(255) DEFAULT NULL,
-  `d` decimal(10,4) DEFAULT '0.0000',
-  `f` float DEFAULT '0',
-  `total` bigint(20) unsigned DEFAULT NULL,
-  `y` year(4) DEFAULT NULL,
-  `t` date DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1
---- Show table on slave ---
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `id` mediumint(9) NOT NULL,
-  `b1` int(11) DEFAULT NULL,
-  `vc` varchar(255) DEFAULT NULL,
-  `bc` char(255) DEFAULT NULL,
-  `d` decimal(10,4) DEFAULT '0.0000',
-  `f` float DEFAULT '0',
-  `total` bigint(20) unsigned DEFAULT NULL,
-  `y` year(4) DEFAULT NULL,
-  `t` date DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
-STOP SLAVE;
-RESET SLAVE;
-RESET MASTER;
-START SLAVE;
---- Populate t1 with data ---
---- Select from t1 on master --- 
-select *
-from t1 
-order by id;
-id	b1	vc	bc	d	f	total	y	t
-2	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1965-11-14
-4	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1985-11-14
-42	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1905-11-14
-142	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1995-11-14
-412	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2005-11-14
---- Select from t1 on slave ---
-select *
-from t1 
-order by id;
-id	b1	vc	bc	d	f	total	y	t
-2	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1965-11-14
-4	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1985-11-14
-42	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1905-11-14
-142	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1995-11-14
-412	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2005-11-14
---- Perform basic operation on master ---
---- and ensure replicated correctly ---
---- Update t1 on master --
-UPDATE t1 SET b1 = 0, bc='updated', t="2006-02-22" 
-WHERE id < 100 
-ORDER BY id;
---- Check the update on master --- 
-SELECT *
-FROM t1 
-WHERE id < 100
-ORDER BY id;
-id	b1	vc	bc	d	f	total	y	t
-2	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22
-4	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22
-42	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22
---- Check Update on slave ---
-SELECT *
-FROM t1 
-WHERE id < 100
-ORDER BY id;
-id	b1	vc	bc	d	f	total	y	t
-2	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22
-4	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22
-42	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22
---- Remove a record from t1 on master ---
-DELETE FROM t1 WHERE id = 412;
---- Show current count on master for t1 ---
-SELECT COUNT(*) FROM t1;
-COUNT(*)
-4
---- Show current count on slave for t1 --- 
-SELECT COUNT(*) FROM t1;
-COUNT(*)
-4
-TRUNCATE TABLE t1;
---- Check that simple Alter statements are replicated correctly --
-ALTER TABLE t1 DROP PRIMARY KEY;
-ALTER TABLE t1 MODIFY vc char(32);
---- Show the new improved table on the master ---
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `id` mediumint(9) NOT NULL,
-  `b1` int(11) DEFAULT NULL,
-  `vc` char(32) DEFAULT NULL,
-  `bc` char(255) DEFAULT NULL,
-  `d` decimal(10,4) DEFAULT '0.0000',
-  `f` float DEFAULT '0',
-  `total` bigint(20) unsigned DEFAULT NULL,
-  `y` year(4) DEFAULT NULL,
-  `t` date DEFAULT NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1
---- Make sure that our tables on slave are still same engine ---
---- and that the alter statements replicated correctly ---
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `id` mediumint(9) NOT NULL,
-  `b1` int(11) DEFAULT NULL,
-  `vc` char(32) DEFAULT NULL,
-  `bc` char(255) DEFAULT NULL,
-  `d` decimal(10,4) DEFAULT '0.0000',
-  `f` float DEFAULT '0',
-  `total` bigint(20) unsigned DEFAULT NULL,
-  `y` year(4) DEFAULT NULL,
-  `t` date DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
-STOP SLAVE;
-RESET SLAVE;
-RESET MASTER;
-START SLAVE;
---- Populate t1 with data ---
---- Select from t1 on master --- 
-select *
-from t1 
-order by id;
-id	b1	vc	bc	d	f	total	y	t
-2	1	Testing MySQL databases is a coo	Must make it bug free for the customer	654321.4321	15.21	0	1965	1965-11-14
-4	1	Testing MySQL databases is a coo	Must make it bug free for the customer	654321.4321	15.21	0	1965	1985-11-14
-42	1	Testing MySQL databases is a coo	Must make it bug free for the customer	654321.4321	15.21	0	1965	1905-11-14
-142	1	Testing MySQL databases is a coo	Must make it bug free for the customer	654321.4321	15.21	0	1965	1995-11-14
-412	1	Testing MySQL databases is a coo	Must make it bug free for the customer	654321.4321	15.21	0	1965	2005-11-14
---- Select from t1 on slave ---
-select *
-from t1 
-order by id;
-id	b1	vc	bc	d	f	total	y	t
-2	1	Testing MySQL databases is a coo	Must make it bug free for the customer	654321.4321	15.21	0	1965	1965-11-14
-4	1	Testing MySQL databases is a coo	Must make it bug free for the customer	654321.4321	15.21	0	1965	1985-11-14
-42	1	Testing MySQL databases is a coo	Must make it bug free for the customer	654321.4321	15.21	0	1965	1905-11-14
-142	1	Testing MySQL databases is a coo	Must make it bug free for the customer	654321.4321	15.21	0	1965	1995-11-14
-412	1	Testing MySQL databases is a coo	Must make it bug free for the customer	654321.4321	15.21	0	1965	2005-11-14
---- Perform basic operation on master ---
---- and ensure replicated correctly ---
---- Update t1 on master --
-UPDATE t1 SET b1 = 0, bc='updated', t="2006-02-22" 
-WHERE id < 100 
-ORDER BY id;
---- Check the update on master --- 
-SELECT *
-FROM t1 
-WHERE id < 100
-ORDER BY id;
-id	b1	vc	bc	d	f	total	y	t
-2	0	Testing MySQL databases is a coo	updated	654321.4321	15.21	0	1965	2006-02-22
-4	0	Testing MySQL databases is a coo	updated	654321.4321	15.21	0	1965	2006-02-22
-42	0	Testing MySQL databases is a coo	updated	654321.4321	15.21	0	1965	2006-02-22
---- Check Update on slave ---
-SELECT *
-FROM t1 
-WHERE id < 100
-ORDER BY id;
-id	b1	vc	bc	d	f	total	y	t
-2	0	Testing MySQL databases is a coo	updated	654321.4321	15.21	0	1965	2006-02-22
-4	0	Testing MySQL databases is a coo	updated	654321.4321	15.21	0	1965	2006-02-22
-42	0	Testing MySQL databases is a coo	updated	654321.4321	15.21	0	1965	2006-02-22
---- Remove a record from t1 on master ---
-DELETE FROM t1 WHERE id = 412;
---- Show current count on master for t1 ---
-SELECT COUNT(*) FROM t1;
-COUNT(*)
-4
---- Show current count on slave for t1 --- 
-SELECT COUNT(*) FROM t1;
-COUNT(*)
-4
-TRUNCATE TABLE t1;
---- Check that replication works when slave has more columns than master
-ALTER TABLE t1 ADD PRIMARY KEY(id,total);
-ALTER TABLE t1 MODIFY vc TEXT;
-INSERT INTO t1 VALUES(3,1,'Testing MySQL databases is a cool ',
-'Must make it bug free for the customer',
-654321.4321,15.21,0,1965,"1905-11-14");
-INSERT INTO t1 VALUES(20,1,'Testing MySQL databases is a cool ',
-'Must make it bug free for the customer',
-654321.4321,15.21,0,1965,"1965-11-14");
-INSERT INTO t1 VALUES(50,1,'Testing MySQL databases is a cool ',
-'Must make it bug free for the customer',
-654321.4321,15.21,0,1965,"1985-11-14");
---- Add columns on slave ---
-ALTER TABLE t1 ADD (u int, v char(16) default 'default');
-UPDATE t1 SET u=7 WHERE id < 50;
-UPDATE t1 SET v='explicit' WHERE id >10;
---- Show changed table on slave ---
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `id` mediumint(9) NOT NULL,
-  `b1` int(11) DEFAULT NULL,
-  `vc` text,
-  `bc` char(255) DEFAULT NULL,
-  `d` decimal(10,4) DEFAULT '0.0000',
-  `f` float DEFAULT '0',
-  `total` bigint(20) unsigned NOT NULL DEFAULT '0',
-  `y` year(4) DEFAULT NULL,
-  `t` date DEFAULT NULL,
-  `u` int(11) DEFAULT NULL,
-  `v` char(16) DEFAULT 'default',
-  PRIMARY KEY (`id`,`total`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
-SELECT * 
-FROM t1
-ORDER BY id;
-id	b1	vc	bc	d	f	total	y	t	u	v
-3	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1905-11-14	7	default
-20	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1965-11-14	7	explicit
-50	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1985-11-14	NULL	explicit
-STOP SLAVE;
-RESET SLAVE;
-RESET MASTER;
-START SLAVE;
---- Populate t1 with data ---
---- Select from t1 on master --- 
-select *
-from t1 
-order by id;
-id	b1	vc	bc	d	f	total	y	t
-2	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1965-11-14
-3	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1905-11-14
-4	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1985-11-14
-20	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1965-11-14
-42	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1905-11-14
-50	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1985-11-14
-142	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1995-11-14
-412	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2005-11-14
---- Select from t1 on slave ---
-select *
-from t1 
-order by id;
-id	b1	vc	bc	d	f	total	y	t	u	v
-2	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1965-11-14	NULL	default
-3	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1905-11-14	7	default
-4	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1985-11-14	NULL	default
-20	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1965-11-14	7	explicit
-42	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1905-11-14	NULL	default
-50	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1985-11-14	NULL	explicit
-142	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1995-11-14	NULL	default
-412	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2005-11-14	NULL	default
---- Perform basic operation on master ---
---- and ensure replicated correctly ---
---- Update t1 on master --
-UPDATE t1 SET b1 = 0, bc='updated', t="2006-02-22" 
-WHERE id < 100 
-ORDER BY id;
---- Check the update on master --- 
-SELECT *
-FROM t1 
-WHERE id < 100
-ORDER BY id;
-id	b1	vc	bc	d	f	total	y	t
-2	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22
-3	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22
-4	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22
-20	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22
-42	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22
-50	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22
---- Check Update on slave ---
-SELECT *
-FROM t1 
-WHERE id < 100
-ORDER BY id;
-id	b1	vc	bc	d	f	total	y	t	u	v
-2	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22	NULL	default
-3	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22	7	default
-4	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22	NULL	default
-20	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22	7	explicit
-42	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22	NULL	default
-50	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22	NULL	explicit
---- Remove a record from t1 on master ---
-DELETE FROM t1 WHERE id = 412;
---- Show current count on master for t1 ---
-SELECT COUNT(*) FROM t1;
-COUNT(*)
-7
---- Show current count on slave for t1 --- 
-SELECT COUNT(*) FROM t1;
-COUNT(*)
-7
-TRUNCATE TABLE t1;
-TRUNCATE TABLE t1;
---- Check that replication works when master has more columns than slave
---- Remove columns on slave ---
-ALTER TABLE t1 DROP COLUMN v;
-ALTER TABLE t1 DROP COLUMN u;
-ALTER TABLE t1 DROP COLUMN t;
-ALTER TABLE t1 DROP COLUMN y;
---- Show changed table on slave ---
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `id` mediumint(9) NOT NULL,
-  `b1` int(11) DEFAULT NULL,
-  `vc` text,
-  `bc` char(255) DEFAULT NULL,
-  `d` decimal(10,4) DEFAULT '0.0000',
-  `f` float DEFAULT '0',
-  `total` bigint(20) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`id`,`total`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
-STOP SLAVE;
-RESET SLAVE;
-RESET MASTER;
-START SLAVE;
---- Populate t1 with data ---
---- Select from t1 on master --- 
-select *
-from t1 
-order by id;
-id	b1	vc	bc	d	f	total	y	t
-2	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1965-11-14
-4	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1985-11-14
-42	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1905-11-14
-142	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	1995-11-14
-412	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2005-11-14
---- Select from t1 on slave ---
-select *
-from t1 
-order by id;
-id	b1	vc	bc	d	f	total
-2	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0
-4	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0
-42	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0
-142	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0
-412	1	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0
---- Perform basic operation on master ---
---- and ensure replicated correctly ---
---- Update t1 on master --
-UPDATE t1 SET b1 = 0, bc='updated', t="2006-02-22" 
-WHERE id < 100 
-ORDER BY id;
---- Check the update on master --- 
-SELECT *
-FROM t1 
-WHERE id < 100
-ORDER BY id;
-id	b1	vc	bc	d	f	total	y	t
-2	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22
-4	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22
-42	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0	1965	2006-02-22
---- Check Update on slave ---
-SELECT *
-FROM t1 
-WHERE id < 100
-ORDER BY id;
-id	b1	vc	bc	d	f	total
-2	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0
-4	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0
-42	0	Testing MySQL databases is a cool 	updated	654321.4321	15.21	0
---- Remove a record from t1 on master ---
-DELETE FROM t1 WHERE id = 412;
---- Show current count on master for t1 ---
-SELECT COUNT(*) FROM t1;
-COUNT(*)
-4
---- Show current count on slave for t1 --- 
-SELECT COUNT(*) FROM t1;
-COUNT(*)
-4
-TRUNCATE TABLE t1;
-TRUNCATE TABLE t1;
---- Do Cleanup --
-DROP TABLE IF EXISTS t1;
+drop table mysql.ndb_apply_status;
diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_apply_status.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_apply_status.result
new file mode 100644
index 00000000000..0fcd361da21
--- /dev/null
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_apply_status.result
@@ -0,0 +1,20 @@
+stop slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+start slave;
+*** on slave there should be zero rows ***
+select count(*) from mysql.ndb_apply_status;
+count(*)
+0
+create table t1 (a int key, b int) engine ndb;
+insert into t1 values (1,1);
+*** on master it should be empty ***
+select * from mysql.ndb_apply_status;
+server_id	epoch	log_name	start_pos	end_pos
+*** on slave there should be one row ***
+select count(*) from mysql.ndb_apply_status;
+count(*)
+1
+drop table t1;
diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result
index 7008dc60d96..db9920dd79f 100644
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result
@@ -20,13 +20,27 @@ from mysql.ndb_apply_status;
 @log_name:=log_name	@start_pos:=start_pos	@end_pos:=end_pos
 <log_name>	<start_pos>	<end_pos>
 
+# Now check that that is in the apply_status table is consistant
+# with what is in the binlog
+
+# since insert is done with transactional engine, expect a BEGIN
+# at <start_pos>
+
 show binlog events from <start_pos> limit 1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	<start_pos>	Query	1	#	use `test`; BEGIN
 
+# Now the insert, one step after
+
 show binlog events from <start_pos> limit 1,1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	1	486	use `test`; insert into t1 values (1,2)
+master-bin.000001	#	Query	1	#	use `test`; insert into t1 values (1,2)
+
+# and the COMMIT should be at <end_pos>
+
+show binlog events from <start_pos> limit 2,1;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Xid	1	<end_pos>	COMMIT /* XID */
 
 begin;
 insert into t1 values (2,3);
diff --git a/mysql-test/suite/rpl_ndb/t/disabled.def b/mysql-test/suite/rpl_ndb/t/disabled.def
index 11530ca190d..ebc99feeac6 100644
--- a/mysql-test/suite/rpl_ndb/t/disabled.def
+++ b/mysql-test/suite/rpl_ndb/t/disabled.def
@@ -10,18 +10,7 @@
 #
 ##############################################################################
 
-
-rpl_ndb_2innodb          : Bug #32648  	Test failure between NDB Cluster and other engines
-rpl_ndb_2myisam          : Bug #32648  	Test failure between NDB Cluster and other engines
-rpl_ndb_2other           : Bug #32648  	Test failure between NDB Cluster and other engines
-rpl_ndb_extraColMaster   : BUG#30854 : Tables name show as binary in slave err msg on vm-win2003-64-b and Solaris
-rpl_ndb_mix_innodb       : Bug #32720   Test rpl_ndb_mix_innodb fails on SPARC and PowerPC
 rpl_ndb_circular         : Bug#33849 COMMIT event missing in cluster circular replication.
 rpl_ndb_circular_simplex : Bug#33849 COMMIT event missing in cluster circular replication.
 
 # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
-
-#rpl_ndb_dd_advance	 : Bug#25913 rpl_ndb_dd_advance fails randomly
-rpl_ndb_innodb_trans     : Bug#34454: Some test cases from the 'rpl_ndb' suite fail
-rpl_ndb_charset          : Bug#34454: Some test cases from the 'rpl_ndb' suite fail
-rpl_ndb_multi            : Bug#34454: Some test cases from the 'rpl_ndb' suite fail
diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-master.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-master.opt
index 701dddb075b..9a3f30e4bd0 100644
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-master.opt
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-master.opt
@@ -1 +1 @@
---default-storage-engine=ndbcluster 
+--new --default-storage-engine=ndbcluster 
diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-slave.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-slave.opt
index d8857e54be2..0d3f1619f1e 100644
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-slave.opt
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-slave.opt
@@ -1 +1 @@
---innodb --default-storage-engine=innodb 
+--innodb --default-storage-engine=innodb --ndbcluster=0
diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test
index 30e4e49eb7a..43ad901d746 100644
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test
@@ -8,9 +8,20 @@
 # test and to have control over the tests.
 ##############################################################
 -- source include/have_ndb.inc
--- source include/ndb_master-slave.inc
-connection slave;
+-- source include/master-slave.inc
+
+-- connection slave
 -- source include/have_innodb.inc
-connection master;
-SET storage_engine=ndb;
+set @@global.slave_exec_mode= 'IDEMPOTENT';
+CREATE TABLE mysql.ndb_apply_status
+                   ( server_id INT UNSIGNED NOT NULL,
+                   epoch BIGINT UNSIGNED NOT NULL,
+                   log_name VARCHAR(255) BINARY NOT NULL,
+                   start_pos BIGINT UNSIGNED NOT NULL,
+                   end_pos BIGINT UNSIGNED NOT NULL,
+                   PRIMARY KEY USING HASH (server_id)) ENGINE=INNODB;
+
 --source extra/rpl_tests/rpl_ndb_2multi_eng.test
+
+--connection slave
+drop table mysql.ndb_apply_status;
diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-master.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-master.opt
index 701dddb075b..b63ef44e8fc 100644
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-master.opt
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-master.opt
@@ -1 +1 @@
---default-storage-engine=ndbcluster 
+--new --default-storage-engine=ndbcluster
diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-slave.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-slave.opt
index 6035ce27c46..9b5f524e131 100644
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-slave.opt
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-slave.opt
@@ -1 +1 @@
---default-storage-engine=myisam 
+--default-storage-engine=myisam --ndbcluster=0
diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test
index 182d4c72d87..b19116ffd78 100644
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test
@@ -8,6 +8,19 @@
 # test and to have control over the tests.
 ##############################################################
 -- source include/have_ndb.inc
--- source include/ndb_master-slave.inc
-SET storage_engine=ndb;
+-- source include/master-slave.inc
+
+-- connection slave
+set @@global.slave_exec_mode= 'IDEMPOTENT';
+CREATE TABLE mysql.ndb_apply_status
+                   ( server_id INT UNSIGNED NOT NULL,
+                   epoch BIGINT UNSIGNED NOT NULL,
+                   log_name VARCHAR(255) BINARY NOT NULL,
+                   start_pos BIGINT UNSIGNED NOT NULL,
+                   end_pos BIGINT UNSIGNED NOT NULL,
+                   PRIMARY KEY USING HASH (server_id)) ENGINE=MYISAM;
+
 --source extra/rpl_tests/rpl_ndb_2multi_eng.test
+
+--connection slave
+drop table mysql.ndb_apply_status;
diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb-slave.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb-slave.opt
new file mode 100644
index 00000000000..5304fd49b6b
--- /dev/null
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb-slave.opt
@@ -0,0 +1 @@
+--default-storage-engine=ndbcluster --log-slave-updates=0
diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb.test
new file mode 100644
index 00000000000..1657a6902ba
--- /dev/null
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb.test
@@ -0,0 +1,18 @@
+#############################################################
+# Author: Rafal Somla
+# Date: 2006-08-20
+# Purpose: Trying to test ability to replicate from cluster
+# to other engines (innodb, myisam), see also rpl_ndb_2other.test
+##############################################################
+--source include/have_binlog_format_mixed_or_row.inc
+--source include/ndb_master-slave.inc
+
+# On master use NDB as storage engine.
+connection master;
+SET storage_engine=ndb;
+
+--echo
+--echo === NDB -> NDB ===
+--echo
+connection slave;
+--source extra/rpl_tests/rpl_ndb_2multi_basic.test
diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2other-slave.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2other-slave.opt
index a6c65034e68..188b31efa8a 100644
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2other-slave.opt
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2other-slave.opt
@@ -1 +1 @@
---innodb --log-slave-updates=0 
+--innodb --ndbcluster=0 --log-slave-updates=0
diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test
index b7e393ca3cc..67e8f7cea42 100644
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test
@@ -7,7 +7,7 @@
 --source include/have_ndb.inc
 --source include/have_innodb.inc
 --source include/have_binlog_format_mixed_or_row.inc
---source include/ndb_master-slave.inc
+--source include/master-slave.inc
 
 # On master use NDB as storage engine.
 connection master;
@@ -17,6 +17,14 @@ SET storage_engine=ndb;
 --echo === NDB -> MYISAM ===
 --echo
 connection slave;
+set @@global.slave_exec_mode= 'IDEMPOTENT';
+CREATE TABLE mysql.ndb_apply_status
+                   ( server_id INT UNSIGNED NOT NULL,
+                   epoch BIGINT UNSIGNED NOT NULL,
+                   log_name VARCHAR(255) BINARY NOT NULL,
+                   start_pos BIGINT UNSIGNED NOT NULL,
+                   end_pos BIGINT UNSIGNED NOT NULL,
+                   PRIMARY KEY USING HASH (server_id)) ENGINE=MYISAM;
 SET storage_engine=myisam;
 --source extra/rpl_tests/rpl_ndb_2multi_basic.test
 
@@ -24,12 +32,9 @@ SET storage_engine=myisam;
 --echo === NDB -> INNODB ===
 --echo
 connection slave;
+alter table mysql.ndb_apply_status engine=innodb;
 SET storage_engine=innodb;
 --source extra/rpl_tests/rpl_ndb_2multi_basic.test
 
---echo
---echo === NDB -> NDB ===
---echo
 connection slave;
-SET storage_engine=ndb;
---source extra/rpl_tests/rpl_ndb_2multi_basic.test
+drop table mysql.ndb_apply_status;
diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status-master.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status-master.opt
new file mode 100644
index 00000000000..3f4aff8a321
--- /dev/null
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status-master.opt
@@ -0,0 +1 @@
+--replicate_ignore_db=mysql
diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test
new file mode 100644
index 00000000000..cc74acc6490
--- /dev/null
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test
@@ -0,0 +1,26 @@
+-- source include/have_ndb.inc
+-- source include/have_binlog_format_row.inc
+-- source include/ndb_master-slave.inc
+
+#
+# Bug#28170 replicate-ignore-db=mysql should not ignore mysql.ndb_apply_status
+#
+# Slave is started with --replicate-ignore-db=mysql
+#
+sync_slave_with_master;
+echo *** on slave there should be zero rows ***;
+select count(*) from mysql.ndb_apply_status;
+
+connection master;
+create table t1 (a int key, b int) engine ndb;
+insert into t1 values (1,1);
+echo *** on master it should be empty ***;
+select * from mysql.ndb_apply_status;
+
+sync_slave_with_master;
+echo *** on slave there should be one row ***;
+select count(*) from mysql.ndb_apply_status;
+
+connection master;
+drop table t1;
+sync_slave_with_master;
diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test
index dacb1307a7b..1ee9aaf5372 100644
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test
@@ -56,15 +56,12 @@ DELETE FROM t1 WHERE c3 = 2;
 
 SELECT * FROM t1 ORDER BY c3;
 
-save_master_pos;
-
 # insert another row, and check that we have it on the slave
 connection server2;
 INSERT INTO t1 VALUES ("row5","E",5);
 SELECT * FROM t1 ORDER BY c3;
-#sync_slave_with_master;
+sync_slave_with_master;
 connection slave;
---sleep 2
 SELECT * FROM t1 ORDER BY c3;
 
 STOP SLAVE;
diff --git a/mysql-test/suite/stress/include/ddl3.inc b/mysql-test/suite/stress/include/ddl3.inc
index aacf09f9428..d41c8506be4 100644
--- a/mysql-test/suite/stress/include/ddl3.inc
+++ b/mysql-test/suite/stress/include/ddl3.inc
@@ -24,7 +24,7 @@
 #----------------------------------------------------------------------
 # Settings for Subtest 3 variants
 # Scenario: CREATE TABLE/CREATE TABLE(F)/DROP TABLE/DROP TABLE(F)
-let $create_table=  CREATE TABLE t1 (f1 BIGINT) ENGINE=$engine_type;
+let $create_table=  CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=$engine_type;
 let $drop_table=    DROP TABLE t1;
 #----------------------------------------------------------------------
 
diff --git a/mysql-test/suite/stress/r/ddl_archive.result b/mysql-test/suite/stress/r/ddl_archive.result
index 47c64a6af94..457fc30b9f9 100644
--- a/mysql-test/suite/stress/r/ddl_archive.result
+++ b/mysql-test/suite/stress/r/ddl_archive.result
@@ -29,26 +29,26 @@ DROP TABLE IF EXISTS t1;
 #    con2:       SELECT COUNT(*) <> 1 FROM t1 WHERE f1 = 1 (expect to get ER_NO_SUCH_TABLE)
 # Subtest 3A (one connection, no PREPARE/EXECUTE)
 #    connection  action
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=ARCHIVE
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=ARCHIVE (expect to get ER_TABLE_EXISTS_ERROR)
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=ARCHIVE
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=ARCHIVE (expect to get ER_TABLE_EXISTS_ERROR)
 #    default:    DROP TABLE t1
 #    default:    DROP TABLE t1 (expect to get ER_BAD_TABLE_ERROR)
 # Subtest 3B (one connection, use PREPARE/EXECUTE)
 #    connection  action
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=ARCHIVE
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=ARCHIVE (expect to get ER_TABLE_EXISTS_ERROR)
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=ARCHIVE
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=ARCHIVE (expect to get ER_TABLE_EXISTS_ERROR)
 #    default:    DROP TABLE t1
 #    default:    DROP TABLE t1 (expect to get ER_BAD_TABLE_ERROR)
 # Subtest 3C (two connections, no PREPARE/EXECUTE)
 #    connection  action
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=ARCHIVE
-#    con2:       CREATE TABLE t1 (f1 BIGINT) ENGINE=ARCHIVE (expect to get ER_TABLE_EXISTS_ERROR)
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=ARCHIVE
+#    con2:       CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=ARCHIVE (expect to get ER_TABLE_EXISTS_ERROR)
 #    default:    DROP TABLE t1
 #    con2:       DROP TABLE t1 (expect to get ER_BAD_TABLE_ERROR)
 # Subtest 3D (two connections, use PREPARE/EXECUTE)
 #    connection  action
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=ARCHIVE
-#    con2:       CREATE TABLE t1 (f1 BIGINT) ENGINE=ARCHIVE (expect to get ER_TABLE_EXISTS_ERROR)
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=ARCHIVE
+#    con2:       CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=ARCHIVE (expect to get ER_TABLE_EXISTS_ERROR)
 #    default:    DROP TABLE t1
 #    con2:       DROP TABLE t1 (expect to get ER_BAD_TABLE_ERROR)
 # Subtest 5A (one connection, no PREPARE/EXECUTE)
diff --git a/mysql-test/suite/stress/r/ddl_csv.result b/mysql-test/suite/stress/r/ddl_csv.result
index 3dfa0c8fd15..2346638360b 100644
--- a/mysql-test/suite/stress/r/ddl_csv.result
+++ b/mysql-test/suite/stress/r/ddl_csv.result
@@ -29,26 +29,26 @@ DROP TABLE IF EXISTS t1;
 #    con2:       SELECT COUNT(*) <> 1 FROM t1 WHERE f1 = 1 (expect to get ER_NO_SUCH_TABLE)
 # Subtest 3A (one connection, no PREPARE/EXECUTE)
 #    connection  action
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=CSV
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=CSV (expect to get ER_TABLE_EXISTS_ERROR)
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=CSV
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=CSV (expect to get ER_TABLE_EXISTS_ERROR)
 #    default:    DROP TABLE t1
 #    default:    DROP TABLE t1 (expect to get ER_BAD_TABLE_ERROR)
 # Subtest 3B (one connection, use PREPARE/EXECUTE)
 #    connection  action
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=CSV
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=CSV (expect to get ER_TABLE_EXISTS_ERROR)
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=CSV
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=CSV (expect to get ER_TABLE_EXISTS_ERROR)
 #    default:    DROP TABLE t1
 #    default:    DROP TABLE t1 (expect to get ER_BAD_TABLE_ERROR)
 # Subtest 3C (two connections, no PREPARE/EXECUTE)
 #    connection  action
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=CSV
-#    con2:       CREATE TABLE t1 (f1 BIGINT) ENGINE=CSV (expect to get ER_TABLE_EXISTS_ERROR)
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=CSV
+#    con2:       CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=CSV (expect to get ER_TABLE_EXISTS_ERROR)
 #    default:    DROP TABLE t1
 #    con2:       DROP TABLE t1 (expect to get ER_BAD_TABLE_ERROR)
 # Subtest 3D (two connections, use PREPARE/EXECUTE)
 #    connection  action
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=CSV
-#    con2:       CREATE TABLE t1 (f1 BIGINT) ENGINE=CSV (expect to get ER_TABLE_EXISTS_ERROR)
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=CSV
+#    con2:       CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=CSV (expect to get ER_TABLE_EXISTS_ERROR)
 #    default:    DROP TABLE t1
 #    con2:       DROP TABLE t1 (expect to get ER_BAD_TABLE_ERROR)
 DEALLOCATE PREPARE stmt_start;
diff --git a/mysql-test/suite/stress/r/ddl_innodb.result b/mysql-test/suite/stress/r/ddl_innodb.result
index 6417d3e1c5c..911aed2622a 100644
--- a/mysql-test/suite/stress/r/ddl_innodb.result
+++ b/mysql-test/suite/stress/r/ddl_innodb.result
@@ -53,26 +53,26 @@ ENGINE = InnoDB
 #    con2:       SELECT COUNT(*) <> 1 FROM t1 WHERE f1 = 1 (expect to get ER_NO_SUCH_TABLE)
 # Subtest 3A (one connection, no PREPARE/EXECUTE)
 #    connection  action
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=InnoDB
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=InnoDB (expect to get ER_TABLE_EXISTS_ERROR)
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=InnoDB
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=InnoDB (expect to get ER_TABLE_EXISTS_ERROR)
 #    default:    DROP TABLE t1
 #    default:    DROP TABLE t1 (expect to get ER_BAD_TABLE_ERROR)
 # Subtest 3B (one connection, use PREPARE/EXECUTE)
 #    connection  action
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=InnoDB
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=InnoDB (expect to get ER_TABLE_EXISTS_ERROR)
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=InnoDB
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=InnoDB (expect to get ER_TABLE_EXISTS_ERROR)
 #    default:    DROP TABLE t1
 #    default:    DROP TABLE t1 (expect to get ER_BAD_TABLE_ERROR)
 # Subtest 3C (two connections, no PREPARE/EXECUTE)
 #    connection  action
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=InnoDB
-#    con2:       CREATE TABLE t1 (f1 BIGINT) ENGINE=InnoDB (expect to get ER_TABLE_EXISTS_ERROR)
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=InnoDB
+#    con2:       CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=InnoDB (expect to get ER_TABLE_EXISTS_ERROR)
 #    default:    DROP TABLE t1
 #    con2:       DROP TABLE t1 (expect to get ER_BAD_TABLE_ERROR)
 # Subtest 3D (two connections, use PREPARE/EXECUTE)
 #    connection  action
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=InnoDB
-#    con2:       CREATE TABLE t1 (f1 BIGINT) ENGINE=InnoDB (expect to get ER_TABLE_EXISTS_ERROR)
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=InnoDB
+#    con2:       CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=InnoDB (expect to get ER_TABLE_EXISTS_ERROR)
 #    default:    DROP TABLE t1
 #    con2:       DROP TABLE t1 (expect to get ER_BAD_TABLE_ERROR)
 CREATE TABLE t1 (f1 BIGINT, f2 BIGINT, UNIQUE(f1), UNIQUE (f2)) ENGINE=InnoDB;
diff --git a/mysql-test/suite/stress/r/ddl_memory.result b/mysql-test/suite/stress/r/ddl_memory.result
index 1700fbc2745..7ad9f9a61c5 100644
--- a/mysql-test/suite/stress/r/ddl_memory.result
+++ b/mysql-test/suite/stress/r/ddl_memory.result
@@ -53,26 +53,26 @@ ENGINE = MEMORY
 #    con2:       SELECT COUNT(*) <> 1 FROM t1 WHERE f1 = 1 (expect to get ER_NO_SUCH_TABLE)
 # Subtest 3A (one connection, no PREPARE/EXECUTE)
 #    connection  action
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=MEMORY
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=MEMORY (expect to get ER_TABLE_EXISTS_ERROR)
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=MEMORY
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=MEMORY (expect to get ER_TABLE_EXISTS_ERROR)
 #    default:    DROP TABLE t1
 #    default:    DROP TABLE t1 (expect to get ER_BAD_TABLE_ERROR)
 # Subtest 3B (one connection, use PREPARE/EXECUTE)
 #    connection  action
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=MEMORY
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=MEMORY (expect to get ER_TABLE_EXISTS_ERROR)
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=MEMORY
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=MEMORY (expect to get ER_TABLE_EXISTS_ERROR)
 #    default:    DROP TABLE t1
 #    default:    DROP TABLE t1 (expect to get ER_BAD_TABLE_ERROR)
 # Subtest 3C (two connections, no PREPARE/EXECUTE)
 #    connection  action
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=MEMORY
-#    con2:       CREATE TABLE t1 (f1 BIGINT) ENGINE=MEMORY (expect to get ER_TABLE_EXISTS_ERROR)
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=MEMORY
+#    con2:       CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=MEMORY (expect to get ER_TABLE_EXISTS_ERROR)
 #    default:    DROP TABLE t1
 #    con2:       DROP TABLE t1 (expect to get ER_BAD_TABLE_ERROR)
 # Subtest 3D (two connections, use PREPARE/EXECUTE)
 #    connection  action
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=MEMORY
-#    con2:       CREATE TABLE t1 (f1 BIGINT) ENGINE=MEMORY (expect to get ER_TABLE_EXISTS_ERROR)
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=MEMORY
+#    con2:       CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=MEMORY (expect to get ER_TABLE_EXISTS_ERROR)
 #    default:    DROP TABLE t1
 #    con2:       DROP TABLE t1 (expect to get ER_BAD_TABLE_ERROR)
 CREATE TABLE t1 (f1 BIGINT, f2 BIGINT, UNIQUE(f1), UNIQUE (f2)) ENGINE=MEMORY;
diff --git a/mysql-test/suite/stress/r/ddl_myisam.result b/mysql-test/suite/stress/r/ddl_myisam.result
index 82be55b8371..808b22dc859 100644
--- a/mysql-test/suite/stress/r/ddl_myisam.result
+++ b/mysql-test/suite/stress/r/ddl_myisam.result
@@ -53,26 +53,26 @@ ENGINE = MyISAM
 #    con2:       SELECT COUNT(*) <> 1 FROM t1 WHERE f1 = 1 (expect to get ER_NO_SUCH_TABLE)
 # Subtest 3A (one connection, no PREPARE/EXECUTE)
 #    connection  action
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=MyISAM
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=MyISAM (expect to get ER_TABLE_EXISTS_ERROR)
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=MyISAM
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=MyISAM (expect to get ER_TABLE_EXISTS_ERROR)
 #    default:    DROP TABLE t1
 #    default:    DROP TABLE t1 (expect to get ER_BAD_TABLE_ERROR)
 # Subtest 3B (one connection, use PREPARE/EXECUTE)
 #    connection  action
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=MyISAM
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=MyISAM (expect to get ER_TABLE_EXISTS_ERROR)
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=MyISAM
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=MyISAM (expect to get ER_TABLE_EXISTS_ERROR)
 #    default:    DROP TABLE t1
 #    default:    DROP TABLE t1 (expect to get ER_BAD_TABLE_ERROR)
 # Subtest 3C (two connections, no PREPARE/EXECUTE)
 #    connection  action
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=MyISAM
-#    con2:       CREATE TABLE t1 (f1 BIGINT) ENGINE=MyISAM (expect to get ER_TABLE_EXISTS_ERROR)
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=MyISAM
+#    con2:       CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=MyISAM (expect to get ER_TABLE_EXISTS_ERROR)
 #    default:    DROP TABLE t1
 #    con2:       DROP TABLE t1 (expect to get ER_BAD_TABLE_ERROR)
 # Subtest 3D (two connections, use PREPARE/EXECUTE)
 #    connection  action
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=MyISAM
-#    con2:       CREATE TABLE t1 (f1 BIGINT) ENGINE=MyISAM (expect to get ER_TABLE_EXISTS_ERROR)
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=MyISAM
+#    con2:       CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=MyISAM (expect to get ER_TABLE_EXISTS_ERROR)
 #    default:    DROP TABLE t1
 #    con2:       DROP TABLE t1 (expect to get ER_BAD_TABLE_ERROR)
 CREATE TABLE t1 (f1 BIGINT, f2 BIGINT, UNIQUE(f1), UNIQUE (f2)) ENGINE=MyISAM;
diff --git a/mysql-test/suite/stress/r/ddl_ndb.result b/mysql-test/suite/stress/r/ddl_ndb.result
index 39146e65fb0..05c29456f7c 100644
--- a/mysql-test/suite/stress/r/ddl_ndb.result
+++ b/mysql-test/suite/stress/r/ddl_ndb.result
@@ -53,26 +53,26 @@ ENGINE = NDB
 #    con2:       SELECT COUNT(*) <> 1 FROM t1 WHERE f1 = 1 (expect to get ER_NO_SUCH_TABLE)
 # Subtest 3A (one connection, no PREPARE/EXECUTE)
 #    connection  action
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=NDB
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=NDB (expect to get ER_TABLE_EXISTS_ERROR)
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=NDB
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=NDB (expect to get ER_TABLE_EXISTS_ERROR)
 #    default:    DROP TABLE t1
 #    default:    DROP TABLE t1 (expect to get ER_BAD_TABLE_ERROR)
 # Subtest 3B (one connection, use PREPARE/EXECUTE)
 #    connection  action
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=NDB
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=NDB (expect to get ER_TABLE_EXISTS_ERROR)
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=NDB
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=NDB (expect to get ER_TABLE_EXISTS_ERROR)
 #    default:    DROP TABLE t1
 #    default:    DROP TABLE t1 (expect to get ER_BAD_TABLE_ERROR)
 # Subtest 3C (two connections, no PREPARE/EXECUTE)
 #    connection  action
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=NDB
-#    con2:       CREATE TABLE t1 (f1 BIGINT) ENGINE=NDB (expect to get ER_TABLE_EXISTS_ERROR)
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=NDB
+#    con2:       CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=NDB (expect to get ER_TABLE_EXISTS_ERROR)
 #    default:    DROP TABLE t1
 #    con2:       DROP TABLE t1 (expect to get ER_BAD_TABLE_ERROR)
 # Subtest 3D (two connections, use PREPARE/EXECUTE)
 #    connection  action
-#    default:    CREATE TABLE t1 (f1 BIGINT) ENGINE=NDB
-#    con2:       CREATE TABLE t1 (f1 BIGINT) ENGINE=NDB (expect to get ER_TABLE_EXISTS_ERROR)
+#    default:    CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=NDB
+#    con2:       CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=NDB (expect to get ER_TABLE_EXISTS_ERROR)
 #    default:    DROP TABLE t1
 #    con2:       DROP TABLE t1 (expect to get ER_BAD_TABLE_ERROR)
 CREATE TABLE t1 (f1 BIGINT, f2 BIGINT, UNIQUE(f1), UNIQUE (f2)) ENGINE=NDB;
diff --git a/mysql-test/suite/stress/t/ddl_ndb.test b/mysql-test/suite/stress/t/ddl_ndb.test
index 7eb45da8739..1e0a3680f8a 100644
--- a/mysql-test/suite/stress/t/ddl_ndb.test
+++ b/mysql-test/suite/stress/t/ddl_ndb.test
@@ -10,6 +10,8 @@
 
 # Storage engine to be used in CREATE TABLE
 --source include/have_ndb.inc
+connection default;
+
 let $engine_type= NDB;
 
 
diff --git a/mysql-test/t/csv_alter_table.test b/mysql-test/t/csv_alter_table.test
new file mode 100644
index 00000000000..0093a1d10a7
--- /dev/null
+++ b/mysql-test/t/csv_alter_table.test
@@ -0,0 +1,56 @@
+#-----------------------------------------------------------------------------
+# csv_alter_table.test - .test file for MySQL regression suite
+# Purpose:  To test the behavior of the CSV engine
+#           Bug#31473 resulted in strict enforcement of non-nullable
+#           columns in CSV engine.
+#           Tests code for Bug#33696 - CSV engine allows NULLable
+#           Columns via ALTER TABLE statements
+#        
+# Author pcrews
+# Last modified:  2008-01-06
+#-----------------------------------------------------------------------------
+
+--source include/have_csv.inc
+
+#############################################################################
+# Testcase csv_alter_table.1: Positive test for ALTER table 
+#                             
+#############################################################################
+-- echo # ===== csv_alter_table.1 =====
+-- disable_warnings
+DROP TABLE IF EXISTS t1;
+-- enable_warnings
+
+CREATE TABLE t1 (a int NOT NULL) ENGINE = CSV;
+ALTER TABLE t1 ADD COLUMN b CHAR(5) NOT NULL;
+DESC t1;
+ALTER TABLE t1 DROP COLUMN b;
+DESC t1;
+ALTER TABLE t1 MODIFY a BIGINT NOT NULL;
+DESC t1;
+ALTER TABLE t1 CHANGE a a INT NOT NULL;
+DESC t1;
+
+DROP TABLE t1;
+
+#############################################################################
+# Testcase csv_alter_table.2: Negative test for ALTER table
+# These queries should not succeed / should throw errors
+#############################################################################
+-- echo # ===== csv_alter_table.2 =====
+-- disable_warnings
+DROP TABLE IF EXISTS t1;
+-- enable_warnings
+
+CREATE TABLE t1 (a int NOT NULL) ENGINE = CSV;
+--error ER_CHECK_NOT_IMPLEMENTED
+ALTER TABLE t1 ADD COLUMN b CHAR(5);
+DESC t1;
+--error ER_CHECK_NOT_IMPLEMENTED
+ALTER TABLE t1 MODIFY a BIGINT;
+DESC t1;
+--error ER_CHECK_NOT_IMPLEMENTED
+ALTER TABLE t1 CHANGE a a INT;
+DESC t1;
+
+DROP TABLE t1;
diff --git a/mysql-test/t/csv_not_null.test b/mysql-test/t/csv_not_null.test
new file mode 100644
index 00000000000..bb7b412aa49
--- /dev/null
+++ b/mysql-test/t/csv_not_null.test
@@ -0,0 +1,100 @@
+#-----------------------------------------------------------------------------
+# csv_not_null.test - .test file for MySQL regression suite
+# Purpose:  To test the behavior of the CSV engine
+#           Bug#31473 resulted in strict enforcement of non-nullable
+#           columns in CSV engine.
+# NOTE:     Main functionality tested - NOT NULL restrictions on CSV tables
+#           CREATE, INSERT, and UPDATE statements 
+#           ALTER statements in separate file due to BUG#33696 
+# Author pcrews
+# Last modified:  2008-01-04
+#-----------------------------------------------------------------------------
+
+--source include/have_csv.inc
+
+#############################################################################
+# Testcase csv_not_null.1:  CREATE TABLE for CSV Engine requires explicit
+#                           NOT NULL for each column
+#############################################################################
+-- echo # ===== csv_not_null.1 =====
+-- disable_warnings
+DROP TABLE IF EXISTS t1, t2;
+-- enable_warnings
+
+
+--echo # === Will fail -- no NOT NULL ===
+--error ER_CHECK_NOT_IMPLEMENTED
+CREATE TABLE t1 (a int) ENGINE = CSV;
+
+--echo # === Good CREATE ===
+CREATE TABLE t1 (a int NOT NULL) ENGINE = CSV;
+
+--echo # === Will fail -- ALL columns need NOT NULL ==
+--error ER_CHECK_NOT_IMPLEMENTED
+CREATE TABLE t2 (a int NOT NULL, b char(20)) ENGINE = CSV;
+
+
+DROP TABLE t1;
+##############################################################################
+# Testcase csv_not_null.2:  INSERT tests -- validating behavior of INSERT
+#                           statements for CSV
+##############################################################################
+-- echo # ===== csv_not_null.2 =====
+-- disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+
+CREATE TABLE t1 (a int NOT NULL, b blob NOT NULL, c CHAR(20) NOT NULL, 
+d VARCHAR(20) NOT NULL, e enum('foo','bar') NOT NULL,f DATE NOT NULL) 
+ENGINE = CSV;
+-- echo # === should result in default for each datatype ===
+-- disable_warnings
+INSERT INTO t1 VALUES();
+-- enable_warnings
+SELECT * FROM t1;
+
+-- disable_warnings
+# NOTE - Test disabled due to enum crash for this INSERT
+# See Bug#33717 - INSERT...(default) fails for enum. 
+# Crashes CSV tables, loads spaces for MyISAM
+#INSERT INTO t1 VALUES(default,default,default,default,default,default);
+-- enable_warnings
+
+SELECT * FROM t1;
+INSERT INTO t1 VALUES(0,'abc','def','ghi','bar','1999-12-31');
+SELECT * FROM t1;
+-- echo # === insert failures ===
+--error ER_BAD_NULL_ERROR
+INSERT INTO t1 VALUES(NULL,'ab','a','b','foo','2007-01-01');
+--error ER_NO_DEFAULT_FOR_FIELD
+INSERT INTO t1 VALUES(default(a),default(b), default(c), default(d),
+                      default(e), default(f));
+
+
+DROP TABLE t1;
+
+##############################################################################
+# Testcase csv_not_null.3:  UPDATE tests -- examining behavior of UPDATE
+#                           statements for CSV
+##############################################################################
+-- echo # ===== csv_not_null.3 =====
+-- disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+
+CREATE TABLE t1 (a int NOT NULL, b char(10) NOT NULL) ENGINE = CSV;
+--disable_warnings
+INSERT INTO t1 VALUES();
+--enable_warnings
+SELECT * FROM t1;
+--disable_warnings
+UPDATE t1 set b = 'new_value' where a = 0;
+--enable_warnings
+SELECT * FROM t1;
+--error ER_BAD_NULL_ERROR
+UPDATE t1 set b = NULL where b = 'new_value';
+SELECT * FROM t1;
+
+DROP TABLE t1;
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 9309d668a15..8ec9cf36751 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -15,10 +15,10 @@ concurrent_innodb        : BUG#21579 2006-08-11 mleich innodb_concurrent random
 ctype_big5               : BUG#26711 2007-06-21 Lars Test has never worked on Double Whopper
 
 federated_transactions   : Bug#29523 Transactions do not work
-events                   : Bug#32664 events.test fails randomly
 lowercase_table3         : Bug#32667 lowercase_table3.test reports to error log
 innodb_mysql         : Bug#32724: innodb_mysql.test fails randomly
 wait_timeout         : Bug#32801 wait_timeout.test fails randomly
 ctype_create         : Bug#32965 main.ctype_create fails
 status               : Bug#32966 main.status fails
 ps_ddl               : Bug#12093 2007-12-14 pending WL#4165 / WL#4166
+csv_alter_table      : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables
diff --git a/mysql-test/t/events.test b/mysql-test/t/events_1.test
index a4c7eaebc30..ccdeb70d291 100644
--- a/mysql-test/t/events.test
+++ b/mysql-test/t/events_1.test
@@ -1,3 +1,6 @@
+# changes 2008-02-20 hhunger splitted events.test into events_1 and events_2
+# changes 2008-02-22 hhunger replaced all sleep by wait_condition
+#
 # Can't test with embedded server that doesn't support grants
 -- source include/not_embedded.inc
 
@@ -24,7 +27,8 @@ CREATE EVENT e_x2 ON SCHEDULE EVERY 1 SECOND DO DROP TABLE x_table;
 connection default;
 SHOW DATABASES LIKE 'db_x';
 SET GLOBAL event_scheduler=1;
---sleep 1.2
+let $wait_condition= SELECT count(*)= 1 FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME LIKE 'db_x';
+--source include/wait_condition.inc
 SHOW DATABASES LIKE 'db_x';
 SHOW TABLES FROM db_x;
 SET GLOBAL event_scheduler=off;
@@ -90,7 +94,8 @@ begin
 end|
 delimiter ;|
 set global event_scheduler = on;
---sleep 3
+let $wait_condition= SELECT count(*)>0 from mysql.event where name='e_43' and interval_value= 5;
+--source include/wait_condition.inc
 select db, name, body, status, interval_field, interval_value from mysql.event;
 drop event e_43;
 drop table test_nested;
@@ -98,7 +103,8 @@ drop table test_nested;
 --echo "Let's check whether we can use non-qualified names"
 create table non_qualif(a int);
 create event non_qualif_ev on schedule every 10 minute do insert into non_qualif values (800219);
---sleep 1.1
+let $wait_condition=SELECT count(*)= 1 from non_qualif where a=800219;
+--source include/wait_condition.inc
 select * from non_qualif;
 drop event non_qualif_ev;
 drop table non_qualif;
@@ -118,6 +124,8 @@ drop event existant;
 create table t_event3 (a int, b float);
 drop event if exists event3;
 create event event3 on schedule every 50 + 10 minute starts date_add("20100101", interval 5 minute) ends date_add("20151010", interval 5 day) comment "portokala_comment" DO insert into t_event3 values (unix_timestamp(), rand());
+let $wait_condition=SELECT count(*)=0 from t_event3;
+--source include/wait_condition.inc
 select count(*) from t_event3;
 drop event event3;
 drop table t_event3;
@@ -302,7 +310,7 @@ SELECT event_name FROM INFORMATION_SCHEMA.events;
 SHOW CREATE EVENT intact_check;
 --error ER_EVENT_DOES_NOT_EXIST
 DROP EVENT no_such_event;
---error ER_CANNOT_LOAD_FROM_TABLE
+--error ER_EVENT_STORE_FAILED
 CREATE EVENT intact_check_1 ON SCHEDULE EVERY 5 HOUR DO SELECT 5;
 --error ER_EVENT_DOES_NOT_EXIST
 ALTER EVENT intact_check_1 ON SCHEDULE EVERY 8 HOUR DO SELECT 8;
@@ -399,396 +407,6 @@ CREATE TABLE mysql.event like event_like;
 DROP TABLE event_like;
 --replace_column 8 # 9 #
 SHOW EVENTS;
-#
-# mysql.event intact checking end
-#
-
-create event e_26 on schedule at '2017-01-01 00:00:00' disable do set @a = 5;
-select db, name, body, definer, convert_tz(execute_at, 'UTC', 'SYSTEM'), on_completion from mysql.event;
-drop event e_26;
---error ER_WRONG_VALUE
-create event e_26 on schedule at NULL disable do set @a = 5;
---error ER_WRONG_VALUE
-create event e_26 on schedule at 'definitely not a datetime' disable do set @a = 5;
-
-set names utf8;
-create event задачка on schedule every 123 minute starts now() ends now() + interval 1 month do select 1;
-drop event задачка;
-
-# event_scheduler is a global var
---error ER_GLOBAL_VARIABLE
-set event_scheduler=off;
-# event_scheduler could be only either 1 or 2
---error ER_WRONG_VALUE_FOR_VAR
-set global event_scheduler=3;
---error ER_WRONG_VALUE_FOR_VAR
-set global event_scheduler=disabled;
-
---echo "DISABLE the scheduler. Testing that it does not work when the variable is 0"
-set global event_scheduler=off;
-select definer, name, db from mysql.event;
-select get_lock("test_lock1", 20);
-create event закачка on schedule every 10 hour do select get_lock("test_lock1", 20);
---echo "Should return 1 row"
-select definer, name, db from mysql.event;
-
---echo "Should be only 0 process"
-select /*1*/ user, host, db, command, state, info
-  from information_schema.processlist
-  where (user='event_scheduler')
-  order by info;
-select release_lock("test_lock1");
-drop event закачка;
---echo "Should have 0 events"
-select count(*) from mysql.event;
-
-#
-#
-#
---echo "ENABLE the scheduler and get a lock"
-set global event_scheduler=on;
-select get_lock("test_lock2", 20);
---echo "Create an event which tries to acquire a mutex. The event locks on the mutex"
-create event закачка on schedule every 10 hour do select get_lock("test_lock2", 20);
-
---echo "Should have only 2 processes: the scheduler and the locked event"
-let $wait_condition= select count(*) = 2 from information_schema.processlist
-  where ( (state like 'User lock%' AND info like 'select get_lock%')
-       OR (command='Daemon' AND user='event_scheduler' AND
-           state = 'Waiting for next activation'));
---source include/wait_condition.inc
-
-select /*2*/ user, host, db, command, state, info
-  from information_schema.processlist
-  where (info like "select get_lock%" OR user='event_scheduler')
-  order by info;
---echo "Release the mutex, the event worker should finish."
-select release_lock("test_lock2");
-drop event закачка;
-
-# Wait for release_lock("test_lock2") to complete,
-# to avoid polluting the next test information_schema.processlist
-let $wait_condition= select count(*) = 0 from information_schema.processlist
-  where (state like 'User lock%' AND info like 'select get_lock%');
---source include/wait_condition.inc
-
-
-##
-## 1. get a lock
-## 2. create an event
-## 3. sleep so it has time to start
-## 4. should appear in processlist
-## 5. kill the scheduler, it will wait for the child to stop
-## 6. both processes should be there on show processlist
-## 7. release the lock and sleep, both scheduler and child should end
-set global event_scheduler=1;
-select get_lock("test_lock2_1", 20);
-create event закачка21 on schedule every 10 hour do select get_lock("test_lock2_1", 20);
-
---echo "Should have only 2 processes: the scheduler and the locked event"
-let $wait_condition= select count(*) = 2 from information_schema.processlist
-  where ( (state like 'User lock%' AND info like 'select get_lock%')
-          OR (command='Daemon' AND user='event_scheduler' AND
-              state = 'Waiting for next activation'));
---source include/wait_condition.inc
-
-select /*3*/ user, host, db, command, state, info
-  from information_schema.processlist
-  where (info like "select get_lock%" OR user='event_scheduler')
-  order by info;
-
-set global event_scheduler=off;
-
-let $wait_condition= select count(*) =1 from information_schema.processlist
-  where (info like "select get_lock%" OR user='event_scheduler');
---source include/wait_condition.inc
-
---echo "Should have only our process now:"
-select /*4*/ user, host, db, command, state, info
-  from information_schema.processlist
-  where (info like "select get_lock%" OR user='event_scheduler')
-  order by info;
-select release_lock("test_lock2_1");
-drop event закачка21;
-let $wait_condition=
-  select count(*) = 0 from information_schema.processlist
-  where db='events_test' and command = 'Connect' and user=current_user();
---source include/wait_condition.inc
-
-####
-# Bug #16410  Events: CREATE EVENT is legal in a CREATE TRIGGER statement
-#
-create table t_16 (s1 int);
---error ER_EVENT_RECURSION_FORBIDDEN
-create trigger t_16_bi before insert on t_16 for each row create event  e_16 on schedule every 1 second do set @a=5;
-drop table t_16;
-#
-# end of test case
-####
-
-#
-# START: BUG #17453: Creating Event crash the server
-#
-create event white_space
-on schedule every 10 hour
-disable
-do
-select 1;
-select event_schema, event_name, definer, event_definition from information_schema.events where event_name='white_space';
-drop event white_space;
-create event white_space on schedule every 10 hour disable do
-
-select 2;
-select event_schema, event_name, definer, event_definition from information_schema.events where event_name='white_space';
-drop event white_space;
-create event white_space on schedule every 10 hour disable do	select 3;
-select event_schema, event_name, definer, event_definition from information_schema.events where event_name='white_space';
-drop event white_space;
-#
-# END:  BUG #17453: Creating Event crash the server
-#
-
-#
-# Bug#17403 "Events: packets out of order with show create event"
-#
-create event e1 on schedule every 1 year do set @a = 5;
-create table t1 (s1 int);
---error ER_SP_NO_RETSET
-create trigger t1_ai after insert on t1 for each row show create event e1;
-drop table t1;
-drop event e1;
-
-##set global event_scheduler=1;
-##select get_lock("test_lock3", 20);
-##create event закачка on schedule every 10 hour do select get_lock("test_lock3", 20);
-##select sleep(2);
-##select /*5*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;
-##drop event закачка;
-##select release_lock("test_lock3");
-
-#
-# test with very often occuring event
-# (disabled for now, locks)
-##select get_lock("test_lock4", 20);
-##create event закачка4 on schedule every 1 second do select get_lock("test_lock4", 20);
-##select sleep(3);
-##select /*6*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;
-##drop event закачка4;
-##select release_lock("test_lock4");
-
-##set global event_scheduler=off;
-##select sleep(2);
-##--replace_column 1 # 6 #
-##show processlist;
-##select count(*) from mysql.event;
-
-#
-# Test wrong syntax
-#
-
---error 1102
-SHOW EVENTS FROM aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;
---error 1102
-SHOW EVENTS FROM ``;
-
-SHOW EVENTS FROM `events\\test`;
-#
-# A check for events SQL under LOCK TABLES and in pre-locked mode.
-#
---echo
---echo LOCK TABLES mode.
---echo 
-#
-# SHOW CREATE EVENT and INFORMATION_SCHEMA.events are available and 
-# cause an implicit lock/unlock of mysql.event table, regardless of the
-# currently locked tables.
-#
-create table t1 (a int);
-create event e1 on schedule every 10 hour do select 1;
-#
-lock table t1 read;
-#
---replace_regex /STARTS '[^']+'/STARTS '#'/
-show create event e1;
-select event_name from information_schema.events;
---error ER_TABLE_NOT_LOCKED
-create event e2 on schedule every 10 hour do select 1;
---error ER_TABLE_NOT_LOCKED
-alter event e2 disable;
---error ER_TABLE_NOT_LOCKED
-alter event e2 rename to e3;
---error ER_TABLE_NOT_LOCKED
-drop event e2;
---error ER_TABLE_NOT_LOCKED
-drop event e1;
-unlock tables;
-#
-lock table t1 write;
-#
---replace_regex /STARTS '[^']+'/STARTS '#'/
-show create event e1;
-select event_name from information_schema.events;
---error ER_TABLE_NOT_LOCKED
-create event e2 on schedule every 10 hour do select 1;
---error ER_TABLE_NOT_LOCKED
-alter event e2 disable;
---error ER_TABLE_NOT_LOCKED
-alter event e2 rename to e3;
---error ER_TABLE_NOT_LOCKED
-drop event e2;
---error ER_TABLE_NOT_LOCKED
-drop event e1;
-unlock tables;
-#
-lock table t1 read, mysql.event read;
-#
---replace_regex /STARTS '[^']+'/STARTS '#'/
-show create event e1;
-select event_name from information_schema.events;
---error ER_TABLE_NOT_LOCKED_FOR_WRITE
-create event e2 on schedule every 10 hour do select 1;
---error ER_TABLE_NOT_LOCKED_FOR_WRITE
-alter event e2 disable;
---error ER_TABLE_NOT_LOCKED_FOR_WRITE
-alter event e2 rename to e3;
---error ER_TABLE_NOT_LOCKED_FOR_WRITE
-drop event e2;
---error ER_TABLE_NOT_LOCKED_FOR_WRITE
-drop event e1;
-unlock tables;
-#
-lock table t1 write, mysql.event read;
-#
---replace_regex /STARTS '[^']+'/STARTS '#'/
-show create event e1;
-select event_name from information_schema.events;
---error ER_TABLE_NOT_LOCKED_FOR_WRITE
-create event e2 on schedule every 10 hour do select 1;
---error ER_TABLE_NOT_LOCKED_FOR_WRITE
-alter event e2 disable;
---error ER_TABLE_NOT_LOCKED_FOR_WRITE
-alter event e2 rename to e3;
---error ER_TABLE_NOT_LOCKED_FOR_WRITE
-drop event e2;
---error ER_TABLE_NOT_LOCKED_FOR_WRITE
-drop event e1;
-unlock tables;
-#
---error ER_WRONG_LOCK_OF_SYSTEM_TABLE
-lock table t1 read, mysql.event write;
-#
---error ER_WRONG_LOCK_OF_SYSTEM_TABLE
-lock table t1 write, mysql.event write;
-#
-lock table mysql.event write;
---replace_regex /STARTS '[^']+'/STARTS '#'/
-show create event e1;
-select event_name from information_schema.events;
-create event e2 on schedule every 10 hour do select 1;
-alter event e2 disable;
-alter event e2 rename to e3;
-drop event e3;
-drop event e1;
-unlock tables;
---echo Make sure we have left no events 
-select event_name from information_schema.events;
---echo
---echo Events in sub-statements, events and prelocking
---echo 
---echo 
-create event e1 on schedule every 10 hour do select 1;
-delimiter |;
---error ER_SP_NO_RETSET
-create function f1() returns int
-begin
-  show create event e1;
-  return 1;
-end|
---error ER_SP_NO_RETSET
-create trigger trg before insert on t1 for each row
-begin
-  show create event e1;
-end|
---error ER_SP_NO_RETSET
-create function f1() returns int
-begin
-  select event_name from information_schema.events;
-  return 1;
-end|
---error ER_SP_NO_RETSET
-create trigger trg before insert on t1 for each row
-begin
-  select event_name from information_schema.events;
-end|
---error ER_EVENT_RECURSION_FORBIDDEN
-create function f1() returns int
-begin
-  create event e2 on schedule every 10 hour do select 1;
-  return 1;
-end|
---error ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
-create function f1() returns int
-begin
-  alter event e1 rename to e2;
-  return 1;
-end|
---error ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
-create function f1() returns int
-begin
-  drop event e2;
-  return 1;
-end|
---echo ----------------------------------------------------------------------
-create trigger trg before insert on t1 for each row
-begin
-  set new.a= f1();
-end|
-create function f1() returns int
-begin
-  call p1();
-  return 0;
-end|
-create procedure p1()
-begin
-  select event_name from information_schema.events;
-end|
---error ER_SP_NO_RETSET
-insert into t1 (a) values (1)|
-drop procedure p1|
-create procedure p1()
-begin
-  show create event e1; 
-end|
---error ER_SP_NO_RETSET
-insert into t1 (a) values (1)|
-drop procedure p1|
-create procedure p1()
-begin
-  create temporary table tmp select event_name from information_schema.events;
-end|
---echo expected to work, since we redirect the output into a tmp table
-insert into t1 (a) values (1)|
-select * from tmp|
-drop temporary table tmp|
-drop procedure p1|
-create procedure p1()
-begin
-  alter event e1 rename to e2;
-end|
---error ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
-insert into t1 (a) values (1)|
-drop procedure p1|
-create procedure p1()
-begin
-  drop event e1;
-end|
---error ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
-insert into t1 (a) values (1)|
-drop table t1|
-drop event e1|
-delimiter ;|
-
-
 # 
 # End of tests
 #
diff --git a/mysql-test/t/events_2.test b/mysql-test/t/events_2.test
new file mode 100644
index 00000000000..c52d9cf06c6
--- /dev/null
+++ b/mysql-test/t/events_2.test
@@ -0,0 +1,411 @@
+# changes 2008-02-20 hhunger splitted events.test into events_1 and events_2
+#
+# Can't test with embedded server that doesn't support grants
+-- source include/not_embedded.inc
+
+--disable_warnings
+drop database if exists events_test;
+--enable_warnings
+create database events_test;
+use events_test;
+
+#
+# mysql.event intact checking end
+#
+
+create event e_26 on schedule at '2017-01-01 00:00:00' disable do set @a = 5;
+select db, name, body, definer, convert_tz(execute_at, 'UTC', 'SYSTEM'), on_completion from mysql.event;
+drop event e_26;
+--error ER_WRONG_VALUE
+create event e_26 on schedule at NULL disable do set @a = 5;
+--error ER_WRONG_VALUE
+create event e_26 on schedule at 'definitely not a datetime' disable do set @a = 5;
+
+set names utf8;
+create event задачка on schedule every 123 minute starts now() ends now() + interval 1 month do select 1;
+drop event задачка;
+
+# event_scheduler is a global var
+--error ER_GLOBAL_VARIABLE
+set event_scheduler=off;
+# event_scheduler could be only either 1 or 2
+--error ER_WRONG_VALUE_FOR_VAR
+set global event_scheduler=3;
+--error ER_WRONG_VALUE_FOR_VAR
+set global event_scheduler=disabled;
+
+--echo "DISABLE the scheduler. Testing that it does not work when the variable is 0"
+set global event_scheduler=off;
+select definer, name, db from mysql.event;
+select get_lock("test_lock1", 20);
+create event закачка on schedule every 10 hour do select get_lock("test_lock1", 20);
+--echo "Should return 1 row"
+select definer, name, db from mysql.event;
+
+--echo "Should be only 0 process"
+select /*1*/ user, host, db, command, state, info
+  from information_schema.processlist
+  where (user='event_scheduler')
+  order by info;
+select release_lock("test_lock1");
+drop event закачка;
+--echo "Should have 0 events"
+select count(*) from mysql.event;
+
+#
+#
+#
+--echo "ENABLE the scheduler and get a lock"
+set global event_scheduler=on;
+select get_lock("test_lock2", 20);
+--echo "Create an event which tries to acquire a mutex. The event locks on the mutex"
+create event закачка on schedule every 10 hour do select get_lock("test_lock2", 20);
+
+--echo "Should have only 2 processes: the scheduler and the locked event"
+let $wait_condition= select count(*) = 2 from information_schema.processlist
+  where ( (state like 'User lock%' AND info like 'select get_lock%')
+       OR (command='Daemon' AND user='event_scheduler' AND
+           state = 'Waiting for next activation'));
+--source include/wait_condition.inc
+
+select /*2*/ user, host, db, command, state, info
+  from information_schema.processlist
+  where (info like "select get_lock%" OR user='event_scheduler')
+  order by info;
+--echo "Release the mutex, the event worker should finish."
+select release_lock("test_lock2");
+drop event закачка;
+
+# Wait for release_lock("test_lock2") to complete,
+# to avoid polluting the next test information_schema.processlist
+let $wait_condition= select count(*) = 0 from information_schema.processlist
+  where (state like 'User lock%' AND info like 'select get_lock%');
+--source include/wait_condition.inc
+
+
+##
+## 1. get a lock
+## 2. create an event
+## 3. sleep so it has time to start
+## 4. should appear in processlist
+## 5. kill the scheduler, it will wait for the child to stop
+## 6. both processes should be there on show processlist
+## 7. release the lock and sleep, both scheduler and child should end
+set global event_scheduler=1;
+select get_lock("test_lock2_1", 20);
+create event закачка21 on schedule every 10 hour do select get_lock("test_lock2_1", 20);
+
+--echo "Should have only 2 processes: the scheduler and the locked event"
+let $wait_condition= select count(*) = 2 from information_schema.processlist
+  where ( (state like 'User lock%' AND info like 'select get_lock%')
+          OR (command='Daemon' AND user='event_scheduler' AND
+              state = 'Waiting for next activation'));
+--source include/wait_condition.inc
+
+select /*3*/ user, host, db, command, state, info
+  from information_schema.processlist
+  where (info like "select get_lock%" OR user='event_scheduler')
+  order by info;
+
+set global event_scheduler=off;
+
+let $wait_condition= select count(*) =1 from information_schema.processlist
+  where (info like "select get_lock%" OR user='event_scheduler');
+--source include/wait_condition.inc
+
+--echo "Should have only our process now:"
+select /*4*/ user, host, db, command, state, info
+  from information_schema.processlist
+  where (info like "select get_lock%" OR user='event_scheduler')
+  order by info;
+select release_lock("test_lock2_1");
+drop event закачка21;
+let $wait_condition=
+  select count(*) = 0 from information_schema.processlist
+  where db='events_test' and command = 'Connect' and user=current_user();
+--source include/wait_condition.inc
+
+####
+# Bug #16410  Events: CREATE EVENT is legal in a CREATE TRIGGER statement
+#
+create table t_16 (s1 int);
+--error ER_EVENT_RECURSION_FORBIDDEN
+create trigger t_16_bi before insert on t_16 for each row create event  e_16 on schedule every 1 second do set @a=5;
+drop table t_16;
+#
+# end of test case
+####
+
+#
+# START: BUG #17453: Creating Event crash the server
+#
+create event white_space
+on schedule every 10 hour
+disable
+do
+select 1;
+select event_schema, event_name, definer, event_definition from information_schema.events where event_name='white_space';
+drop event white_space;
+create event white_space on schedule every 10 hour disable do
+
+select 2;
+select event_schema, event_name, definer, event_definition from information_schema.events where event_name='white_space';
+drop event white_space;
+create event white_space on schedule every 10 hour disable do	select 3;
+select event_schema, event_name, definer, event_definition from information_schema.events where event_name='white_space';
+drop event white_space;
+#
+# END:  BUG #17453: Creating Event crash the server
+#
+
+#
+# Bug#17403 "Events: packets out of order with show create event"
+#
+create event e1 on schedule every 1 year do set @a = 5;
+create table t1 (s1 int);
+--error ER_SP_NO_RETSET
+create trigger t1_ai after insert on t1 for each row show create event e1;
+drop table t1;
+drop event e1;
+
+##set global event_scheduler=1;
+##select get_lock("test_lock3", 20);
+##create event закачка on schedule every 10 hour do select get_lock("test_lock3", 20);
+##select sleep(2);
+##select /*5*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;
+##drop event закачка;
+##select release_lock("test_lock3");
+
+#
+# test with very often occuring event
+# (disabled for now, locks)
+##select get_lock("test_lock4", 20);
+##create event закачка4 on schedule every 1 second do select get_lock("test_lock4", 20);
+##select sleep(3);
+##select /*6*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;
+##drop event закачка4;
+##select release_lock("test_lock4");
+
+##set global event_scheduler=off;
+##select sleep(2);
+##--replace_column 1 # 6 #
+##show processlist;
+##select count(*) from mysql.event;
+
+#
+# Test wrong syntax
+#
+
+--error ER_WRONG_DB_NAME 
+SHOW EVENTS FROM aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;
+--error ER_WRONG_DB_NAME
+SHOW EVENTS FROM ``;
+
+SHOW EVENTS FROM `events\\test`;
+#
+# A check for events SQL under LOCK TABLES and in pre-locked mode.
+#
+--echo
+--echo LOCK TABLES mode.
+--echo 
+#
+# SHOW CREATE EVENT and INFORMATION_SCHEMA.events are available and 
+# cause an implicit lock/unlock of mysql.event table, regardless of the
+# currently locked tables.
+#
+create table t1 (a int);
+create event e1 on schedule every 10 hour do select 1;
+#
+lock table t1 read;
+#
+--replace_regex /STARTS '[^']+'/STARTS '#'/
+show create event e1;
+select event_name from information_schema.events;
+--error ER_TABLE_NOT_LOCKED
+create event e2 on schedule every 10 hour do select 1;
+--error ER_TABLE_NOT_LOCKED
+alter event e2 disable;
+--error ER_TABLE_NOT_LOCKED
+alter event e2 rename to e3;
+--error ER_TABLE_NOT_LOCKED
+drop event e2;
+--error ER_TABLE_NOT_LOCKED
+drop event e1;
+unlock tables;
+#
+lock table t1 write;
+#
+--replace_regex /STARTS '[^']+'/STARTS '#'/
+show create event e1;
+select event_name from information_schema.events;
+--error ER_TABLE_NOT_LOCKED
+create event e2 on schedule every 10 hour do select 1;
+--error ER_TABLE_NOT_LOCKED
+alter event e2 disable;
+--error ER_TABLE_NOT_LOCKED
+alter event e2 rename to e3;
+--error ER_TABLE_NOT_LOCKED
+drop event e2;
+--error ER_TABLE_NOT_LOCKED
+drop event e1;
+unlock tables;
+#
+lock table t1 read, mysql.event read;
+#
+--replace_regex /STARTS '[^']+'/STARTS '#'/
+show create event e1;
+select event_name from information_schema.events;
+--error ER_TABLE_NOT_LOCKED_FOR_WRITE
+create event e2 on schedule every 10 hour do select 1;
+--error ER_TABLE_NOT_LOCKED_FOR_WRITE
+alter event e2 disable;
+--error ER_TABLE_NOT_LOCKED_FOR_WRITE
+alter event e2 rename to e3;
+--error ER_TABLE_NOT_LOCKED_FOR_WRITE
+drop event e2;
+--error ER_TABLE_NOT_LOCKED_FOR_WRITE
+drop event e1;
+unlock tables;
+#
+lock table t1 write, mysql.event read;
+#
+--replace_regex /STARTS '[^']+'/STARTS '#'/
+show create event e1;
+select event_name from information_schema.events;
+--error ER_TABLE_NOT_LOCKED_FOR_WRITE
+create event e2 on schedule every 10 hour do select 1;
+--error ER_TABLE_NOT_LOCKED_FOR_WRITE
+alter event e2 disable;
+--error ER_TABLE_NOT_LOCKED_FOR_WRITE
+alter event e2 rename to e3;
+--error ER_TABLE_NOT_LOCKED_FOR_WRITE
+drop event e2;
+--error ER_TABLE_NOT_LOCKED_FOR_WRITE
+drop event e1;
+unlock tables;
+#
+--error ER_WRONG_LOCK_OF_SYSTEM_TABLE
+lock table t1 read, mysql.event write;
+#
+--error ER_WRONG_LOCK_OF_SYSTEM_TABLE
+lock table t1 write, mysql.event write;
+#
+lock table mysql.event write;
+--replace_regex /STARTS '[^']+'/STARTS '#'/
+show create event e1;
+select event_name from information_schema.events;
+create event e2 on schedule every 10 hour do select 1;
+alter event e2 disable;
+alter event e2 rename to e3;
+drop event e3;
+drop event e1;
+unlock tables;
+--echo Make sure we have left no events 
+select event_name from information_schema.events;
+--echo
+--echo Events in sub-statements, events and prelocking
+--echo 
+--echo 
+create event e1 on schedule every 10 hour do select 1;
+delimiter |;
+--error ER_SP_NO_RETSET
+create function f1() returns int
+begin
+  show create event e1;
+  return 1;
+end|
+--error ER_SP_NO_RETSET
+create trigger trg before insert on t1 for each row
+begin
+  show create event e1;
+end|
+--error ER_SP_NO_RETSET
+create function f1() returns int
+begin
+  select event_name from information_schema.events;
+  return 1;
+end|
+--error ER_SP_NO_RETSET
+create trigger trg before insert on t1 for each row
+begin
+  select event_name from information_schema.events;
+end|
+--error ER_EVENT_RECURSION_FORBIDDEN
+create function f1() returns int
+begin
+  create event e2 on schedule every 10 hour do select 1;
+  return 1;
+end|
+--error ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
+create function f1() returns int
+begin
+  alter event e1 rename to e2;
+  return 1;
+end|
+--error ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
+create function f1() returns int
+begin
+  drop event e2;
+  return 1;
+end|
+--echo ----------------------------------------------------------------------
+create trigger trg before insert on t1 for each row
+begin
+  set new.a= f1();
+end|
+create function f1() returns int
+begin
+  call p1();
+  return 0;
+end|
+create procedure p1()
+begin
+  select event_name from information_schema.events;
+end|
+--error ER_SP_NO_RETSET
+insert into t1 (a) values (1)|
+drop procedure p1|
+create procedure p1()
+begin
+  show create event e1; 
+end|
+--error ER_SP_NO_RETSET
+insert into t1 (a) values (1)|
+drop procedure p1|
+create procedure p1()
+begin
+  create temporary table tmp select event_name from information_schema.events;
+end|
+--echo expected to work, since we redirect the output into a tmp table
+insert into t1 (a) values (1)|
+select * from tmp|
+drop temporary table tmp|
+drop procedure p1|
+create procedure p1()
+begin
+  alter event e1 rename to e2;
+end|
+--error ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
+insert into t1 (a) values (1)|
+drop procedure p1|
+create procedure p1()
+begin
+  drop event e1;
+end|
+--error ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
+insert into t1 (a) values (1)|
+drop table t1|
+drop event e1|
+delimiter ;|
+
+
+# 
+# End of tests
+#
+
+let $wait_condition=
+  select count(*) = 0 from information_schema.processlist
+  where db='events_test' and command = 'Connect' and user=current_user();
+--source include/wait_condition.inc
+
+drop database events_test;
diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test
index 8fdbbfcde79..54d4ca94f84 100644
--- a/mysql-test/t/innodb.test
+++ b/mysql-test/t/innodb.test
@@ -753,6 +753,38 @@ drop table t1, t2;
 
 
 #
+# Bug #29136  	erred multi-delete on trans table does not rollback 
+#
+
+# prepare
+--disable_warnings
+drop table if exists t1, t2;
+--enable_warnings
+CREATE TABLE t1 (a int, PRIMARY KEY (a));
+CREATE TABLE t2 (a int, PRIMARY KEY (a)) ENGINE=InnoDB;
+create trigger trg_del_t2 after  delete on t2 for each row
+       insert into t1 values (1);
+insert into t1 values (1);
+insert into t2 values (1),(2);
+
+
+# exec cases A, B - see multi_update.test
+
+# A. send_error() w/o send_eof() branch
+
+--error ER_DUP_ENTRY
+delete t2 from t2;
+
+# check
+
+select count(*) from t2 /* must be 2 as restored after rollback caused by the error */;
+
+# cleanup bug#29136
+
+drop table t1, t2;
+
+
+#
 # Testing of IFNULL
 #
 create table t1 (a int, b int) engine=innodb;
@@ -2382,6 +2414,27 @@ DROP TABLE t1;
 DROP TABLE t2;
 DISCONNECT c1;
 DISCONNECT c2;
+CONNECTION default;
+
+#
+# Bug #29157 UPDATE, changed rows incorrect
+#
+create table t1 (i int, j int) engine=innodb;
+insert into t1 (i, j) values (1, 1), (2, 2);
+--enable_info
+update t1 set j = 2;
+--disable_info
+drop table t1;
+
+#
+# Bug #32440 InnoDB free space info does not appear in SHOW TABLE STATUS or
+# I_S
+#
+create table t1 (id int) comment='this is a comment' engine=innodb;
+select table_comment, data_free > 0 as data_free_is_set
+  from information_schema.tables
+  where table_schema='test' and table_name = 't1';
+drop table t1;
 
 #######################################################################
 #                                                                     #
diff --git a/mysql-test/t/innodb_bug34053.test b/mysql-test/t/innodb_bug34053.test
new file mode 100644
index 00000000000..b935e45c06d
--- /dev/null
+++ b/mysql-test/t/innodb_bug34053.test
@@ -0,0 +1,50 @@
+#
+# Make sure http://bugs.mysql.com/34053 remains fixed.
+#
+
+-- source include/not_embedded.inc
+-- source include/have_innodb.inc
+
+SET storage_engine=InnoDB;
+
+# we do not really care about what gets printed, we are only
+# interested in getting success or failure according to our
+# expectations
+-- disable_query_log
+-- disable_result_log
+
+GRANT USAGE ON *.* TO 'shane'@'localhost' IDENTIFIED BY '12345';
+FLUSH PRIVILEGES;
+
+-- connect (con1,localhost,shane,12345,)
+
+-- connection con1
+-- error ER_SPECIFIC_ACCESS_DENIED_ERROR
+CREATE TABLE innodb_monitor (a INT) ENGINE=INNODB;
+-- error ER_SPECIFIC_ACCESS_DENIED_ERROR
+CREATE TABLE innodb_mem_validate (a INT) ENGINE=INNODB;
+CREATE TABLE innodb_monitorx (a INT) ENGINE=INNODB;
+DROP TABLE innodb_monitorx;
+CREATE TABLE innodb_monito (a INT) ENGINE=INNODB;
+DROP TABLE innodb_monito;
+CREATE TABLE xinnodb_monitor (a INT) ENGINE=INNODB;
+DROP TABLE xinnodb_monitor;
+CREATE TABLE nnodb_monitor (a INT) ENGINE=INNODB;
+DROP TABLE nnodb_monitor;
+
+-- connection default
+CREATE TABLE innodb_monitor (a INT) ENGINE=INNODB;
+CREATE TABLE innodb_mem_validate (a INT) ENGINE=INNODB;
+
+-- connection con1
+-- error ER_SPECIFIC_ACCESS_DENIED_ERROR
+DROP TABLE innodb_monitor;
+-- error ER_SPECIFIC_ACCESS_DENIED_ERROR
+DROP TABLE innodb_mem_validate;
+
+-- connection default
+DROP TABLE innodb_monitor;
+DROP TABLE innodb_mem_validate;
+DROP USER 'shane'@'localhost';
+
+-- disconnect con1
diff --git a/mysql-test/t/partition_innodb.test b/mysql-test/t/partition_innodb.test
index 58010f85ecf..76a54b36942 100644
--- a/mysql-test/t/partition_innodb.test
+++ b/mysql-test/t/partition_innodb.test
@@ -20,6 +20,9 @@ DROP TABLE t1;
 # Bug #14673: Wrong InnoDB default row format
 #
 create table t1 (a int) engine=innodb partition by hash(a) ;
+# Data_free for InnoDB tablespace varies depending on which
+# tests have been run before this one
+--replace_column 10 #
 show table status like 't1';
 drop table t1;
 
@@ -29,18 +32,33 @@ drop table t1;
 create table t1 (a int)
 engine = innodb
 partition by key (a);
+# Data_free for InnoDB tablespace varies depending on which
+# tests have been run before this one
+--replace_column 10 #
 show table status;
 insert into t1 values (0), (1), (2), (3);
+# Data_free for InnoDB tablespace varies depending on which
+# tests have been run before this one
+--replace_column 10 #
 show table status;
 drop table t1;
 
 create table t1 (a int auto_increment primary key)
 engine = innodb
 partition by key (a);
+# Data_free for InnoDB tablespace varies depending on which
+# tests have been run before this one
+--replace_column 10 #
 show table status;
 insert into t1 values (NULL), (NULL), (NULL), (NULL);
+# Data_free for InnoDB tablespace varies depending on which
+# tests have been run before this one
+--replace_column 10 #
 show table status;
 insert into t1 values (NULL), (NULL), (NULL), (NULL);
+# Data_free for InnoDB tablespace varies depending on which
+# tests have been run before this one
+--replace_column 10 #
 show table status;
 drop table t1;
 
diff --git a/mysys/charset.c b/mysys/charset.c
index 692d7867fe0..9bd8de4316a 100644
--- a/mysys/charset.c
+++ b/mysys/charset.c
@@ -606,9 +606,9 @@ CHARSET_INFO *get_charset_by_csname(const char *cs_name,
   is no character set with given name.
 */
 
-bool resolve_charset(const char *cs_name,
-                     CHARSET_INFO *default_cs,
-                     CHARSET_INFO **cs)
+my_bool resolve_charset(const char *cs_name,
+                        CHARSET_INFO *default_cs,
+                        CHARSET_INFO **cs)
 {
   *cs= get_charset_by_csname(cs_name, MY_CS_PRIMARY, MYF(0));
 
@@ -638,9 +638,9 @@ bool resolve_charset(const char *cs_name,
   collation with given name.
 */
 
-bool resolve_collation(const char *cl_name,
-                       CHARSET_INFO *default_cl,
-                       CHARSET_INFO **cl)
+my_bool resolve_collation(const char *cl_name,
+                          CHARSET_INFO *default_cl,
+                          CHARSET_INFO **cl)
 {
   *cl= get_charset_by_name(cl_name, MYF(0));
 
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c
index 5132ac820b8..6a7ee748930 100644
--- a/mysys/my_getopt.c
+++ b/mysys/my_getopt.c
@@ -795,10 +795,10 @@ static longlong getopt_ll(char *arg, const struct my_option *optp, int *err)
 */
 
 longlong getopt_ll_limit_value(longlong num, const struct my_option *optp,
-                               bool *fix)
+                               my_bool *fix)
 {
   longlong old= num;
-  bool adjusted= FALSE;
+  my_bool adjusted= FALSE;
   char buf1[255], buf2[255];
   ulonglong block_size= (optp->block_size ? (ulonglong) optp->block_size : 1L);
 
@@ -864,9 +864,9 @@ static ulonglong getopt_ull(char *arg, const struct my_option *optp, int *err)
 
 
 ulonglong getopt_ull_limit_value(ulonglong num, const struct my_option *optp,
-                                 bool *fix)
+                                 my_bool *fix)
 {
-  bool adjusted= FALSE;
+  my_bool adjusted= FALSE;
   ulonglong old= num;
   char buf1[255], buf2[255];
 
diff --git a/mysys/queues.c b/mysys/queues.c
index 94f49ab8f9c..9c85e493141 100644
--- a/mysys/queues.c
+++ b/mysys/queues.c
@@ -276,7 +276,7 @@ void _downheap(register QUEUE *queue, uint idx)
 {
   uchar *element;
   uint elements,half_queue,offset_to_key, next_index;
-  bool first= TRUE;
+  my_bool first= TRUE;
   uint start_idx= idx;
 
   offset_to_key=queue->offset_to_key;
diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c
index afa5aadece7..b710a7eee39 100644
--- a/mysys/thr_alarm.c
+++ b/mysys/thr_alarm.c
@@ -632,7 +632,7 @@ my_bool thr_alarm(thr_alarm_t *alrm, uint sec, ALARM *alarm)
 }
 
 
-bool thr_got_alarm(thr_alarm_t *alrm_ptr)
+my_bool thr_got_alarm(thr_alarm_t *alrm_ptr)
 {
   thr_alarm_t alrm= *alrm_ptr;
   MSG msg;
diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c
index afe8f289089..55b95407db5 100644
--- a/mysys/thr_lock.c
+++ b/mysys/thr_lock.c
@@ -121,7 +121,7 @@ thr_lock_owner_equal(THR_LOCK_OWNER *rhs, THR_LOCK_OWNER *lhs)
 static uint found_errors=0;
 
 static int check_lock(struct st_lock_list *list, const char* lock_type,
-		      const char *where, my_bool same_owner, bool no_cond)
+		      const char *where, my_bool same_owner, my_bool no_cond)
 {
   THR_LOCK_DATA *data,**prev;
   uint count=0;
@@ -709,7 +709,7 @@ end:
 
 
 static inline void free_all_read_locks(THR_LOCK *lock,
-				       bool using_concurrent_insert)
+				       my_bool using_concurrent_insert)
 {
   THR_LOCK_DATA *data=lock->read_wait.data;
 
@@ -1063,7 +1063,7 @@ void thr_multi_unlock(THR_LOCK_DATA **data,uint count)
   TL_WRITE_ONLY to abort any new accesses to the lock
 */
 
-void thr_abort_locks(THR_LOCK *lock, bool upgrade_lock)
+void thr_abort_locks(THR_LOCK *lock, my_bool upgrade_lock)
 {
   THR_LOCK_DATA *data;
   DBUG_ENTER("thr_abort_locks");
diff --git a/regex/reginit.c b/regex/reginit.c
index 8347c4f6895..5980de24030 100644
--- a/regex/reginit.c
+++ b/regex/reginit.c
@@ -5,7 +5,7 @@
 #include <m_string.h>
 #include "cclass.h"
 
-static bool regex_inited=0;
+static my_bool regex_inited=0;
 
 void my_regex_init(CHARSET_INFO *cs)
 {
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 6fbfcab72d4..f0db25be79a 100755
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -40,3 +40,38 @@ ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_SOURCE_DIR}/scripts/mysql_fix_privilege_tabl
 ADD_CUSTOM_TARGET(GenFixPrivs
                   ALL
                   DEPENDS ${PROJECT_SOURCE_DIR}/scripts/mysql_fix_privilege_tables_sql.c)
+
+# ----------------------------------------------------------------------
+# Replace some variables @foo@ in the .in/.sh file, and write the new script
+# ----------------------------------------------------------------------
+
+SET(CFLAGS             "-D_WINDOWS ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
+SET(prefix             "${CMAKE_INSTALL_PREFIX}/MySQL Server ${MYSQL_BASE_VERSION}")
+SET(sysconfdir          ${prefix})
+SET(bindir              ${prefix}/bin)
+SET(libexecdir          ${prefix}/bin)
+SET(scriptdir           ${prefix}/bin)
+SET(datadir             ${prefix}/share)
+SET(pkgdatadir          ${prefix}/share)
+SET(localstatedir       ${prefix}/data)
+
+CONFIGURE_FILE(mysql_config.pl.in
+               scripts/mysql_config.pl ESCAPE_QUOTES @ONLY)
+
+CONFIGURE_FILE(mysql_convert_table_format.sh
+               scripts/mysql_convert_table_format.pl ESCAPE_QUOTES @ONLY)
+
+CONFIGURE_FILE(mysql_install_db.pl.in
+               scripts/mysql_install_db.pl ESCAPE_QUOTES @ONLY)
+
+CONFIGURE_FILE(mysql_secure_installation.pl.in
+               scripts/mysql_secure_installation.pl ESCAPE_QUOTES @ONLY)
+
+CONFIGURE_FILE(mysqld_multi.sh
+               scripts/mysqld_multi.pl ESCAPE_QUOTES @ONLY)
+
+CONFIGURE_FILE(mysqldumpslow.sh
+               scripts/mysqldumpslow.pl ESCAPE_QUOTES @ONLY)
+
+CONFIGURE_FILE(mysqlhotcopy.sh
+               scripts/mysqlhotcopy.pl ESCAPE_QUOTES @ONLY)
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index fc4359fd872..cf061cc08e5 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -43,11 +43,14 @@ EXTRA_SCRIPTS =		make_binary_distribution.sh \
 			make_sharedlib_distribution.sh \
 			msql2mysql.sh \
 			mysql_config.sh \
+			mysql_config.pl.in \
 			mysql_fix_privilege_tables.sh \
 			mysql_fix_extensions.sh \
 			mysql_install_db.sh \
+			mysql_install_db.pl.in \
 			mysql_setpermission.sh \
 			mysql_secure_installation.sh \
+			mysql_secure_installation.pl.in \
 			mysql_zap.sh \
 			mysqlaccess.sh \
 			mysqlbug.sh \
@@ -87,7 +90,6 @@ CLEANFILES =		@server_scripts@ \
 			mysql_find_rows \
 			mysqlhotcopy \
 			mysqldumpslow \
-			mysql_tableinfo \
 			mysqld_multi
 
 # Default same as 'pkgdatadir', but we can override it
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index a5deb52d526..17d5c6ebbaf 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -23,7 +23,8 @@
 #  Note that the structure created by this script is slightly different from
 #  what a normal "make install" would produce. No extra "mysql" sub directory
 #  will be created, i.e. no "$prefix/include/mysql", "$prefix/lib/mysql" or
-#  "$prefix/share/mysql".
+#  "$prefix/share/mysql".  This is because the build system explicitly calls
+#  make with pkgdatadir=<datadir>, etc.
 #
 #  In GNU make/automake terms
 #
@@ -218,11 +219,13 @@ if [ x"$BASE_SYSTEM" != x"netware" ] ; then
   # If we compiled with gcc, copy libgcc.a to the dist as libmygcc.a
   # ----------------------------------------------------------------------
   if [ x"@GXX@" = x"yes" ] ; then
-    gcclib=`@CC@ @CFLAGS@ --print-libgcc-file`
-    if [ $? -ne 0 ] ; then
-      echo "Warning: Couldn't find libgcc.a!"
-    else
+    gcclib=`@CC@ @CFLAGS@ --print-libgcc-file 2>/dev/null` || true
+    if [ -z "$gcclib" ] ; then
+      echo "Warning: Compiler doesn't tell libgcc.a!"
+    elif [ -f "$gcclib" ] ; then
       $CP $gcclib $DEST/lib/libmygcc.a
+    else
+      echo "Warning: Compiler result '$gcclib' not found / no file!"
     fi
   fi
 
diff --git a/scripts/make_win_bin_dist b/scripts/make_win_bin_dist
index a5b73ecc6c3..f0dc3eff72b 100755
--- a/scripts/make_win_bin_dist
+++ b/scripts/make_win_bin_dist
@@ -316,35 +316,32 @@ if [ -d mysql-test/extra ] ; then
 fi
 
 # ----------------------------------------------------------------------
-# Copy what could be usable in the "scripts" directory. Currently
-# only SQL files, others are Bourne shell scripts or Perl scripts
-# not really usable on Windows.
-#
-# But to be nice to the few Cygwin users we might have in 5.0 we
-# continue to copy the stuff, but don't include it in the WiX install.
+# Copy what could be usable in the "scripts" directory
 # ----------------------------------------------------------------------
 
+mysql_scripts="\
+mysql_config.pl \
+mysql_convert_table_format.pl \
+mysql_install_db.pl \
+mysql_secure_installation.pl \
+mysqld_multi.pl \
+mysqldumpslow.pl \
+mysqlhotcopy.pl \
+"
+
 mkdir -p $DESTDIR/scripts
 
-# Uncomment and remove the for loop in 5.1
-#cp scripts/*.sql $DESTDIR/scripts/
-
-for i in `cd scripts && ls`; do \
-  if echo $i | grep -q '\.sh'; then \
-    cp scripts/$i $DESTDIR/scripts/`echo $i | sed -e 's/\.sh$//'`; \
-  elif [ -d scripts/$i -o $i = Makefile.am -o $i = Makefile.in -o -e scripts/$i.sh ] ; then \
-    : ; \
-  else \
-    cp scripts/$i $DESTDIR/scripts/$i; \
-  fi; \
+for i in $mysql_scripts
+do
+  cp scripts/$i $DESTDIR/scripts/$i
 done
 
 cp -pR sql/share $DESTDIR/
 cp -pR sql-bench $DESTDIR/
 rm -f $DESTDIR/sql-bench/*.sh $DESTDIR/sql-bench/Makefile*
 
-# The SQL initialisation code is really expected to be in "share"
-mv $DESTDIR/scripts/*.sql $DESTDIR/share/ || true
+# The SQL initialisation code is to be in "share"
+cp scripts/*.sql $DESTDIR/share/
 
 # ----------------------------------------------------------------------
 # Clean up from possibly copied SCCS directories
diff --git a/scripts/mysql_config.pl.in b/scripts/mysql_config.pl.in
new file mode 100644
index 00000000000..3ae8baf7db0
--- /dev/null
+++ b/scripts/mysql_config.pl.in
@@ -0,0 +1,285 @@
+#!/usr/bin/perl
+# -*- cperl -*-
+#
+# Copyright (C) 2007 MySQL AB
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+##############################################################################
+#
+#  This script reports various configuration settings that may be needed
+#  when using the MySQL client library.
+#
+#  This script try to match the shell script version as close as possible,
+#  but in addition being compatible with ActiveState Perl on Windows.
+#
+#  All unrecognized arguments to this script are passed to mysqld.
+#
+#  NOTE: This script will only be used on Windows until solved how to
+#        handle @LIBS@ and other strings inserted that might contain
+#        several arguments, possibly with spaces in them.
+#
+#  NOTE: This script was deliberately written to be as close to the shell
+#        script as possible, to make the maintenance of both in parallel
+#        easier.
+#
+##############################################################################
+
+use File::Basename;
+use Getopt::Long;
+use Cwd;
+use strict;
+
+my @exclude_cflags =
+  qw/DDBUG_OFF DSAFEMALLOC USAFEMALLOC DSAFE_MUTEX
+     DPEDANTIC_SAFEMALLOC DUNIV_MUST_NOT_INLINE DFORCE_INIT_OF_VARS
+     DEXTRA_DEBUG DHAVE_purify O O[0-9] xO[0-9] W[-A-Za-z]*
+     Xa xstrconst xc99=none
+     unroll2 ip mp restrict/;
+
+my @exclude_libs = qw/lmtmalloc static-libcxa i-static static-intel/;
+
+my $cwd = cwd();
+my $basedir;
+
+my $socket  = '@MYSQL_UNIX_ADDR@';
+my $version = '@VERSION@';
+
+sub which
+{
+  my $file = shift;
+
+  my $IFS = $^O eq "MSWin32" ? ";" : ":";
+
+  foreach my $dir ( split($IFS, $ENV{PATH}) )
+  {
+    if ( -f "$dir/$file" or -f "$dir/$file.exe" )
+    {
+      return "$dir/$file";
+    }
+  }
+  print STDERR "which: no $file in ($ENV{PATH})\n";
+  exit 1;
+}
+
+# ----------------------------------------------------------------------
+# If we can find the given directory relatively to where mysql_config is
+# we should use this instead of the incompiled one.
+# This is to ensure that this script also works with the binary MySQL
+# version
+# ----------------------------------------------------------------------
+
+sub fix_path
+{
+  my $default = shift;
+  my @dirs = @_;
+
+  foreach my $dirname ( @dirs )
+  {
+    my $path = "$basedir/$dirname";
+    if ( -d $path )
+    {
+      return $path;
+    }
+  }
+  return $default;
+}
+
+sub get_full_path
+{
+  my $file = shift;
+
+  # if the file is a symlink, try to resolve it
+  if ( $^O ne "MSWin32" and -l $file )
+  {
+    $file = readlink($file);
+  }
+
+  if ( $file =~ m,^/, )
+  {
+    # Do nothing, absolute path
+  }
+  elsif ( $file =~ m,/, )
+  {
+    # Make absolute, and remove "/./" in path
+    $file = "$cwd/$file";
+    $file =~ s,/\./,/,g;
+  }
+  else
+  {
+    # Find in PATH
+    $file = which($file);
+  }
+
+  return $file;
+}
+
+##############################################################################
+#
+#  Form a command line that can handle spaces in paths and arguments
+#
+##############################################################################
+
+sub quote_options {
+  my @cmd;
+  foreach my $opt ( @_ )
+  {
+    next unless $opt;           # If undefined or empty, just skip
+    push(@cmd, "\"$opt\"");       # Quote argument
+  }
+  return join(" ", @cmd);
+}
+
+##############################################################################
+#
+#  Main program
+#
+##############################################################################
+
+my $me = get_full_path($0);
+$basedir = dirname(dirname($me)); # Remove "/bin/mysql_config" part
+
+my $ldata   = '@localstatedir@';
+my $execdir = '@libexecdir@';
+my $bindir  = '@bindir@';
+
+# ----------------------------------------------------------------------
+# If installed, search for the compiled in directory first (might be "lib64")
+# ----------------------------------------------------------------------
+
+my $pkglibdir = fix_path('@pkglibdir@',"libmysql/relwithdebinfo",
+                         "libmysql/release","libmysql/debug","lib/mysql","lib");
+
+my $pkgincludedir = fix_path('@pkgincludedir@', "include/mysql", "include");
+
+# Assume no argument with space in it
+my @ldflags = split(" ",'@LDFLAGS@');
+
+my $port;
+if ( '@MYSQL_TCP_PORT_DEFAULT@' == 0 ) {
+  $port = 0;
+} else {
+  $port = '@MYSQL_TCP_PORT@';
+}
+
+# ----------------------------------------------------------------------
+# Create options 
+# We intentionally add a space to the beginning and end of lib strings, simplifies replace later
+# ----------------------------------------------------------------------
+
+my (@lib_opts,@lib_r_opts,@lib_e_opts);
+if ( $^O eq "MSWin32" )
+{
+  my $linkpath   = "$pkglibdir";
+  # user32 is only needed for debug or embedded
+  my @winlibs = ("wsock32.lib","advapi32.lib","user32.lib");
+  @lib_opts   = ("$linkpath/mysqlclient.lib",@winlibs);
+  @lib_r_opts = @lib_opts;
+  @lib_e_opts = ("$linkpath/mysqlserver.lib",@winlibs);
+}
+else
+{
+  my $linkpath   = "-L$pkglibdir";
+  @lib_opts   = ($linkpath,"-lmysqlclient");
+  @lib_r_opts = ($linkpath,"-lmysqlclient_r");
+  @lib_e_opts = ($linkpath,"-lmysqld");
+}
+
+my $flags;
+$flags->{libs} =
+  [@ldflags,@lib_opts,'@ZLIB_DEPS@','@NON_THREADED_LIBS@','@openssl_libs@','@STATIC_NSS_FLAGS@'];
+$flags->{libs_r} =
+  [@ldflags,@lib_r_opts,'@ZLIB_DEPS@','@LIBS@','@openssl_libs@'];
+$flags->{embedded_libs} =
+  [@ldflags,@lib_e_opts,'@ZLIB_DEPS@','@LIBS@','@WRAPLIBS@','@innodb_system_libs@','@openssl_libs@'];
+
+$flags->{include} = ["-I$pkgincludedir"];
+$flags->{cflags}  = [@{$flags->{include}},split(" ",'@CFLAGS@')];
+
+# ----------------------------------------------------------------------
+# Remove some options that a client doesn't have to care about
+# FIXME until we have a --cxxflags, we need to remove -Xa
+#       and -xstrconst to make --cflags usable for Sun Forte C++
+# ----------------------------------------------------------------------
+
+my $filter = join("|", @exclude_cflags);
+my @tmp = @{$flags->{cflags}};          # Copy the flag list
+$flags->{cflags} = [];                  # Clear it
+foreach my $cflag ( @tmp )
+{
+  push(@{$flags->{cflags}}, $cflag) unless $cflag =~ m/^($filter)$/o;
+}
+
+# Same for --libs(_r)
+$filter = join("|", @exclude_libs);
+foreach my $lib_type ( "libs","libs_r","embedded_libs" )
+{
+  my @tmp = @{$flags->{$lib_type}};          # Copy the flag list
+  $flags->{$lib_type} = [];                  # Clear it
+  foreach my $lib ( @tmp )
+  {
+    push(@{$flags->{$lib_type}}, $lib) unless $lib =~ m/^($filter)$/o;
+  }
+}
+
+my $include =       quote_options(@{$flags->{include}});
+my $cflags  =       quote_options(@{$flags->{cflags}});
+my $libs    =       quote_options(@{$flags->{libs}});
+my $libs_r  =       quote_options(@{$flags->{libs_r}});
+my $embedded_libs = quote_options(@{$flags->{embedded_libs}});
+
+##############################################################################
+#
+#  Usage information, output if no option is given
+#
+##############################################################################
+
+sub usage
+{
+  print <<EOF;
+Usage: $0 [OPTIONS]
+Options:
+        --cflags         [$cflags]
+        --include        [$include]
+        --libs           [$libs]
+        --libs_r         [$libs_r]
+        --socket         [$socket]
+        --port           [$port]
+        --version        [$version]
+        --libmysqld-libs [$embedded_libs]
+EOF
+  exit 1;
+}
+
+@ARGV or usage();
+
+##############################################################################
+#
+#  Get options and output the values
+#
+##############################################################################
+
+GetOptions(
+           "cflags"  => sub { print "$cflags\n" },
+           "include" => sub { print "$include\n" },
+           "libs"    => sub { print "$libs\n" },
+           "libs_r"  => sub { print "$libs_r\n" },
+           "socket"  => sub { print "$socket\n" },
+           "port"    => sub { print "$port\n" },
+           "version" => sub { print "$version\n" },
+           "embedded-libs|embedded|libmysqld-libs" =>
+             sub { print "$embedded_libs\n" },
+           ) or usage();
+
+exit 0
diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh
index ae58655ed0f..8abad75bc2a 100644
--- a/scripts/mysql_config.sh
+++ b/scripts/mysql_config.sh
@@ -107,6 +107,16 @@ libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
 libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@ @openssl_libs@ "
 embedded_libs=" $ldflags -L$pkglibdir -lmysqld @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ "
 
+if [ -r "$pkglibdir/libmygcc.a" ]; then
+  # When linking against the static library with a different version of GCC
+  # from what was used to compile the library, some symbols may not be defined
+  # automatically.  We package the libmygcc.a from the build host, to provide
+  # definitions for those.  Bugs 4921, 19561, 19817, 21158, etc.
+  libs="$libs -lmygcc "
+  libs_r="$libs_r -lmygcc "
+  embedded_libs="$embedded_libs -lmygcc "
+fi
+
 cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!
 include="-I$pkgincludedir"
 
@@ -116,6 +126,7 @@ include="-I$pkgincludedir"
 for remove in DDBUG_OFF DSAFEMALLOC USAFEMALLOC DSAFE_MUTEX \
               DPEDANTIC_SAFEMALLOC DUNIV_MUST_NOT_INLINE DFORCE_INIT_OF_VARS \
               DEXTRA_DEBUG DHAVE_purify O 'O[0-9]' 'xO[0-9]' 'W[-A-Za-z]*' \
+              'mtune=[-A-Za-z0-9]*' 'mcpu=[-A-Za-z0-9]*' 'march=[-A-Za-z0-9]*' \
               Xa xstrconst "xc99=none" \
               unroll2 ip mp restrict
 do
diff --git a/scripts/mysql_convert_table_format.sh b/scripts/mysql_convert_table_format.sh
index 4df3e293303..d15c7b28410 100644
--- a/scripts/mysql_convert_table_format.sh
+++ b/scripts/mysql_convert_table_format.sh
@@ -1,4 +1,4 @@
-#!@PERL@
+#!/usr/bin/perl
 # Copyright (C) 2000-2002 MySQL AB
 # 
 # This program is free software; you can redistribute it and/or modify
diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in
new file mode 100644
index 00000000000..18bd713c041
--- /dev/null
+++ b/scripts/mysql_install_db.pl.in
@@ -0,0 +1,612 @@
+#!/usr/bin/perl
+# -*- cperl -*-
+#
+# Copyright (C) 2007 MySQL AB
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+##############################################################################
+#
+#  This scripts creates the MySQL Server system tables.
+#
+#  This script try to match the shell script version as close as possible,
+#  but in addition being compatible with ActiveState Perl on Windows.
+#
+#  All unrecognized arguments to this script are passed to mysqld.
+#
+#  NOTE: This script in 5.0 doesn't really match the shell script
+#        version 100%, it is more close to the 5.1 version.
+#
+#  NOTE: This script was deliberately written to be as close to the shell
+#        script as possible, to make the maintenance of both in parallel
+#        easier.
+#
+##############################################################################
+
+use File::Basename;
+use Getopt::Long;
+use Sys::Hostname;
+use Data::Dumper;
+use strict;
+
+Getopt::Long::Configure("pass_through");
+
+my @args;                       # Argument list filled in
+
+##############################################################################
+#
+#  Usage information
+#
+##############################################################################
+
+sub usage
+{
+  print <<EOF;
+Usage: $0 [OPTIONS]
+  --basedir=path       The path to the MySQL installation directory.
+  --builddir=path      If using --srcdir with out-of-directory builds, you
+                       will need to set this to the location of the build
+                       directory where built files reside.
+  --cross-bootstrap    For internal use.  Used when building the MySQL system
+                       tables on a different host than the target.
+  --datadir=path       The path to the MySQL data directory.
+  --force              Causes mysql_install_db to run even if DNS does not
+                       work.  In that case, grant table entries that normally
+                       use hostnames will use IP addresses.
+  --ldata=path         The path to the MySQL data directory. Same as --datadir.
+  --rpm                For internal use.  This option is used by RPM files
+                       during the MySQL installation process.
+  --skip-name-resolve  Use IP addresses rather than hostnames when creating
+                       grant table entries.  This option can be useful if
+                       your DNS does not work.
+  --srcdir=path        The path to the MySQL source directory.  This option
+                       uses the compiled binaries and support files within the
+                       source tree, useful for if you don't want to install
+                       MySQL yet and just want to create the system tables.
+  --user=user_name     The login username to use for running mysqld.  Files
+                       and directories created by mysqld will be owned by this
+                       user.  You must be root to use this option.  By default
+                       mysqld runs using your current login name and files and
+                       directories that it creates will be owned by you.
+
+All other options are passed to the mysqld program
+
+EOF
+  exit 1;
+}
+
+##############################################################################
+#
+#  Parse an argument list
+#
+#  We only need to pass arguments through to the server if we don't
+#  handle them here.  So, we collect unrecognized options (passed on
+#  the command line) into the args variable.
+#
+##############################################################################
+
+sub parse_arguments
+{
+  my $opt = shift;
+
+  my @saved_ARGV = @ARGV;
+  @ARGV = @_;                           # Set ARGV so GetOptions works
+
+  my $pick_args;
+  if (@ARGV and $ARGV[0] eq 'PICK-ARGS-FROM-ARGV')
+  {
+    $pick_args = 1;
+    shift @ARGV;
+  }
+
+  GetOptions(
+             $opt,
+             "force",
+             "basedir=s",
+             "builddir=s",      # FIXME not documented
+             "srcdir=s",
+             "ldata|datadir=s",
+
+             # Note that the user will be passed to mysqld so that it runs
+             # as 'user' (crucial e.g. if log-bin=/some_other_path/
+             # where a chown of datadir won't help)
+             "user=s",
+
+             "skip-name-resolve",
+             "verbose",
+             "rpm",
+             "help",
+             "defaults-file|defaults-extra-file|no-defaults:s",
+
+             # Used when building the MySQL system tables on a different host than
+             # the target. The platform-independent files that are created in
+             # --datadir on the host can be copied to the target system.
+             #
+             # The most common use for this feature is in the Windows installer
+             # which will take the files from datadir and include them as part of
+             # the install package.  See top-level 'dist-hook' make target.
+             #
+             # --windows is a deprecated alias
+             "cross-bootstrap|windows", # FIXME undocumented, even needed?
+  ) or usage();
+
+  usage() if $opt->{help};
+
+  @args =  @ARGV if $pick_args;
+
+  @ARGV = @saved_ARGV;                  # Set back ARGV
+}
+
+##############################################################################
+#
+#  Try to find a specific file within --basedir which can either be a binary
+#  release or installed source directory and return the path.
+#
+##############################################################################
+
+sub find_in_basedir
+{
+  my $opt   = shift;
+  my $mode  = shift;            # "dir" or "file"
+  my $files = shift;
+
+  foreach my $file ( @{ref($files) ? $files : [$files]} )
+  {
+    foreach my $dir ( @_ )
+    {
+      foreach my $part ( "$file","$file.exe","release/$file.exe",
+                         "debug/$file.exe","relwithdebinfo/$file.exe" )
+      {
+        my $path = "$opt->{basedir}/$dir/$part";
+        if ( -f $path )
+        {
+          return $mode eq "dir" ? dirname($path) : $path;
+        }
+      }
+    }
+  }
+}
+
+##############################################################################
+#
+#  Just a function to write out an error report
+#
+##############################################################################
+
+sub cannot_find_file
+{
+  my $file = shift;
+
+  print "FATAL ERROR: Could not find $file\n";
+  print "\n";
+  print "If you compiled from source, you need to run 'make install' to\n";
+  print "copy the software into the correct location ready for operation.\n";
+  print "\n";
+  print "If you are using a binary release, you must either be at the top\n";
+  print "level of the extracted archive, or pass the --basedir option\n";
+  print "pointing to that location.\n";
+  print "\n";
+
+  exit 1;
+}
+
+##############################################################################
+#
+#  Form a command line that can handle spaces in paths and arguments
+#
+##############################################################################
+
+# FIXME this backslash escaping needed if using '"..."' ?
+# This regexp makes sure that any special chars are quoted,
+# so the arg gets passed exactly to the server.
+# XXX: This is broken; true fix requires using eval and proper
+# quoting of every single arg ($opt->{basedir}, $opt->{ldata}, etc.)
+#  join(" ", map {s/([^\w\_\.\-])/\\$1/g}
+
+sub quote_options {
+  my @cmd;
+  foreach my $opt ( @_ )
+  {
+    next unless $opt;           # If undefined or empty, just skip
+    push(@cmd, "\"$opt\"");     # Quote argument
+  }
+  return join(" ", @cmd);
+}
+
+##############################################################################
+#
+#  Ok, let's go.  We first need to parse arguments which are required by
+#  my_print_defaults so that we can execute it first, then later re-parse
+#  the command line to add any extra bits that we need.
+#
+##############################################################################
+
+my $opt = {};
+parse_arguments($opt, 'PICK-ARGS-FROM-ARGV', @ARGV);
+
+# ----------------------------------------------------------------------
+# We can now find my_print_defaults.  This script supports:
+#
+#   --srcdir=path pointing to compiled source tree
+#   --basedir=path pointing to installed binary location
+#
+# or default to compiled-in locations.
+# ----------------------------------------------------------------------
+
+my $print_defaults;
+
+if ( $opt->{srcdir} and $opt->{basedir} )
+{
+  error("Specify either --basedir or --srcdir, not both");
+}
+if ( $opt->{srcdir} )
+{
+  $opt->{builddir} = $opt->{srcdir} unless $opt->{builddir};
+  $print_defaults = "$opt->{builddir}/extra/my_print_defaults";
+}
+elsif ( $opt->{basedir} )
+{
+  $print_defaults = find_in_basedir($opt,"file","my_print_defaults","bin","extra");
+}
+else
+{
+  $print_defaults='@bindir@/my_print_defaults';
+}
+
+-x $print_defaults or -f "$print_defaults.exe"
+  or cannot_find_file($print_defaults);
+
+# ----------------------------------------------------------------------
+# Now we can get arguments from the groups [mysqld] and [mysql_install_db]
+# in the my.cfg file, then re-run to merge with command line arguments.
+# ----------------------------------------------------------------------
+
+my @default_options;
+my $cmd = quote_options($print_defaults,$opt->{'defaults-file'},
+                        "mysqld","mysql_install_db");
+open(PIPE, "$cmd |") or error($opt,"can't run $cmd: $!");
+while ( <PIPE> )
+{
+  chomp;
+  next unless /\S/;
+  push(@default_options, $_);
+}
+close PIPE;
+$opt = {};                              # Reset the arguments FIXME ?
+parse_arguments($opt, @default_options);
+parse_arguments($opt, 'PICK-ARGS-FROM-ARGV', @ARGV);
+
+# ----------------------------------------------------------------------
+# Configure paths to support files
+# ----------------------------------------------------------------------
+
+# FIXME $extra_bindir is not used
+my ($bindir,$extra_bindir,$mysqld,$pkgdatadir,$mysqld_opt,$scriptdir);
+
+if ( $opt->{srcdir} )
+{
+  $opt->{basedir} = $opt->{builddir};
+  $bindir         = "$opt->{basedir}/client";
+  $extra_bindir   = "$opt->{basedir}/extra";
+  $mysqld         = "$opt->{basedir}/sql/mysqld";
+  $mysqld_opt     = "--language=$opt->{srcdir}/sql/share/english";
+  $pkgdatadir     = "$opt->{srcdir}/scripts";
+  $scriptdir      = "$opt->{srcdir}/scripts";
+}
+elsif ( $opt->{basedir} )
+{
+  $bindir         = "$opt->{basedir}/bin";
+  $extra_bindir   = $bindir;
+  $mysqld         = find_in_basedir($opt,"file",["mysqld-nt","mysqld"],
+                                    "libexec","sbin","bin") ||  # ,"sql"
+                    find_in_basedir($opt,"file","mysqld-nt",
+                                  "bin");  # ,"sql"
+  $pkgdatadir     = find_in_basedir($opt,"dir","fill_help_tables.sql",
+                                    "share","share/mysql");  # ,"scripts"
+  $scriptdir      = "$opt->{basedir}/scripts";
+}
+else
+{
+  $opt->{basedir} = '@prefix@';
+  $bindir         = '@bindir@';
+  $extra_bindir   = $bindir;
+  $mysqld         = '@libexecdir@/mysqld';
+  $pkgdatadir     = '@pkgdatadir@';
+  $scriptdir      = '@scriptdir@';
+}
+
+unless ( $opt->{ldata} )
+{
+  $opt->{ldata} = '@localstatedir@';
+}
+
+if ( $opt->{srcdir} )
+{
+  $pkgdatadir = "$opt->{srcdir}/scripts";
+}
+
+# ----------------------------------------------------------------------
+# Set up paths to SQL scripts required for bootstrap
+# ----------------------------------------------------------------------
+
+my $fill_help_tables     = "$pkgdatadir/fill_help_tables.sql";
+my $create_system_tables = "$pkgdatadir/mysql_system_tables.sql";
+my $fill_system_tables   = "$pkgdatadir/mysql_system_tables_data.sql";
+
+foreach my $f ( $fill_help_tables,$create_system_tables,$fill_system_tables )
+{
+  -f $f or cannot_find_file($f);
+}
+
+-x $mysqld or -f "$mysqld.exe" or cannot_find_file($mysqld);
+# Try to determine the hostname
+my $hostname = hostname();
+
+# ----------------------------------------------------------------------
+# Check if hostname is valid
+# ----------------------------------------------------------------------
+
+my $resolved;
+if ( !$opt->{'cross-bootstrap'} and !$opt->{rpm} and !$opt->{force} )
+{
+  my $resolveip;
+
+  $resolved = `$resolveip $hostname 2>&1`;
+  if ( $? != 0 )
+  {
+    $resolved=`$resolveip localhost 2>&1`;
+    if ( $? != 0 )
+    {
+      error($opt,
+            "Neither host '$hostname' nor 'localhost' could be looked up with",
+            "$bindir/resolveip",
+            "Please configure the 'hostname' command to return a correct",
+            "hostname.",
+            "If you want to solve this at a later stage, restart this script",
+            "with the --force option");
+    }
+    warning($opt,
+            "The host '$hostname' could not be looked up with resolveip.",
+            "This probably means that your libc libraries are not 100 % compatible",
+            "with this binary MySQL version. The MySQL daemon, mysqld, should work",
+            "normally with the exception that host name resolving will not work.",
+            "This means that you should use IP addresses instead of hostnames",
+            "when specifying MySQL privileges !");
+  }
+}
+
+# FIXME what does this really mean....
+if ( $opt->{'skip-name-resolve'} and $resolved and $resolved =~ /\s/ )
+{
+  $hostname = (split(' ', $resolved))[5];
+}
+
+# ----------------------------------------------------------------------
+# Create database directories mysql & test
+# ----------------------------------------------------------------------
+
+foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql", "$opt->{ldata}/test" )
+{
+  # FIXME not really the same as original "mkdir -p", but ok?
+  mkdir($dir, 0700) unless -d $dir;
+  chown($opt->{user}, $dir) if -w "/" and !$opt->{user};
+}
+
+push(@args, "--user=$opt->{user}") if $opt->{user};
+
+# ----------------------------------------------------------------------
+# Configure mysqld command line
+# ----------------------------------------------------------------------
+
+# FIXME use --init-file instead of --bootstrap ?!
+
+my $mysqld_bootstrap = $ENV{MYSQLD_BOOTSTRAP} || $mysqld;
+my $mysqld_install_cmd_line = quote_options($mysqld_bootstrap,
+                                            $opt->{'defaults-file'},
+                                            $mysqld_opt,
+                                            "--bootstrap",
+                                            "--basedir=$opt->{basedir}",
+                                            "--datadir=$opt->{ldata}",
+                                            "--skip-innodb",
+                                            "--skip-bdb",
+                                            "--skip-ndbcluster",
+                                            "--max_allowed_packet=8M",
+                                            "--net_buffer_length=16K",
+                                            @args,
+                                          );
+
+# ----------------------------------------------------------------------
+# Create the system and help tables by passing them to "mysqld --bootstrap"
+# ----------------------------------------------------------------------
+
+report_verbose_wait($opt,"Installing MySQL system tables...");
+
+open(SQL, $create_system_tables)
+  or error($opt,"can't open $create_system_tables for reading: $!");
+# FIXME  > /dev/null ?
+if ( open(PIPE, "| $mysqld_install_cmd_line") )
+{
+  print PIPE "use mysql;\n";
+  while ( <SQL> )
+  {
+    # When doing a "cross bootstrap" install, no reference to the current
+    # host should be added to the system tables.  So we filter out any
+    # lines which contain the current host name.
+    next if $opt->{'cross-bootstrap'} and /\@current_hostname/;
+
+    print PIPE $_;
+  }
+  close PIPE;
+  close SQL;
+
+  report_verbose($opt,"OK");
+
+  # ----------------------------------------------------------------------
+  # Pipe fill_help_tables.sql to "mysqld --bootstrap"
+  # ----------------------------------------------------------------------
+
+  report_verbose_wait($opt,"Filling help tables...");
+  open(SQL, $fill_help_tables)
+    or error($opt,"can't open $fill_help_tables for reading: $!");
+  # FIXME  > /dev/null ?
+  if ( open(PIPE, "| $mysqld_install_cmd_line") )
+  {
+    print PIPE "use mysql;\n";
+    while ( <SQL> )
+    {
+      print PIPE $_;
+    }
+    close PIPE;
+    close SQL;
+
+    report_verbose($opt,"OK");
+  }
+  else
+  {
+    warning($opt,"HELP FILES ARE NOT COMPLETELY INSTALLED!",
+                 "The \"HELP\" command might not work properly");
+  }
+
+  report_verbose($opt,"To start mysqld at boot time you have to copy",
+                      "support-files/mysql.server to the right place " .
+                      "for your system");
+
+  if ( !$opt->{'cross-bootstrap'} )
+  {
+    # This is not a true installation on a running system.  The end user must
+    # set a password after installing the data files on the real host system.
+    # At this point, there is no end user, so it does not make sense to print
+    # this reminder.
+    report($opt,
+           "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !",
+           "To do so, start the server, then issue the following commands:",
+           "",
+           "  $bindir/mysqladmin -u root password 'new-password'",
+           "  $bindir/mysqladmin -u root -h $hostname password 'new-password'",
+           "",
+           "Alternatively you can run:",
+           "",
+           "  $bindir/mysql_secure_installation",
+           "",
+           "which will also give you the option of removing the test",
+           "databases and anonymous user created by default.  This is",
+           "strongly recommended for production servers.",
+           "",
+           "See the manual for more instructions.");
+
+    if ( !$opt->{rpm} )
+    {
+      report($opt,
+             "You can start the MySQL daemon with:",
+             "",
+             "  cd " . '@prefix@' . " ; $bindir/mysqld_safe &",
+             "",
+             "You can test the MySQL daemon with mysql-test-run.pl",
+             "",
+             "  cd mysql-test ; perl mysql-test-run.pl");
+    }
+    report($opt,
+           "Please report any problems with the " . '@scriptdir@' . "/mysqlbug script!",
+           "",
+           "The latest information about MySQL is available on the web at",
+           "",
+           "  http://www.mysql.com",
+           "",
+           "Support MySQL by buying support/licenses at http://shop.mysql.com");
+  }
+  exit 0
+}
+else
+{
+  error($opt,
+        "Installation of system tables failed!",
+         "",
+        "Examine the logs in $opt->{ldata} for more information.",
+        "You can try to start the mysqld daemon with:",
+        "$mysqld --skip-grant &",
+        "and use the command line tool",
+        "$bindir/mysql to connect to the mysql",
+        "database and look at the grant tables:",
+        "",
+        "shell> $bindir/mysql -u root mysql",
+        "mysql> show tables",
+        "",
+        "Try 'mysqld --help' if you have problems with paths. Using --log",
+        "gives you a log in $opt->{ldata} that may be helpful.",
+        "",
+        "The latest information about MySQL is available on the web at",
+        "http://www.mysql.com",
+        "Please consult the MySQL manual section: 'Problems running mysql_install_db',",
+        "and the manual section that describes problems on your OS.",
+        "Another information source is the MySQL email archive.",
+        "Please check all of the above before mailing us!",
+        "And if you do mail us, you MUST use the " . '@scriptdir@' . "/mysqlbug script!")
+}
+
+##############################################################################
+#
+#  Misc
+#
+##############################################################################
+
+sub report_verbose
+{
+  my $opt  = shift;
+  my $text = shift;
+
+  report_verbose_wait($opt, $text, @_);
+  print "\n\n";
+}
+
+sub report_verbose_wait
+{
+  my $opt  = shift;
+  my $text = shift;
+
+  if ( $opt->{verbose} or (!$opt->{rpm} and !$opt->{'cross-bootstrap'}) )
+  {
+    print "$text";
+    map {print "\n$_"} @_;
+  }
+}
+
+sub report
+{
+  my $opt  = shift;
+  my $text = shift;
+
+  print "$text\n";
+  map {print "$_\n"} @_;
+  print "\n";
+}
+
+sub error
+{
+  my $opt  = shift;
+  my $text = shift;
+
+  print "FATAL ERROR: $text\n";
+  map {print "$_\n"} @_;
+  exit 1;
+}
+
+sub warning
+{
+  my $opt  = shift;
+  my $text = shift;
+
+  print "WARNING: $text\n";
+  map {print "$_\n"} @_;
+  print "\n";
+}
diff --git a/scripts/mysql_secure_installation.pl.in b/scripts/mysql_secure_installation.pl.in
new file mode 100755
index 00000000000..4eeb50e6d2f
--- /dev/null
+++ b/scripts/mysql_secure_installation.pl.in
@@ -0,0 +1,352 @@
+#!/usr/bin/perl
+# -*- cperl -*-
+#
+# Copyright (C) 2002 MySQL AB and Jeremy Cole
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+use Fcntl;
+use strict;
+
+my $config  = ".my.cnf.$$";
+my $command = ".mysql.$$";
+my $hadpass = 0;
+
+# FIXME
+# trap "interrupt" 2
+
+my $rootpass = "";
+
+sub echo_on {
+  if ($^O eq 'MSWin32') {
+    ReadMode('normal');
+  } else {
+    system("stty echo");
+  }
+}
+
+sub echo_off {
+  if ($^O eq 'MSWin32') {
+    ReadMode('noecho');
+  } else {
+    system("stty -echo");
+  }
+}
+
+sub write_file {
+  my $file = shift;
+  -f $file or die "ERROR: file is missing \"$file\": $!";
+  open(FILE, ">$file") or die "ERROR: can't write to file \"$file\": $!";
+  foreach my $line ( @_ ) {
+    print FILE $line, "\n";             # Add EOL char
+  }
+  close FILE;
+}
+
+sub prepare {
+  foreach my $file ( $config, $command ) {
+    next if -f $file;                   # Already exists
+    local *FILE;
+    sysopen(FILE, $file, O_CREAT, 0600)
+      or die "ERROR: can't create $file: $!";
+    close FILE;
+  }
+}
+
+sub do_query {
+  my $query   = shift;
+  write_file($command, $query);
+  system("mysql --defaults-file=$config < $command");
+  return $?;
+}
+
+sub make_config {
+  my $password = shift;
+
+  write_file($config,
+             "# mysql_secure_installation config file",
+             "[mysql]",
+             "user=root",
+             "password=$rootpass");
+}
+
+sub get_root_password {
+  my $status = 1;
+  while ( $status == 1 ) {
+    echo_off();
+    print "Enter current password for root (enter for none): ";
+    my $password = <STDIN>;
+    echo_on();
+    if ( $password ) {
+      $hadpass = 1;
+    } else {
+      $hadpass = 0;
+    }
+    $rootpass = $password;
+    make_config($rootpass);
+    do_query("");
+    $status = $?;
+  }
+  print "OK, successfully used password, moving on...\n\n";
+}
+
+sub set_root_password {
+  echo_off();
+  print "New password: ";
+  my $password1 = <STDIN>;
+  print "\nRe-enter new password: ";
+  my $password2 = <STDIN>;
+  print "\n";
+  echo_on();
+
+  if ( $password1 eq $password2 ) {
+    print "Sorry, passwords do not match.\n\n";
+    return 1;
+  }
+
+  if ( !$password1 ) {
+    print "Sorry, you can't use an empty password here.\n\n";
+    return 1;
+  }
+
+  do_query("UPDATE mysql.user SET Password=PASSWORD('$password1') WHERE User='root';");
+  if ( $? == 0 ) {
+    print "Password updated successfully!\n";
+    print "Reloading privilege tables..\n";
+    if ( !reload_privilege_tables() ) {
+      exit 1;
+    }
+    print "\n";
+    $rootpass = $password1;
+    make_config($rootpass);
+  } else {
+    print "Password update failed!\n";
+    exit 1;
+  }
+
+  return 0;
+}
+
+sub remove_anonymous_users {
+  do_query("DELETE FROM mysql.user WHERE User='';");
+  if ( $? == 0 ) {
+    print " ... Success!\n";
+  } else {
+    print " ... Failed!\n";
+    exit 1;
+  }
+
+  return 0;
+}
+
+sub remove_remote_root {
+  do_query("DELETE FROM mysql.user WHERE User='root' AND Host!='localhost';");
+  if ( $? == 0 ) {
+    print " ... Success!\n";
+  } else {
+    print " ... Failed!\n";
+  }
+}
+
+sub remove_test_database {
+  print " - Dropping test database...\n";
+  do_query("DROP DATABASE test;");
+  if ( $? == 0 ) {
+    print " ... Success!\n";
+  } else {
+    print " ... Failed!  Not critical, keep moving...\n";
+  }
+
+  print " - Removing privileges on test database...\n";
+  do_query("DELETE FROM mysql.db WHERE Db='test' OR Db='test\\_%'");
+  if ( $? == 0 ) {
+    print " ... Success!\n";
+  } else {
+    print " ... Failed!  Not critical, keep moving...\n";
+  }
+
+  return 0;
+}
+
+sub reload_privilege_tables {
+  do_query("FLUSH PRIVILEGES;");
+  if ( $? == 0 ) {
+    print " ... Success!\n";
+    return 0;
+  } else {
+    print " ... Failed!\n";
+    return 1;
+  }
+}
+
+sub interrupt {
+  print "\nAborting!\n\n";
+  cleanup();
+  echo_on();
+  exit 1;
+}
+
+sub cleanup {
+  print "Cleaning up...\n";
+  unlink($config,$command);
+}
+
+
+# The actual script starts here
+
+prepare();
+
+print <<HERE;
+
+
+
+NOTE: RUNNING ALL PARTS OF THIS SCRIPT IS RECOMMENDED FOR ALL MySQL
+      SERVERS IN PRODUCTION USE!  PLEASE READ EACH STEP CAREFULLY!
+
+In order to log into MySQL to secure it, we'll need the current
+password for the root user.  If you've just installed MySQL, and
+you haven't set the root password yet, the password will be blank,
+so you should just press enter here.
+
+HERE
+
+get_root_password();
+
+
+#
+# Set the root password
+#
+
+print "Setting the root password ensures that nobody can log into the MySQL\n";
+print "root user without the proper authorisation.\n\n";
+
+if ( $hadpass == 0 ) {
+  print "Set root password? [Y/n] ";
+} else {
+  print "You already have a root password set, so you can safely answer 'n'.\n\n";
+  print "Change the root password? [Y/n] ";
+}
+
+my $reply = <STDIN>;
+if ( $reply =~ /n/i ) {
+  print " ... skipping.\n";
+} else {
+  my $status = 1;
+  while ( $status == 1 ) {
+    set_root_password();
+    $status = $?;
+  }
+}
+print "\n";
+
+
+#
+# Remove anonymous users
+#
+
+print <<HERE;
+By default, a MySQL installation has an anonymous user, allowing anyone
+to log into MySQL without having to have a user account created for
+them.  This is intended only for testing, and to make the installation
+go a bit smoother.  You should remove them before moving into a
+production environment.
+
+HERE
+
+print "Remove anonymous users? [Y/n] ";
+$reply = <STDIN>;
+if ( $reply =~ /n/i ) {
+  print " ... skipping.\n";
+} else {
+  remove_anonymous_users();
+}
+print "\n";
+
+
+#
+# Disallow remote root login
+#
+
+print <<HERE;
+Normally, root should only be allowed to connect from 'localhost'.  This
+ensures that someone cannot guess at the root password from the network.
+
+HERE
+
+print "Disallow root login remotely? [Y/n] ";
+$reply = <STDIN>;
+if ( $reply =~ /n/i ) {
+  print " ... skipping.\n";
+} else {
+  remove_remote_root();
+}
+print "\n";
+
+
+#
+# Remove test database
+#
+
+print <<HERE;
+By default, MySQL comes with a database named 'test' that anyone can
+access.  This is also intended only for testing, and should be removed
+before moving into a production environment.
+
+HERE
+
+print "Remove test database and access to it? [Y/n] ";
+$reply = <STDIN>;
+if ( $reply =~ /n/i ) {
+  print " ... skipping.\n";
+} else {
+  remove_test_database();
+}
+print "\n";
+
+
+#
+# Reload privilege tables
+#
+
+print <<HERE;
+Reloading the privilege tables will ensure that all changes made so far
+will take effect immediately.
+
+HERE
+
+print "Reload privilege tables now? [Y/n] ";
+$reply = <STDIN>;
+if ( $reply =~ /n/i ) {
+  print " ... skipping.\n";
+} else {
+  reload_privilege_tables();
+}
+print "\n";
+
+cleanup();
+
+print <<HERE;
+
+
+
+All done!  If you've completed all of the above steps, your MySQL
+installation should now be secure.
+
+Thanks for using MySQL!
+
+
+HERE
+
+
+
diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh
index 92cfbe3ef22..3cb4665eb1c 100644
--- a/scripts/mysqld_multi.sh
+++ b/scripts/mysqld_multi.sh
@@ -1,4 +1,4 @@
-#!@PERL@
+#!/usr/bin/perl
 
 use Getopt::Long;
 use POSIX qw(strftime);
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index 99dcafbbf71..5e7a177a546 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -200,16 +200,24 @@ parse_arguments() {
 
 #
 # First, try to find BASEDIR and ledir (where mysqld is)
-# 
+#
+
+if echo '@pkgdatadir@' | grep '^@prefix@' > /dev/null
+then
+  relpkgdata=`echo '@pkgdatadir@' | sed -e 's,^@prefix@,,' -e 's,^/,,' -e 's,^,./,'`
+else
+  # pkgdatadir is not relative to prefix
+  relpkgdata='@pkgdatadir@'
+fi
 
 MY_PWD=`pwd`
 # Check for the directories we would expect from a binary release install
-if test -f ./share/mysql/english/errmsg.sys -a -x ./bin/mysqld
+if test -f "$relpkgdata"/english/errmsg.sys -a -x ./bin/mysqld
 then
   MY_BASEDIR_VERSION=$MY_PWD		# Where bin, share and data are
   ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
 # Check for the directories we would expect from a source install
-elif test -f ./share/mysql/english/errmsg.sys -a -x ./libexec/mysqld
+elif test -f "$relpkgdata"/english/errmsg.sys -a -x ./libexec/mysqld
 then
   MY_BASEDIR_VERSION=$MY_PWD		# Where libexec, share and var are
   ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld is
@@ -219,6 +227,7 @@ else
   ledir=@libexecdir@
 fi
 
+
 #
 # Second, try to find the data directory
 #
diff --git a/scripts/mysqldumpslow.sh b/scripts/mysqldumpslow.sh
index ff82a35ec3f..f05761bb837 100644
--- a/scripts/mysqldumpslow.sh
+++ b/scripts/mysqldumpslow.sh
@@ -1,4 +1,4 @@
-#!@PERL@
+#!/usr/bin/perl
 # mysqldumpslow - parse and summarize the MySQL slow query log
 
 # Original version by Tim Bunce, sometime in 2000.
diff --git a/scripts/mysqlhotcopy.sh b/scripts/mysqlhotcopy.sh
index 6ad5c77b954..8814e36b2fa 100644
--- a/scripts/mysqlhotcopy.sh
+++ b/scripts/mysqlhotcopy.sh
@@ -1,4 +1,4 @@
-#!@PERL@ -w
+#!/usr/bin/perl
 
 use strict;
 use Getopt::Long;
@@ -39,7 +39,7 @@ WARNING: THIS PROGRAM IS STILL IN BETA. Comments/patches welcome.
 
 # Documentation continued at end of file
 
-my $VERSION = "1.22";
+my $VERSION = "1.23";
 
 my $opt_tmpdir = $ENV{TMPDIR} || "/tmp";
 
@@ -132,7 +132,6 @@ GetOptions( \%opt,
 #   'target'  - destination directory of the copy
 #   'tables'  - array-ref to list of tables in the db
 #   'files'   - array-ref to list of files to be copied
-#               (RAID files look like 'nn/name.MYD')
 #   'index'   - array-ref to list of indexes to be copied
 #
 
@@ -263,7 +262,6 @@ my $hc_locks = "";
 my $hc_tables = "";
 my $num_tables = 0;
 my $num_files = 0;
-my $raid_dir_regex = '[A-Za-z0-9]{2}';
 
 foreach my $rdb ( @db_desc ) {
     my $db = $rdb->{src};
@@ -292,20 +290,12 @@ foreach my $rdb ( @db_desc ) {
       or die "Cannot open dir '$db_dir': $!";
 
     my %db_files;
-    my @raid_dir = ();
 
     while ( defined( my $name = readdir DBDIR ) ) {
-	if ( $name =~ /^$raid_dir_regex$/ && -d "$db_dir/$name" ) {
-	    push @raid_dir, $name;
-	}
-	else {
-	    $db_files{$name} = $1 if ( $name =~ /(.+)\.\w+$/ );
-        }
+        $db_files{$name} = $1 if ( $name =~ /(.+)\.\w+$/ );
     }
     closedir( DBDIR );
 
-    scan_raid_dir( \%db_files, $db_dir, @raid_dir );
-
     unless( keys %db_files ) {
 	warn "'$db' is an empty database\n";
     }
@@ -336,8 +326,6 @@ foreach my $rdb ( @db_desc ) {
     my @hc_tables = map { quote_names("$db.$_") } @dbh_tables;
     $rdb->{tables} = [ @hc_tables ];
 
-    $rdb->{raid_dirs} = [ get_raid_dirs( $rdb->{files} ) ];
-
     $hc_locks .= ", "  if ( length $hc_locks && @hc_tables );
     $hc_locks .= join ", ", map { "$_ READ" } @hc_tables;
     $hc_tables .= ", "  if ( length $hc_tables && @hc_tables );
@@ -411,27 +399,24 @@ if ($opt{method} =~ /^cp\b/)
 retire_directory( @existing ) if @existing && !$opt{addtodest};
 
 foreach my $rdb ( @db_desc ) {
-    foreach my $td ( '', @{$rdb->{raid_dirs}} ) {
-
-	my $tgt_dirpath = "$rdb->{target}/$td";
-	# Remove trailing slashes (needed for Mac OS X)
-    	substr($tgt_dirpath, 1) =~ s|/+$||;
-	if ( $opt{dryrun} ) {
-	    print "mkdir $tgt_dirpath, 0750\n";
-	}
-	elsif ($opt{method} =~ /^scp\b/) {
-	    ## assume it's there?
-	    ## ...
-	}
-	else {
-	    mkdir($tgt_dirpath, 0750) or die "Can't create '$tgt_dirpath': $!\n"
-		unless -d $tgt_dirpath;
-	     if ($^O !~ m/^(NetWare)$/)  
-    	    {
-	    my @f_info= stat "$datadir/$rdb->{src}";
-	    chown $f_info[4], $f_info[5], $tgt_dirpath;
-    	    }
-	}
+    my $tgt_dirpath = "$rdb->{target}";
+    # Remove trailing slashes (needed for Mac OS X)
+    substr($tgt_dirpath, 1) =~ s|/+$||;
+    if ( $opt{dryrun} ) {
+        print "mkdir $tgt_dirpath, 0750\n";
+    }
+    elsif ($opt{method} =~ /^scp\b/) {
+        ## assume it's there?
+        ## ...
+    }
+    else {
+        mkdir($tgt_dirpath, 0750) or die "Can't create '$tgt_dirpath': $!\n"
+            unless -d $tgt_dirpath;
+        if ($^O !~ m/^(NetWare)$/)  
+        {
+            my @f_info= stat "$datadir/$rdb->{src}";
+            chown $f_info[4], $f_info[5], $tgt_dirpath;
+        }
     }
 }
 
@@ -489,7 +474,7 @@ foreach my $rdb ( @db_desc )
   my @files = map { "$datadir/$rdb->{src}/$_" } @{$rdb->{files}};
   next unless @files;
   
-  eval { copy_files($opt{method}, \@files, $rdb->{target}, $rdb->{raid_dirs} ); };
+  eval { copy_files($opt{method}, \@files, $rdb->{target}); };
   push @failed, "$rdb->{src} -> $rdb->{target} failed: $@"
     if ( $@ );
   
@@ -582,7 +567,7 @@ exit 0;
 # ---
 
 sub copy_files {
-    my ($method, $files, $target, $raid_dirs) = @_;
+    my ($method, $files, $target) = @_;
     my @cmd;
     print "Copying ".@$files." files...\n" unless $opt{quiet};
 
@@ -603,15 +588,8 @@ sub copy_files {
 	# add recursive option for scp
 	$cp.= " -r" if $^O =~ /m^(solaris|linux|freebsd|darwin)$/ && $method =~ /^scp\b/;
 
-	my @non_raid = map { "'$_'" } grep { ! m:/$raid_dir_regex/[^/]+$: } @$files;
-
-	# add files to copy and the destination directory
-	safe_system( $cp, @non_raid, "'$target'" ) if (@non_raid);
-	
-	foreach my $rd ( @$raid_dirs ) {
-	    my @raid = map { "'$_'" } grep { m:$rd/: } @$files;
-	    safe_system( $cp, @raid, "'$target'/$rd" ) if ( @raid );
-	}
+	# perform the actual copy
+	safe_system( $cp, (map { "'$_'" } @$files), "'$target'" );
     }
     else
     {
@@ -789,35 +767,6 @@ sub get_row_hash {
   return $sth->fetchrow_hashref();
 }
 
-sub scan_raid_dir {
-    my ( $r_db_files, $data_dir, @raid_dir ) = @_;
-
-    local(*RAID_DIR);
-    
-    foreach my $rd ( @raid_dir ) {
-
-	opendir(RAID_DIR, "$data_dir/$rd" ) 
-	    or die "Cannot open dir '$data_dir/$rd': $!";
-
-	while ( defined( my $name = readdir RAID_DIR ) ) {
-	    $r_db_files->{"$rd/$name"} = $1 if ( $name =~ /(.+)\.\w+$/ );
-	}
-	closedir( RAID_DIR );
-    }
-}
-
-sub get_raid_dirs {
-    my ( $r_files ) = @_;
-
-    my %dirs = ();
-    foreach my $f ( @$r_files ) {
-	if ( $f =~ m:^($raid_dir_regex)/: ) {
-	    $dirs{$1} = 1;
-	}
-    }
-    return sort keys %dirs;
-}
-
 sub get_list_of_tables {
     my ( $db ) = @_;
 
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index 1dffb6ffb58..c5c8c27bc4e 100755
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -43,7 +43,7 @@ ADD_DEFINITIONS(-DMYSQL_SERVER -D_CONSOLE -DHAVE_DLOPEN)
 
 ADD_EXECUTABLE(mysqld
                ../sql-common/client.c derror.cc des_key_file.cc
-               discover.cc ../libmysql/errmsg.c field.cc field_conv.cc 
+               discover.cc ../libmysql/errmsg.c field.cc  stacktrace.c stacktrace.h field_conv.cc 
                filesort.cc gstream.cc
                ha_partition.cc
                handler.cc hash_filo.cc hash_filo.h 
@@ -168,5 +168,5 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
                          "lex_hash.h;message.rc;message.h;sql_yacc.h;sql_yacc.cc")
 
 ADD_LIBRARY(udf_example MODULE udf_example.c udf_example.def)
-ADD_DEPENDENCIES(udf_example strings)
+ADD_DEPENDENCIES(udf_example strings GenError)
 TARGET_LINK_LIBRARIES(udf_example strings wsock32)
diff --git a/sql/filesort.cc b/sql/filesort.cc
index 3783aa2a06a..ac731616218 100644
--- a/sql/filesort.cc
+++ b/sql/filesort.cc
@@ -120,6 +120,13 @@ ha_rows filesort(THD *thd, TABLE *table, SORT_FIELD *sortorder, uint s_length,
   FILESORT_INFO table_sort;
   TABLE_LIST *tab= table->pos_in_table_list;
   Item_subselect *subselect= tab ? tab->containing_subselect() : 0;
+
+  /*
+   Release InnoDB's adaptive hash index latch (if holding) before
+   running a sort.
+  */
+  ha_release_temporary_latches(thd);
+
   /* 
     Don't use table->sort in filesort as it is also used by 
     QUICK_INDEX_MERGE_SELECT. Work with a copy and put it back at the end 
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 26292a0c57e..1cfe403407e 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -316,6 +316,10 @@ int execute_no_commit_ie(ha_ndbcluster *h, NdbTransaction *trans,
 /*
   Place holder for ha_ndbcluster thread specific data
 */
+typedef struct st_thd_ndb_share {
+  const void *key;
+  struct Ndb_local_table_statistics stat;
+} THD_NDB_SHARE;
 static
 uchar *thd_ndb_share_get_key(THD_NDB_SHARE *thd_ndb_share, size_t *length,
                             my_bool not_used __attribute__((unused)))
@@ -372,41 +376,6 @@ Thd_ndb::init_open_tables()
   my_hash_reset(&open_tables);
 }
 
-THD_NDB_SHARE *
-Thd_ndb::get_open_table(THD *thd, const void *key)
-{
-  DBUG_ENTER("Thd_ndb::get_open_table");
-  HASH_SEARCH_STATE state;
-  THD_NDB_SHARE *thd_ndb_share=
-    (THD_NDB_SHARE*)hash_first(&open_tables, (uchar *)&key, sizeof(key), &state);
-  while (thd_ndb_share && thd_ndb_share->key != key)
-    thd_ndb_share= (THD_NDB_SHARE*)hash_next(&open_tables, (uchar *)&key, sizeof(key), &state);
-  if (thd_ndb_share == 0)
-  {
-    thd_ndb_share= (THD_NDB_SHARE *) alloc_root(&thd->transaction.mem_root,
-                                                sizeof(THD_NDB_SHARE));
-    if (!thd_ndb_share)
-    {
-      mem_alloc_error(sizeof(THD_NDB_SHARE));
-      DBUG_RETURN(NULL);
-    }
-    thd_ndb_share->key= key;
-    thd_ndb_share->stat.last_count= count;
-    thd_ndb_share->stat.no_uncommitted_rows_count= 0;
-    thd_ndb_share->stat.records= ~(ha_rows)0;
-    my_hash_insert(&open_tables, (uchar *)thd_ndb_share);
-  }
-  else if (thd_ndb_share->stat.last_count != count)
-  {
-    thd_ndb_share->stat.last_count= count;
-    thd_ndb_share->stat.no_uncommitted_rows_count= 0;
-    thd_ndb_share->stat.records= ~(ha_rows)0;
-  }
-  DBUG_PRINT("exit", ("thd_ndb_share: 0x%lx  key: 0x%lx",
-                      (long) thd_ndb_share, (long) key));
-  DBUG_RETURN(thd_ndb_share);
-}
-
 inline
 Ndb *ha_ndbcluster::get_ndb()
 {
@@ -2742,10 +2711,13 @@ ha_ndbcluster::set_auto_inc(Field *field)
              ("Trying to set next auto increment value to %s",
               llstr(next_val, buff)));
 #endif
-  Ndb_tuple_id_range_guard g(m_share);
-  if (ndb->setAutoIncrementValue(m_table, g.range, next_val, TRUE)
-      == -1)
-    ERR_RETURN(ndb->getNdbError());
+  if (ndb->checkUpdateAutoIncrementValue(m_share->tuple_id_range, next_val))
+  {
+    Ndb_tuple_id_range_guard g(m_share);
+    if (ndb->setAutoIncrementValue(m_table, g.range, next_val, TRUE)
+        == -1)
+      ERR_RETURN(ndb->getNdbError());
+  }
   DBUG_RETURN(0);
 }
 
@@ -4554,12 +4526,48 @@ int ha_ndbcluster::init_handler_for_statement(THD *thd, Thd_ndb *thd_ndb)
         thd_ndb->trans_options|= TNTO_INJECTED_APPLY_STATUS;
   }
 #endif
-  // TODO remove double pointers...
-  if (!(m_thd_ndb_share= thd_ndb->get_open_table(thd, m_table)))
+
+  if (thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))
   {
-    DBUG_RETURN(1);
+    const void *key= m_table;
+    HASH_SEARCH_STATE state;
+    THD_NDB_SHARE *thd_ndb_share=
+      (THD_NDB_SHARE*)hash_first(&thd_ndb->open_tables, (uchar *)&key, sizeof(key), &state);
+    while (thd_ndb_share && thd_ndb_share->key != key)
+      thd_ndb_share= (THD_NDB_SHARE*)hash_next(&thd_ndb->open_tables, (uchar *)&key, sizeof(key), &state);
+    if (thd_ndb_share == 0)
+    {
+      thd_ndb_share= (THD_NDB_SHARE *) alloc_root(&thd->transaction.mem_root,
+                                                  sizeof(THD_NDB_SHARE));
+      if (!thd_ndb_share)
+      {
+        mem_alloc_error(sizeof(THD_NDB_SHARE));
+        DBUG_RETURN(1);
+      }
+      thd_ndb_share->key= key;
+      thd_ndb_share->stat.last_count= thd_ndb->count;
+      thd_ndb_share->stat.no_uncommitted_rows_count= 0;
+      thd_ndb_share->stat.records= ~(ha_rows)0;
+      my_hash_insert(&thd_ndb->open_tables, (uchar *)thd_ndb_share);
+    }
+    else if (thd_ndb_share->stat.last_count != thd_ndb->count)
+    {
+      thd_ndb_share->stat.last_count= thd_ndb->count;
+      thd_ndb_share->stat.no_uncommitted_rows_count= 0;
+      thd_ndb_share->stat.records= ~(ha_rows)0;
+    }
+    DBUG_PRINT("exit", ("thd_ndb_share: 0x%lx  key: 0x%lx",
+                        (long) thd_ndb_share, (long) key));
+    m_table_info= &thd_ndb_share->stat;
+  }
+  else
+  {
+    struct Ndb_local_table_statistics &stat= m_table_info_instance;
+    stat.last_count= thd_ndb->count;
+    stat.no_uncommitted_rows_count= 0;
+    stat.records= ~(ha_rows)0;
+    m_table_info= &stat;
   }
-  m_table_info= &m_thd_ndb_share->stat;
   DBUG_RETURN(0);
 }
 
diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h
index cc79402fe92..a17323d3fd6 100644
--- a/sql/ha_ndbcluster.h
+++ b/sql/ha_ndbcluster.h
@@ -195,11 +195,6 @@ struct Ndb_local_table_statistics {
   ha_rows records;
 };
 
-typedef struct st_thd_ndb_share {
-  const void *key;
-  struct Ndb_local_table_statistics stat;
-} THD_NDB_SHARE;
-
 class Thd_ndb 
 {
  public:
@@ -207,7 +202,6 @@ class Thd_ndb
   ~Thd_ndb();
 
   void init_open_tables();
-  THD_NDB_SHARE *get_open_table(THD *thd, const void *key);
 
   Ndb *ndb;
   ulong count;
@@ -514,6 +508,7 @@ private:
   NdbScanOperation *m_active_cursor;
   const NdbDictionary::Table *m_table;
   struct Ndb_local_table_statistics *m_table_info;
+  struct Ndb_local_table_statistics m_table_info_instance;
   char m_dbname[FN_HEADLEN];
   //char m_schemaname[FN_HEADLEN];
   char m_tabname[FN_HEADLEN];
@@ -522,7 +517,6 @@ private:
   bool m_lock_tuple;
   NDB_SHARE *m_share;
   NDB_INDEX_DATA  m_index[MAX_KEY];
-  THD_NDB_SHARE *m_thd_ndb_share;
   // NdbRecAttr has no reference to blob
   NdbValue m_value[NDB_MAX_ATTRIBUTES_IN_TABLE];
   uchar m_ref[NDB_HIDDEN_PRIMARY_KEY_LENGTH];
diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc
index ba8c1ed0c18..4fd5ee1b402 100644
--- a/sql/ha_ndbcluster_binlog.cc
+++ b/sql/ha_ndbcluster_binlog.cc
@@ -684,6 +684,18 @@ static void ndbcluster_reset_slave(THD *thd)
 /*
   Initialize the binlog part of the ndb handlerton
 */
+
+/**
+  Upon the sql command flush logs, we need to ensure that all outstanding
+  ndb data to be logged has made it to the binary log to get a deterministic
+  behavior on the rotation of the log.
+ */
+static bool ndbcluster_flush_logs(handlerton *hton)
+{
+  ndbcluster_binlog_wait(current_thd);
+  return FALSE;
+}
+
 static int ndbcluster_binlog_func(handlerton *hton, THD *thd, 
                                   enum_binlog_func fn, 
                                   void *arg)
@@ -712,6 +724,7 @@ static int ndbcluster_binlog_func(handlerton *hton, THD *thd,
 void ndbcluster_binlog_init_handlerton()
 {
   handlerton *h= ndbcluster_hton;
+  h->flush_logs=       ndbcluster_flush_logs;
   h->binlog_func=      ndbcluster_binlog_func;
   h->binlog_log_query= ndbcluster_binlog_log_query;
 }
@@ -1003,7 +1016,7 @@ static void ndbcluster_get_schema(NDB_SHARE *share,
     uint blob_len= field_blob->get_length((*field)->ptr);
     uchar *blob_ptr= 0;
     field_blob->get_ptr(&blob_ptr);
-    assert(blob_len == 0 || blob_ptr != 0);
+    DBUG_ASSERT(blob_len == 0 || blob_ptr != 0);
     s->query_length= blob_len;
     s->query= sql_strmake((char*) blob_ptr, blob_len);
   }
diff --git a/sql/handler.cc b/sql/handler.cc
index 4cf73874f22..0fb61895a61 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -4517,6 +4517,8 @@ int handler::ha_reset()
   DBUG_ASSERT(inited == NONE);
   /* Free cache used by filesort */
   free_io_cache(table);
+  /* reset the bitmaps to point to defaults */
+  table->default_column_bitmaps();
   DBUG_RETURN(reset());
 }
 
diff --git a/sql/log_event.cc b/sql/log_event.cc
index 4ca7d6cc509..7c98ccaff28 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -8104,7 +8104,7 @@ int Rows_log_event::find_row(const Relay_log_info *rli)
     {
       DBUG_PRINT("info",("ha_index_init returns error %d",error));
       table->file->print_error(error, MYF(0));
-      DBUG_RETURN(error);
+      goto err;
     }
 
     /* Fill key data for the row */
@@ -8137,7 +8137,7 @@ int Rows_log_event::find_row(const Relay_log_info *rli)
       DBUG_PRINT("info",("no record matching the key found in the table"));
       table->file->print_error(error, MYF(0));
       table->file->ha_index_end();
-      DBUG_RETURN(error);
+      goto err;
     }
 
   /*
@@ -8165,7 +8165,7 @@ int Rows_log_event::find_row(const Relay_log_info *rli)
     if (table->key_info->flags & HA_NOSAME)
     {
       table->file->ha_index_end();
-      DBUG_RETURN(0);
+      goto ok;
     }
 
     /*
@@ -8197,7 +8197,7 @@ int Rows_log_event::find_row(const Relay_log_info *rli)
         DBUG_PRINT("info",("no record matching the given row found"));
         table->file->print_error(error, MYF(0));
         table->file->ha_index_end();
-        DBUG_RETURN(error);
+        goto err;
       }
     }
 
@@ -8218,7 +8218,7 @@ int Rows_log_event::find_row(const Relay_log_info *rli)
       DBUG_PRINT("info",("error initializing table scan"
                          " (ha_rnd_init returns %d)",error));
       table->file->print_error(error, MYF(0));
-      DBUG_RETURN(error);
+      goto err;
     }
 
     /* Continue until we find the right record or have made a full loop */
@@ -8242,7 +8242,7 @@ int Rows_log_event::find_row(const Relay_log_info *rli)
                             " (rnd_next returns %d)",error));
         table->file->print_error(error, MYF(0));
         table->file->ha_rnd_end();
-        DBUG_RETURN(error);
+        goto err;
       }
     }
     while (restart_count < 2 && record_compare(table));
@@ -8262,10 +8262,15 @@ int Rows_log_event::find_row(const Relay_log_info *rli)
     table->file->ha_rnd_end();
 
     DBUG_ASSERT(error == HA_ERR_END_OF_FILE || error == HA_ERR_RECORD_DELETED || error == 0);
-    DBUG_RETURN(error);
+    goto err;
   }
-
+ok:
+  table->default_column_bitmaps();
   DBUG_RETURN(0);
+
+err:
+  table->default_column_bitmaps();
+  DBUG_RETURN(error);
 }
 
 #endif
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 6c0234a9b0b..b52e5aa745c 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -1048,7 +1048,6 @@ bool check_access(THD *thd, ulong access, const char *db, ulong *save_priv,
 		  bool no_grant, bool no_errors, bool schema_db);
 bool check_table_access(THD *thd, ulong want_access, TABLE_LIST *tables,
 			uint number, bool no_errors);
-bool check_global_access(THD *thd, ulong want_access);
 #else
 inline bool check_access(THD *thd, ulong access, const char *db,
                          ulong *save_priv, bool no_grant, bool no_errors,
@@ -1061,10 +1060,14 @@ inline bool check_access(THD *thd, ulong access, const char *db,
 inline bool check_table_access(THD *thd, ulong want_access, TABLE_LIST *tables,
 			uint number, bool no_errors)
 { return false; }
-inline bool check_global_access(THD *thd, ulong want_access)
-{ return false; }
 #endif /*NO_EMBEDDED_ACCESS_CHECKS*/
 
+#endif /* MYSQL_SERVER */
+#if defined MYSQL_SERVER || defined INNODB_COMPATIBILITY_HOOKS
+bool check_global_access(THD *thd, ulong want_access);
+#endif /* MYSQL_SERVER || INNODB_COMPATIBILITY_HOOKS */
+#ifdef MYSQL_SERVER
+
 /*
   Support routine for SQL parser on partitioning syntax
 */
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index a982a8f4809..cdd08be6573 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -121,6 +121,13 @@ extern "C" {					// Because of SCO 3.2V4.2
 #include <sys/mman.h>
 #endif
 
+#ifdef __WIN__ 
+#include <crtdbg.h>
+#define SIGNAL_FMT "exception 0x%x"
+#else
+#define SIGNAL_FMT "signal %d"
+#endif
+
 #ifdef __NETWARE__
 #define zVOLSTATE_ACTIVE 6
 #define zVOLSTATE_DEACTIVE 2
@@ -217,6 +224,7 @@ inline void set_proper_floating_point_mode()
 extern "C" int gethostname(char *name, int namelen);
 #endif
 
+extern "C" sig_handler handle_segfault(int sig);
 
 /* Constants */
 
@@ -1085,9 +1093,6 @@ static void __cdecl kill_server(int sig_ptr)
   
   close_connections();
   if (sig != MYSQL_KILL_SIGNAL &&
-#ifdef __WIN__
-      sig != SIGINT &&				/* Bug#18235 */
-#endif
       sig != 0)
     unireg_abort(1);				/* purecov: inspected */
   else
@@ -1656,8 +1661,7 @@ static void network_init(void)
 		      FORMAT_MESSAGE_FROM_SYSTEM,
 		      NULL, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
 		      (LPTSTR) &lpMsgBuf, 0, NULL );
-	MessageBox(NULL, (LPTSTR) lpMsgBuf, "Error from CreateNamedPipe",
-		    MB_OK|MB_ICONINFORMATION);
+	sql_perror((char *)lpMsgBuf);
 	LocalFree(lpMsgBuf);
 	unireg_abort(1);
       }
@@ -1916,16 +1920,162 @@ extern "C" sig_handler abort_thread(int sig __attribute__((unused)))
 ******************************************************************************/
 
 #if defined(__WIN__)
+
+
+/*
+  On Windows, we use native SetConsoleCtrlHandler for handle events like Ctrl-C
+  with graceful shutdown.
+  Also, we do not use signal(), but SetUnhandledExceptionFilter instead - as it
+  provides possibility to pass the exception to just-in-time debugger, collect
+  dumps and potentially also the exception and thread context used to output
+  callstack.
+*/
+
+static BOOL WINAPI console_event_handler( DWORD type ) 
+{
+  DBUG_ENTER("console_event_handler");
+  if(type == CTRL_C_EVENT)
+  {
+     /*
+       Do not shutdown before startup is finished and shutdown
+       thread is initialized. Otherwise there is a race condition 
+       between main thread doing initialization and CTRL-C thread doing
+       cleanup, which can result into crash.
+     */
+     if(hEventShutdown)
+       kill_mysql();
+     else
+       sql_print_warning("CTRL-C ignored during startup");
+     DBUG_RETURN(TRUE);
+  }
+  DBUG_RETURN(FALSE);
+}
+
+
+/*
+  In Visual Studio 2005 and later, default SIGABRT handler will overwrite
+  any unhandled exception filter set by the application  and will try to
+  call JIT debugger. This is not what we want, this we calling __debugbreak
+  to stop in debugger, if process is being debugged or to generate 
+  EXCEPTION_BREAKPOINT and then handle_segfault will do its magic.
+*/
+
+#if (_MSC_VER >= 1400)
+static void my_sigabrt_handler(int sig)
+{
+  __debugbreak();
+}
+#endif /*_MSC_VER >=1400 */
+
+void win_install_sigabrt_handler(void)
+{
+#if (_MSC_VER >=1400)
+  /*abort() should not override our exception filter*/
+  _set_abort_behavior(0,_CALL_REPORTFAULT);
+  signal(SIGABRT,my_sigabrt_handler);
+#endif /* _MSC_VER >=1400 */
+}
+
+#ifdef DEBUG_UNHANDLED_EXCEPTION_FILTER
+#define DEBUGGER_ATTACH_TIMEOUT 120
+/*
+  Wait for debugger to attach and break into debugger. If debugger is not attached,
+  resume after timeout.
+*/
+static void wait_for_debugger(int timeout_sec)
+{
+   if(!IsDebuggerPresent())
+   {
+     int i;
+     printf("Waiting for debugger to attach, pid=%u\n",GetCurrentProcessId());
+     fflush(stdout);
+     for(i= 0; i < timeout_sec; i++)
+     {
+       Sleep(1000);
+       if(IsDebuggerPresent())
+       {
+         /* Break into debugger */
+         __debugbreak();
+         return;
+       }
+     }
+     printf("pid=%u, debugger not attached after %d seconds, resuming\n",GetCurrentProcessId(),
+       timeout_sec);
+     fflush(stdout);
+   }
+}
+#endif /* DEBUG_UNHANDLED_EXCEPTION_FILTER */
+
+LONG WINAPI my_unhandler_exception_filter(EXCEPTION_POINTERS *ex_pointers)
+{
+   static BOOL first_time= TRUE;
+   if(!first_time)
+   {
+     /*
+       This routine can be called twice, typically
+       when detaching in JIT debugger.
+       Return EXCEPTION_EXECUTE_HANDLER to terminate process.
+     */
+     return EXCEPTION_EXECUTE_HANDLER;
+   }
+   first_time= FALSE;
+#ifdef DEBUG_UNHANDLED_EXCEPTION_FILTER
+   /*
+    Unfortunately there is no clean way to debug unhandled exception filters,
+    as debugger does not stop there(also documented in MSDN) 
+    To overcome, one could put a MessageBox, but this will not work in service.
+    Better solution is to print error message and sleep some minutes 
+    until debugger is attached
+  */
+  wait_for_debugger(DEBUGGER_ATTACH_TIMEOUT);
+#endif /* DEBUG_UNHANDLED_EXCEPTION_FILTER */
+  __try
+  {
+    set_exception_pointers(ex_pointers);
+    handle_segfault(ex_pointers->ExceptionRecord->ExceptionCode);
+  }
+  __except(EXCEPTION_EXECUTE_HANDLER)
+  {
+    DWORD written;
+    const char msg[] = "Got exception in exception handler!\n";
+    WriteFile(GetStdHandle(STD_OUTPUT_HANDLE),msg, sizeof(msg)-1, 
+      &written,NULL);
+  }
+  /*
+    Return EXCEPTION_CONTINUE_SEARCH to give JIT debugger
+    (drwtsn32 or vsjitdebugger) possibility to attach,
+    if JIT debugger is configured.
+    Windows Error reporting might generate a dump here.
+  */
+  return EXCEPTION_CONTINUE_SEARCH;
+}
+
+
 static void init_signals(void)
 {
-  int signals[] = {SIGINT,SIGILL,SIGFPE,SIGSEGV,SIGTERM,SIGABRT } ;
-  for (uint i=0 ; i < sizeof(signals)/sizeof(int) ; i++)
-    signal(signals[i], kill_server) ;
-#if defined(__WIN__)
-  signal(SIGBREAK,SIG_IGN);	//ignore SIGBREAK for NT
-#else
-  signal(SIGBREAK, kill_server);
-#endif
+  win_install_sigabrt_handler();
+  if(opt_console)
+    SetConsoleCtrlHandler(console_event_handler,TRUE);
+  else
+  {
+    /* Avoid MessageBox()es*/
+   _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
+   _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
+   _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_FILE);
+   _CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR);
+   _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_FILE);
+   _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);
+
+   /*
+     Do not use SEM_NOGPFAULTERRORBOX in the following SetErrorMode (),
+     because it would prevent JIT debugger and Windows error reporting
+     from working. We need WER or JIT-debugging, since our own unhandled
+     exception filter is not guaranteed to work in all situation
+     (like heap corruption or stack overflow)
+   */
+   SetErrorMode(SetErrorMode(0)|SEM_FAILCRITICALERRORS|SEM_NOOPENFILEERRORBOX);
+  }
+  SetUnhandledExceptionFilter(my_unhandler_exception_filter);
 }
 
 
@@ -2178,7 +2328,7 @@ static void check_data_home(const char *path)
 {
 }
 
-#else /* if ! __WIN__  */
+#endif /*__WIN__ || __NETWARE */
 
 #ifdef HAVE_LINUXTHREADS
 #define UNSAFE_DEFAULT_LINUX_THREADS 200
@@ -2208,7 +2358,7 @@ extern "C" sig_handler handle_segfault(int sig)
   */
   if (segfaulted)
   {
-    fprintf(stderr, "Fatal signal %d while backtracing\n", sig);
+    fprintf(stderr, "Fatal " SIGNAL_FMT " while backtracing\n", sig);
     exit(1);
   }
 
@@ -2218,7 +2368,7 @@ extern "C" sig_handler handle_segfault(int sig)
   localtime_r(&curr_time, &tm);
 
   fprintf(stderr,"\
-%02d%02d%02d %2d:%02d:%02d - mysqld got signal %d;\n\
+%02d%02d%02d %2d:%02d:%02d - mysqld got " SIGNAL_FMT " ;\n\
 This could be because you hit a bug. It is also possible that this binary\n\
 or one of the libraries it was linked against is corrupt, improperly built,\n\
 or misconfigured. This error can also be caused by malfunctioning hardware.\n",
@@ -2260,8 +2410,12 @@ the thread stack. Please read http://dev.mysql.com/doc/mysql/en/linux.html\n\n",
   if (!(test_flags & TEST_NO_STACKTRACE))
   {
     fprintf(stderr,"thd: 0x%lx\n",(long) thd);
+    fprintf(stderr,"\
+Attempting backtrace. You can use the following information to find out\n\
+where mysqld died. If you see no messages after this, something went\n\
+terribly wrong...\n");  
     print_stacktrace(thd ? (uchar*) thd->thread_stack : (uchar*) 0,
-		     thread_stack);
+                   thread_stack);
   }
   if (thd)
   {
@@ -2327,15 +2481,22 @@ of those buggy OS calls.  You should consider whether you really need the\n\
 bugs.\n");
   }
 
+#ifdef HAVE_WRITE_CORE
   if (test_flags & TEST_CORE_ON_SIGNAL)
   {
     fprintf(stderr, "Writing a core file\n");
     fflush(stderr);
     write_core(sig);
   }
+#endif
+
+#ifndef __WIN__
+  /* On Windows, do not terminate, but pass control to exception filter */
   exit(1);
+#endif
 }
 
+#if !defined(__WIN__) && !defined(__NETWARE__)
 #ifndef SA_RESETHAND
 #define SA_RESETHAND 0
 #endif
@@ -2726,18 +2887,6 @@ pthread_handler_t handle_shutdown(void *arg)
      kill_server(MYSQL_KILL_SIGNAL);
   return 0;
 }
-
-
-int STDCALL handle_kill(ulong ctrl_type)
-{
-  if (ctrl_type == CTRL_CLOSE_EVENT ||
-      ctrl_type == CTRL_SHUTDOWN_EVENT)
-  {
-    kill_server(MYSQL_KILL_SIGNAL);
-    return TRUE;
-  }
-  return FALSE;
-}
 #endif
 
 #if !defined(EMBEDDED_LIBRARY)
@@ -4101,11 +4250,6 @@ we force server id to 2, but this MySQL server will not act as a slave.");
     freopen(log_error_file,"a+",stderr);
     FreeConsole();				// Remove window
   }
-  else
-  {
-    /* Don't show error dialog box when on foreground: it stops the server */ 
-    SetErrorMode(SEM_NOOPENFILEERRORBOX | SEM_FAILCRITICALERRORS);
-  }
 #endif
 
   /*
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 64c79ed3bb3..8b38ffede41 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -1219,7 +1219,7 @@ static void throw_bounds_warning(THD *thd, const char *name, ulonglong num)
 static ulonglong fix_unsigned(THD *thd, ulonglong num,
                               const struct my_option *option_limits)
 {
-  bool fixed= FALSE;
+  my_bool fixed= FALSE;
   ulonglong out= getopt_ull_limit_value(num, option_limits, &fixed);
 
   if (fixed)
@@ -1279,7 +1279,7 @@ bool sys_var_long_ptr_global::update(THD *thd, set_var *var)
 
 void sys_var_long_ptr_global::set_default(THD *thd, enum_var_type type)
 {
-  bool not_used;
+  my_bool not_used;
   pthread_mutex_lock(guard);
   *value= (ulong) getopt_ull_limit_value((ulong) option_limits->def_value,
                                          option_limits, &not_used);
@@ -1302,7 +1302,7 @@ bool sys_var_ulonglong_ptr::update(THD *thd, set_var *var)
 
 void sys_var_ulonglong_ptr::set_default(THD *thd, enum_var_type type)
 {
-  bool not_used;
+  my_bool not_used;
   pthread_mutex_lock(&LOCK_global_system_variables);
   *value= getopt_ull_limit_value((ulonglong) option_limits->def_value,
                                  option_limits, &not_used);
@@ -1382,7 +1382,7 @@ void sys_var_thd_ulong::set_default(THD *thd, enum_var_type type)
 {
   if (type == OPT_GLOBAL)
   {
-    bool not_used;
+    my_bool not_used;
     /* We will not come here if option_limits is not set */
     global_system_variables.*offset=
       (ulong) getopt_ull_limit_value((ulong) option_limits->def_value,
@@ -1429,7 +1429,7 @@ void sys_var_thd_ha_rows::set_default(THD *thd, enum_var_type type)
 {
   if (type == OPT_GLOBAL)
   {
-    bool not_used;
+    my_bool not_used;
     /* We will not come here if option_limits is not set */
     pthread_mutex_lock(&LOCK_global_system_variables);
     global_system_variables.*offset=
@@ -1481,7 +1481,7 @@ void sys_var_thd_ulonglong::set_default(THD *thd, enum_var_type type)
 {
   if (type == OPT_GLOBAL)
   {
-    bool not_used;
+    my_bool not_used;
     pthread_mutex_lock(&LOCK_global_system_variables);
     global_system_variables.*offset=
       getopt_ull_limit_value((ulonglong) option_limits->def_value,
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 3ce1b350027..376102c8bf9 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -682,6 +682,7 @@ void *thd_memdup(MYSQL_THD thd, const void* str, unsigned int size)
   return thd->memdup(str, size);
 }
 
+extern "C"
 void thd_get_xid(const MYSQL_THD thd, MYSQL_XID *xid)
 {
   *xid = *(MYSQL_XID *) &thd->transaction.xid_state.xid;
@@ -2767,6 +2768,17 @@ extern "C" int thd_killed(const MYSQL_THD thd)
   return(thd->killed);
 }
 
+/**
+  Return the thread id of a user thread
+  @param thd user thread
+  @return thread id
+*/
+extern "C" unsigned long thd_get_thread_id(const MYSQL_THD thd)
+{
+  return((unsigned long)thd->thread_id);
+}
+
+
 #ifdef INNODB_COMPATIBILITY_HOOKS
 extern "C" struct charset_info_st *thd_charset(MYSQL_THD thd)
 {
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc
index ac9c745bb44..b22a33e3e92 100644
--- a/sql/sql_connect.cc
+++ b/sql/sql_connect.cc
@@ -39,22 +39,7 @@
 #endif /* HAVE_OPENSSL */
 
 #ifdef __WIN__
-static void  test_signal(int sig_ptr)
-{
-#if !defined( DBUG_OFF)
-  MessageBox(NULL,"Test signal","DBUG",MB_OK);
-#endif
-#if defined(OS2)
-  fprintf(stderr, "Test signal %d\n", sig_ptr);
-  fflush(stderr);
-#endif
-}
-static void init_signals(void)
-{
-  int signals[7] = {SIGINT,SIGILL,SIGFPE,SIGSEGV,SIGTERM,SIGBREAK,SIGABRT } ;
-  for (int i=0 ; i < 7 ; i++)
-    signal( signals[i], test_signal) ;
-}
+extern void win_install_sigabrt_handler();
 #endif
 
 /*
@@ -626,7 +611,7 @@ bool init_new_connection_handler_thread()
 {
   pthread_detach_this_thread();
 #if defined(__WIN__)
-  init_signals();
+  win_install_sigabrt_handler();
 #else
   /* Win32 calls this in pthread_create */
   if (my_thread_init())
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 1111fdac200..bc97e783b77 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -4982,35 +4982,6 @@ check_access(THD *thd, ulong want_access, const char *db, ulong *save_priv,
 }
 
 
-/**
-  check for global access and give descriptive error message if it fails.
-
-  @param thd			Thread handler
-  @param want_access		Use should have any of these global rights
-
-  @warning
-    One gets access right if one has ANY of the rights in want_access.
-    This is useful as one in most cases only need one global right,
-    but in some case we want to check if the user has SUPER or
-    REPL_CLIENT_ACL rights.
-
-  @retval
-    0	ok
-  @retval
-    1	Access denied.  In this case an error is sent to the client
-*/
-
-bool check_global_access(THD *thd, ulong want_access)
-{
-  char command[128];
-  if ((thd->security_ctx->master_access & want_access))
-    return 0;
-  get_privilege_desc(command, sizeof(command), want_access);
-  my_error(ER_SPECIFIC_ACCESS_DENIED_ERROR, MYF(0), command);
-  return 1;
-}
-
-
 static bool check_show_access(THD *thd, TABLE_LIST *table)
 {
   switch (get_schema_table_idx(table->schema_table)) {
@@ -5253,6 +5224,39 @@ bool check_some_access(THD *thd, ulong want_access, TABLE_LIST *table)
 
 #endif /*NO_EMBEDDED_ACCESS_CHECKS*/
 
+
+/**
+  check for global access and give descriptive error message if it fails.
+
+  @param thd			Thread handler
+  @param want_access		Use should have any of these global rights
+
+  @warning
+    One gets access right if one has ANY of the rights in want_access.
+    This is useful as one in most cases only need one global right,
+    but in some case we want to check if the user has SUPER or
+    REPL_CLIENT_ACL rights.
+
+  @retval
+    0	ok
+  @retval
+    1	Access denied.  In this case an error is sent to the client
+*/
+
+bool check_global_access(THD *thd, ulong want_access)
+{
+#ifndef NO_EMBEDDED_ACCESS_CHECKS
+  char command[128];
+  if ((thd->security_ctx->master_access & want_access))
+    return 0;
+  get_privilege_desc(command, sizeof(command), want_access);
+  my_error(ER_SPECIFIC_ACCESS_DENIED_ERROR, MYF(0), command);
+  return 1;
+#else
+  return 0;
+#endif
+}
+
 /****************************************************************************
 	Check stack size; Send error if there isn't enough stack to continue
 ****************************************************************************/
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
index 5cd056807a6..10176239711 100644
--- a/sql/sql_plugin.cc
+++ b/sql/sql_plugin.cc
@@ -1876,7 +1876,7 @@ err:
 static int check_func_int(THD *thd, struct st_mysql_sys_var *var,
                           void *save, st_mysql_value *value)
 {
-  bool fixed;
+  my_bool fixed;
   long long tmp;
   struct my_option options;
   value->val_int(value, &tmp);
@@ -1904,7 +1904,7 @@ static int check_func_int(THD *thd, struct st_mysql_sys_var *var,
 static int check_func_long(THD *thd, struct st_mysql_sys_var *var,
                           void *save, st_mysql_value *value)
 {
-  bool fixed;
+  my_bool fixed;
   long long tmp;
   struct my_option options;
   value->val_int(value, &tmp);
@@ -1932,12 +1932,11 @@ static int check_func_long(THD *thd, struct st_mysql_sys_var *var,
 static int check_func_longlong(THD *thd, struct st_mysql_sys_var *var,
                                void *save, st_mysql_value *value)
 {
-  bool fixed;
+  my_bool fixed;
   long long tmp;
   struct my_option options;
   value->val_int(value, &tmp);
   plugin_opt_set_limits(&options, var);
-  *(ulonglong *)save= getopt_ull_limit_value(tmp, &options, &fixed);
 
   if (var->flags & PLUGIN_VAR_UNSIGNED)
     *(ulonglong *)save= getopt_ull_limit_value((ulonglong) tmp, &options,
diff --git a/sql/stacktrace.c b/sql/stacktrace.c
index 3d718dfd9d2..5c3411aa8b1 100644
--- a/sql/stacktrace.c
+++ b/sql/stacktrace.c
@@ -13,12 +13,16 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+/* Workaround for Bug#32082: VOID redefinition on Win results in compile errors*/
+#define DONT_DEFINE_VOID 1
+
 #include <my_global.h>
 #include "stacktrace.h"
+
+#ifndef __WIN__
 #include <signal.h>
 #include <my_pthread.h>
 #include <m_string.h>
-
 #ifdef HAVE_STACKTRACE
 #include <unistd.h>
 #include <strings.h>
@@ -167,10 +171,7 @@ void  print_stacktrace(uchar* stack_bottom, ulong thread_stack)
 #endif
   LINT_INIT(fp);
 
-  fprintf(stderr,"\
-Attempting backtrace. You can use the following information to find out\n\
-where mysqld died. If you see no messages after this, something went\n\
-terribly wrong...\n");
+
 #ifdef __i386__
   __asm __volatile__ ("movl %%ebp,%0"
 		      :"=r"(fp)
@@ -308,3 +309,267 @@ void write_core(int sig)
 #endif
 }
 #endif
+#else /* __WIN__*/
+
+#include <dbghelp.h>
+
+/*
+  Stack tracing on Windows is implemented using Debug Helper library(dbghelp.dll)
+  We do not redistribute dbghelp and the one comes with older OS (up to Windows 2000)
+  is missing some important functions like functions StackWalk64 or MinidumpWriteDump.
+  Hence, we have to load functions at runtime using LoadLibrary/GetProcAddress.
+*/
+
+typedef DWORD (WINAPI *SymSetOptions_FctType)(DWORD dwOptions);
+typedef BOOL  (WINAPI *SymGetModuleInfo64_FctType)
+  (HANDLE,DWORD64,PIMAGEHLP_MODULE64) ;
+typedef BOOL  (WINAPI *SymGetSymFromAddr64_FctType)
+  (HANDLE,DWORD64,PDWORD64,PIMAGEHLP_SYMBOL64) ;
+typedef BOOL  (WINAPI *SymGetLineFromAddr64_FctType)
+  (HANDLE,DWORD64,PDWORD,PIMAGEHLP_LINE64);
+typedef BOOL  (WINAPI *SymInitialize_FctType)
+  (HANDLE,PSTR,BOOL);
+typedef BOOL  (WINAPI *StackWalk64_FctType)
+  (DWORD,HANDLE,HANDLE,LPSTACKFRAME64,PVOID,PREAD_PROCESS_MEMORY_ROUTINE64,
+  PFUNCTION_TABLE_ACCESS_ROUTINE64,PGET_MODULE_BASE_ROUTINE64 ,
+  PTRANSLATE_ADDRESS_ROUTINE64);
+typedef BOOL (WINAPI *MiniDumpWriteDump_FctType)(
+    IN HANDLE hProcess,
+    IN DWORD ProcessId,
+    IN HANDLE hFile,
+    IN MINIDUMP_TYPE DumpType,
+    IN CONST PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam, OPTIONAL
+    IN CONST PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam, OPTIONAL
+    IN CONST PMINIDUMP_CALLBACK_INFORMATION CallbackParam OPTIONAL
+    );
+
+static SymSetOptions_FctType           pSymSetOptions;
+static SymGetModuleInfo64_FctType      pSymGetModuleInfo64;
+static SymGetSymFromAddr64_FctType     pSymGetSymFromAddr64;
+static SymInitialize_FctType           pSymInitialize;
+static StackWalk64_FctType             pStackWalk64;
+static SymGetLineFromAddr64_FctType    pSymGetLineFromAddr64;
+static MiniDumpWriteDump_FctType       pMiniDumpWriteDump;
+
+static EXCEPTION_POINTERS *exception_ptrs;
+
+#define MODULE64_SIZE_WINXP 576
+#define STACKWALK_MAX_FRAMES 64
+
+/*
+  Dynamically load dbghelp functions
+*/
+BOOL init_dbghelp_functions()
+{
+  static BOOL first_time= TRUE;
+  static BOOL rc;
+  HMODULE hDbghlp;
+
+  if(first_time)
+  {
+    first_time= FALSE;
+    hDbghlp= LoadLibrary("dbghelp");
+    if(!hDbghlp)
+    {
+      rc= FALSE;
+      return rc;
+    }
+    pSymSetOptions= (SymSetOptions_FctType)
+      GetProcAddress(hDbghlp,"SymSetOptions");
+    pSymInitialize= (SymInitialize_FctType)
+      GetProcAddress(hDbghlp,"SymInitialize");
+    pSymGetModuleInfo64= (SymGetModuleInfo64_FctType)
+      GetProcAddress(hDbghlp,"SymGetModuleInfo64");
+    pSymGetLineFromAddr64= (SymGetLineFromAddr64_FctType)
+      GetProcAddress(hDbghlp,"SymGetLineFromAddr64");
+    pSymGetSymFromAddr64=(SymGetSymFromAddr64_FctType)
+      GetProcAddress(hDbghlp,"SymGetSymFromAddr64");
+    pStackWalk64= (StackWalk64_FctType)
+      GetProcAddress(hDbghlp,"StackWalk64");
+    pMiniDumpWriteDump = (MiniDumpWriteDump_FctType)
+      GetProcAddress(hDbghlp,"MiniDumpWriteDump");
+
+    rc = (BOOL)(pSymSetOptions && pSymInitialize && pSymGetModuleInfo64
+    && pSymGetLineFromAddr64 && pSymGetSymFromAddr64 && pStackWalk64);
+  }
+  return rc;
+}
+
+void set_exception_pointers(EXCEPTION_POINTERS *ep)
+{
+  exception_ptrs = ep;
+}
+
+/* Platform SDK in VS2003 does not have definition for SYMOPT_NO_PROMPTS*/
+#ifndef SYMOPT_NO_PROMPTS
+#define SYMOPT_NO_PROMPTS 0
+#endif
+
+void print_stacktrace(uchar* unused1, ulong unused2)
+{
+  HANDLE  hProcess= GetCurrentProcess();
+  HANDLE  hThread= GetCurrentThread();
+  static  IMAGEHLP_MODULE64 module= {sizeof(module)};
+  static  IMAGEHLP_SYMBOL64_PACKAGE package;
+  DWORD64 addr;
+  DWORD   machine;
+  int     i;
+  CONTEXT context;
+  STACKFRAME64 frame={0};
+
+  if(!exception_ptrs || !init_dbghelp_functions())
+    return;
+
+  /* Copy context, as stackwalking on original will unwind the stack */
+  context = *(exception_ptrs->ContextRecord);
+  /*Initialize symbols.*/
+  pSymSetOptions(SYMOPT_LOAD_LINES|SYMOPT_NO_PROMPTS|SYMOPT_DEFERRED_LOADS|SYMOPT_DEBUG);
+  pSymInitialize(hProcess,NULL,TRUE);
+
+  /*Prepare stackframe for the first StackWalk64 call*/
+  frame.AddrFrame.Mode= frame.AddrPC.Mode= frame.AddrStack.Mode= AddrModeFlat;
+#if (defined _M_IX86)
+  machine= IMAGE_FILE_MACHINE_I386;
+  frame.AddrFrame.Offset= context.Ebp;
+  frame.AddrPC.Offset=    context.Eip;
+  frame.AddrStack.Offset= context.Esp;
+#elif (defined _M_X64)
+  machine = IMAGE_FILE_MACHINE_AMD64;
+  frame.AddrFrame.Offset= context.Rbp;
+  frame.AddrPC.Offset=    context.Rip;
+  frame.AddrStack.Offset= context.Rsp;
+#else
+  /*There is currently no need to support IA64*/
+#pragma error ("unsupported architecture")
+#endif
+
+  package.sym.SizeOfStruct= sizeof(package.sym);
+  package.sym.MaxNameLength= sizeof(package.name);
+
+  /*Walk the stack, output useful information*/ 
+  for(i= 0; i< STACKWALK_MAX_FRAMES;i++)
+  {
+    DWORD64 function_offset= 0;
+    DWORD line_offset= 0;
+    IMAGEHLP_LINE64 line= {sizeof(line)};
+    BOOL have_module= FALSE;
+    BOOL have_symbol= FALSE;
+    BOOL have_source= FALSE;
+
+    if(!pStackWalk64(machine, hProcess, hThread, &frame, &context, 0, 0, 0 ,0))
+      break;
+    addr= frame.AddrPC.Offset;
+
+    have_module= pSymGetModuleInfo64(hProcess,addr,&module);
+#ifdef _M_IX86
+    if(!have_module)
+    {
+      /*
+        ModuleInfo structure has been "compatibly" extended in releases after XP,
+        and its size was increased. To make XP dbghelp.dll function
+        happy, pretend passing the old structure.
+      */
+      module.SizeOfStruct= MODULE64_SIZE_WINXP;
+      have_module= pSymGetModuleInfo64(hProcess, addr, &module);
+    }
+#endif
+
+    have_symbol= pSymGetSymFromAddr64(hProcess, addr, &function_offset,
+      &(package.sym));
+    have_source= pSymGetLineFromAddr64(hProcess, addr, &line_offset, &line);
+
+    fprintf(stderr, "%p    ", addr);
+    if(have_module)
+    {
+      char *base_image_name= strrchr(module.ImageName, '\\');
+      if(base_image_name)
+        base_image_name++;
+      else
+        base_image_name= module.ImageName;
+      fprintf(stderr, "%s!", base_image_name);
+    }
+    if(have_symbol)
+      fprintf(stderr, "%s()", package.sym.Name);
+    else if(have_module)
+      fprintf(stderr, "???");
+
+    if(have_source)
+    {
+      char *base_file_name= strrchr(line.FileName, '\\');
+      if(base_file_name)
+        base_file_name++;
+      else
+        base_file_name= line.FileName;
+      fprintf(stderr,"[%s:%u]", base_file_name, line.LineNumber);
+    }
+    fprintf(stderr, "\n");
+  }
+  fflush(stderr);
+}
+
+
+/*
+  Write dump. The dump is created in current directory,
+  file name is constructed from executable name plus
+  ".dmp" extension
+*/
+void write_core(int unused)
+{
+  char path[MAX_PATH];
+  char dump_fname[MAX_PATH]= "core.dmp";
+  MINIDUMP_EXCEPTION_INFORMATION info;
+  HANDLE hFile;
+
+  if(!exception_ptrs || !init_dbghelp_functions() || !pMiniDumpWriteDump)
+    return;
+
+  info.ExceptionPointers= exception_ptrs;
+  info.ClientPointers= FALSE;
+  info.ThreadId= GetCurrentThreadId();
+
+  if(GetModuleFileName(NULL, path, sizeof(path)))
+  {
+    _splitpath(path, NULL, NULL,dump_fname,NULL);
+    strncat(dump_fname, ".dmp", sizeof(dump_fname));
+  }
+
+  hFile= CreateFile(dump_fname, GENERIC_WRITE, 0, 0, CREATE_ALWAYS,
+    FILE_ATTRIBUTE_NORMAL, 0);
+  if(hFile)
+  {
+    /* Create minidump */
+    if(pMiniDumpWriteDump(GetCurrentProcess(), GetCurrentProcessId(),
+      hFile, MiniDumpNormal, &info, 0, 0))
+    {
+      fprintf(stderr, "Minidump written to %s\n",
+        _fullpath(path, dump_fname, sizeof(path)) ? path : dump_fname);
+    }
+    else
+    {
+      fprintf(stderr,"MiniDumpWriteDump() failed, last error %u\n",
+        GetLastError());
+    }
+    CloseHandle(hFile);
+  }
+  else
+  {
+    fprintf(stderr, "CreateFile(%s) failed, last error %u\n", dump_fname,
+      GetLastError());
+  }
+  fflush(stderr);
+}
+
+
+void safe_print_str(const char *name, const char *val, int len)
+{
+  fprintf(stderr,"%s at %p", name, val);
+  __try 
+  {
+    fprintf(stderr,"=%.*s\n", len, val);
+  }
+  __except(EXCEPTION_EXECUTE_HANDLER)
+  {
+    fprintf(stderr,"is an invalid string pointer\n");
+  }
+}
+#endif /*__WIN__*/
diff --git a/sql/stacktrace.h b/sql/stacktrace.h
index 96c09a21ad6..498f4f197fc 100644
--- a/sql/stacktrace.h
+++ b/sql/stacktrace.h
@@ -36,19 +36,33 @@ extern char* heap_start;
 #define init_stacktrace() do {                                 \
                             heap_start = (char*) &__bss_start; \
                           } while(0);
+void check_thread_lib(void);
+#endif /* defined (__i386__) || (defined(__alpha__) && defined(__GNUC__))) */
+#elif defined (__WIN__)
+#define HAVE_STACKTRACE
+extern void set_exception_pointers(EXCEPTION_POINTERS *ep);
+#define init_stacktrace() {}
+#endif
+
+#ifdef HAVE_STACKTRACE
 void print_stacktrace(uchar* stack_bottom, ulong thread_stack);
 void safe_print_str(const char* name, const char* val, int max_len);
-#endif /* (defined (__i386__) || (defined(__alpha__) && defined(__GNUC__))) */
-#endif /* TARGET_OS_LINUX */
-
+#else
 /* Define empty prototypes for functions that are not implemented */
-#ifndef HAVE_STACKTRACE
 #define init_stacktrace() {}
 #define print_stacktrace(A,B) {}
 #define safe_print_str(A,B,C) {}
 #endif /* HAVE_STACKTRACE */
 
+
+#if !defined(__NETWARE__)
+#define HAVE_WRITE_CORE
+#endif
+
+#ifdef HAVE_WRITE_CORE
 void write_core(int sig);
+#endif
+
 
 #ifdef	__cplusplus
 }
diff --git a/storage/archive/CMakeLists.txt b/storage/archive/CMakeLists.txt
index 9a1cfe081b6..1c53ad15c07 100644
--- a/storage/archive/CMakeLists.txt
+++ b/storage/archive/CMakeLists.txt
@@ -25,4 +25,5 @@ SET(ARCHIVE_SOURCES  azio.c ha_archive.cc ha_archive.h)
 
 IF(NOT SOURCE_SUBLIBS)
   ADD_LIBRARY(archive ${ARCHIVE_SOURCES})
+  ADD_DEPENDENCIES(archive GenError)
 ENDIF(NOT SOURCE_SUBLIBS)
diff --git a/storage/blackhole/CMakeLists.txt b/storage/blackhole/CMakeLists.txt
index 9b6dd7adac9..b11330db255 100644
--- a/storage/blackhole/CMakeLists.txt
+++ b/storage/blackhole/CMakeLists.txt
@@ -24,4 +24,5 @@ SET(BLACKHOLE_SOURCES  ha_blackhole.cc ha_blackhole.h)
 
 IF(NOT SOURCE_SUBLIBS)
   ADD_LIBRARY(blackhole ${BLACKHOLE_SOURCES})
+  ADD_DEPENDENCIES(blackhole GenError)
 ENDIF(NOT SOURCE_SUBLIBS)
diff --git a/storage/csv/CMakeLists.txt b/storage/csv/CMakeLists.txt
index bb0df45e5f4..528b9928c76 100644
--- a/storage/csv/CMakeLists.txt
+++ b/storage/csv/CMakeLists.txt
@@ -24,4 +24,5 @@ SET(CSV_SOURCES  ha_tina.cc ha_tina.h transparent_file.cc transparent_file.h)
 
 IF(NOT SOURCE_SUBLIBS)
   ADD_LIBRARY(csv ${CSV_SOURCES})
+  ADD_DEPENDENCIES(csv GenError)
 ENDIF(NOT SOURCE_SUBLIBS)
diff --git a/storage/example/CMakeLists.txt b/storage/example/CMakeLists.txt
index 99c223f3f85..0af60e1df83 100644
--- a/storage/example/CMakeLists.txt
+++ b/storage/example/CMakeLists.txt
@@ -24,4 +24,5 @@ SET(EXAMPLE_SOURCES ha_example.cc)
 
 IF(NOT SOURCE_SUBLIBS)
   ADD_LIBRARY(example ${EXAMPLE_SOURCES})
+  ADD_DEPENDENCIES(example GenError)
 ENDIF(NOT SOURCE_SUBLIBS)
diff --git a/storage/federated/CMakeLists.txt b/storage/federated/CMakeLists.txt
index 62064a633b1..b96f68a3c37 100644
--- a/storage/federated/CMakeLists.txt
+++ b/storage/federated/CMakeLists.txt
@@ -24,4 +24,5 @@ SET(FEDERATED_SOURCES  ha_federated.cc)
 
 IF(NOT SOURCE_SUBLIBS)
   ADD_LIBRARY(federated ${FEDERATED_SOURCES})
+  ADD_DEPENDENCIES(federated GenError)
 ENDIF(NOT SOURCE_SUBLIBS)
diff --git a/storage/heap/CMakeLists.txt b/storage/heap/CMakeLists.txt
index fd3ce149b2c..f8f0aa91464 100755
--- a/storage/heap/CMakeLists.txt
+++ b/storage/heap/CMakeLists.txt
@@ -29,4 +29,5 @@ SET(HEAP_SOURCES  _check.c _rectest.c hp_block.c hp_clear.c hp_close.c hp_create
 
 IF(NOT SOURCE_SUBLIBS)
   ADD_LIBRARY(heap ${HEAP_SOURCES})
+  ADD_DEPENDENCIES(heap GenError)
 ENDIF(NOT SOURCE_SUBLIBS)
diff --git a/storage/heap/hp_update.c b/storage/heap/hp_update.c
index 11dca974ad4..7f469af3c96 100644
--- a/storage/heap/hp_update.c
+++ b/storage/heap/hp_update.c
@@ -21,7 +21,7 @@ int heap_update(HP_INFO *info, const uchar *old, const uchar *heap_new)
 {
   HP_KEYDEF *keydef, *end, *p_lastinx;
   uchar *pos;
-  bool auto_key_changed= 0;
+  my_bool auto_key_changed= 0;
   HP_SHARE *share= info->s;
   DBUG_ENTER("heap_update");
 
diff --git a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt
index 47b1a566cd8..c4246abd30d 100755
--- a/storage/innobase/CMakeLists.txt
+++ b/storage/innobase/CMakeLists.txt
@@ -58,4 +58,5 @@ SET(INNOBASE_SOURCES  btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c btr/btr0sea.c
 
 IF(NOT SOURCE_SUBLIBS)
   ADD_LIBRARY(innobase ${INNOBASE_SOURCES})
+  ADD_DEPENDENCIES(innobase GenError)
 ENDIF(NOT SOURCE_SUBLIBS)
diff --git a/storage/innobase/btr/btr0cur.c b/storage/innobase/btr/btr0cur.c
index 975d5252a2f..54acdf73db6 100644
--- a/storage/innobase/btr/btr0cur.c
+++ b/storage/innobase/btr/btr0cur.c
@@ -52,7 +52,7 @@ can be released by page reorganize, then it is reorganized */
 
 #define BTR_CUR_PAGE_REORGANIZE_LIMIT	(UNIV_PAGE_SIZE / 32)
 
-/* When estimating number of different kay values in an index sample
+/* When estimating number of different key values in an index, sample
 this many index pages */
 #define BTR_KEY_VAL_ESTIMATE_N_PAGES	8
 
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index 205cfc91e52..f81804c0701 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -129,7 +129,7 @@ static my_bool	innobase_locks_unsafe_for_binlog	= FALSE;
 static my_bool	innobase_rollback_on_timeout		= FALSE;
 static my_bool	innobase_create_status_file		= FALSE;
 static my_bool innobase_stats_on_metadata		= TRUE;
-static my_bool	innobase_use_adaptive_hash_indexes	= TRUE;
+static my_bool	innobase_adaptive_hash_index	= TRUE;
 
 static char*	internal_innobase_data_file_path	= NULL;
 
@@ -600,7 +600,9 @@ convert_error_code_to_mysql(
 		tell it also to MySQL so that MySQL knows to empty the
 		cached binlog for this transaction */
 
-                thd_mark_transaction_to_rollback(thd, TRUE);
+		if (thd) {
+			thd_mark_transaction_to_rollback(thd, TRUE);
+		}
 
 		return(HA_ERR_LOCK_DEADLOCK);
 	} else if (error == (int) DB_LOCK_WAIT_TIMEOUT) {
@@ -609,8 +611,10 @@ convert_error_code_to_mysql(
 		latest SQL statement in a lock wait timeout. Previously, we
 		rolled back the whole transaction. */
 
-                thd_mark_transaction_to_rollback(thd,
-                                             (bool)row_rollback_on_timeout);
+		if (thd) {
+			thd_mark_transaction_to_rollback(
+				thd, (bool)row_rollback_on_timeout);
+		}
 
 		return(HA_ERR_LOCK_WAIT_TIMEOUT);
 
@@ -662,7 +666,9 @@ convert_error_code_to_mysql(
  		tell it also to MySQL so that MySQL knows to empty the
  		cached binlog for this transaction */
 
-                thd_mark_transaction_to_rollback(thd, TRUE);
+		if (thd) {
+			thd_mark_transaction_to_rollback(thd, TRUE);
+		}
 
     		return(HA_ERR_LOCK_TABLE_FULL);
 	} else if (error == DB_TOO_MANY_CONCURRENT_TRXS) {
@@ -1621,7 +1627,7 @@ innobase_init(
 	srv_stats_on_metadata = (ibool) innobase_stats_on_metadata;
 
 	srv_use_adaptive_hash_indexes =
-		(ibool) innobase_use_adaptive_hash_indexes;
+		(ibool) innobase_adaptive_hash_index;
 
 	srv_print_verbose_log = mysqld_embedded ? 0 : 1;
 
@@ -2269,6 +2275,8 @@ ha_innobase::open(
 	dict_table_t*	ib_table;
 	char		norm_name[1000];
 	THD*		thd;
+	ulint		retries = 0;
+	char*		is_part = NULL;
 
 	DBUG_ENTER("ha_innobase::open");
 
@@ -2302,11 +2310,29 @@ ha_innobase::open(
 		DBUG_RETURN(1);
 	}
 
+	/* We look for pattern #P# to see if the table is partitioned
+	MySQL table. The retry logic for partitioned tables is a
+	workaround for http://bugs.mysql.com/bug.php?id=33349. Look
+	at support issue https://support.mysql.com/view.php?id=21080
+	for more details. */
+	is_part = strstr(norm_name, "#P#");
+retry:
 	/* Get pointer to a table object in InnoDB dictionary cache */
-
 	ib_table = dict_table_get(norm_name, TRUE);
-
+	
 	if (NULL == ib_table) {
+		if (is_part && retries < 10) {
+			++retries;
+			os_thread_sleep(100000);
+			goto retry;
+		}
+
+		if (is_part) {
+			sql_print_error("Failed to open table %s after "
+					"%lu attemtps.\n", norm_name,
+					retries);
+		}
+
 		sql_print_error("Cannot find or open table %s from\n"
 				"the internal data dictionary of InnoDB "
 				"though the .frm file for the\n"
@@ -3769,6 +3795,16 @@ ha_innobase::update_row(
 
 	error = convert_error_code_to_mysql(error, user_thd);
 
+	if (error == 0 /* success */
+	    && uvect->n_fields == 0 /* no columns were updated */) {
+
+		/* This is the same as success, but instructs
+		MySQL that the row is not really updated and it
+		should not increase the count of updated rows.
+		This is fix for http://bugs.mysql.com/29157 */
+		error = HA_ERR_RECORD_IS_THE_SAME;
+	}
+
 	/* Tell InnoDB server that there might be work for
 	utility threads: */
 
@@ -4609,6 +4645,12 @@ innodb_check_for_record_too_big_error(
 	}
 }
 
+/* limit innodb monitor access to users with PROCESS privilege.
+See http://bugs.mysql.com/32710 for expl. why we choose PROCESS. */
+#define IS_MAGIC_TABLE_AND_USER_DENIED_ACCESS(table_name, thd) \
+	(row_is_magic_monitor_table(table_name) \
+	 && check_global_access(thd, PROCESS_ACL))
+
 /*********************************************************************
 Creates a table definition to an InnoDB database. */
 static
@@ -4645,6 +4687,12 @@ create_table_def(
 	DBUG_ENTER("create_table_def");
 	DBUG_PRINT("enter", ("table_name: %s", table_name));
 
+	ut_a(trx->mysql_thd != NULL);
+	if (IS_MAGIC_TABLE_AND_USER_DENIED_ACCESS(table_name,
+						  (THD*) trx->mysql_thd)) {
+		DBUG_RETURN(HA_ERR_GENERIC);
+	}
+
 	n_cols = form->s->fields;
 
 	/* We pass 0 as the space id, and determine at a lower level the space
@@ -5185,6 +5233,14 @@ ha_innobase::delete_table(
 
 	DBUG_ENTER("ha_innobase::delete_table");
 
+	/* Strangely, MySQL passes the table name without the '.frm'
+	extension, in contrast to ::create */
+	normalize_table_name(norm_name, name);
+
+	if (IS_MAGIC_TABLE_AND_USER_DENIED_ACCESS(norm_name, thd)) {
+		DBUG_RETURN(HA_ERR_GENERIC);
+	}
+
 	/* Get the transaction associated with the current thd, or create one
 	if not yet created */
 
@@ -5218,11 +5274,6 @@ ha_innobase::delete_table(
 
 	assert(name_len < 1000);
 
-	/* Strangely, MySQL passes the table name without the '.frm'
-	extension, in contrast to ::create */
-
-	normalize_table_name(norm_name, name);
-
 	/* Drop the table in InnoDB */
 
 	error = row_drop_table_for_mysql(norm_name, trx,
@@ -5720,7 +5771,9 @@ ha_innobase::info(
 		stats.index_file_length = ((ulonglong)
 				ib_table->stat_sum_of_other_index_sizes)
 					* UNIV_PAGE_SIZE;
-		stats.delete_length = 0;
+		stats.delete_length =
+			fsp_get_available_space_in_free_extents(
+				ib_table->space);
 		stats.check_time = 0;
 
 		if (stats.records == 0) {
@@ -7246,6 +7299,7 @@ On return if there is no error then the tables AUTOINC lock is locked.*/
 
 ulong
 ha_innobase::innobase_get_auto_increment(
+/*=====================================*/
 	ulonglong*	value)		/* out: autoinc value */
 {
 	ulong		error;
@@ -7969,9 +8023,10 @@ static MYSQL_SYSVAR_BOOL(stats_on_metadata, innobase_stats_on_metadata,
   "Enable statistics gathering for metadata commands such as SHOW TABLE STATUS (on by default)",
   NULL, NULL, TRUE);
 
-static MYSQL_SYSVAR_BOOL(use_adaptive_hash_indexes, innobase_use_adaptive_hash_indexes,
+static MYSQL_SYSVAR_BOOL(adaptive_hash_index, innobase_adaptive_hash_index,
   PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY,
-  "Enable the InnoDB adaptive hash indexes (enabled by default)",
+  "Enable InnoDB adaptive hash index (enabled by default).  "
+  "Disable with --skip-innodb-adaptive-hash-index.",
   NULL, NULL, TRUE);
 
 static MYSQL_SYSVAR_LONG(additional_mem_pool_size, innobase_additional_mem_pool_size,
@@ -8061,10 +8116,11 @@ static MYSQL_SYSVAR_STR(data_file_path, innobase_data_file_path,
 
 static MYSQL_SYSVAR_LONG(autoinc_lock_mode, innobase_autoinc_lock_mode,
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
-  "The AUTOINC lock modes supported by InnoDB:\n"
-  "  0 => Old style AUTOINC locking (for backward compatibility)\n"
-  "  1 => New style AUTOINC locking\n"
-  "  2 => No AUTOINC locking (unsafe for SBR)",
+  "The AUTOINC lock modes supported by InnoDB:               "
+  "0 => Old style AUTOINC locking (for backward"
+  " compatibility)                                           "
+  "1 => New style AUTOINC locking                            "
+  "2 => No AUTOINC locking (unsafe for SBR)",
   NULL, NULL,
   AUTOINC_NEW_STYLE_LOCKING,	/* Default setting */
   AUTOINC_OLD_STYLE_LOCKING,	/* Minimum value */
@@ -8102,7 +8158,7 @@ static struct st_mysql_sys_var* innobase_system_variables[]= {
   MYSQL_SYSVAR(open_files),
   MYSQL_SYSVAR(rollback_on_timeout),
   MYSQL_SYSVAR(stats_on_metadata),
-  MYSQL_SYSVAR(use_adaptive_hash_indexes),
+  MYSQL_SYSVAR(adaptive_hash_index),
   MYSQL_SYSVAR(status_file),
   MYSQL_SYSVAR(support_xa),
   MYSQL_SYSVAR(sync_spin_loops),
diff --git a/storage/innobase/include/os0sync.h b/storage/innobase/include/os0sync.h
index 0239cc853ed..a39a331c297 100644
--- a/storage/innobase/include/os0sync.h
+++ b/storage/innobase/include/os0sync.h
@@ -112,9 +112,13 @@ os_event_set(
 	os_event_t	event);	/* in: event to set */
 /**************************************************************
 Resets an event semaphore to the nonsignaled state. Waiting threads will
-stop to wait for the event. */
+stop to wait for the event.
+The return value should be passed to os_even_wait_low() if it is desired
+that this thread should not wait in case of an intervening call to
+os_event_set() between this os_event_reset() and the
+os_event_wait_low() call. See comments for os_event_wait_low(). */
 
-void
+ib_longlong
 os_event_reset(
 /*===========*/
 	os_event_t	event);	/* in: event to reset */
@@ -125,16 +129,38 @@ void
 os_event_free(
 /*==========*/
 	os_event_t	event);	/* in: event to free */
+
 /**************************************************************
 Waits for an event object until it is in the signaled state. If
 srv_shutdown_state == SRV_SHUTDOWN_EXIT_THREADS this also exits the
 waiting thread when the event becomes signaled (or immediately if the
-event is already in the signaled state). */
+event is already in the signaled state).
+
+Typically, if the event has been signalled after the os_event_reset()
+we'll return immediately because event->is_set == TRUE.
+There are, however, situations (e.g.: sync_array code) where we may
+lose this information. For example:
+
+thread A calls os_event_reset()
+thread B calls os_event_set()   [event->is_set == TRUE]
+thread C calls os_event_reset() [event->is_set == FALSE]
+thread A calls os_event_wait()  [infinite wait!]
+thread C calls os_event_wait()  [infinite wait!]
+
+Where such a scenario is possible, to avoid infinite wait, the
+value returned by os_event_reset() should be passed in as
+reset_sig_count. */
+
+#define os_event_wait(event) os_event_wait_low((event), 0)
 
 void
-os_event_wait(
-/*==========*/
-	os_event_t	event);	/* in: event to wait */
+os_event_wait_low(
+/*==============*/
+	os_event_t	event,		/* in: event to wait */
+	ib_longlong	reset_sig_count);/* in: zero or the value
+					returned by previous call of
+					os_event_reset(). */
+
 /**************************************************************
 Waits for an event object until it is in the signaled state or
 a timeout is exceeded. In Unix the timeout is always infinite. */
diff --git a/storage/innobase/include/read0read.h b/storage/innobase/include/read0read.h
index 8089a620536..97b6d7e9dd9 100644
--- a/storage/innobase/include/read0read.h
+++ b/storage/innobase/include/read0read.h
@@ -111,10 +111,6 @@ struct read_view_struct{
 	dulint	undo_no;	/* (0, 0) or if type is VIEW_HIGH_GRANULARITY
 				transaction undo_no when this high-granularity
 				consistent read view was created */
-	ibool	can_be_too_old;	/* TRUE if the system has had to purge old
-				versions which this read view should be able
-				to access: the read view can bump into the
-				DB_MISSING_HISTORY error */
 	dulint	low_limit_no;	/* The view does not need to see the undo
 				logs for transactions whose transaction number
 				is strictly smaller (<) than this value: they
diff --git a/storage/innobase/include/row0mysql.h b/storage/innobase/include/row0mysql.h
index fd7ec8918ee..f486caa874d 100644
--- a/storage/innobase/include/row0mysql.h
+++ b/storage/innobase/include/row0mysql.h
@@ -319,7 +319,7 @@ row_mysql_unfreeze_data_dictionary(
 /*===============================*/
 	trx_t*	trx);	/* in: transaction */
 /*************************************************************************
-Drops a table for MySQL. If the name of the table ends in
+Creates a table for MySQL. If the name of the table ends in
 one of "innodb_monitor", "innodb_lock_monitor", "innodb_tablespace_monitor",
 "innodb_table_monitor", then this will also start the printing of monitor
 output by the master thread. If the table name ends in "innodb_mem_validate",
@@ -464,6 +464,16 @@ row_check_table_for_mysql(
 	row_prebuilt_t*	prebuilt);	/* in: prebuilt struct in MySQL
 					handle */
 
+/*************************************************************************
+Determines if a table is a magic monitor table. */
+
+ibool
+row_is_magic_monitor_table(
+/*=======================*/
+					/* out: TRUE if monitor table */
+	const char*	table_name);	/* in: name of the table, in the
+					form database/table_name */
+
 /* A struct describing a place for an individual column in the MySQL
 row format which is presented to the table handler in ha_innobase.
 This template struct is used to speed up row transformations between
diff --git a/storage/innobase/include/sync0arr.h b/storage/innobase/include/sync0arr.h
index d4407e14dc4..fae26b7a63e 100644
--- a/storage/innobase/include/sync0arr.h
+++ b/storage/innobase/include/sync0arr.h
@@ -66,26 +66,21 @@ sync_array_wait_event(
 	sync_array_t*	arr,	/* in: wait array */
 	ulint		index);	 /* in: index of the reserved cell */
 /**********************************************************************
-Frees the cell safely by reserving the sync array mutex and decrementing
-n_reserved if necessary. Should only be called from mutex_spin_wait. */
+Frees the cell. NOTE! sync_array_wait_event frees the cell
+automatically! */
 
 void
-sync_array_free_cell_protected(
-/*===========================*/
+sync_array_free_cell(
+/*=================*/
 	sync_array_t*	arr,	/* in: wait array */
 	ulint		index);	/* in: index of the cell in array */
 /**************************************************************************
-Looks for the cells in the wait array which refer
-to the wait object specified,
-and sets their corresponding events to the signaled state. In this
-way releases the threads waiting for the object to contend for the object.
-It is possible that no such cell is found, in which case does nothing. */
+Note that one of the wait objects was signalled. */
 
 void
-sync_array_signal_object(
-/*=====================*/
-	sync_array_t*	arr,	/* in: wait array */
-	void*		object);/* in: wait object */
+sync_array_object_signalled(
+/*========================*/
+	sync_array_t*	arr);	/* in: wait array */
 /**************************************************************************
 If the wakeup algorithm does not work perfectly at semaphore relases,
 this function will do the waking (see the comment in mutex_exit). This
diff --git a/storage/innobase/include/sync0rw.h b/storage/innobase/include/sync0rw.h
index 7d2f63803d0..008df80a2c7 100644
--- a/storage/innobase/include/sync0rw.h
+++ b/storage/innobase/include/sync0rw.h
@@ -421,6 +421,18 @@ blocked by readers, a writer may queue for the lock by setting the writer
 field. Then no new readers are allowed in. */
 
 struct rw_lock_struct {
+	os_event_t	event;	/* Used by sync0arr.c for thread queueing */
+
+#ifdef __WIN__
+	os_event_t	wait_ex_event;	/* This windows specific event is
+				used by the thread which has set the
+				lock state to RW_LOCK_WAIT_EX. The
+				rw_lock design guarantees that this
+				thread will be the next one to proceed
+				once the current the event gets
+				signalled. See LEMMA 2 in sync0sync.c */
+#endif
+
 	ulint	reader_count;	/* Number of readers who have locked this
 				lock in the shared mode */
 	ulint	writer;		/* This field is set to RW_LOCK_EX if there
diff --git a/storage/innobase/include/sync0rw.ic b/storage/innobase/include/sync0rw.ic
index b41593d0a96..eea639f26f4 100644
--- a/storage/innobase/include/sync0rw.ic
+++ b/storage/innobase/include/sync0rw.ic
@@ -381,7 +381,11 @@ rw_lock_s_unlock_func(
 	mutex_exit(mutex);
 
 	if (UNIV_UNLIKELY(sg)) {
-		sync_array_signal_object(sync_primary_wait_array, lock);
+#ifdef __WIN__
+		os_event_set(lock->wait_ex_event);
+#endif
+		os_event_set(lock->event);
+		sync_array_object_signalled(sync_primary_wait_array);
 	}
 
 	ut_ad(rw_lock_validate(lock));
@@ -461,7 +465,11 @@ rw_lock_x_unlock_func(
 	mutex_exit(&(lock->mutex));
 
 	if (UNIV_UNLIKELY(sg)) {
-		sync_array_signal_object(sync_primary_wait_array, lock);
+#ifdef __WIN__
+		os_event_set(lock->wait_ex_event);
+#endif
+		os_event_set(lock->event);
+		sync_array_object_signalled(sync_primary_wait_array);
 	}
 
 	ut_ad(rw_lock_validate(lock));
diff --git a/storage/innobase/include/sync0sync.h b/storage/innobase/include/sync0sync.h
index 69c0cd9e39b..6a61330f97e 100644
--- a/storage/innobase/include/sync0sync.h
+++ b/storage/innobase/include/sync0sync.h
@@ -470,6 +470,7 @@ Do not use its fields directly! The structure used in the spin lock
 implementation of a mutual exclusion semaphore. */
 
 struct mutex_struct {
+	os_event_t	event;	/* Used by sync0arr.c for the wait queue */
 	ulint	lock_word;	/* This ulint is the target of the atomic
 				test-and-set instruction in Win32 */
 #if !defined(_WIN32) || !defined(UNIV_CAN_USE_X86_ASSEMBLER)
diff --git a/storage/innobase/include/sync0sync.ic b/storage/innobase/include/sync0sync.ic
index 9bd5ac2a518..908797f9729 100644
--- a/storage/innobase/include/sync0sync.ic
+++ b/storage/innobase/include/sync0sync.ic
@@ -211,7 +211,7 @@ mutex_exit(
 	perform the read first, which could leave a waiting
 	thread hanging indefinitely.
 
-	Our current solution call every 10 seconds
+	Our current solution call every second
 	sync_arr_wake_threads_if_sema_free()
 	to wake up possible hanging threads if
 	they are missed in mutex_signal_object. */
diff --git a/storage/innobase/os/os0sync.c b/storage/innobase/os/os0sync.c
index 9c6b1134e12..18fd38f3f9b 100644
--- a/storage/innobase/os/os0sync.c
+++ b/storage/innobase/os/os0sync.c
@@ -21,6 +21,7 @@ Created 9/6/1995 Heikki Tuuri
 
 /* Type definition for an operating system mutex struct */
 struct os_mutex_struct{
+	os_event_t	event;	/* Used by sync0arr.c for queing threads */
 	void*		handle;	/* OS handle to mutex */
 	ulint		count;	/* we use this counter to check
 				that the same thread does not
@@ -35,6 +36,7 @@ struct os_mutex_struct{
 /* Mutex protecting counts and the lists of OS mutexes and events */
 os_mutex_t	os_sync_mutex;
 ibool		os_sync_mutex_inited	= FALSE;
+ibool		os_sync_free_called	= FALSE;
 
 /* This is incremented by 1 in os_thread_create and decremented by 1 in
 os_thread_exit */
@@ -50,6 +52,10 @@ ulint	os_event_count		= 0;
 ulint	os_mutex_count		= 0;
 ulint	os_fast_mutex_count	= 0;
 
+/* Because a mutex is embedded inside an event and there is an
+event embedded inside a mutex, on free, this generates a recursive call.
+This version of the free event function doesn't acquire the global lock */
+static void os_event_free_internal(os_event_t	event);
 
 /*************************************************************
 Initializes global event and OS 'slow' mutex lists. */
@@ -76,6 +82,7 @@ os_sync_free(void)
 	os_event_t	event;
 	os_mutex_t	mutex;
 
+	os_sync_free_called = TRUE;
 	event = UT_LIST_GET_FIRST(os_event_list);
 
 	while (event) {
@@ -99,6 +106,7 @@ os_sync_free(void)
 
 		mutex = UT_LIST_GET_FIRST(os_mutex_list);
 	}
+	os_sync_free_called = FALSE;
 }
 
 /*************************************************************
@@ -144,17 +152,31 @@ os_event_create(
 	ut_a(0 == pthread_cond_init(&(event->cond_var), NULL));
 #endif
 	event->is_set = FALSE;
-	event->signal_count = 0;
+
+	/* We return this value in os_event_reset(), which can then be
+	be used to pass to the os_event_wait_low(). The value of zero
+	is reserved in os_event_wait_low() for the case when the
+	caller does not want to pass any signal_count value. To
+	distinguish between the two cases we initialize signal_count
+	to 1 here. */
+	event->signal_count = 1;
 #endif /* __WIN__ */
 
-	/* Put to the list of events */
-	os_mutex_enter(os_sync_mutex);
+	/* The os_sync_mutex can be NULL because during startup an event
+	can be created [ because it's embedded in the mutex/rwlock ] before
+	this module has been initialized */
+	if (os_sync_mutex != NULL) {
+		os_mutex_enter(os_sync_mutex);
+	}
 
+	/* Put to the list of events */
 	UT_LIST_ADD_FIRST(os_event_list, os_event_list, event);
 
 	os_event_count++;
 
-	os_mutex_exit(os_sync_mutex);
+	if (os_sync_mutex != NULL) {
+		os_mutex_exit(os_sync_mutex);
+	}
 
 	return(event);
 }
@@ -231,13 +253,20 @@ os_event_set(
 
 /**************************************************************
 Resets an event semaphore to the nonsignaled state. Waiting threads will
-stop to wait for the event. */
+stop to wait for the event.
+The return value should be passed to os_even_wait_low() if it is desired
+that this thread should not wait in case of an intervening call to
+os_event_set() between this os_event_reset() and the
+os_event_wait_low() call. See comments for os_event_wait_low(). */
 
-void
+ib_longlong
 os_event_reset(
 /*===========*/
+				/* out: current signal_count. */
 	os_event_t	event)	/* in: event to reset */
 {
+	ib_longlong	ret = 0;
+
 #ifdef __WIN__
 	ut_a(event);
 
@@ -252,9 +281,40 @@ os_event_reset(
 	} else {
 		event->is_set = FALSE;
 	}
+	ret = event->signal_count;
 
 	os_fast_mutex_unlock(&(event->os_mutex));
 #endif
+	return(ret);
+}
+
+/**************************************************************
+Frees an event object, without acquiring the global lock. */
+static
+void
+os_event_free_internal(
+/*===================*/
+	os_event_t	event)	/* in: event to free */
+{
+#ifdef __WIN__
+	ut_a(event);
+
+	ut_a(CloseHandle(event->handle));
+#else
+	ut_a(event);
+
+	/* This is to avoid freeing the mutex twice */
+	os_fast_mutex_free(&(event->os_mutex));
+
+	ut_a(0 == pthread_cond_destroy(&(event->cond_var)));
+#endif
+	/* Remove from the list of events */
+
+	UT_LIST_REMOVE(os_event_list, os_event_list, event);
+
+	os_event_count--;
+
+	ut_free(event);
 }
 
 /**************************************************************
@@ -293,18 +353,38 @@ os_event_free(
 Waits for an event object until it is in the signaled state. If
 srv_shutdown_state == SRV_SHUTDOWN_EXIT_THREADS this also exits the
 waiting thread when the event becomes signaled (or immediately if the
-event is already in the signaled state). */
+event is already in the signaled state).
+
+Typically, if the event has been signalled after the os_event_reset()
+we'll return immediately because event->is_set == TRUE.
+There are, however, situations (e.g.: sync_array code) where we may
+lose this information. For example:
+
+thread A calls os_event_reset()
+thread B calls os_event_set()   [event->is_set == TRUE]
+thread C calls os_event_reset() [event->is_set == FALSE]
+thread A calls os_event_wait()  [infinite wait!]
+thread C calls os_event_wait()  [infinite wait!]
+
+Where such a scenario is possible, to avoid infinite wait, the
+value returned by os_event_reset() should be passed in as
+reset_sig_count. */
 
 void
-os_event_wait(
-/*==========*/
-	os_event_t	event)	/* in: event to wait */
+os_event_wait_low(
+/*==============*/
+	os_event_t	event,		/* in: event to wait */
+	ib_longlong	reset_sig_count)/* in: zero or the value
+					returned by previous call of
+					os_event_reset(). */
 {
 #ifdef __WIN__
 	DWORD	err;
 
 	ut_a(event);
 
+	UT_NOT_USED(reset_sig_count);
+
 	/* Specify an infinite time limit for waiting */
 	err = WaitForSingleObject(event->handle, INFINITE);
 
@@ -318,7 +398,11 @@ os_event_wait(
 
 	os_fast_mutex_lock(&(event->os_mutex));
 
-	old_signal_count = event->signal_count;
+	if (reset_sig_count) {
+		old_signal_count = reset_sig_count;
+	} else {
+		old_signal_count = event->signal_count;
+	}
 
 	for (;;) {
 		if (event->is_set == TRUE
@@ -458,6 +542,7 @@ os_mutex_create(
 
 	mutex_str->handle = mutex;
 	mutex_str->count = 0;
+	mutex_str->event = os_event_create(NULL);
 
 	if (os_sync_mutex_inited) {
 		/* When creating os_sync_mutex itself we cannot reserve it */
@@ -534,6 +619,10 @@ os_mutex_free(
 {
 	ut_a(mutex);
 
+	if (!os_sync_free_called) {
+		os_event_free_internal(mutex->event);
+	}
+
 	if (os_sync_mutex_inited) {
 		os_mutex_enter(os_sync_mutex);
 	}
diff --git a/storage/innobase/read/read0read.c b/storage/innobase/read/read0read.c
index 10a6e07e96a..4068cf4fa69 100644
--- a/storage/innobase/read/read0read.c
+++ b/storage/innobase/read/read0read.c
@@ -212,7 +212,6 @@ read_view_oldest_copy_or_open_new(
 	view_copy->low_limit_no = old_view->low_limit_no;
 	view_copy->low_limit_id = old_view->low_limit_id;
 
-	view_copy->can_be_too_old = FALSE;
 
 	if (n > 0) {
 		/* The last active transaction has the smallest id: */
@@ -258,8 +257,6 @@ read_view_open_now(
 	view->low_limit_no = trx_sys->max_trx_id;
 	view->low_limit_id = view->low_limit_no;
 
-	view->can_be_too_old = FALSE;
-
 	n = 0;
 	trx = UT_LIST_GET_FIRST(trx_sys->trx_list);
 
@@ -432,8 +429,6 @@ read_cursor_view_create_for_mysql(
 	view->low_limit_no = trx_sys->max_trx_id;
 	view->low_limit_id = view->low_limit_no;
 
-	view->can_be_too_old = FALSE;
-
 	n = 0;
 	trx = UT_LIST_GET_FIRST(trx_sys->trx_list);
 
diff --git a/storage/innobase/row/row0mysql.c b/storage/innobase/row/row0mysql.c
index b3cf20b78b8..d5ef12d0af2 100644
--- a/storage/innobase/row/row0mysql.c
+++ b/storage/innobase/row/row0mysql.c
@@ -57,6 +57,12 @@ static const char S_innodb_tablespace_monitor[] = "innodb_tablespace_monitor";
 static const char S_innodb_table_monitor[] = "innodb_table_monitor";
 static const char S_innodb_mem_validate[] = "innodb_mem_validate";
 
+/* Evaluates to true if str1 equals str2_onstack, used for comparing
+the above strings. */
+#define STR_EQ(str1, str1_len, str2_onstack) \
+	((str1_len) == sizeof(str2_onstack) \
+	 && memcmp(str1, str2_onstack, sizeof(str2_onstack)) == 0)
+
 /***********************************************************************
 Determine if the given name is a name reserved for MySQL system tables. */
 static
@@ -1728,7 +1734,7 @@ row_mysql_unlock_data_dictionary(
 }
 
 /*************************************************************************
-Drops a table for MySQL. If the name of the table ends in
+Creates a table for MySQL. If the name of the table ends in
 one of "innodb_monitor", "innodb_lock_monitor", "innodb_tablespace_monitor",
 "innodb_table_monitor", then this will also start the printing of monitor
 output by the master thread. If the table name ends in "innodb_mem_validate",
@@ -1809,9 +1815,7 @@ row_create_table_for_mysql(
 	table_name++;
 	table_name_len = strlen(table_name) + 1;
 
-	if (table_name_len == sizeof S_innodb_monitor
-	    && !memcmp(table_name, S_innodb_monitor,
-		       sizeof S_innodb_monitor)) {
+	if (STR_EQ(table_name, table_name_len, S_innodb_monitor)) {
 
 		/* Table equals "innodb_monitor":
 		start monitor prints */
@@ -1822,28 +1826,24 @@ row_create_table_for_mysql(
 		of InnoDB monitor prints */
 
 		os_event_set(srv_lock_timeout_thread_event);
-	} else if (table_name_len == sizeof S_innodb_lock_monitor
-		   && !memcmp(table_name, S_innodb_lock_monitor,
-			      sizeof S_innodb_lock_monitor)) {
+	} else if (STR_EQ(table_name, table_name_len,
+			  S_innodb_lock_monitor)) {
 
 		srv_print_innodb_monitor = TRUE;
 		srv_print_innodb_lock_monitor = TRUE;
 		os_event_set(srv_lock_timeout_thread_event);
-	} else if (table_name_len == sizeof S_innodb_tablespace_monitor
-		   && !memcmp(table_name, S_innodb_tablespace_monitor,
-			      sizeof S_innodb_tablespace_monitor)) {
+	} else if (STR_EQ(table_name, table_name_len,
+			  S_innodb_tablespace_monitor)) {
 
 		srv_print_innodb_tablespace_monitor = TRUE;
 		os_event_set(srv_lock_timeout_thread_event);
-	} else if (table_name_len == sizeof S_innodb_table_monitor
-		   && !memcmp(table_name, S_innodb_table_monitor,
-			      sizeof S_innodb_table_monitor)) {
+	} else if (STR_EQ(table_name, table_name_len,
+			  S_innodb_table_monitor)) {
 
 		srv_print_innodb_table_monitor = TRUE;
 		os_event_set(srv_lock_timeout_thread_event);
-	} else if (table_name_len == sizeof S_innodb_mem_validate
-		   && !memcmp(table_name, S_innodb_mem_validate,
-			      sizeof S_innodb_mem_validate)) {
+	} else if (STR_EQ(table_name, table_name_len,
+			  S_innodb_mem_validate)) {
 		/* We define here a debugging feature intended for
 		developers */
 
@@ -3312,6 +3312,66 @@ funct_exit:
 	return((int) err);
 }
 
+/***********************************************************************
+Drop all foreign keys in a database, see Bug#18942.
+Called at the end of row_drop_database_for_mysql(). */
+static
+ulint
+drop_all_foreign_keys_in_db(
+/*========================*/
+				/* out: error code or DB_SUCCESS */
+	const char*	name,	/* in: database name which ends to '/' */
+	trx_t*		trx)	/* in: transaction handle */
+{
+	pars_info_t*	pinfo;
+	ulint		err;
+
+	ut_a(name[strlen(name) - 1] == '/');
+
+	pinfo = pars_info_create();
+
+	pars_info_add_str_literal(pinfo, "dbname", name);
+
+/* true if for_name is not prefixed with dbname */
+#define TABLE_NOT_IN_THIS_DB \
+"SUBSTR(for_name, 0, LENGTH(:dbname)) <> :dbname"
+
+	err = que_eval_sql(pinfo,
+			   "PROCEDURE DROP_ALL_FOREIGN_KEYS_PROC () IS\n"
+			   "foreign_id CHAR;\n"
+			   "for_name CHAR;\n"
+			   "found INT;\n"
+			   "DECLARE CURSOR cur IS\n"
+			   "SELECT ID, FOR_NAME FROM SYS_FOREIGN\n"
+			   "WHERE FOR_NAME >= :dbname\n"
+			   "LOCK IN SHARE MODE\n"
+			   "ORDER BY FOR_NAME;\n"
+			   "BEGIN\n"
+			   "found := 1;\n"
+			   "OPEN cur;\n"
+			   "WHILE found = 1 LOOP\n"
+			   "        FETCH cur INTO foreign_id, for_name;\n"
+			   "        IF (SQL % NOTFOUND) THEN\n"
+			   "                found := 0;\n"
+			   "        ELSIF (" TABLE_NOT_IN_THIS_DB ") THEN\n"
+			   "                found := 0;\n"
+			   "        ELSIF (1=1) THEN\n"
+			   "                DELETE FROM SYS_FOREIGN_COLS\n"
+			   "                WHERE ID = foreign_id;\n"
+			   "                DELETE FROM SYS_FOREIGN\n"
+			   "                WHERE ID = foreign_id;\n"
+			   "        END IF;\n"
+			   "END LOOP;\n"
+			   "CLOSE cur;\n"
+			   "COMMIT WORK;\n"
+			   "END;\n",
+			   FALSE, /* do not reserve dict mutex,
+				  we are already holding it */
+			   trx);
+
+	return(err);
+}
+
 /*************************************************************************
 Drops a database for MySQL. */
 
@@ -3382,6 +3442,19 @@ loop:
 		}
 	}
 
+	if (err == DB_SUCCESS) {
+		/* after dropping all tables try to drop all leftover
+		foreign keys in case orphaned ones exist */
+		err = (int) drop_all_foreign_keys_in_db(name, trx);
+
+		if (err != DB_SUCCESS) {
+			fputs("InnoDB: DROP DATABASE ", stderr);
+			ut_print_name(stderr, trx, TRUE, name);
+			fprintf(stderr, " failed with error %d while "
+				"dropping all foreign keys", err);
+		}
+	}
+
 	trx_commit_for_mysql(trx);
 
 	row_mysql_unlock_data_dictionary(trx);
@@ -4057,3 +4130,33 @@ row_check_table_for_mysql(
 
 	return(ret);
 }
+
+/*************************************************************************
+Determines if a table is a magic monitor table. */
+
+ibool
+row_is_magic_monitor_table(
+/*=======================*/
+					/* out: TRUE if monitor table */
+	const char*	table_name)	/* in: name of the table, in the
+					form database/table_name */
+{
+	const char*	name; /* table_name without database/ */
+	ulint		len;
+
+	name = strchr(table_name, '/');
+	ut_a(name != NULL);
+	name++;
+	len = strlen(name) + 1;
+
+	if (STR_EQ(name, len, S_innodb_monitor)
+	    || STR_EQ(name, len, S_innodb_lock_monitor)
+	    || STR_EQ(name, len, S_innodb_tablespace_monitor)
+	    || STR_EQ(name, len, S_innodb_table_monitor)
+	    || STR_EQ(name, len, S_innodb_mem_validate)) {
+
+		return(TRUE);
+	}
+
+	return(FALSE);
+}
diff --git a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
index 82b55789be2..1b13b19783e 100644
--- a/storage/innobase/srv/srv0srv.c
+++ b/storage/innobase/srv/srv0srv.c
@@ -1904,12 +1904,6 @@ loop:
 
 	os_thread_sleep(1000000);
 
-	/* In case mutex_exit is not a memory barrier, it is
-	theoretically possible some threads are left waiting though
-	the semaphore is already released. Wake up those threads: */
-
-	sync_arr_wake_threads_if_sema_free();
-
 	current_time = time(NULL);
 
 	time_elapsed = difftime(current_time, last_monitor_time);
@@ -2106,9 +2100,15 @@ loop:
 		srv_refresh_innodb_monitor_stats();
 	}
 
+	/* In case mutex_exit is not a memory barrier, it is
+	theoretically possible some threads are left waiting though
+	the semaphore is already released. Wake up those threads: */
+	
+	sync_arr_wake_threads_if_sema_free();
+
 	if (sync_array_print_long_waits()) {
 		fatal_cnt++;
-		if (fatal_cnt > 5) {
+		if (fatal_cnt > 10) {
 
 			fprintf(stderr,
 				"InnoDB: Error: semaphore wait has lasted"
@@ -2128,7 +2128,7 @@ loop:
 
 	fflush(stderr);
 
-	os_thread_sleep(2000000);
+	os_thread_sleep(1000000);
 
 	if (srv_shutdown_state < SRV_SHUTDOWN_CLEANUP) {
 
diff --git a/storage/innobase/sync/sync0arr.c b/storage/innobase/sync/sync0arr.c
index 82b08a890e0..154593a9035 100644
--- a/storage/innobase/sync/sync0arr.c
+++ b/storage/innobase/sync/sync0arr.c
@@ -40,24 +40,23 @@ because we can do with a very small number of OS events,
 say 200. In NT 3.51, allocating events seems to be a quadratic
 algorithm, because 10 000 events are created fast, but
 100 000 events takes a couple of minutes to create.
-*/
+
+As of 5.0.30 the above mentioned design is changed. Since now
+OS can handle millions of wait events efficiently, we no longer
+have this concept of each cell of wait array having one event.
+Instead, now the event that a thread wants to wait on is embedded
+in the wait object (mutex or rw_lock). We still keep the global
+wait array for the sake of diagnostics and also to avoid infinite
+wait The error_monitor thread scans the global wait array to signal
+any waiting threads who have missed the signal. */
 
 /* A cell where an individual thread may wait suspended
 until a resource is released. The suspending is implemented
 using an operating system event semaphore. */
 struct sync_cell_struct {
-	/* State of the cell. SC_WAKING_UP means
-	sync_array_struct->n_reserved has been decremented, but the thread
-	in this cell has not waken up yet. When it does, it will set the
-	state to SC_FREE. Note that this is done without the protection of
-	any mutex. */
-	enum { SC_FREE, SC_RESERVED, SC_WAKING_UP } state;
-
 	void*		wait_object;	/* pointer to the object the
-					thread is waiting for; this is not
-					reseted to NULL when a cell is
-					freed. */
-
+					thread is waiting for; if NULL
+					the cell is free for use */
 	mutex_t*	old_wait_mutex;	/* the latest wait mutex in cell */
 	rw_lock_t*	old_wait_rw_lock;/* the latest wait rw-lock in cell */
 	ulint		request_type;	/* lock type requested on the
@@ -71,13 +70,23 @@ struct sync_cell_struct {
 	ibool		waiting;	/* TRUE if the thread has already
 					called sync_array_event_wait
 					on this cell */
-	ibool		event_set;	/* TRUE if the event is set */
-	os_event_t	event;		/* operating system event
-					semaphore handle */
+	ib_longlong	signal_count;	/* We capture the signal_count
+					of the wait_object when we
+					reset the event. This value is
+					then passed on to os_event_wait
+					and we wait only if the event
+					has not been signalled in the
+					period between the reset and
+					wait call. */
 	time_t		reservation_time;/* time when the thread reserved
 					the wait cell */
 };
 
+/* NOTE: It is allowed for a thread to wait
+for an event allocated for the array without owning the
+protecting mutex (depending on the case: OS or database mutex), but
+all changes (set or reset) to the state of the event must be made
+while owning the mutex. */
 struct sync_array_struct {
 	ulint		n_reserved;	/* number of currently reserved
 					cells in the wait array */
@@ -220,12 +229,9 @@ sync_array_create(
 
 	for (i = 0; i < n_cells; i++) {
 		cell = sync_array_get_nth_cell(arr, i);
-		cell->state = SC_FREE;
-		cell->wait_object = NULL;
-
-		/* Create an operating system event semaphore with no name */
-		cell->event = os_event_create(NULL);
-		cell->event_set = FALSE; /* it is created in reset state */
+	cell->wait_object = NULL;
+		cell->waiting = FALSE;
+		cell->signal_count = 0;
 	}
 
 	return(arr);
@@ -239,19 +245,12 @@ sync_array_free(
 /*============*/
 	sync_array_t*	arr)	/* in, own: sync wait array */
 {
-	ulint		i;
-	sync_cell_t*	cell;
 	ulint		protection;
 
 	ut_a(arr->n_reserved == 0);
 
 	sync_array_validate(arr);
 
-	for (i = 0; i < arr->n_cells; i++) {
-		cell = sync_array_get_nth_cell(arr, i);
-		os_event_free(cell->event);
-	}
-
 	protection = arr->protection;
 
 	/* Release the mutex protecting the wait array complex */
@@ -285,8 +284,7 @@ sync_array_validate(
 
 	for (i = 0; i < arr->n_cells; i++) {
 		cell = sync_array_get_nth_cell(arr, i);
-
-		if (cell->state == SC_RESERVED) {
+		if (cell->wait_object != NULL) {
 			count++;
 		}
 	}
@@ -296,6 +294,29 @@ sync_array_validate(
 	sync_array_exit(arr);
 }
 
+/***********************************************************************
+Puts the cell event in reset state. */
+static
+ib_longlong
+sync_cell_event_reset(
+/*==================*/
+				/* out: value of signal_count
+				at the time of reset. */
+	ulint		type,	/* in: lock type mutex/rw_lock */
+	void*		object) /* in: the rw_lock/mutex object */
+{
+	if (type == SYNC_MUTEX) {
+		return(os_event_reset(((mutex_t *) object)->event));
+#ifdef __WIN__
+	} else if (type == RW_LOCK_WAIT_EX) {
+		return(os_event_reset(
+		       ((rw_lock_t *) object)->wait_ex_event));
+#endif
+	} else {
+		return(os_event_reset(((rw_lock_t *) object)->event));
+	}
+}
+
 /**********************************************************************
 Reserves a wait array cell for waiting for an object.
 The event of the cell is reset to nonsignalled state. */
@@ -324,21 +345,9 @@ sync_array_reserve_cell(
 	for (i = 0; i < arr->n_cells; i++) {
 		cell = sync_array_get_nth_cell(arr, i);
 
-		if (cell->state == SC_FREE) {
-
-			/* We do not check cell->event_set because it is
-			set outside the protection of the sync array mutex
-			and we had a bug regarding it, and since resetting
-			an event when it is not needed does no harm it is
-			safer always to do it. */
-
-			cell->event_set = FALSE;
-			os_event_reset(cell->event);
-
-			cell->state = SC_RESERVED;
-			cell->reservation_time = time(NULL);
-			cell->thread = os_thread_get_curr_id();
+		if (cell->wait_object == NULL) {
 
+			cell->waiting = FALSE;
 			cell->wait_object = object;
 
 			if (type == SYNC_MUTEX) {
@@ -348,7 +357,6 @@ sync_array_reserve_cell(
 			}
 
 			cell->request_type = type;
-			cell->waiting = FALSE;
 
 			cell->file = file;
 			cell->line = line;
@@ -359,6 +367,16 @@ sync_array_reserve_cell(
 
 			sync_array_exit(arr);
 
+			/* Make sure the event is reset and also store
+			the value of signal_count at which the event
+			was reset. */
+			cell->signal_count = sync_cell_event_reset(type,
+								object);
+
+			cell->reservation_time = time(NULL);
+
+			cell->thread = os_thread_get_curr_id();
+
 			return;
 		}
 	}
@@ -369,68 +387,6 @@ sync_array_reserve_cell(
 }
 
 /**********************************************************************
-Frees the cell. Note that we don't have any mutex reserved when calling
-this. */
-static
-void
-sync_array_free_cell(
-/*=================*/
-	sync_array_t*	arr,	/* in: wait array */
-	ulint		index)	/* in: index of the cell in array */
-{
-	sync_cell_t*	cell;
-
-	cell = sync_array_get_nth_cell(arr, index);
-
-	ut_a(cell->state == SC_WAKING_UP);
-	ut_a(cell->wait_object != NULL);
-
-	cell->state = SC_FREE;
-}
-
-/**********************************************************************
-Frees the cell safely by reserving the sync array mutex and decrementing
-n_reserved if necessary. Should only be called from mutex_spin_wait. */
-
-void
-sync_array_free_cell_protected(
-/*===========================*/
-	sync_array_t*	arr,	/* in: wait array */
-	ulint		index)	/* in: index of the cell in array */
-{
-	sync_cell_t*	cell;
-
-	sync_array_enter(arr);
-
-	cell = sync_array_get_nth_cell(arr, index);
-
-	ut_a(cell->state != SC_FREE);
-	ut_a(cell->wait_object != NULL);
-
-	/* We only need to decrement n_reserved if it has not already been
-	done by sync_array_signal_object. */
-	if (cell->state == SC_RESERVED) {
-		ut_a(arr->n_reserved > 0);
-		arr->n_reserved--;
-	} else if (cell->state == SC_WAKING_UP) {
-		/* This is tricky; if we don't wait for the event to be
-		signaled, signal_object can set the state of a cell to
-		SC_WAKING_UP, mutex_spin_wait can call this and set the
-		state to SC_FREE, and then signal_object gets around to
-		calling os_set_event for the cell but since it's already
-		been freed things break horribly. */
-
-		sync_array_exit(arr);
-		os_event_wait(cell->event);
-		sync_array_enter(arr);
-	}
-
-	cell->state = SC_FREE;
-
-	sync_array_exit(arr);
-}
-
-/**********************************************************************
 This function should be called when a thread starts to wait on
 a wait array cell. In the debug version this function checks
 if the wait for a semaphore will result in a deadlock, in which
@@ -447,15 +403,28 @@ sync_array_wait_event(
 
 	ut_a(arr);
 
+	sync_array_enter(arr);
+
 	cell = sync_array_get_nth_cell(arr, index);
 
-	ut_a((cell->state == SC_RESERVED) || (cell->state == SC_WAKING_UP));
 	ut_a(cell->wait_object);
 	ut_a(!cell->waiting);
 	ut_ad(os_thread_get_curr_id() == cell->thread);
 
-	event = cell->event;
-	cell->waiting = TRUE;
+	if (cell->request_type == SYNC_MUTEX) {
+		event = ((mutex_t*) cell->wait_object)->event;
+#ifdef __WIN__
+	/* On windows if the thread about to wait is the one which
+	has set the state of the rw_lock to RW_LOCK_WAIT_EX, then
+	it waits on a special event i.e.: wait_ex_event. */
+	} else if (cell->request_type == RW_LOCK_WAIT_EX) {
+		event = ((rw_lock_t*) cell->wait_object)->wait_ex_event;
+#endif
+	} else {
+		event = ((rw_lock_t*) cell->wait_object)->event;
+	}
+
+		cell->waiting = TRUE;
 
 #ifdef UNIV_SYNC_DEBUG
 
@@ -464,7 +433,6 @@ sync_array_wait_event(
 	recursively sync_array routines, leading to trouble.
 	rw_lock_debug_mutex freezes the debug lists. */
 
-	sync_array_enter(arr);
 	rw_lock_debug_mutex_enter();
 
 	if (TRUE == sync_array_detect_deadlock(arr, cell, cell, 0)) {
@@ -474,16 +442,16 @@ sync_array_wait_event(
 	}
 
 	rw_lock_debug_mutex_exit();
-	sync_array_exit(arr);
 #endif
-	os_event_wait(event);
+	sync_array_exit(arr);
+
+	os_event_wait_low(event, cell->signal_count);
 
 	sync_array_free_cell(arr, index);
 }
 
 /**********************************************************************
-Reports info of a wait array cell. Note: sync_array_print_long_waits()
-calls this without mutex protection. */
+Reports info of a wait array cell. */
 static
 void
 sync_array_cell_print(
@@ -503,17 +471,8 @@ sync_array_cell_print(
 		(ulong) os_thread_pf(cell->thread), cell->file,
 		(ulong) cell->line,
 		difftime(time(NULL), cell->reservation_time));
-	fprintf(file, "Wait array cell state %lu\n", (ulong)cell->state);
-
-	/* If the memory area pointed to by old_wait_mutex /
-	old_wait_rw_lock has been freed, this can crash. */
 
-	if (cell->state != SC_RESERVED) {
-		/* If cell has this state, then even if we are holding the sync
-		array mutex, the wait object may get freed meanwhile. Do not
-		print the wait object then. */
-
-	} else if (type == SYNC_MUTEX) {
+	if (type == SYNC_MUTEX) {
 		/* We use old_wait_mutex in case the cell has already
 		been freed meanwhile */
 		mutex = cell->old_wait_mutex;
@@ -531,7 +490,11 @@ sync_array_cell_print(
 #endif /* UNIV_SYNC_DEBUG */
 			(ulong) mutex->waiters);
 
-	} else if (type == RW_LOCK_EX || type == RW_LOCK_SHARED) {
+	} else if (type == RW_LOCK_EX
+#ifdef __WIN__
+		   || type == RW_LOCK_WAIT_EX
+#endif
+		   || type == RW_LOCK_SHARED) {
 
 		fputs(type == RW_LOCK_EX ? "X-lock on" : "S-lock on", file);
 
@@ -565,8 +528,8 @@ sync_array_cell_print(
 		ut_error;
 	}
 
-	if (cell->event_set) {
-		fputs("wait is ending\n", file);
+	if (!cell->waiting) {
+		fputs("wait has ended\n", file);
 	}
 }
 
@@ -589,7 +552,7 @@ sync_array_find_thread(
 
 		cell = sync_array_get_nth_cell(arr, i);
 
-		if ((cell->state == SC_RESERVED)
+		if (cell->wait_object != NULL
 		    && os_thread_eq(cell->thread, thread)) {
 
 			return(cell);	/* Found */
@@ -679,7 +642,7 @@ sync_array_detect_deadlock(
 
 	depth++;
 
-	if (cell->event_set || !cell->waiting) {
+	if (!cell->waiting) {
 
 		return(FALSE); /* No deadlock here */
 	}
@@ -704,10 +667,8 @@ sync_array_detect_deadlock(
 						       depth);
 			if (ret) {
 				fprintf(stderr,
-					"Mutex %p owned by thread %lu"
-					" file %s line %lu\n",
-					(void*) mutex,
-					(ulong) os_thread_pf(mutex->thread_id),
+			"Mutex %p owned by thread %lu file %s line %lu\n",
+					mutex, (ulong) os_thread_pf(mutex->thread_id),
 					mutex->file_name, (ulong) mutex->line);
 				sync_array_cell_print(stderr, cell);
 
@@ -717,7 +678,8 @@ sync_array_detect_deadlock(
 
 		return(FALSE); /* No deadlock */
 
-	} else if (cell->request_type == RW_LOCK_EX) {
+	} else if (cell->request_type == RW_LOCK_EX
+		   || cell->request_type == RW_LOCK_WAIT_EX) {
 
 		lock = cell->wait_object;
 
@@ -816,7 +778,8 @@ sync_arr_cell_can_wake_up(
 			return(TRUE);
 		}
 
-	} else if (cell->request_type == RW_LOCK_EX) {
+	} else if (cell->request_type == RW_LOCK_EX
+		   || cell->request_type == RW_LOCK_WAIT_EX) {
 
 		lock = cell->wait_object;
 
@@ -845,101 +808,47 @@ sync_arr_cell_can_wake_up(
 	return(FALSE);
 }
 
-/**************************************************************************
-Looks for the cells in the wait array which refer to the wait object
-specified, and sets their corresponding events to the signaled state. In this
-way releases the threads waiting for the object to contend for the object.
-It is possible that no such cell is found, in which case does nothing. */
+/**********************************************************************
+Frees the cell. NOTE! sync_array_wait_event frees the cell
+automatically! */
 
 void
-sync_array_signal_object(
-/*=====================*/
+sync_array_free_cell(
+/*=================*/
 	sync_array_t*	arr,	/* in: wait array */
-	void*		object)	/* in: wait object */
+	ulint		index)  /* in: index of the cell in array */
 {
 	sync_cell_t*	cell;
-	ulint		count;
-	ulint		i;
-	ulint		res_count;
-
-	/* We store the addresses of cells we need to signal and signal
-	them only after we have released the sync array's mutex (for
-	performance reasons). cell_count is the number of such cells, and
-	cell_ptr points to the first one. If there are less than
-	UT_ARR_SIZE(cells) of them, cell_ptr == &cells[0], otherwise
-	cell_ptr points to malloc'd memory that we must free. */
-
-	sync_cell_t*	cells[100];
-	sync_cell_t**	cell_ptr = &cells[0];
-	ulint		cell_count = 0;
-	ulint		cell_max_count = UT_ARR_SIZE(cells);
-
-	ut_a(100 == cell_max_count);
 
 	sync_array_enter(arr);
 
-	arr->sg_count++;
-
-	i = 0;
-	count = 0;
+	cell = sync_array_get_nth_cell(arr, index);
 
-	/* We need to store this to a local variable because it is modified
-	inside the loop */
-	res_count = arr->n_reserved;
+	ut_a(cell->wait_object != NULL);
 
-	while (count < res_count) {
+	cell->waiting = FALSE;
+	cell->wait_object =  NULL;
+	cell->signal_count = 0;
 
-		cell = sync_array_get_nth_cell(arr, i);
+	ut_a(arr->n_reserved > 0);
+	arr->n_reserved--;
 
-		if (cell->state == SC_RESERVED) {
+	sync_array_exit(arr);
+}
 
-			count++;
-			if (cell->wait_object == object) {
-				cell->state = SC_WAKING_UP;
-
-				ut_a(arr->n_reserved > 0);
-				arr->n_reserved--;
-
-				if (cell_count == cell_max_count) {
-					sync_cell_t** old_cell_ptr = cell_ptr;
-					size_t old_size, new_size;
-
-					old_size = cell_max_count
-						* sizeof(sync_cell_t*);
-					cell_max_count *= 2;
-					new_size = cell_max_count
-						* sizeof(sync_cell_t*);
-
-					cell_ptr = malloc(new_size);
-					ut_a(cell_ptr);
-					memcpy(cell_ptr, old_cell_ptr,
-					       old_size);
-
-					if (old_cell_ptr != &cells[0]) {
-						free(old_cell_ptr);
-					}
-				}
+/**************************************************************************
+Increments the signalled count. */
 
-				cell_ptr[cell_count] = cell;
-				cell_count++;
-			}
-		}
+void
+sync_array_object_signalled(
+/*========================*/
+	sync_array_t*	arr)	/* in: wait array */
+{
+	sync_array_enter(arr);
 
-		i++;
-	}
+	arr->sg_count++;
 
 	sync_array_exit(arr);
-
-	for (i = 0; i < cell_count; i++) {
-		cell = cell_ptr[i];
-
-		cell->event_set = TRUE;
-		os_event_set(cell->event);
-	}
-
-	if (cell_ptr != &cells[0]) {
-		free(cell_ptr);
-	}
 }
 
 /**************************************************************************
@@ -959,33 +868,41 @@ sync_arr_wake_threads_if_sema_free(void)
 	sync_cell_t*	cell;
 	ulint		count;
 	ulint		i;
-	ulint		res_count;
 
 	sync_array_enter(arr);
 
 	i = 0;
 	count = 0;
 
-	/* We need to store this to a local variable because it is modified
-	inside the loop */
-
-	res_count = arr->n_reserved;
-
-	while (count < res_count) {
+	while (count < arr->n_reserved) {
 
 		cell = sync_array_get_nth_cell(arr, i);
 
-		if (cell->state == SC_RESERVED) {
+		if (cell->wait_object != NULL) {
 
 			count++;
 
 			if (sync_arr_cell_can_wake_up(cell)) {
-				cell->state = SC_WAKING_UP;
-				cell->event_set = TRUE;
-				os_event_set(cell->event);
 
-				ut_a(arr->n_reserved > 0);
-				arr->n_reserved--;
+				if (cell->request_type == SYNC_MUTEX) {
+					mutex_t*	mutex;
+
+					mutex = cell->wait_object;
+					os_event_set(mutex->event);
+#ifdef __WIN__
+				} else if (cell->request_type
+					   == RW_LOCK_WAIT_EX) {
+					rw_lock_t*	lock;
+
+					lock = cell->wait_object;
+					os_event_set(lock->wait_ex_event);
+#endif
+				} else {
+					rw_lock_t*	lock;
+
+					lock = cell->wait_object;
+					os_event_set(lock->event);
+				}
 			}
 		}
 
@@ -1015,7 +932,7 @@ sync_array_print_long_waits(void)
 
 		cell = sync_array_get_nth_cell(sync_primary_wait_array, i);
 
-		if ((cell->state != SC_FREE)
+		if (cell->wait_object != NULL && cell->waiting
 		    && difftime(time(NULL), cell->reservation_time) > 240) {
 			fputs("InnoDB: Warning: a long semaphore wait:\n",
 			      stderr);
@@ -1023,7 +940,7 @@ sync_array_print_long_waits(void)
 			noticed = TRUE;
 		}
 
-		if ((cell->state != SC_FREE)
+		if (cell->wait_object != NULL && cell->waiting
 		    && difftime(time(NULL), cell->reservation_time)
 		    > fatal_timeout) {
 			fatal = TRUE;
@@ -1072,20 +989,25 @@ sync_array_output_info(
 				mutex */
 {
 	sync_cell_t*	cell;
+	ulint		count;
 	ulint		i;
 
 	fprintf(file,
-		"OS WAIT ARRAY INFO: reservation count %ld,"
-		" signal count %ld\n",
-		(long) arr->res_count,
-		(long) arr->sg_count);
-	for (i = 0; i < arr->n_cells; i++) {
+		"OS WAIT ARRAY INFO: reservation count %ld, signal count %ld\n",
+						(long) arr->res_count, (long) arr->sg_count);
+	i = 0;
+	count = 0;
+
+	while (count < arr->n_reserved) {
 
 		cell = sync_array_get_nth_cell(arr, i);
 
-		if (cell->state != SC_FREE) {
+	if (cell->wait_object != NULL) {
+		count++;
 			sync_array_cell_print(file, cell);
 		}
+
+		i++;
 	}
 }
 
diff --git a/storage/innobase/sync/sync0rw.c b/storage/innobase/sync/sync0rw.c
index 8dbc69816e9..367f019ce55 100644
--- a/storage/innobase/sync/sync0rw.c
+++ b/storage/innobase/sync/sync0rw.c
@@ -151,6 +151,11 @@ rw_lock_create_func(
 	lock->last_x_file_name = "not yet reserved";
 	lock->last_s_line = 0;
 	lock->last_x_line = 0;
+	lock->event = os_event_create(NULL);
+
+#ifdef __WIN__
+	lock->wait_ex_event = os_event_create(NULL);
+#endif
 
 	mutex_enter(&rw_lock_list_mutex);
 
@@ -184,6 +189,11 @@ rw_lock_free(
 	mutex_free(rw_lock_get_mutex(lock));
 
 	mutex_enter(&rw_lock_list_mutex);
+	os_event_free(lock->event);
+
+#ifdef __WIN__
+	os_event_free(lock->wait_ex_event);
+#endif
 
 	if (UT_LIST_GET_PREV(list, lock)) {
 		ut_a(UT_LIST_GET_PREV(list, lock)->magic_n == RW_LOCK_MAGIC_N);
@@ -544,7 +554,15 @@ lock_loop:
 	rw_x_system_call_count++;
 
 	sync_array_reserve_cell(sync_primary_wait_array,
-				lock, RW_LOCK_EX,
+				lock,
+#ifdef __WIN__
+				/* On windows RW_LOCK_WAIT_EX signifies
+				that this thread should wait on the
+				special wait_ex_event. */
+				(state == RW_LOCK_WAIT_EX)
+				 ? RW_LOCK_WAIT_EX :
+#endif
+				RW_LOCK_EX,
 				file_name, line,
 				&index);
 
diff --git a/storage/innobase/sync/sync0sync.c b/storage/innobase/sync/sync0sync.c
index 39872f72204..944fd2a97fc 100644
--- a/storage/innobase/sync/sync0sync.c
+++ b/storage/innobase/sync/sync0sync.c
@@ -95,17 +95,47 @@ have happened that the thread which was holding the mutex has just released
 it and did not see the waiters byte set to 1, a case which would lead the
 other thread to an infinite wait.
 
-LEMMA 1: After a thread resets the event of the cell it reserves for waiting
-========
-for a mutex, some thread will eventually call sync_array_signal_object with
-the mutex as an argument. Thus no infinite wait is possible.
+LEMMA 1: After a thread resets the event of a mutex (or rw_lock), some
+=======
+thread will eventually call os_event_set() on that particular event.
+Thus no infinite wait is possible in this case.
 
 Proof:	After making the reservation the thread sets the waiters field in the
 mutex to 1. Then it checks that the mutex is still reserved by some thread,
 or it reserves the mutex for itself. In any case, some thread (which may be
 also some earlier thread, not necessarily the one currently holding the mutex)
 will set the waiters field to 0 in mutex_exit, and then call
-sync_array_signal_object with the mutex as an argument.
+os_event_set() with the mutex as an argument.
+Q.E.D.
+
+LEMMA 2: If an os_event_set() call is made after some thread has called
+=======
+the os_event_reset() and before it starts wait on that event, the call
+will not be lost to the second thread. This is true even if there is an
+intervening call to os_event_reset() by another thread.
+Thus no infinite wait is possible in this case.
+
+Proof (non-windows platforms): os_event_reset() returns a monotonically
+increasing value of signal_count. This value is increased at every
+call of os_event_set() If thread A has called os_event_reset() followed
+by thread B calling os_event_set() and then some other thread C calling
+os_event_reset(), the is_set flag of the event will be set to FALSE;
+but now if thread A calls os_event_wait_low() with the signal_count
+value returned from the earlier call of os_event_reset(), it will
+return immediately without waiting.
+Q.E.D.
+
+Proof (windows): If there is a writer thread which is forced to wait for
+the lock, it may be able to set the state of rw_lock to RW_LOCK_WAIT_EX
+The design of rw_lock ensures that there is one and only one thread
+that is able to change the state to RW_LOCK_WAIT_EX and this thread is
+guaranteed to acquire the lock after it is released by the current
+holders and before any other waiter gets the lock.
+On windows this thread waits on a separate event i.e.: wait_ex_event.
+Since only one thread can wait on this event there is no chance
+of this event getting reset before the writer starts wait on it.
+Therefore, this thread is guaranteed to catch the os_set_event()
+signalled unconditionally at the release of the lock.
 Q.E.D. */
 
 /* The number of system calls made in this module. Intended for performance
@@ -217,6 +247,7 @@ mutex_create_func(
 	os_fast_mutex_init(&(mutex->os_fast_mutex));
 	mutex->lock_word = 0;
 #endif
+	mutex->event = os_event_create(NULL);
 	mutex_set_waiters(mutex, 0);
 #ifdef UNIV_DEBUG
 	mutex->magic_n = MUTEX_MAGIC_N;
@@ -300,6 +331,8 @@ mutex_free(
 		mutex_exit(&mutex_list_mutex);
 	}
 
+	os_event_free(mutex->event);
+
 #if !defined(_WIN32) || !defined(UNIV_CAN_USE_X86_ASSEMBLER)
 	os_fast_mutex_free(&(mutex->os_fast_mutex));
 #endif
@@ -509,8 +542,7 @@ spin_loop:
 		if (mutex_test_and_set(mutex) == 0) {
 			/* Succeeded! Free the reserved wait cell */
 
-			sync_array_free_cell_protected(sync_primary_wait_array,
-						       index);
+			sync_array_free_cell(sync_primary_wait_array, index);
 
 			ut_d(mutex->thread_id = os_thread_get_curr_id());
 #ifdef UNIV_SYNC_DEBUG
@@ -591,8 +623,8 @@ mutex_signal_object(
 
 	/* The memory order of resetting the waiters field and
 	signaling the object is important. See LEMMA 1 above. */
-
-	sync_array_signal_object(sync_primary_wait_array, mutex);
+	os_event_set(mutex->event);
+	sync_array_object_signalled(sync_primary_wait_array);
 }
 
 #ifdef UNIV_SYNC_DEBUG
@@ -1130,6 +1162,7 @@ sync_thread_add_level(
 		break;
 	case SYNC_TREE_NODE:
 		ut_a(sync_thread_levels_contain(array, SYNC_INDEX_TREE)
+		     || sync_thread_levels_contain(array, SYNC_DICT_OPERATION)
 		     || sync_thread_levels_g(array, SYNC_TREE_NODE - 1));
 		break;
 	case SYNC_TREE_NODE_NEW:
diff --git a/storage/innobase/trx/trx0trx.c b/storage/innobase/trx/trx0trx.c
index a278ad51984..55b244abb0a 100644
--- a/storage/innobase/trx/trx0trx.c
+++ b/storage/innobase/trx/trx0trx.c
@@ -933,6 +933,7 @@ trx_commit_off_kernel(
 	trx->rseg = NULL;
 	trx->undo_no = ut_dulint_zero;
 	trx->last_sql_stat_start.least_undo_no = ut_dulint_zero;
+	trx->mysql_query_str = NULL;
 
 	ut_ad(UT_LIST_GET_LEN(trx->wait_thrs) == 0);
 	ut_ad(UT_LIST_GET_LEN(trx->trx_locks) == 0);
diff --git a/storage/myisam/CMakeLists.txt b/storage/myisam/CMakeLists.txt
index 9d91bf0560a..4436c8fa7c4 100755
--- a/storage/myisam/CMakeLists.txt
+++ b/storage/myisam/CMakeLists.txt
@@ -37,6 +37,7 @@ SET(MYISAM_SOURCES  ft_boolean_search.c ft_nlq_search.c ft_parser.c ft_static.c
 IF(NOT SOURCE_SUBLIBS)
 
   ADD_LIBRARY(myisam ${MYISAM_SOURCES})
+  ADD_DEPENDENCIES(myisam GenError)
 
   ADD_EXECUTABLE(myisam_ftdump myisam_ftdump.c)
   TARGET_LINK_LIBRARIES(myisam_ftdump myisam mysys debug dbug strings zlib wsock32)
diff --git a/storage/myisam/mi_check.c b/storage/myisam/mi_check.c
index 3cc82b832c9..6d84764450a 100644
--- a/storage/myisam/mi_check.c
+++ b/storage/myisam/mi_check.c
@@ -3363,7 +3363,7 @@ static int sort_get_next_record(MI_SORT_PARAM *sort_param)
 	}
 	if (b_type & BLOCK_DELETED)
 	{
-	  bool error=0;
+	  my_bool error=0;
 	  if (block_info.block_len+ (uint) (block_info.filepos-pos) <
 	      share->base.min_block_length)
 	  {
diff --git a/storage/myisam/mi_dynrec.c b/storage/myisam/mi_dynrec.c
index 9940cf62204..7e5f710c02c 100644
--- a/storage/myisam/mi_dynrec.c
+++ b/storage/myisam/mi_dynrec.c
@@ -430,7 +430,7 @@ static int _mi_find_writepos(MI_INFO *info,
   a big block.
 */
 
-static bool unlink_deleted_block(MI_INFO *info, MI_BLOCK_INFO *block_info)
+static my_bool unlink_deleted_block(MI_INFO *info, MI_BLOCK_INFO *block_info)
 {
   DBUG_ENTER("unlink_deleted_block");
   if (block_info->filepos == info->s->state.dellink)
diff --git a/storage/myisam/mi_search.c b/storage/myisam/mi_search.c
index 2195ac178dd..89fabfa46d0 100644
--- a/storage/myisam/mi_search.c
+++ b/storage/myisam/mi_search.c
@@ -1469,7 +1469,7 @@ _mi_calc_var_pack_key_length(MI_KEYDEF *keyinfo,uint nod_flag,uchar *next_key,
   uint key_length,ref_length,org_key_length=0,
        length_pack,new_key_length,diff_flag,pack_marker;
   uchar *start,*end,*key_end,*sort_order;
-  bool same_length;
+  my_bool same_length;
 
   length_pack=s_temp->ref_length=s_temp->n_ref_length=s_temp->n_length=0;
   same_length=0; keyseg=keyinfo->seg;
diff --git a/storage/myisam/mi_update.c b/storage/myisam/mi_update.c
index 956334b7806..2ac405dd785 100644
--- a/storage/myisam/mi_update.c
+++ b/storage/myisam/mi_update.c
@@ -24,7 +24,7 @@ int mi_update(register MI_INFO *info, const uchar *oldrec, uchar *newrec)
   reg3 my_off_t pos;
   uint i;
   uchar old_key[MI_MAX_KEY_BUFF],*new_key;
-  bool auto_key_changed=0;
+  my_bool auto_key_changed=0;
   ulonglong changed;
   MYISAM_SHARE *share=info->s;
   ha_checksum old_checksum;
diff --git a/storage/myisam/mi_write.c b/storage/myisam/mi_write.c
index 70ba7a4588a..89782fbae1a 100644
--- a/storage/myisam/mi_write.c
+++ b/storage/myisam/mi_write.c
@@ -102,9 +102,9 @@ int mi_write(MI_INFO *info, uchar *record)
   {
     if (mi_is_key_active(share->state.key_map, i))
     {
-      bool local_lock_tree= (lock_tree &&
-			     !(info->bulk_insert &&
-			       is_tree_inited(&info->bulk_insert[i])));
+      my_bool local_lock_tree= (lock_tree &&
+                                !(info->bulk_insert &&
+                                  is_tree_inited(&info->bulk_insert[i])));
       if (local_lock_tree)
       {
 	rw_wrlock(&share->key_root_lock[i]);
@@ -193,9 +193,9 @@ err:
     {
       if (mi_is_key_active(share->state.key_map, i))
       {
-	bool local_lock_tree= (lock_tree &&
-			       !(info->bulk_insert &&
-				 is_tree_inited(&info->bulk_insert[i])));
+	my_bool local_lock_tree= (lock_tree &&
+                                  !(info->bulk_insert &&
+                                    is_tree_inited(&info->bulk_insert[i])));
 	if (local_lock_tree)
 	  rw_wrlock(&share->key_root_lock[i]);
 	if (share->keyinfo[i].flag & HA_FULLTEXT)
diff --git a/storage/myisam/myisamdef.h b/storage/myisam/myisamdef.h
index 721d6b9f271..c1e1f39d77c 100644
--- a/storage/myisam/myisamdef.h
+++ b/storage/myisam/myisamdef.h
@@ -493,7 +493,7 @@ typedef struct st_mi_s_param
 	totlength,
 	part_of_prev_key,prev_length,pack_marker;
   uchar *key, *prev_key,*next_key_pos;
-  bool	store_not_null;
+  my_bool store_not_null;
 } MI_KEY_PARAM;
 
 	/* Prototypes for intern functions */
diff --git a/storage/myisam/myisamlog.c b/storage/myisam/myisamlog.c
index 6566a7a7a02..fafb5140a5e 100644
--- a/storage/myisam/myisamlog.c
+++ b/storage/myisam/myisamlog.c
@@ -35,7 +35,7 @@ struct file_info {
   char *name, *show_name;
   uchar *record;
   MI_INFO *isam;
-  bool closed,used;
+  my_bool closed, used;
   ulong accessed;
 };
 
@@ -67,7 +67,7 @@ static int close_some_file(TREE *tree);
 static int reopen_closed_file(TREE *tree,struct file_info *file_info);
 static int find_record_with_key(struct file_info *file_info,uchar *record);
 static void printf_log(const char *str,...);
-static bool cmp_filename(struct file_info *file_info,char * name);
+static my_bool cmp_filename(struct file_info *file_info,char * name);
 
 static uint verbose=0,update=0,test_info=0,max_files=0,re_open_count=0,
   recover=0,prefix_remove=0,opt_processes=0;
@@ -839,7 +839,7 @@ static void printf_log(const char *format,...)
 }
 
 
-static bool cmp_filename(struct file_info *file_info, char * name)
+static my_bool cmp_filename(struct file_info *file_info, char * name)
 {
   if (!file_info)
     return 1;
diff --git a/storage/myisam/myisampack.c b/storage/myisam/myisampack.c
index 7233ebbff80..b2ad124bbc0 100644
--- a/storage/myisam/myisampack.c
+++ b/storage/myisam/myisampack.c
@@ -123,7 +123,7 @@ typedef struct st_isam_mrg {
 extern int main(int argc,char * *argv);
 static void get_options(int *argc,char ***argv);
 static MI_INFO *open_isam_file(char *name,int mode);
-static bool open_isam_files(PACK_MRG_INFO *mrg,char **names,uint count);
+static my_bool open_isam_files(PACK_MRG_INFO *mrg,char **names,uint count);
 static int compress(PACK_MRG_INFO *file,char *join_name);
 static HUFF_COUNTS *init_huff_count(MI_INFO *info,my_off_t records);
 static void free_counts_and_tree_and_queue(HUFF_TREE *huff_trees,
@@ -436,7 +436,7 @@ static MI_INFO *open_isam_file(char *name,int mode)
 }
 
 
-static bool open_isam_files(PACK_MRG_INFO *mrg,char **names,uint count)
+static my_bool open_isam_files(PACK_MRG_INFO *mrg, char **names, uint count)
 {
   uint i,j;
   mrg->count=0;
diff --git a/storage/myisammrg/CMakeLists.txt b/storage/myisammrg/CMakeLists.txt
index 848f2dfea43..403ca6c2776 100755
--- a/storage/myisammrg/CMakeLists.txt
+++ b/storage/myisammrg/CMakeLists.txt
@@ -30,4 +30,5 @@ SET(MYISAMMRG_SOURCES  myrg_close.c myrg_create.c myrg_delete.c myrg_extra.c myr
 
 IF(NOT SOURCE_SUBLIBS)
   ADD_LIBRARY(myisammrg ${MYISAMMRG_SOURCES})
+  ADD_DEPENDENCIES(myisammrg GenError)
 ENDIF(NOT SOURCE_SUBLIBS)
diff --git a/storage/ndb/include/kernel/ndb_limits.h b/storage/ndb/include/kernel/ndb_limits.h
index 682f904d99a..9a9521e82ef 100644
--- a/storage/ndb/include/kernel/ndb_limits.h
+++ b/storage/ndb/include/kernel/ndb_limits.h
@@ -28,6 +28,17 @@
 #define MAX_NODES     64
 #define UNDEF_NODEGROUP 0xFFFF
 
+/**************************************************************************
+ * IT SHOULD BE (MAX_NDB_NODES - 1).
+ * WHEN MAX_NDB_NODE IS CHANGED, IT SHOULD BE CHANGED ALSO
+ **************************************************************************/
+#define MAX_DATA_NODE_ID 48
+/**************************************************************************
+ * IT SHOULD BE (MAX_NODES - 1).
+ * WHEN MAX_NODES IS CHANGED, IT SHOULD BE CHANGED ALSO
+ **************************************************************************/
+#define MAX_NODES_ID 63
+
 /**
  * MAX_API_NODES = MAX_NODES - No of NDB Nodes in use
  */
diff --git a/storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp b/storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp
index 6140e78cc5a..bbd3e818681 100644
--- a/storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp
+++ b/storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp
@@ -163,7 +163,8 @@ struct CreateFileImplRef {
     InvalidFileMetadata = 1510,
     OutOfMemory = 1511,
     FileReadError = 1512,
-    FilegroupNotOnline = 1513
+    FilegroupNotOnline = 1513,
+    FileSizeTooLarge = 1515
   };
   
   Uint32 senderData;
diff --git a/storage/ndb/include/mgmapi/ndb_logevent.h b/storage/ndb/include/mgmapi/ndb_logevent.h
index 6640b4a46e8..70691f6fd28 100644
--- a/storage/ndb/include/mgmapi/ndb_logevent.h
+++ b/storage/ndb/include/mgmapi/ndb_logevent.h
@@ -553,7 +553,13 @@ extern "C" {
       /** Log event specific data for for corresponding NDB_LE_ log event */
       struct {
 	int      gth;
-	unsigned page_size_kb;
+        /* union is for compatibility backward.
+         * page_size_kb member variable should be removed in the future
+        */
+        union {
+	  unsigned page_size_kb;
+          unsigned page_size_bytes;
+        };
 	unsigned pages_used;
 	unsigned pages_total;
 	unsigned block;
diff --git a/storage/ndb/include/ndbapi/Ndb.hpp b/storage/ndb/include/ndbapi/Ndb.hpp
index dca19c2ead0..f31638db283 100644
--- a/storage/ndb/include/ndbapi/Ndb.hpp
+++ b/storage/ndb/include/ndbapi/Ndb.hpp
@@ -1515,37 +1515,40 @@ public:
     TupleIdRange() {}
     Uint64 m_first_tuple_id;
     Uint64 m_last_tuple_id;
+    Uint64 m_highest_seen;
     void reset() {
       m_first_tuple_id = ~(Uint64)0;
       m_last_tuple_id = ~(Uint64)0;
+      m_highest_seen = 0;
     };
   };
 
   int initAutoIncrement();
 
   int getAutoIncrementValue(const char* aTableName, 
-                            Uint64 & tupleId, Uint32 cacheSize,
+                            Uint64 & autoValue, Uint32 cacheSize,
                             Uint64 step = 1, Uint64 start = 1);
   int getAutoIncrementValue(const NdbDictionary::Table * aTable, 
-                            Uint64 & tupleId, Uint32 cacheSize,
+                            Uint64 & autoValue, Uint32 cacheSize,
                             Uint64 step = 1, Uint64 start = 1);
   int getAutoIncrementValue(const NdbDictionary::Table * aTable, 
-                            TupleIdRange & range, Uint64 & tupleId,
+                            TupleIdRange & range, Uint64 & autoValue,
                             Uint32 cacheSize,
                             Uint64 step = 1, Uint64 start = 1);
   int readAutoIncrementValue(const char* aTableName,
-                             Uint64 & tupleId);
+                             Uint64 & autoValue);
   int readAutoIncrementValue(const NdbDictionary::Table * aTable,
-                             Uint64 & tupleId);
+                             Uint64 & autoValue);
   int readAutoIncrementValue(const NdbDictionary::Table * aTable,
-                             TupleIdRange & range, Uint64 & tupleId);
+                             TupleIdRange & range, Uint64 & autoValue);
   int setAutoIncrementValue(const char* aTableName,
-                            Uint64 tupleId, bool increase);
+                            Uint64 autoValue, bool modify);
   int setAutoIncrementValue(const NdbDictionary::Table * aTable,
-                            Uint64 tupleId, bool increase);
+                            Uint64 autoValue, bool modify);
   int setAutoIncrementValue(const NdbDictionary::Table * aTable,
-                            TupleIdRange & range, Uint64 tupleId,
-                            bool increase);
+                            TupleIdRange & range, Uint64 autoValue,
+                            bool modify);
+  bool checkUpdateAutoIncrementValue(TupleIdRange & range, Uint64 autoValue);
 private:
   int getTupleIdFromNdb(const NdbTableImpl* table,
                         TupleIdRange & range, Uint64 & tupleId,
@@ -1553,7 +1556,9 @@ private:
   int readTupleIdFromNdb(const NdbTableImpl* table,
                          TupleIdRange & range, Uint64 & tupleId);
   int setTupleIdInNdb(const NdbTableImpl* table,
-                      TupleIdRange & range, Uint64 tupleId, bool increase);
+                      TupleIdRange & range, Uint64 tupleId, bool modify);
+  int checkTupleIdInNdb(TupleIdRange & range,
+                        Uint64 tupleId);
   int opTupleIdOnNdb(const NdbTableImpl* table,
                      TupleIdRange & range, Uint64 & opValue, Uint32 op);
 public:
diff --git a/storage/ndb/include/ndbapi/ndbapi_limits.h b/storage/ndb/include/ndbapi/ndbapi_limits.h
index e283913d059..98551866edc 100644
--- a/storage/ndb/include/ndbapi/ndbapi_limits.h
+++ b/storage/ndb/include/ndbapi/ndbapi_limits.h
@@ -26,6 +26,7 @@
 #define NDB_MAX_TUPLE_SIZE (NDB_MAX_TUPLE_SIZE_IN_WORDS*4)
 #define NDB_MAX_ACTIVE_EVENTS 100
 
-#define NDB_MAX_SCANFILTER_SIZE_IN_WORDS 50000
+/* TUP ZATTR_BUFFER_SIZE 16384 (minus 1) minus place for getValue()s */
+#define NDB_MAX_SCANFILTER_SIZE_IN_WORDS (16384 - 1 - 1024)
 
 #endif
diff --git a/storage/ndb/include/util/Bitmask.hpp b/storage/ndb/include/util/Bitmask.hpp
index de47b79d393..d1663b7c76d 100644
--- a/storage/ndb/include/util/Bitmask.hpp
+++ b/storage/ndb/include/util/Bitmask.hpp
@@ -139,6 +139,7 @@ public:
 
   /**
    * setField - Set bitfield at given position and length (max 32 bits)
+   * Note : length == 0 not supported.
    */
   static void setField(unsigned size, Uint32 data[],
       unsigned pos, unsigned len, Uint32 val);
@@ -146,6 +147,7 @@ public:
 
   /**
    * getField - Get bitfield at given position and length
+   * Note : length == 0 not supported.
    */
   static void getField(unsigned size, const Uint32 data[],
 		       unsigned pos, unsigned len, Uint32 dst[]);
@@ -918,7 +920,10 @@ BitmaskImpl::getField(unsigned size, const Uint32 src[],
 		      unsigned pos, unsigned len, Uint32 dst[])
 {
   assert(pos + len <= (size << 5));
-  
+  assert (len != 0);
+  if (len == 0)
+    return;
+
   src += (pos >> 5);
   Uint32 offset = pos & 31;
   * dst = (* src >> offset) & (len >= 32 ? ~0 : (1 << len) - 1);
@@ -937,6 +942,9 @@ BitmaskImpl::setField(unsigned size, Uint32 dst[],
 		      unsigned pos, unsigned len, const Uint32 src[])
 {
   assert(pos + len <= (size << 5));
+  assert(len != 0);
+  if (len == 0)
+    return;
 
   dst += (pos >> 5);
   Uint32 offset = pos & 31;
diff --git a/storage/ndb/src/common/debugger/SignalLoggerManager.cpp b/storage/ndb/src/common/debugger/SignalLoggerManager.cpp
index 471bea64f64..48cacb6bc1a 100644
--- a/storage/ndb/src/common/debugger/SignalLoggerManager.cpp
+++ b/storage/ndb/src/common/debugger/SignalLoggerManager.cpp
@@ -129,7 +129,7 @@ SignalLoggerManager::log(LogMode logMode, const char * params)
   const int count = getParameter(blocks, "BLOCK=", params);
   
   int cnt = 0;
-  if((count == 1 && blocks[0] == "ALL") ||
+  if((count == 1 && !strcmp(blocks[0], "ALL")) ||
      count == 0){
     
     for (int number = 0; number < NO_OF_BLOCKS; ++number){
diff --git a/storage/ndb/src/common/debugger/signaldata/ScanTab.cpp b/storage/ndb/src/common/debugger/signaldata/ScanTab.cpp
index 9668c9d0605..4f6b69ebfba 100644
--- a/storage/ndb/src/common/debugger/signaldata/ScanTab.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/ScanTab.cpp
@@ -70,7 +70,7 @@ printSCANTABCONF(FILE * output, const Uint32 * theData, Uint32 len, Uint16 recei
 	  sig->transId1, sig->transId2);
 
   fprintf(output, " requestInfo: Eod: %d OpCount: %d\n", 
-	  (requestInfo & ScanTabConf::EndOfData == ScanTabConf::EndOfData),
+	  (requestInfo & ScanTabConf::EndOfData) == ScanTabConf::EndOfData,
 	  (requestInfo & (~ScanTabConf::EndOfData)));
   size_t op_count= requestInfo & (~ScanTabConf::EndOfData);
   if(op_count){
diff --git a/storage/ndb/src/common/transporter/TCP_Transporter.cpp b/storage/ndb/src/common/transporter/TCP_Transporter.cpp
index 298e43710b0..8b386483bff 100644
--- a/storage/ndb/src/common/transporter/TCP_Transporter.cpp
+++ b/storage/ndb/src/common/transporter/TCP_Transporter.cpp
@@ -317,22 +317,32 @@ TCP_Transporter::doSend() {
 
   // Empty the SendBuffers
   
-  const char * const sendPtr = m_sendBuffer.sendPtr;
-  const Uint32 sizeToSend    = m_sendBuffer.sendDataSize;
-  if (sizeToSend > 0){
+  bool sent_any = true;
+  while (m_sendBuffer.dataSize > 0)
+  {
+    const char * const sendPtr = m_sendBuffer.sendPtr;
+    const Uint32 sizeToSend    = m_sendBuffer.sendDataSize;
     const int nBytesSent = send(theSocket, sendPtr, sizeToSend, 0);
     
-    if (nBytesSent > 0) {
+    if (nBytesSent > 0) 
+    {
+      sent_any = true;
       m_sendBuffer.bytesSent(nBytesSent);
       
       sendCount ++;
       sendSize  += nBytesSent;
-      if(sendCount == reportFreq){
+      if(sendCount == reportFreq)
+      {
 	reportSendLen(get_callback_obj(), remoteNodeId, sendCount, sendSize);
 	sendCount = 0;
 	sendSize  = 0;
       }
-    } else {
+    } 
+    else 
+    {
+      if (nBytesSent < 0 && InetErrno == EAGAIN && sent_any)
+        break;
+
       // Send failed
 #if defined DEBUG_TRANSPORTER
       g_eventLogger.error("Send Failure(disconnect==%d) to node = %d nBytesSent = %d "
diff --git a/storage/ndb/src/common/util/Bitmask.cpp b/storage/ndb/src/common/util/Bitmask.cpp
index edfe2363039..22919fe585a 100644
--- a/storage/ndb/src/common/util/Bitmask.cpp
+++ b/storage/ndb/src/common/util/Bitmask.cpp
@@ -20,28 +20,59 @@ void
 BitmaskImpl::getFieldImpl(const Uint32 src[],
 			  unsigned shiftL, unsigned len, Uint32 dst[])
 {
+  /* Copy whole words of src to dst, shifting src left
+   * by shiftL.  Undefined bits of the last written dst word
+   * should be zeroed.
+   */
   assert(shiftL < 32);
 
   unsigned shiftR = 32 - shiftL;
   unsigned undefined = shiftL ? ~0 : 0;
 
+  /* Merge first word with previously set bits if there's a shift */
   * dst = shiftL ? * dst : 0;
-  
-  while(len >= 32)
-  {
-    * dst++ |= (* src) << shiftL;
-    * dst = ((* src++) >> shiftR) & undefined;
-    len -= 32;
-  }
-  
-  if(len < shiftR)
+
+  /* Treat the zero-shift case separately to avoid
+   * trampling or reading past the end of src
+   */
+  if (shiftL == 0)
   {
-    * dst |= ((* src) & ((1 << len) - 1)) << shiftL;
+    while(len >= 32)
+    {
+      * dst++ = * src++;
+      len -=32;
+    }
+
+    if (len != 0)
+    {
+      /* Last word has some bits set */
+      Uint32 mask= ((1 << len) -1); // 0000111
+      * dst = (* src) & mask;
+    }
   }
-  else
+  else // shiftL !=0, need to build each word from two words shifted
   {
-    * dst++ |= ((* src) << shiftL);
-    * dst = ((* src) >> shiftR) & ((1 << (len - shiftR)) - 1) & undefined;
+    while(len >= 32)
+    {
+      * dst++ |= (* src) << shiftL;
+      * dst = ((* src++) >> shiftR) & undefined;
+      len -= 32;
+    }
+
+    /* Have space for shiftR more bits in the current dst word
+     * is that enough?
+     */
+    if(len <= shiftR)
+    {
+      /* Fit the remaining bits in the current dst word */
+      * dst |= ((* src) & ((1 << len) - 1)) << shiftL;
+    }
+    else
+    {
+      /* Need to write to two dst words */
+      * dst++ |= ((* src) << shiftL);
+      * dst = ((* src) >> shiftR) & ((1 << (len - shiftR)) - 1) & undefined;
+    }
   }
 }
 
@@ -64,370 +95,23 @@ BitmaskImpl::setFieldImpl(Uint32 dst[],
     len -= 32;
   }
   
+  /* Copy last bits */
   Uint32 mask = ((1 << len) -1);
   * dst = (* dst & ~mask);
-  if(len < shiftR)
+  if(len <= shiftR)
   {
+    /* Remaining bits fit in current word */
     * dst |= ((* src++) >> shiftL) & mask;
   }
   else
   {
+    /* Remaining bits update 2 words */
     * dst |= ((* src++) >> shiftL);
     * dst |= ((* src) & ((1 << (len - shiftR)) - 1)) << shiftR ;
   }
 }
-#ifdef __TEST_BITMASK__
-
-static
-void print(const Uint32 src[], Uint32 len, Uint32 pos = 0)
-{
-  printf("b'");
-  for(unsigned i = 0; i<len; i++)
-  {
-    if(BitmaskImpl::get((pos + len + 31) >> 5, src, i+pos))
-      printf("1");
-    else
-      printf("0");
-    if((i & 31) == 31)
-      printf(" ");
-  }
-}
-
-
-#define DEBUG 0
-#include <Vector.hpp>
-static void do_test(int bitmask_size);
-
-int
-main(int argc, char** argv)
-{
-  int loops = argc > 1 ? atoi(argv[1]) : 1000;
-  int max_size = argc > 2 ? atoi(argv[2]) : 1000;
-
-  
-  for(int i = 0; i<loops; i++)
-    do_test(1 + (rand() % max_size));
-}
-
-struct Alloc
-{
-  Uint32 pos;
-  Uint32 size;
-  Vector<Uint32> data;
-};
-
-static void require(bool b)
-{
-  if(!b) abort();
-}
-
-static
-bool cmp(const Uint32 b1[], const Uint32 b2[], Uint32 len)
-{
-  Uint32 sz32 = (len + 31) >> 5;
-  for(int i = 0; i<len; i++)
-  {
-    if(BitmaskImpl::get(sz32, b1, i) ^ BitmaskImpl::get(sz32, b2, i))
-      return false;
-  }
-  return true;
-}
-
-
-static int val_pos = 0;
-static int val[] = { 384, 241, 32, 
-		     1,1,1,1, 0,0,0,0, 1,1,1,1, 0,0,0,0,
-		     241 };
-
-static int lrand()
-{
-#if 0
-  return val[val_pos++];
-#else
-  return rand();
-#endif
-}
-
-static
-void rand(Uint32 dst[], Uint32 len)
-{
-  for(int i = 0; i<len; i++)
-    BitmaskImpl::set((len + 31) >> 5, dst, i, (lrand() % 1000) > 500);
-}
-
-static
-void simple(int pos, int size)
-{
-  ndbout_c("simple pos: %d size: %d", pos, size);
-  Vector<Uint32> _mask;
-  Vector<Uint32> _src;
-  Vector<Uint32> _dst;
-  Uint32 sz32 = (size + pos + 32) >> 5;
-  const Uint32 sz = 4 * sz32;
-  
-  Uint32 zero = 0;
-  _mask.fill(sz32+1, zero);
-  _src.fill(sz32+1, zero);
-  _dst.fill(sz32+1, zero);
-
-  Uint32 * src = _src.getBase();
-  Uint32 * dst = _dst.getBase();
-  Uint32 * mask = _mask.getBase();
-
-  memset(src, 0x0, sz);
-  memset(dst, 0x0, sz);
-  memset(mask, 0xFF, sz);
-  rand(src, size);
-  BitmaskImpl::setField(sz32, mask, pos, size, src);
-  BitmaskImpl::getField(sz32, mask, pos, size, dst);
-  printf("src: "); print(src, size+31); printf("\n");
-  printf("msk: "); print(mask, (sz32 << 5) + 31); printf("\n");
-  printf("dst: "); print(dst, size+31); printf("\n");
-  require(cmp(src, dst, size+31));
-};
-
-static
-void simple2(int size, int loops)
-{
-  ndbout_c("simple2 %d - ", size);
-  Vector<Uint32> _mask;
-  Vector<Uint32> _src;
-  Vector<Uint32> _dst;
-
-  Uint32 sz32 = (size + 32) >> 5;
-  Uint32 sz = sz32 << 2;
-  
-  Uint32 zero = 0;
-  _mask.fill(sz32+1, zero);
-  _src.fill(sz32+1, zero);
-  _dst.fill(sz32+1, zero);
-
-  Uint32 * src = _src.getBase();
-  Uint32 * dst = _dst.getBase();
-  Uint32 * mask = _mask.getBase();
-
-  Vector<Uint32> save;
-  for(int i = 0; i<loops; i++)
-  {
-    memset(mask, 0xFF, sz);
-    memset(dst, 0xFF, sz);
-    int len;
-    int pos = 0;
-    while(pos+1 < size)
-    {
-      memset(src, 0xFF, sz);
-      while(!(len = rand() % (size - pos)));
-      BitmaskImpl::setField(sz32, mask, pos, len, src);
-      if(memcmp(dst, mask, sz))
-      {
-	ndbout_c("pos: %d len: %d", pos, len);
-	print(mask, size);
-	abort();
-      }
-      printf("[ %d %d ]", pos, len);
-      save.push_back(pos);
-      save.push_back(len);
-      pos += len;
-    }
-
-    for(int j = 0; j<save.size(); )
-    {
-      pos = save[j++];
-      len = save[j++];
-      memset(src, 0xFF, sz);
-      BitmaskImpl::getField(sz32, mask, pos, len, src);
-      if(memcmp(dst, src, sz))
-      {
-	ndbout_c("pos: %d len: %d", pos, len);
-	printf("src: "); print(src, size); printf("\n");
-	printf("dst: "); print(dst, size); printf("\n");
-	printf("msk: "); print(mask, size); printf("\n");
-	abort();
-      }
-    }
-    ndbout_c("");
-  }
-}
-
-static void 
-do_test(int bitmask_size)
-{
-#if 1
-  simple(rand() % 33, (rand() % 63)+1);
-//#else
-  Vector<Alloc> alloc_list;
-  bitmask_size = (bitmask_size + 31) & ~31;
-  Uint32 sz32 = (bitmask_size >> 5);
-  Vector<Uint32> alloc_mask;
-  Vector<Uint32> test_mask;
-  
-  ndbout_c("Testing bitmask of size %d", bitmask_size);
-  Uint32 zero = 0;
-  alloc_mask.fill(sz32, zero);
-  test_mask.fill(sz32, zero);
-  
-  for(int i = 0; i<5000; i++)
-  {
-    Vector<Uint32> tmp;
-    tmp.fill(sz32, zero);
-
-    int pos = lrand() % (bitmask_size - 1);
-    int free = 0;
-    if(BitmaskImpl::get(sz32, alloc_mask.getBase(), pos))
-    {
-      // Bit was allocated
-      // 1) Look up allocation
-      // 2) Check data
-      // 3) free it
-      size_t j;
-      int min, max;
-      for(j = 0; j<alloc_list.size(); j++)
-      {
-	min = alloc_list[j].pos;
-	max = min + alloc_list[j].size;
-	if(pos >= min && pos < max)
-	{
-	  break;
-	}
-      }
-      require(pos >= min && pos < max);
-      BitmaskImpl::getField(sz32, test_mask.getBase(), min, max-min, 
-			    tmp.getBase());
-      if(DEBUG)
-      {
-	printf("freeing [ %d %d ]", min, max);
-	printf("- mask: ");
-	print(tmp.getBase(), max - min);
-	
-	printf(" save: ");
-	size_t k;
-	Alloc& a = alloc_list[j];
-	for(k = 0; k<a.data.size(); k++)
-	  printf("%.8x ", a.data[k]);
-	printf("\n");
-      }
-      int bytes = (max - min + 7) >> 3;
-      if(!cmp(tmp.getBase(), alloc_list[j].data.getBase(), max - min))
-      {
-	abort();
-      }
-      while(min < max)
-	BitmaskImpl::clear(sz32, alloc_mask.getBase(), min++);
-      alloc_list.erase(j);
-    }
-    else
-    {
-      Vector<Uint32> tmp;
-      tmp.fill(sz32, zero);
-      
-      // Bit was free
-      // 1) Check how much space is avaiable
-      // 2) Create new allocation of lrandom size
-      // 3) Fill data with lrandom data
-      // 4) Update alloc mask
-      while(pos+free < bitmask_size && 
-	    !BitmaskImpl::get(sz32, alloc_mask.getBase(), pos+free))
-	free++;
-
-      Uint32 sz = 
-	(free <= 64 && ((lrand() % 100) > 80)) ? free : (lrand() % free); 
-      sz = sz ? sz : 1;
-      sz = pos + sz == bitmask_size ? sz - 1 : sz;
-      Alloc a;
-      a.pos = pos;
-      a.size = sz;
-      a.data.fill(((sz+31)>> 5)-1, zero);
-      if(DEBUG)
-	printf("pos %d -> alloc [ %d %d ]", pos, pos, pos+sz);
-      for(size_t j = 0; j<sz; j++)
-      {
-	BitmaskImpl::set(sz32, alloc_mask.getBase(), pos+j);
-	if((lrand() % 1000) > 500)
-	  BitmaskImpl::set((sz + 31) >> 5, a.data.getBase(), j);
-      }
-      if(DEBUG)
-      {
-	printf("- mask: ");
-	print(a.data.getBase(), sz);
-	printf("\n");
-      }
-      BitmaskImpl::setField(sz32, test_mask.getBase(), pos, sz, 
-			    a.data.getBase());
-      alloc_list.push_back(a);
-    }
-  }
-
-  for(Uint32 i = 0; i<1000; i++)
-  {
-    Uint32 sz32 = 10+rand() % 100;
-    Uint32 zero = 0;
-    Vector<Uint32> map;
-    map.fill(sz32, zero);
-    
-    Uint32 sz = 32 * sz32;
-    Uint32 start = (rand() % sz);
-    Uint32 stop = start + ((rand() % (sz - start)) & 0xFFFFFFFF);
-
-    Vector<Uint32> check;
-    check.fill(sz32, zero);
-    
-    for(Uint32 j = 0; j<sz; j++)
-    {
-      bool expect = (j >= start && j<stop);
-      if(expect)
-	BitmaskImpl::set(sz32, check.getBase(), j);
-    }
-    
-    BitmaskImpl::set(sz32, map.getBase(), start, stop);
-    if (!BitmaskImpl::equal(sz32, map.getBase(), check.getBase()))
-    {
-      ndbout_c(" FAIL sz: %d [ %d %d ]", sz, start, stop);
-      printf("check: ");
-      for(Uint32 j = 0; j<sz32; j++)
-	printf("%.8x ", check[j]);
-      printf("\n");
-      
-      printf("map  : ");
-      for(Uint32 j = 0; j<sz32; j++)
-	printf("%.8x ", map[j]);
-      printf("\n");
-      abort();
-    }
-
-    map.clear();
-    check.clear();
-
-    Uint32 one = ~(Uint32)0;
-    map.fill(sz32, one);
-    check.fill(sz32, one);
-
-    for(Uint32 j = 0; j<sz; j++)
-    {
-      bool expect = (j >= start && j<stop);
-      if(expect)
-	BitmaskImpl::clear(sz32, check.getBase(), j);
-    }
-
-    BitmaskImpl::clear(sz32, map.getBase(), start, stop);    
-    if (!BitmaskImpl::equal(sz32, map.getBase(), check.getBase()))
-    {
-      ndbout_c(" FAIL sz: %d [ %d %d ]", sz, start, stop);
-      printf("check: ");
-      for(Uint32 j = 0; j<sz32; j++)
-	printf("%.8x ", check[j]);
-      printf("\n");
-      
-      printf("map  : ");
-      for(Uint32 j = 0; j<sz32; j++)
-	printf("%.8x ", map[j]);
-      printf("\n");
-      abort();
-    }
-  }
-#endif
-}
-
-template class Vector<Alloc>;
-template class Vector<Uint32>;
 
-#endif
+/* Bitmask testcase code moved from here to
+ * storage/ndb/test/ndbapi/testBitfield.cpp
+ * to get coverage from automated testing
+ */
diff --git a/storage/ndb/src/common/util/NdbOut.cpp b/storage/ndb/src/common/util/NdbOut.cpp
index 7ca7c91e266..61de2be7572 100644
--- a/storage/ndb/src/common/util/NdbOut.cpp
+++ b/storage/ndb/src/common/util/NdbOut.cpp
@@ -29,7 +29,7 @@ static const char * fms[] = {
   "%d", "0x%08x",      // Int32
   "%u", "0x%08x",      // Uint32
   "%lld", "0x%016llx", // Int64
-  "%llu", "0x%016llx"  // Uint64
+  "%llu", "0x%016llx", // Uint64
   "%llu", "0x%016llx"  // UintPtr
 };
 
diff --git a/storage/ndb/src/common/util/OutputStream.cpp b/storage/ndb/src/common/util/OutputStream.cpp
index 0943e47e33f..cd619380e5a 100644
--- a/storage/ndb/src/common/util/OutputStream.cpp
+++ b/storage/ndb/src/common/util/OutputStream.cpp
@@ -62,7 +62,7 @@ SocketOutputStream::print(const char * fmt, ...){
 
   if(ret >= 0)
     m_timeout_remain-=time;
-  if(errno==ETIMEDOUT || m_timeout_remain<=0)
+  if((ret < 0 && errno==ETIMEDOUT) || m_timeout_remain<=0)
   {
     m_timedout= true;
     ret= -1;
@@ -84,7 +84,7 @@ SocketOutputStream::println(const char * fmt, ...){
 
   if(ret >= 0)
     m_timeout_remain-=time;
-  if (errno==ETIMEDOUT || m_timeout_remain<=0)
+  if ((ret < 0 && errno==ETIMEDOUT) || m_timeout_remain<=0)
   {
     m_timedout= true;
     ret= -1;
diff --git a/storage/ndb/src/kernel/blocks/ERROR_codes.txt b/storage/ndb/src/kernel/blocks/ERROR_codes.txt
index 72791cb0ebc..150400b9deb 100644
--- a/storage/ndb/src/kernel/blocks/ERROR_codes.txt
+++ b/storage/ndb/src/kernel/blocks/ERROR_codes.txt
@@ -3,15 +3,18 @@ Next NDBCNTR 1002
 Next NDBFS 2000
 Next DBACC 3002
 Next DBTUP 4029
-Next DBLQH 5047
+Next DBLQH 5050
 Next DBDICT 6008
 Next DBDIH 7195
-Next DBTC 8054
+Next DBTC 8058
 Next CMVMI 9000
 Next BACKUP 10038
 Next DBUTIL 11002
 Next DBTUX 12008
 Next SUMA 13034
+Next SUMA 13036
+Next LGMAN 15001
+Next TSMAN 16001
 
 TESTING NODE FAILURE, ARBITRATION
 ---------------------------------
@@ -260,6 +263,9 @@ Delay execution of ABORTCONF signal 2 seconds to generate time-out.
 
 8053: Crash in timeOutFoundLab, state CS_WAIT_COMMIT_CONF
 
+5048: Crash in execCOMMIT
+5049: SET_ERROR_INSERT_VALUE(5048)
+
 ERROR CODES FOR TESTING TIME-OUT HANDLING IN DBTC
 -------------------------------------------------
 
@@ -316,6 +322,8 @@ ABORT OF TCKEYREQ
 
 8038 : Simulate API disconnect just after SCAN_TAB_REQ
 
+8057 : Send only 1 COMMIT per timeslice
+
 8052 : Simulate failure of TransactionBufferMemory allocation for OI lookup
 
 8051 : Simulate failure of allocation for saveINDXKEYINFO
@@ -547,3 +555,11 @@ NDBCNTR:
 
 1000: Crash insertion on SystemError::CopyFragRef
 1001: Delay sending NODE_FAILREP (to own node), until error is cleared
+
+LGMAN:
+-----
+15000: Fail to create log file
+
+TSMAN:
+-----
+16000: Fail to create data file
diff --git a/storage/ndb/src/kernel/blocks/backup/Backup.cpp b/storage/ndb/src/kernel/blocks/backup/Backup.cpp
index 45501bf50d5..5cc486ff83b 100644
--- a/storage/ndb/src/kernel/blocks/backup/Backup.cpp
+++ b/storage/ndb/src/kernel/blocks/backup/Backup.cpp
@@ -326,16 +326,18 @@ Backup::execCONTINUEB(Signal* signal)
     ptr.p->files.getPtr(filePtr, ptr.p->ctlFilePtr);
     FsBuffer & buf = filePtr.p->operation.dataBuffer;
     
-    if(buf.getFreeSize() + buf.getMinRead() < buf.getUsableSize()) {
+    if(buf.getFreeSize() < buf.getMaxWrite()) {
       jam();
       TablePtr tabPtr LINT_SET_PTR;
       c_tablePool.getPtr(tabPtr, Tdata2);
       
-      DEBUG_OUT("Backup - Buffer full - " << buf.getFreeSize()
-		<< " + " << buf.getMinRead()
-		<< " < " << buf.getUsableSize()
-		<< " - tableId = " << tabPtr.p->tableId);
-
+      DEBUG_OUT("Backup - Buffer full - " 
+                << buf.getFreeSize()
+		<< " < " << buf.getMaxWrite()
+                << " (sz: " << buf.getUsableSize()
+                << " getMinRead: " << buf.getMinRead()
+		<< ") - tableId = " << tabPtr.p->tableId);
+      
       signal->theData[0] = BackupContinueB::BUFFER_FULL_META;
       signal->theData[1] = Tdata1;
       signal->theData[2] = Tdata2;
@@ -967,6 +969,7 @@ Backup::checkNodeFail(Signal* signal,
       ref->backupPtr = ptr.i;
       ref->backupId = ptr.p->backupId;
       ref->errorCode = AbortBackupOrd::BackupFailureDueToNodeFail;
+      ref->nodeId = getOwnNodeId();
       gsn= GSN_STOP_BACKUP_REF;
       len= StopBackupRef::SignalLength;
       pos= &ref->nodeId - signal->getDataPtr();
@@ -2081,6 +2084,15 @@ Backup::sendDropTrig(Signal* signal, BackupRecordPtr ptr)
     /**
      * Insert footers
      */
+    //if backup error, we needn't insert footers
+    if(ptr.p->checkError())
+    {
+      jam();
+      closeFiles(signal, ptr);
+      ptr.p->errorCode = 0;
+      return;
+    }
+
     {
       BackupFilePtr filePtr LINT_SET_PTR;
       ptr.p->files.getPtr(filePtr, ptr.p->logFilePtr);
@@ -4187,6 +4199,37 @@ Backup::checkFile(Signal* signal, BackupFilePtr filePtr)
 #if 0
   ndbout << "Ptr to data = " << hex << tmp << endl;
 #endif
+  BackupRecordPtr ptr LINT_SET_PTR;
+  c_backupPool.getPtr(ptr, filePtr.p->backupPtr);
+
+  if (ERROR_INSERTED(10036))
+  {
+    jam();
+    filePtr.p->m_flags &= ~(Uint32)BackupFile::BF_FILE_THREAD;
+    filePtr.p->errorCode = 2810;
+    ptr.p->setErrorCode(2810);
+
+    if(ptr.p->m_gsn == GSN_STOP_BACKUP_REQ)
+    {
+      jam();
+      closeFile(signal, ptr, filePtr);
+    }
+    return;
+  }
+
+  if(filePtr.p->errorCode != 0)
+  {
+    jam();
+    ptr.p->setErrorCode(filePtr.p->errorCode);
+
+    if(ptr.p->m_gsn == GSN_STOP_BACKUP_REQ)
+    {
+      jam();
+      closeFile(signal, ptr, filePtr);
+    }
+    return;
+  }
+
   if (!ready_to_write(ready, sz, eof, filePtr.p))
   {
     jam();
@@ -4218,8 +4261,6 @@ Backup::checkFile(Signal* signal, BackupFilePtr filePtr)
   ndbrequire(flags & BackupFile::BF_OPEN);
   ndbrequire(flags & BackupFile::BF_FILE_THREAD);
   
-  BackupRecordPtr ptr LINT_SET_PTR;
-  c_backupPool.getPtr(ptr, filePtr.p->backupPtr);
   closeFile(signal, ptr, filePtr);
 }
 
@@ -4582,6 +4623,22 @@ Backup::closeFilesDone(Signal* signal, BackupRecordPtr ptr)
   
   jam();
 
+  //error when do insert footer or close file
+  if(ptr.p->checkError())
+  {
+    StopBackupRef * ref = (StopBackupRef*)signal->getDataPtr();
+    ref->backupPtr = ptr.i;
+    ref->backupId = ptr.p->backupId;
+    ref->errorCode = ptr.p->errorCode;
+    ref->nodeId = getOwnNodeId();
+    sendSignal(ptr.p->masterRef, GSN_STOP_BACKUP_REF, signal,
+             StopBackupConf::SignalLength, JBB);
+
+    ptr.p->m_gsn = GSN_STOP_BACKUP_REF;
+    ptr.p->slaveState.setState(CLEANING);
+    return;
+  }
+
   StopBackupConf* conf = (StopBackupConf*)signal->getDataPtrSend();
   conf->backupId = ptr.p->backupId;
   conf->backupPtr = ptr.i;
diff --git a/storage/ndb/src/kernel/blocks/backup/Backup.hpp b/storage/ndb/src/kernel/blocks/backup/Backup.hpp
index 3fd9b2967fd..ad6e3b8fadc 100644
--- a/storage/ndb/src/kernel/blocks/backup/Backup.hpp
+++ b/storage/ndb/src/kernel/blocks/backup/Backup.hpp
@@ -557,8 +557,8 @@ public:
   NDB_TICKS m_reset_disk_speed_time;
   static const int  DISK_SPEED_CHECK_DELAY = 100;
   
-  STATIC_CONST(NO_OF_PAGES_META_FILE =
-               (MAX_WORDS_META_FILE + BACKUP_WORDS_PER_PAGE - 1) /
+  STATIC_CONST(NO_OF_PAGES_META_FILE = 
+	       (2*MAX_WORDS_META_FILE + BACKUP_WORDS_PER_PAGE - 1) / 
 	       BACKUP_WORDS_PER_PAGE);
 
   /**
diff --git a/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp b/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
index 63d22bd0a37..1805d6ef4f8 100644
--- a/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
+++ b/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
@@ -3210,7 +3210,6 @@ Dbacc::readTablePk(Uint32 localkey1, Uint32 eh, Ptr<Operationrec> opPtr)
     {
       dump_lock_queue(opPtr);
       ndbrequire(opPtr.p->nextParallelQue == RNIL);
-      ndbrequire(opPtr.p->nextSerialQue == RNIL);
       ndbrequire(opPtr.p->m_op_bits & Operationrec::OP_ELEMENT_DISAPPEARED);
       ndbrequire(opPtr.p->m_op_bits & Operationrec::OP_COMMIT_DELETE_CHECK);
       ndbrequire((opPtr.p->m_op_bits & Operationrec::OP_STATE_MASK) == Operationrec::OP_STATE_RUNNING);
diff --git a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
index 7ced078144a..a61a5bc035c 100644
--- a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
+++ b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
@@ -4086,9 +4086,7 @@ Dbdict::execALTER_TABLE_REQ(Signal* signal)
   bool ok = false;
   switch(tabState){
   case TableRecord::NOT_DEFINED:
-  case TableRecord::REORG_TABLE_PREPARED:
   case TableRecord::DEFINING:
-  case TableRecord::CHECKED:
     jam();
     alterTableRef(signal, req, AlterTableRef::NoSuchTable);
     return;
@@ -4339,9 +4337,7 @@ Dbdict::execALTER_TAB_REQ(Signal * signal)
     bool ok = false;
     switch(tabState){
     case TableRecord::NOT_DEFINED:
-    case TableRecord::REORG_TABLE_PREPARED:
     case TableRecord::DEFINING:
-    case TableRecord::CHECKED:
       jam();
       alterTabRef(signal, req, AlterTableRef::NoSuchTable);
       return;
@@ -6690,9 +6686,7 @@ Dbdict::execDROP_TABLE_REQ(Signal* signal){
   bool ok = false;
   switch(tabState){
   case TableRecord::NOT_DEFINED:
-  case TableRecord::REORG_TABLE_PREPARED:
   case TableRecord::DEFINING:
-  case TableRecord::CHECKED:
     jam();
     dropTableRef(signal, req, DropTableRef::NoSuchTable);
     return;
@@ -7718,7 +7712,6 @@ Dbdict::execLIST_TABLES_REQ(Signal* signal)
       if(DictTabInfo::isTable(type)){
 	switch (tablePtr.p->tabState) {
 	case TableRecord::DEFINING:
-	case TableRecord::CHECKED:
 	  conf->setTableState(pos, DictTabInfo::StateBuilding);
 	  break;
 	case TableRecord::PREPARE_DROPPING:
diff --git a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
index 3fff330d699..1189b23c14d 100644
--- a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
+++ b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
@@ -320,9 +320,7 @@ public:
 
     enum TabState {
       NOT_DEFINED = 0,
-      REORG_TABLE_PREPARED = 1,
       DEFINING = 2,
-      CHECKED = 3,
       DEFINED = 4,
       PREPARE_DROPPING = 5,
       DROPPING = 6,
diff --git a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
index bbacb300089..e2b1058242d 100644
--- a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
@@ -8464,6 +8464,12 @@ void Dbdih::execDIHNDBTAMPER(Signal* signal)
     } else if (tuserpointer < 15000) {
       jam();
       tuserblockref = DBDICT_REF;
+    } else if (tuserpointer < 16000) {
+      jam();
+      tuserblockref = LGMAN_REF;
+    } else if (tuserpointer < 17000) {
+      jam();
+      tuserblockref = TSMAN_REF;
     } else if (tuserpointer < 30000) {
       /*--------------------------------------------------------------------*/
       // Ignore errors in the 20000-range.
diff --git a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
index 83d38595c1f..bc8adf6fd32 100644
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
@@ -5959,6 +5959,12 @@ void Dblqh::execCOMMIT(Signal* signal)
 
     TcConnectionrec * const regTcPtr = tcConnectptr.p;
     TRACE_OP(regTcPtr, "COMMIT");
+
+    CRASH_INSERTION(5048);
+    if (ERROR_INSERTED(5049))
+    {
+      SET_ERROR_INSERT_VALUE(5048);
+    }
     
     commitReqLab(signal, gci);
     return;
diff --git a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
index e584883e3b6..043df5d5038 100644
--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
@@ -4495,7 +4495,7 @@ void Dbtc::commit020Lab(Signal* signal)
 
     if (localTcConnectptr.i != RNIL) {
       Tcount = Tcount + 1;
-      if (Tcount < 16) {
+      if (Tcount < 16 && !ERROR_INSERTED(8057)) {
         ptrCheckGuard(localTcConnectptr,
                       TtcConnectFilesize, localTcConnectRecord);
         jam();
@@ -4514,6 +4514,9 @@ void Dbtc::commit020Lab(Signal* signal)
       }//if
     } else {
       jam();
+      if (ERROR_INSERTED(8057))
+        CLEAR_ERROR_INSERT_VALUE;
+
       regApiPtr->apiConnectstate = CS_COMMIT_SENT;
       return;
     }//if
diff --git a/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp b/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
index 45d124b8d7d..decb47e9758 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
@@ -251,6 +251,7 @@ inline const Uint32* ALIGN_WORD(const void* ptr)
 #define ZUNSUPPORTED_BRANCH 892
 
 #define ZSTORED_SEIZE_ATTRINBUFREC_ERROR 873 // Part of Scan
+#define ZSTORED_TOO_MUCH_ATTRINFO_ERROR 874
 
 #define ZREAD_ONLY_CONSTRAINT_VIOLATION 893
 #define ZVAR_SIZED_NOT_SUPPORTED 894
@@ -1330,6 +1331,11 @@ typedef Ptr<HostBuffer> HostBufferPtr;
   struct Tuple_header
   {
     union {
+      /**
+       * List of prepared operations for this tuple.
+       * Points to most recent/last operation, ie. to walk the list must follow
+       * regOperPtr->prevActiveOp links.
+       */
       Uint32 m_operation_ptr_i;  // OperationPtrI
       Uint32 m_base_record_ref;  // For disk tuple, ref to MM tuple
     };
@@ -1558,7 +1564,7 @@ public:
   /*
    * TUX checks if tuple is visible to scan.
    */
-  bool tuxQueryTh(Uint32 fragPtrI, Uint32 tupAddr, Uint32 tupVersion, Uint32 transId1, Uint32 transId2, Uint32 savePointId);
+  bool tuxQueryTh(Uint32 fragPtrI, Uint32 pageId, Uint32 pageIndex, Uint32 tupVersion, Uint32 transId1, Uint32 transId2, bool dirty, Uint32 savepointId);
 
   int load_diskpage(Signal*, Uint32 opRec, Uint32 fragPtrI, 
 		    Uint32 local_key, Uint32 flags);
@@ -2202,17 +2208,20 @@ private:
   void
   checkImmediateTriggersAfterInsert(KeyReqStruct *req_struct,
                                     Operationrec* regOperPtr, 
-                                    Tablerec* tablePtr);
+                                    Tablerec* tablePtr,
+                                    bool disk);
 
   void
   checkImmediateTriggersAfterUpdate(KeyReqStruct *req_struct,
                                     Operationrec* regOperPtr, 
-                                    Tablerec* tablePtr);
+                                    Tablerec* tablePtr,
+                                    bool disk);
 
   void
   checkImmediateTriggersAfterDelete(KeyReqStruct *req_struct,
                                     Operationrec* regOperPtr, 
-                                    Tablerec* tablePtr);
+                                    Tablerec* tablePtr,
+                                    bool disk);
 
 #if 0
   void checkDeferredTriggers(Signal* signal, 
@@ -2226,7 +2235,8 @@ private:
 
   void fireImmediateTriggers(KeyReqStruct *req_struct,
                              DLList<TupTriggerData>& triggerList, 
-                             Operationrec* regOperPtr);
+                             Operationrec* regOperPtr,
+                             bool disk);
 
   void fireDeferredTriggers(KeyReqStruct *req_struct,
                             DLList<TupTriggerData>& triggerList,
@@ -2239,12 +2249,13 @@ private:
 
   void executeTriggers(KeyReqStruct *req_struct,
                        DLList<TupTriggerData>& triggerList,
-                       Operationrec* regOperPtr);
+                       Operationrec* regOperPtr,
+                       bool disk);
 
   void executeTrigger(KeyReqStruct *req_struct,
                       TupTriggerData* trigPtr, 
                       Operationrec* regOperPtr,
-                      bool disk = true);
+                      bool disk);
 
   bool readTriggerInfo(TupTriggerData* trigPtr,
                        Operationrec* regOperPtr,
@@ -2421,6 +2432,7 @@ private:
 
   void setNullBits(Uint32*, Tablerec* regTabPtr);
   bool checkNullAttributes(KeyReqStruct * const, Tablerec* const);
+  bool find_savepoint(OperationrecPtr& loopOpPtr, Uint32 savepointId);
   bool setup_read(KeyReqStruct* req_struct,
 		  Operationrec* regOperPtr,
 		  Fragrecord* regFragPtr,
@@ -2533,7 +2545,8 @@ private:
                      Operationrec* regOperPtr,
                      Uint32 lenAttrInfo);
   void storedSeizeAttrinbufrecErrorLab(Signal* signal,
-                                       Operationrec* regOperPtr);
+                                       Operationrec* regOperPtr,
+                                       Uint32 errorCode);
   bool storedProcedureAttrInfo(Signal* signal,
                                Operationrec* regOperPtr,
 			       const Uint32* data,
@@ -2874,7 +2887,7 @@ private:
   void verify_page_lists(Disk_alloc_info&) {}
 #endif
   
-  void fix_commit_order(OperationrecPtr);
+  void findFirstOp(OperationrecPtr&);
   void commit_operation(Signal*, Uint32, Tuple_header*, PagePtr,
 			Operationrec*, Fragrecord*, Tablerec*);
   
@@ -3036,4 +3049,21 @@ Dbtup::get_dd_ptr(PagePtr* pagePtr,
 NdbOut&
 operator<<(NdbOut&, const Dbtup::Tablerec&);
 
+inline
+bool Dbtup::find_savepoint(OperationrecPtr& loopOpPtr, Uint32 savepointId)
+{
+  while (true) {
+    if (savepointId > loopOpPtr.p->savepointId) {
+      jam();
+      return true;
+    }
+    loopOpPtr.i = loopOpPtr.p->prevActiveOp;
+    if (loopOpPtr.i == RNIL) {
+      break;
+    }
+    c_operation_pool.getPtr(loopOpPtr);
+  }
+  return false;
+}
+
 #endif
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp
index 59adfbfde89..93a160a4df3 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp
@@ -385,3 +385,38 @@ void Dbtup::send_TUPKEYREF(Signal* signal,
              TupKeyRef::SignalLength, JBB);
 }
 
+/**
+ * Unlink one operation from the m_operation_ptr_i list in the tuple.
+ */
+void Dbtup::removeActiveOpList(Operationrec*  const regOperPtr,
+                               Tuple_header *tuple_ptr)
+{
+  OperationrecPtr raoOperPtr;
+
+  if(!regOperPtr->m_copy_tuple_location.isNull())
+  {
+    jam();
+    c_undo_buffer.free_copy_tuple(&regOperPtr->m_copy_tuple_location);
+  }
+
+  if (regOperPtr->op_struct.in_active_list) {
+    regOperPtr->op_struct.in_active_list= false;
+    if (regOperPtr->nextActiveOp != RNIL) {
+      jam();
+      raoOperPtr.i= regOperPtr->nextActiveOp;
+      c_operation_pool.getPtr(raoOperPtr);
+      raoOperPtr.p->prevActiveOp= regOperPtr->prevActiveOp;
+    } else {
+      jam();
+      tuple_ptr->m_operation_ptr_i = regOperPtr->prevActiveOp;
+    }
+    if (regOperPtr->prevActiveOp != RNIL) {
+      jam();
+      raoOperPtr.i= regOperPtr->prevActiveOp;
+      c_operation_pool.getPtr(raoOperPtr);
+      raoOperPtr.p->nextActiveOp= regOperPtr->nextActiveOp;
+    }
+    regOperPtr->prevActiveOp= RNIL;
+    regOperPtr->nextActiveOp= RNIL;
+  }
+}
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
index 812f071e037..f56e772c8b9 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
@@ -97,39 +97,6 @@ void Dbtup::execTUP_WRITELOG_REQ(Signal* signal)
   } while (true);
 }
 
-void Dbtup::removeActiveOpList(Operationrec*  const regOperPtr,
-                               Tuple_header *tuple_ptr)
-{
-  OperationrecPtr raoOperPtr;
-
-  /**
-   * Release copy tuple
-   */
-  if(!regOperPtr->m_copy_tuple_location.isNull())
-    c_undo_buffer.free_copy_tuple(&regOperPtr->m_copy_tuple_location);
-  
-  if (regOperPtr->op_struct.in_active_list) {
-    regOperPtr->op_struct.in_active_list= false;
-    if (regOperPtr->nextActiveOp != RNIL) {
-      jam();
-      raoOperPtr.i= regOperPtr->nextActiveOp;
-      c_operation_pool.getPtr(raoOperPtr);
-      raoOperPtr.p->prevActiveOp= regOperPtr->prevActiveOp;
-    } else {
-      jam();
-      tuple_ptr->m_operation_ptr_i = regOperPtr->prevActiveOp;
-    }
-    if (regOperPtr->prevActiveOp != RNIL) {
-      jam();
-      raoOperPtr.i= regOperPtr->prevActiveOp;
-      c_operation_pool.getPtr(raoOperPtr);
-      raoOperPtr.p->nextActiveOp= regOperPtr->nextActiveOp;
-    }
-    regOperPtr->prevActiveOp= RNIL;
-    regOperPtr->nextActiveOp= RNIL;
-  }
-}
-
 /* ---------------------------------------------------------------- */
 /* INITIALIZATION OF ONE CONNECTION RECORD TO PREPARE FOR NEXT OP.  */
 /* ---------------------------------------------------------------- */
@@ -142,6 +109,7 @@ void Dbtup::initOpConnection(Operationrec* regOperPtr)
   regOperPtr->op_struct.m_disk_preallocated= 0;
   regOperPtr->op_struct.m_load_diskpage_on_commit= 0;
   regOperPtr->op_struct.m_wait_log_buffer= 0;
+  regOperPtr->op_struct.in_active_list = false;
   regOperPtr->m_undo_buffer_space= 0;
 }
 
@@ -170,6 +138,7 @@ Dbtup::dealloc_tuple(Signal* signal,
   Uint32 extra_bits = Tuple_header::FREED;
   if (bits & Tuple_header::DISK_PART)
   {
+    jam();
     Local_key disk;
     memcpy(&disk, ptr->get_disk_ref_ptr(regTabPtr), sizeof(disk));
     PagePtr tmpptr;
@@ -182,6 +151,7 @@ Dbtup::dealloc_tuple(Signal* signal,
   if (! (bits & (Tuple_header::LCP_SKIP | Tuple_header::ALLOC)) && 
       lcpScan_ptr_i != RNIL)
   {
+    jam();
     ScanOpPtr scanOp;
     c_scanOpPool.getPtr(scanOp, lcpScan_ptr_i);
     Local_key rowid = regOperPtr->m_tuple_location;
@@ -189,6 +159,7 @@ Dbtup::dealloc_tuple(Signal* signal,
     rowid.m_page_no = page->frag_page_id;
     if (rowid > scanpos)
     {
+      jam();
       extra_bits = Tuple_header::LCP_KEEP; // Note REMOVE FREE
       ptr->m_operation_ptr_i = lcp_keep_list;
       regFragPtr->m_lcp_keep_list = rowid.ref();
@@ -229,11 +200,13 @@ Dbtup::commit_operation(Signal* signal,
   Uint32 mm_vars= regTabPtr->m_attributes[MM].m_no_of_varsize;
   if(mm_vars == 0)
   {
+    jam();
     memcpy(tuple_ptr, copy, 4*fixsize);
     disk_ptr= (Tuple_header*)(((Uint32*)copy)+fixsize);
   }
   else
   {
+    jam();
     /**
      * Var_part_ref is only stored in *allocated* tuple
      * so memcpy from copy, will over write it...
@@ -258,6 +231,7 @@ Dbtup::commit_operation(Signal* signal,
     
     if(copy_bits & Tuple_header::MM_SHRINK)
     {
+      jam();
       vpagePtrP->shrink_entry(tmp.m_page_idx, (sz + 3) >> 2);
       update_free_page_list(regFragPtr, vpagePtr);
     } 
@@ -268,6 +242,7 @@ Dbtup::commit_operation(Signal* signal,
   if (regTabPtr->m_no_of_disk_attributes &&
       (copy_bits & Tuple_header::DISK_INLINE))
   {
+    jam();
     Local_key key;
     memcpy(&key, copy->get_disk_ref_ptr(regTabPtr), sizeof(Local_key));
     Uint32 logfile_group_id= regFragPtr->m_logfile_group_id;
@@ -278,22 +253,26 @@ Dbtup::commit_operation(Signal* signal,
     Uint32 sz, *dst;
     if(copy_bits & Tuple_header::DISK_ALLOC)
     {
+      jam();
       disk_page_alloc(signal, regTabPtr, regFragPtr, &key, diskPagePtr, gci);
     }
     
     if(regTabPtr->m_attributes[DD].m_no_of_varsize == 0)
     {
+      jam();
       sz= regTabPtr->m_offsets[DD].m_fix_header_size;
       dst= ((Fix_page*)diskPagePtr.p)->get_ptr(key.m_page_idx, sz);
     }
     else
     {
+      jam();
       dst= ((Var_page*)diskPagePtr.p)->get_ptr(key.m_page_idx);
       sz= ((Var_page*)diskPagePtr.p)->get_entry_len(key.m_page_idx);
     }
     
     if(! (copy_bits & Tuple_header::DISK_ALLOC))
     {
+      jam();
       disk_page_undo_update(diskPagePtr.p, 
 			    &key, dst, sz, gci, logfile_group_id);
     }
@@ -307,6 +286,7 @@ Dbtup::commit_operation(Signal* signal,
   
   if(lcpScan_ptr_i != RNIL && (bits & Tuple_header::ALLOC))
   {
+    jam();
     ScanOpPtr scanOp;
     c_scanOpPool.getPtr(scanOp, lcpScan_ptr_i);
     Local_key rowid = regOperPtr->m_tuple_location;
@@ -314,6 +294,7 @@ Dbtup::commit_operation(Signal* signal,
     rowid.m_page_no = pagePtr.p->frag_page_id;
     if(rowid > scanpos)
     {
+      jam();
        copy_bits |= Tuple_header::LCP_SKIP;
     }
   }
@@ -372,7 +353,10 @@ Dbtup::disk_page_commit_callback(Signal* signal,
   
   execTUP_COMMITREQ(signal);
   if(signal->theData[0] == 0)
+  {
+    jam();
     c_lqh->tupcommit_conf_callback(signal, regOperPtr.p->userpointer);
+  }
 }
 
 void
@@ -407,35 +391,21 @@ Dbtup::disk_page_log_buffer_callback(Signal* signal,
   c_lqh->tupcommit_conf_callback(signal, regOperPtr.p->userpointer);
 }
 
+/**
+ * Move to the first operation performed on this tuple
+ */
 void
-Dbtup::fix_commit_order(OperationrecPtr opPtr)
+Dbtup::findFirstOp(OperationrecPtr & firstPtr)
 {
-  ndbassert(!opPtr.p->is_first_operation());
-  OperationrecPtr firstPtr = opPtr;
+  jam();
+  printf("Detect out-of-order commit(%u) -> ", firstPtr.i);
+  ndbassert(!firstPtr.p->is_first_operation());
   while(firstPtr.p->prevActiveOp != RNIL)
   {
     firstPtr.i = firstPtr.p->prevActiveOp;
     c_operation_pool.getPtr(firstPtr);    
   }
-
-  ndbout_c("fix_commit_order (swapping %d and %d)",
-	   opPtr.i, firstPtr.i);
-  
-  /**
-   * Swap data between first and curr
-   */
-  Uint32 prev= opPtr.p->prevActiveOp;
-  Uint32 next= opPtr.p->nextActiveOp;
-  Uint32 seco= firstPtr.p->nextActiveOp;
-
-  Operationrec tmp = *opPtr.p;
-  * opPtr.p = * firstPtr.p;
-  * firstPtr.p = tmp;
-
-  c_operation_pool.getPtr(seco)->prevActiveOp = opPtr.i;
-  c_operation_pool.getPtr(prev)->nextActiveOp = firstPtr.i;
-  if(next != RNIL)
-    c_operation_pool.getPtr(next)->prevActiveOp = firstPtr.i;
+  ndbout_c("%u", firstPtr.i);
 }
 
 /* ----------------------------------------------------------------- */
@@ -448,22 +418,17 @@ void Dbtup::execTUP_COMMITREQ(Signal* signal)
   TablerecPtr regTabPtr;
   KeyReqStruct req_struct;
   TransState trans_state;
-  Uint32 no_of_fragrec, no_of_tablerec, hash_value, gci;
+  Uint32 no_of_fragrec, no_of_tablerec;
 
   TupCommitReq * const tupCommitReq= (TupCommitReq *)signal->getDataPtr();
 
   regOperPtr.i= tupCommitReq->opPtr;
+  Uint32 hash_value= tupCommitReq->hashValue;
+  Uint32 gci = tupCommitReq->gci;
+
   jamEntry();
 
   c_operation_pool.getPtr(regOperPtr);
-  if(!regOperPtr.p->is_first_operation())
-  {
-    /**
-     * Out of order commit   XXX check effect on triggers
-     */
-    fix_commit_order(regOperPtr);
-  }
-  ndbassert(regOperPtr.p->is_first_operation());
   
   regFragPtr.i= regOperPtr.p->fragmentPtr;
   trans_state= get_trans_state(regOperPtr.p);
@@ -486,8 +451,10 @@ void Dbtup::execTUP_COMMITREQ(Signal* signal)
 #ifdef VM_TRACE
   if (tupCommitReq->diskpage == RNIL)
   {
-    m_pgman.m_ptr.setNull();
-    req_struct.m_disk_page_ptr.setNull();
+    m_pgman.m_ptr.i = RNIL;
+    m_pgman.m_ptr.p = 0;
+    req_struct.m_disk_page_ptr.i = RNIL;
+    req_struct.m_disk_page_ptr.p = 0;
   }
 #endif
   
@@ -496,19 +463,63 @@ void Dbtup::execTUP_COMMITREQ(Signal* signal)
   PagePtr page;
   Tuple_header* tuple_ptr= (Tuple_header*)
     get_ptr(&page, &regOperPtr.p->m_tuple_location, regTabPtr.p);
+
+  /**
+   * NOTE: This has to be run before potential time-slice when
+   *       waiting for disk, as otherwise the "other-ops" in a multi-op
+   *       commit might run while we're waiting for disk
+   *
+   */
+  if (!regTabPtr.p->tuxCustomTriggers.isEmpty())
+  {
+    if(get_tuple_state(regOperPtr.p) == TUPLE_PREPARED)
+    {
+      jam();
+
+      OperationrecPtr loopPtr = regOperPtr;
+      if (unlikely(!regOperPtr.p->is_first_operation()))
+      {
+        findFirstOp(loopPtr);
+      }
+
+      /**
+       * Execute all tux triggers at first commit
+       *   since previous tuple is otherwise removed...
+       */
+      jam();
+      goto first;
+      while(loopPtr.i != RNIL)
+      {
+	c_operation_pool.getPtr(loopPtr);
+    first:
+	executeTuxCommitTriggers(signal,
+				 loopPtr.p,
+				 regFragPtr.p,
+				 regTabPtr.p);
+	set_tuple_state(loopPtr.p, TUPLE_TO_BE_COMMITTED);
+	loopPtr.i = loopPtr.p->nextActiveOp;
+      }
+    }
+  }
   
   bool get_page = false;
   if(regOperPtr.p->op_struct.m_load_diskpage_on_commit)
   {
+    jam();
     Page_cache_client::Request req;
-    ndbassert(regOperPtr.p->is_first_operation() && 
-	      regOperPtr.p->is_last_operation());
+
+    /**
+     * Only last op on tuple needs "real" commit,
+     *   hence only this one should have m_load_diskpage_on_commit
+     */
+    ndbassert(tuple_ptr->m_operation_ptr_i == regOperPtr.i);
 
     /**
      * Check for page
      */
     if(!regOperPtr.p->m_copy_tuple_location.isNull())
     {
+      jam();
       Tuple_header* tmp= (Tuple_header*)
 	c_undo_buffer.get_ptr(&regOperPtr.p->m_copy_tuple_location);
       
@@ -518,23 +529,26 @@ void Dbtup::execTUP_COMMITREQ(Signal* signal)
       if (unlikely(regOperPtr.p->op_struct.op_type == ZDELETE &&
 		   tmp->m_header_bits & Tuple_header::DISK_ALLOC))
       {
-	jam();
+        jam();
 	/**
 	 * Insert+Delete
 	 */
-	regOperPtr.p->op_struct.m_load_diskpage_on_commit = 0;
-	regOperPtr.p->op_struct.m_wait_log_buffer = 0;	
-	disk_page_abort_prealloc(signal, regFragPtr.p, 
+        regOperPtr.p->op_struct.m_load_diskpage_on_commit = 0;
+        regOperPtr.p->op_struct.m_wait_log_buffer = 0;	
+        disk_page_abort_prealloc(signal, regFragPtr.p, 
 				 &req.m_page, req.m_page.m_page_idx);
-	
-	c_lgman->free_log_space(regFragPtr.p->m_logfile_group_id, 
+        
+        c_lgman->free_log_space(regFragPtr.p->m_logfile_group_id, 
 				regOperPtr.p->m_undo_buffer_space);
-	if (0) ndbout_c("insert+delete");
 	goto skip_disk;
+        if (0) ndbout_c("insert+delete");
+        jamEntry();
+        goto skip_disk;
       }
     } 
     else
     {
+      jam();
       // initial delete
       ndbassert(regOperPtr.p->op_struct.op_type == ZDELETE);
       memcpy(&req.m_page, 
@@ -558,11 +572,14 @@ void Dbtup::execTUP_COMMITREQ(Signal* signal)
       /**
        * Timeslice
        */
+      jam();
       signal->theData[0] = 1;
       return;
     case -1:
       ndbrequire("NOT YET IMPLEMENTED" == 0);
       break;
+    default:
+      jam();
     }
     get_page = true;
 
@@ -579,8 +596,12 @@ void Dbtup::execTUP_COMMITREQ(Signal* signal)
   
   if(regOperPtr.p->op_struct.m_wait_log_buffer)
   {
-    ndbassert(regOperPtr.p->is_first_operation() && 
-	      regOperPtr.p->is_last_operation());
+    jam();
+    /**
+     * Only last op on tuple needs "real" commit,
+     *   hence only this one should have m_wait_log_buffer
+     */
+    ndbassert(tuple_ptr->m_operation_ptr_i == regOperPtr.i);
     
     Callback cb;
     cb.m_callbackData= regOperPtr.i;
@@ -590,51 +611,39 @@ void Dbtup::execTUP_COMMITREQ(Signal* signal)
     
     Logfile_client lgman(this, c_lgman, regFragPtr.p->m_logfile_group_id);
     int res= lgman.get_log_buffer(signal, sz, &cb);
+    jamEntry();
     switch(res){
     case 0:
+      jam();
       signal->theData[0] = 1;
       return;
     case -1:
       ndbrequire("NOT YET IMPLEMENTED" == 0);
       break;
+    default:
+      jam();
     }
   }
   
-  if(!tuple_ptr)
-  {
-    tuple_ptr = (Tuple_header*)
-      get_ptr(&page, &regOperPtr.p->m_tuple_location,regTabPtr.p);
-  }
+  assert(tuple_ptr);
 skip_disk:
   req_struct.m_tuple_ptr = tuple_ptr;
   
-  if(get_tuple_state(regOperPtr.p) == TUPLE_PREPARED)
-  {
-    /**
-     * Execute all tux triggers at first commit
-     *   since previous tuple is otherwise removed...
-     *   btw...is this a "good" solution??
-     *   
-     *   why can't we instead remove "own version" (when approriate ofcourse)
-     */
-    if (!regTabPtr.p->tuxCustomTriggers.isEmpty()) {
-      jam();
-      OperationrecPtr loopPtr= regOperPtr;
-      while(loopPtr.i != RNIL)
-      {
-	c_operation_pool.getPtr(loopPtr);
-	executeTuxCommitTriggers(signal,
-				 loopPtr.p,
-				 regFragPtr.p,
-				 regTabPtr.p);
-	set_tuple_state(loopPtr.p, TUPLE_TO_BE_COMMITTED);
-	loopPtr.i = loopPtr.p->nextActiveOp;
-      }
-    }
-  }
-  
-  if(regOperPtr.p->is_last_operation())
+  Uint32 nextOp = regOperPtr.p->nextActiveOp;
+  Uint32 prevOp = regOperPtr.p->prevActiveOp;
+  /**
+   * The trigger code (which is shared between detached/imediate)
+   *   check op-list to check were to read before values from
+   *   detached triggers should always read from original tuple value
+   *   from before transaction start, not from any intermediate update
+   *
+   * Setting the op-list has this effect
+   */
+  regOperPtr.p->nextActiveOp = RNIL;
+  regOperPtr.p->prevActiveOp = RNIL;
+  if(tuple_ptr->m_operation_ptr_i == regOperPtr.i)
   {
+    jam();
     /**
      * Perform "real" commit
      */
@@ -643,24 +652,38 @@ skip_disk:
     checkDetachedTriggers(&req_struct, regOperPtr.p, regTabPtr.p, 
                           disk != RNIL);
     
+    tuple_ptr->m_operation_ptr_i = RNIL;
+    
     if(regOperPtr.p->op_struct.op_type != ZDELETE)
     {
+      jam();
       commit_operation(signal, gci, tuple_ptr, page,
 		       regOperPtr.p, regFragPtr.p, regTabPtr.p); 
-      removeActiveOpList(regOperPtr.p, tuple_ptr);
     }
     else
     {
-      removeActiveOpList(regOperPtr.p, tuple_ptr);
+      jam();
       if (get_page)
 	ndbassert(tuple_ptr->m_header_bits & Tuple_header::DISK_PART);
       dealloc_tuple(signal, gci, page.p, tuple_ptr, 
 		    regOperPtr.p, regFragPtr.p, regTabPtr.p); 
     }
   } 
-  else
+
+  if (nextOp != RNIL)
   {
-    removeActiveOpList(regOperPtr.p, tuple_ptr);   
+    c_operation_pool.getPtr(nextOp)->prevActiveOp = prevOp;
+  }
+  
+  if (prevOp != RNIL)
+  {
+    c_operation_pool.getPtr(prevOp)->nextActiveOp = nextOp;
+  }
+  
+  if(!regOperPtr.p->m_copy_tuple_location.isNull())
+  {
+    jam();
+    c_undo_buffer.free_copy_tuple(&regOperPtr.p->m_copy_tuple_location);
   }
   
   initOpConnection(regOperPtr.p);
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp
index 8420e7f2bde..3a3c1155657 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp
@@ -282,6 +282,7 @@ Dbtup::update_extent_pos(Disk_alloc_info& alloc,
 void
 Dbtup::restart_setup_page(Disk_alloc_info& alloc, PagePtr pagePtr)
 {
+  jam();
   /**
    * Link to extent, clear uncommitted_used_space
    */
@@ -302,6 +303,7 @@ Dbtup::restart_setup_page(Disk_alloc_info& alloc, PagePtr pagePtr)
   ddassert(real_free >= estimated);
   if (real_free != estimated)
   {
+    jam();
     extentPtr.p->m_free_space += (real_free - estimated);
     update_extent_pos(alloc, extentPtr);
   }
@@ -374,6 +376,7 @@ Dbtup::disk_page_prealloc(Signal* signal,
       key->m_file_no= tmp.p->m_file_no;
       if (DBG_DISK)
 	ndbout << " found dirty page " << *key << endl;
+      jam();
       return 0; // Page in memory
     }
   }
@@ -395,6 +398,7 @@ Dbtup::disk_page_prealloc(Signal* signal,
       * key = req.p->m_key;
       if (DBG_DISK)
 	ndbout << " found transit page " << *key << endl;
+      jam();
       return 0;
     }
   }
@@ -404,6 +408,7 @@ Dbtup::disk_page_prealloc(Signal* signal,
    */
   if (!c_page_request_pool.seize(req))
   {
+    jam();
     err= 1;
     //XXX set error code
     ndbout_c("no free request");
@@ -468,6 +473,7 @@ Dbtup::disk_page_prealloc(Signal* signal,
 
       err = c_lgman->alloc_log_space(logfile_group_id,
 				     sizeof(Disk_undo::AllocExtent)>>2);
+      jamEntry();
       if(unlikely(err))
       {
 	return -err;
@@ -568,6 +574,7 @@ Dbtup::disk_page_prealloc(Signal* signal,
   Uint32 newPageBits= alloc.calc_page_free_bits(new_size);
   if (newPageBits != (Uint32)pageBits)
   {
+    jam();
     ddassert(ext.p->m_free_page_count[pageBits] > 0);
     ext.p->m_free_page_count[pageBits]--;
     ext.p->m_free_page_count[newPageBits]++;
@@ -595,6 +602,7 @@ Dbtup::disk_page_prealloc(Signal* signal,
   int flags= Page_cache_client::ALLOC_REQ;
   if (pageBits == 0)
   {
+    jam();
     //XXX empty page -> fast to map
     flags |= Page_cache_client::EMPTY_PAGE;
     preq.m_callback.m_callbackFunction = 
@@ -606,11 +614,13 @@ Dbtup::disk_page_prealloc(Signal* signal,
   switch(res)
   {
   case 0:
+    jam();
     break;
   case -1:
     ndbassert(false);
     break;
   default:
+    jam();
     execute(signal, preq.m_callback, res); // run callback
   }
   
@@ -622,6 +632,7 @@ Dbtup::disk_page_prealloc_dirty_page(Disk_alloc_info & alloc,
 				     PagePtr pagePtr, 
 				     Uint32 old_idx, Uint32 sz)
 {
+  jam();
   ddassert(pagePtr.p->list_index == old_idx);
 
   Uint32 free= pagePtr.p->free_space;
@@ -637,6 +648,7 @@ Dbtup::disk_page_prealloc_dirty_page(Disk_alloc_info & alloc,
 
   if (old_idx != new_idx)
   {
+    jam();
     LocalDLList<Page> old_list(*pool, alloc.m_dirty_pages[old_idx]);
     LocalDLList<Page> new_list(*pool, alloc.m_dirty_pages[new_idx]);
     old_list.remove(pagePtr);
@@ -660,6 +672,7 @@ Dbtup::disk_page_prealloc_transit_page(Disk_alloc_info& alloc,
 				       Ptr<Page_request> req, 
 				       Uint32 old_idx, Uint32 sz)
 {
+  jam();
   ddassert(req.p->m_list_index == old_idx);
 
   Uint32 free= req.p->m_estimated_free_space;
@@ -674,6 +687,7 @@ Dbtup::disk_page_prealloc_transit_page(Disk_alloc_info& alloc,
   
   if (old_idx != new_idx)
   {
+    jam();
     Page_request_list::Head *lists = alloc.m_page_requests;
     Local_page_request_list old_list(c_page_request_pool, lists[old_idx]);
     Local_page_request_list new_list(c_page_request_pool, lists[new_idx]);
@@ -698,6 +712,7 @@ void
 Dbtup::disk_page_prealloc_callback(Signal* signal, 
 				   Uint32 page_request, Uint32 page_id)
 {
+  jamEntry();
   //ndbout_c("disk_alloc_page_callback id: %d", page_id);
 
   Ptr<Page_request> req;
@@ -727,6 +742,7 @@ Dbtup::disk_page_prealloc_initial_callback(Signal*signal,
 					   Uint32 page_request, 
 					   Uint32 page_id)
 {
+  jamEntry();
   //ndbout_c("disk_alloc_page_callback_initial id: %d", page_id);  
   /**
    * 1) lookup page request
@@ -818,6 +834,7 @@ Dbtup::disk_page_prealloc_callback_common(Signal* signal,
 
   if (old_idx != new_idx || free != real_free)
   {
+    jam();
     Ptr<Extent_info> extentPtr;
     c_extent_pool.getPtr(extentPtr, ext);
 
@@ -825,6 +842,7 @@ Dbtup::disk_page_prealloc_callback_common(Signal* signal,
     
     if (old_idx != new_idx)
     {
+      jam();
       ddassert(extentPtr.p->m_free_page_count[old_idx]);
       extentPtr.p->m_free_page_count[old_idx]--;
       extentPtr.p->m_free_page_count[new_idx]++;
@@ -843,9 +861,11 @@ Dbtup::disk_page_prealloc_callback_common(Signal* signal,
 void
 Dbtup::disk_page_set_dirty(PagePtr pagePtr)
 {
+  jam();
   Uint32 idx = pagePtr.p->list_index;
   if ((idx & 0x8000) == 0)
   {
+    jam();
     /**
      * Already in dirty list
      */
@@ -874,7 +894,6 @@ Dbtup::disk_page_set_dirty(PagePtr pagePtr)
   Uint32 used = pagePtr.p->uncommitted_used_space;
   if (unlikely(pagePtr.p->m_restart_seq != globalData.m_restart_seq))
   {
-    jam();
     restart_setup_page(alloc, pagePtr);
     idx = alloc.calc_page_free_bits(free);
     used = 0;
@@ -918,6 +937,7 @@ Dbtup::disk_page_unmap_callback(Uint32 when,
 		type != File_formats::PT_Tup_varsize_page) ||
 	       f_undo_done == false))
   {
+    jam();
     return ;
   }
 
@@ -1014,6 +1034,7 @@ Dbtup::disk_page_unmap_callback(Uint32 when,
 	     << endl;
     }
     tsman.update_page_free_bits(&key, alloc.calc_page_free_bits(real_free));
+    jamEntry();
   }
 }
 
@@ -1022,6 +1043,7 @@ Dbtup::disk_page_alloc(Signal* signal,
 		       Tablerec* tabPtrP, Fragrecord* fragPtrP, 
 		       Local_key* key, PagePtr pagePtr, Uint32 gci)
 {
+  jam();
   Uint32 logfile_group_id= fragPtrP->m_logfile_group_id;
   Disk_alloc_info& alloc= fragPtrP->m_disk_alloc_info;
 
@@ -1050,6 +1072,7 @@ Dbtup::disk_page_free(Signal *signal,
 		      Tablerec *tabPtrP, Fragrecord * fragPtrP,
 		      Local_key* key, PagePtr pagePtr, Uint32 gci)
 {
+  jam();
   if (DBG_DISK)
     ndbout << " disk_page_free " << *key << endl;
   
@@ -1100,6 +1123,7 @@ Dbtup::disk_page_free(Signal *signal,
   
   if (old_idx != new_idx)
   {
+    jam();
     ddassert(extentPtr.p->m_free_page_count[old_idx]);
     extentPtr.p->m_free_page_count[old_idx]--;
     extentPtr.p->m_free_page_count[new_idx]++;
@@ -1126,6 +1150,7 @@ void
 Dbtup::disk_page_abort_prealloc(Signal *signal, Fragrecord* fragPtrP, 
 				Local_key* key, Uint32 sz)
 {
+  jam();
   Page_cache_client::Request req;
   req.m_callback.m_callbackData= sz;
   req.m_callback.m_callbackFunction = 
@@ -1139,9 +1164,13 @@ Dbtup::disk_page_abort_prealloc(Signal *signal, Fragrecord* fragPtrP,
   switch(res)
   {
   case 0:
+    jam();
+    break;
   case -1:
+    ndbrequire(false);
     break;
   default:
+    jam();
     Ptr<GlobalPage> gpage;
     m_global_page_pool.getPtr(gpage, (Uint32)res);
     PagePtr pagePtr;
@@ -1157,7 +1186,7 @@ Dbtup::disk_page_abort_prealloc_callback(Signal* signal,
 					 Uint32 sz, Uint32 page_id)
 {
   //ndbout_c("disk_alloc_page_callback id: %d", page_id);
-  
+  jamEntry();  
   Ptr<GlobalPage> gpage;
   m_global_page_pool.getPtr(gpage, page_id);
   
@@ -1200,12 +1229,14 @@ Dbtup::disk_page_abort_prealloc_callback_1(Signal* signal,
   c_extent_pool.getPtr(extentPtr, ext);
   if (old_idx != new_idx)
   {
+    jam();
     ddassert(extentPtr.p->m_free_page_count[old_idx]);
     extentPtr.p->m_free_page_count[old_idx]--;
     extentPtr.p->m_free_page_count[new_idx]++;
 
     if (old_idx == page_idx)
     {
+      jam();
       ArrayPool<Page> *pool= (ArrayPool<Page>*)&m_global_page_pool;
       LocalDLList<Page> old_list(*pool, alloc.m_dirty_pages[old_idx]);
       LocalDLList<Page> new_list(*pool, alloc.m_dirty_pages[new_idx]);
@@ -1215,6 +1246,7 @@ Dbtup::disk_page_abort_prealloc_callback_1(Signal* signal,
     }
     else
     {
+      jam();
       pagePtr.p->list_index = new_idx | 0x8000;
     }
   }
@@ -1272,6 +1304,7 @@ Uint64
 Dbtup::disk_page_undo_alloc(Page* page, const Local_key* key,
 			    Uint32 sz, Uint32 gci, Uint32 logfile_group_id)
 {
+  jam();
   Logfile_client lgman(this, c_lgman, logfile_group_id);
   
   Disk_undo::Alloc alloc;
@@ -1293,6 +1326,7 @@ Dbtup::disk_page_undo_update(Page* page, const Local_key* key,
 			     const Uint32* src, Uint32 sz,
 			     Uint32 gci, Uint32 logfile_group_id)
 {
+  jam();
   Logfile_client lgman(this, c_lgman, logfile_group_id);
 
   Disk_undo::Update update;
@@ -1323,6 +1357,7 @@ Dbtup::disk_page_undo_free(Page* page, const Local_key* key,
 			   const Uint32* src, Uint32 sz,
 			   Uint32 gci, Uint32 logfile_group_id)
 {
+  jam();
   Logfile_client lgman(this, c_lgman, logfile_group_id);
 
   Disk_undo::Free free;
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
index a642d704eb9..8c096681b58 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
@@ -75,9 +75,17 @@ void Dbtup::copyAttrinfo(Operationrec * regOperPtr,
     jam();
     ndbrequire(copyAttrBufPtr.i < RnoOfAttrBufrec);
     ptrAss(copyAttrBufPtr, attrbufrec);
-    RbufLen= copyAttrBufPtr.p->attrbuf[ZBUF_DATA_LEN];
-    Rnext= copyAttrBufPtr.p->attrbuf[ZBUF_NEXT];
-    Rfirst= cfirstfreeAttrbufrec;
+    RbufLen = copyAttrBufPtr.p->attrbuf[ZBUF_DATA_LEN];
+    Rnext = copyAttrBufPtr.p->attrbuf[ZBUF_NEXT];
+    Rfirst = cfirstfreeAttrbufrec;
+    /*
+     * ATTRINFO comes from 2 mutually exclusive places:
+     * 1) TUPKEYREQ (also interpreted part)
+     * 2) STORED_PROCREQ before scan start
+     * Assert here that both have a check for overflow.
+     * The "<" instead of "<=" is intentional.
+     */
+    ndbrequire(RinBufIndex + RbufLen < ZATTR_BUFFER_SIZE);
     MEMCOPY_NO_WORDS(&inBuffer[RinBufIndex],
                      &copyAttrBufPtr.p->attrbuf[0],
                      RbufLen);
@@ -221,7 +229,7 @@ Dbtup::calculateChecksum(Tuple_header* tuple_ptr,
   // includes tupVersion
   //printf("%p - ", tuple_ptr);
   
-  for (i= 0; i < rec_size-2; i++) {
+  for (i= 0; i < rec_size-Tuple_header::HeaderSize; i++) {
     checksum ^= tuple_header[i];
     //printf("%.8x ", tuple_header[i]);
   }
@@ -358,21 +366,7 @@ Dbtup::setup_read(KeyReqStruct *req_struct,
       dirty= false;
     }
 
-    OperationrecPtr prevOpPtr = currOpPtr;  
-    bool found= false;
-    while(true) 
-    {
-      if (savepointId > currOpPtr.p->savepointId) {
-	found= true;
-	break;
-      }
-      if (currOpPtr.p->is_first_operation()){
-	break;
-      }
-      prevOpPtr= currOpPtr;
-      currOpPtr.i = currOpPtr.p->prevActiveOp;
-      c_operation_pool.getPtr(currOpPtr);
-    }
+    bool found= find_savepoint(currOpPtr, savepointId);
     
     Uint32 currOp= currOpPtr.p->op_struct.op_type;
     
@@ -763,7 +757,8 @@ void Dbtup::execTUPKEYREQ(Signal* signal)
        }
        checkImmediateTriggersAfterInsert(&req_struct,
 					 regOperPtr,
-					 regTabPtr);
+					 regTabPtr,
+                                         disk_page != RNIL);
        set_change_mask_state(regOperPtr, SET_ALL_MASK);
        sendTUPKEYCONF(signal, &req_struct, regOperPtr);
        return;
@@ -796,7 +791,8 @@ void Dbtup::execTUPKEYREQ(Signal* signal)
        }
        checkImmediateTriggersAfterUpdate(&req_struct,
 					 regOperPtr,
-					 regTabPtr);
+					 regTabPtr,
+                                         disk_page != RNIL);
        // XXX use terrorCode for now since all methods are void
        if (terrorCode != 0) 
        {
@@ -827,7 +823,8 @@ void Dbtup::execTUPKEYREQ(Signal* signal)
 	*/
        checkImmediateTriggersAfterDelete(&req_struct,
 					 regOperPtr, 
-					 regTabPtr);
+					 regTabPtr,
+                                         disk_page != RNIL);
        set_change_mask_state(regOperPtr, DELETE_CHANGES);
        sendTUPKEYCONF(signal, &req_struct, regOperPtr);
        return;
@@ -1506,32 +1503,22 @@ int Dbtup::handleDeleteReq(Signal* signal,
   else 
   {
     regOperPtr->tupVersion= req_struct->m_tuple_ptr->get_tuple_version();
-    if(regTabPtr->m_no_of_disk_attributes)
+  }
+
+  if(disk && regOperPtr->m_undo_buffer_space == 0)
+  {
+    regOperPtr->op_struct.m_wait_log_buffer = 1;
+    regOperPtr->op_struct.m_load_diskpage_on_commit = 1;
+    Uint32 sz= regOperPtr->m_undo_buffer_space= 
+      (sizeof(Dbtup::Disk_undo::Free) >> 2) + 
+      regTabPtr->m_offsets[DD].m_fix_header_size - 1;
+    
+    terrorCode= c_lgman->alloc_log_space(regFragPtr->m_logfile_group_id,
+                                         sz);
+    if(unlikely(terrorCode))
     {
-      Uint32 sz;
-      if(regTabPtr->m_attributes[DD].m_no_of_varsize)
-      {
-	/**
-	 * Need to have page in memory to read size 
-	 *   to alloc undo space
-	 */
-	abort();
-      }
-      else
-	sz= (sizeof(Dbtup::Disk_undo::Free) >> 2) + 
-	  regTabPtr->m_offsets[DD].m_fix_header_size - 1;
-      
-      regOperPtr->m_undo_buffer_space= sz;
-      
-      int res;
-      if((res= c_lgman->alloc_log_space(regFragPtr->m_logfile_group_id, 
-					sz)))
-      {
-	terrorCode= res;
-	regOperPtr->m_undo_buffer_space= 0;
-	goto error;
-      }
-      
+      regOperPtr->m_undo_buffer_space= 0;
+      goto error;
     }
   }
   if (req_struct->attrinfo_len == 0)
@@ -1540,7 +1527,9 @@ int Dbtup::handleDeleteReq(Signal* signal,
   }
 
   if (regTabPtr->need_expand(disk))
+  {
     prepare_read(req_struct, regTabPtr, disk);
+  }
   
   {
     Uint32 RlogSize;
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp
index 0427f1c7612..0a4477db0d0 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp
@@ -15,6 +15,7 @@
 
 #define DBTUP_C
 #define DBTUP_INDEX_CPP
+#include <Dblqh.hpp>
 #include "Dbtup.hpp"
 #include <RefConvert.hpp>
 #include <ndb_limits.h>
@@ -319,13 +320,25 @@ Dbtup::accReadPk(Uint32 tableId, Uint32 fragId, Uint32 fragPageId, Uint32 pageIn
   return ret;
 }
 
+/*
+ * TUX index contains all tuple versions.  A scan in TUX has scanned
+ * one of them and asks if it can be returned as scan result.  This
+ * depends on trans id, dirty read flag, and savepoint within trans.
+ *
+ * Previously this faked a ZREAD operation and used getPage().
+ * In TUP getPage() is run after ACC locking, but TUX comes here
+ * before ACC access.  Instead of modifying getPage() it is more
+ * clear to do the full check here.
+ */
 bool
 Dbtup::tuxQueryTh(Uint32 fragPtrI,
-                  Uint32 tupAddr,
+                  Uint32 pageId,
+                  Uint32 pageIndex,
                   Uint32 tupVersion,
                   Uint32 transId1,
                   Uint32 transId2,
-                  Uint32 savePointId)
+                  bool dirty,
+                  Uint32 savepointId)
 {
   jamEntry();
   FragrecordPtr fragPtr;
@@ -334,35 +347,83 @@ Dbtup::tuxQueryTh(Uint32 fragPtrI,
   TablerecPtr tablePtr;
   tablePtr.i= fragPtr.p->fragTableId;
   ptrCheckGuard(tablePtr, cnoOfTablerec, tablerec);
-  // get page
-  Uint32 fragPageId= tupAddr >> MAX_TUPLES_BITS;
-  Uint32 pageIndex= tupAddr & ((1 << MAX_TUPLES_BITS ) - 1);
-  // use temp op rec
-  Operationrec tempOp;
+  PagePtr pagePtr;
+  pagePtr.i = pageId;
+  c_page_pool.getPtr(pagePtr);
+
   KeyReqStruct req_struct;
-  tempOp.m_tuple_location.m_page_no= getRealpid(fragPtr.p, fragPageId);
-  tempOp.m_tuple_location.m_page_idx= pageIndex;
-  tempOp.savepointId= savePointId;
-  tempOp.op_struct.op_type= ZREAD;
-  req_struct.frag_page_id= fragPageId;
-  req_struct.trans_id1= transId1;
-  req_struct.trans_id2= transId2;
-  req_struct.dirty_op= 1;
-  
-  setup_fixed_part(&req_struct, &tempOp, tablePtr.p);
-  if (setup_read(&req_struct, &tempOp, fragPtr.p, tablePtr.p, false)) {
-    /*
-     * We use the normal getPage which will return the tuple to be used
-     * for this transaction and savepoint id.  If its tuple version
-     * equals the requested then we have a visible tuple otherwise not.
-     */
+
+  {
+    Operationrec tmpOp;
+    tmpOp.m_tuple_location.m_page_no = pageId;
+    tmpOp.m_tuple_location.m_page_idx = pageIndex;
+    setup_fixed_part(&req_struct, &tmpOp, tablePtr.p);
+  }
+
+  Tuple_header* tuple_ptr = req_struct.m_tuple_ptr;
+
+  OperationrecPtr currOpPtr;
+  currOpPtr.i = tuple_ptr->m_operation_ptr_i;
+  if (currOpPtr.i == RNIL) {
+    jam();
+    // tuple has no operation, any scan can see it
+    return true;
+  }
+  c_operation_pool.getPtr(currOpPtr);
+
+  const bool sameTrans =
+    c_lqh->is_same_trans(currOpPtr.p->userpointer, transId1, transId2);
+
+  bool res = false;
+  OperationrecPtr loopOpPtr = currOpPtr;
+
+  if (!sameTrans) {
     jam();
-    if (req_struct.m_tuple_ptr->get_tuple_version() == tupVersion) {
+    if (!dirty) {
       jam();
-      return true;
+      if (currOpPtr.p->nextActiveOp == RNIL) {
+        jam();
+        // last op - TUX makes ACC lock request in same timeslice
+        res = true;
+      }
+    }
+    else {
+      // loop to first op (returns false)
+      find_savepoint(loopOpPtr, 0);
+      const Uint32 op_type = loopOpPtr.p->op_struct.op_type;
+
+      if (op_type != ZINSERT) {
+        jam();
+        // read committed version
+        const Uint32 origVersion = tuple_ptr->get_tuple_version();
+        if (origVersion == tupVersion) {
+          jam();
+          res = true;
+        }
+      }
     }
   }
-  return false;
+  else {
+    jam();
+    // for own trans, ignore dirty flag
+
+    if (find_savepoint(loopOpPtr, savepointId)) {
+      jam();
+      const Uint32 op_type = loopOpPtr.p->op_struct.op_type;
+
+      if (op_type != ZDELETE) {
+        jam();
+        // check if this op has produced the scanned version
+        Uint32 loopVersion = loopOpPtr.p->tupVersion;
+        if (loopVersion == tupVersion) {
+          jam();
+          res = true;
+        }
+      }
+    }
+  }
+
+  return res;
 }
 
 // ordered index build
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp
index 5e9306909b4..4c5fb7b645f 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp
@@ -54,7 +54,14 @@ Dbtup::execACC_SCANREQ(Signal* signal)
     // flags
     Uint32 bits = 0;
     
-    if (!AccScanReq::getLcpScanFlag(req->requestInfo))
+
+    if (AccScanReq::getLcpScanFlag(req->requestInfo))
+    {
+      jam();
+      bits |= ScanOp::SCAN_LCP;
+      c_scanOpPool.getPtr(scanPtr, c_lcp_scan_op);
+    }
+    else
     {
       // seize from pool and link to per-fragment list
       LocalDLList<ScanOp> list(c_scanOpPool, frag.m_scanList);
@@ -62,37 +69,26 @@ Dbtup::execACC_SCANREQ(Signal* signal)
 	jam();
 	break;
       }
-
-      if (!AccScanReq::getNoDiskScanFlag(req->requestInfo)
-	  && tablePtr.p->m_no_of_disk_attributes)
-      {
-	bits |= ScanOp::SCAN_DD;
-      }
-      
-      bool mm = (bits & ScanOp::SCAN_DD);
-      if (tablePtr.p->m_attributes[mm].m_no_of_varsize > 0) {
-	bits |= ScanOp::SCAN_VS;
-	
-	// disk pages have fixed page format
-	ndbrequire(! (bits & ScanOp::SCAN_DD));
-      }
-      if (! AccScanReq::getReadCommittedFlag(req->requestInfo)) {
-	if (AccScanReq::getLockMode(req->requestInfo) == 0)
-	  bits |= ScanOp::SCAN_LOCK_SH;
-	else
-	  bits |= ScanOp::SCAN_LOCK_EX;
-      }
-    } else {
-      jam();
-      // LCP scan and disk
+    }
+     
+    if (!AccScanReq::getNoDiskScanFlag(req->requestInfo)
+        && tablePtr.p->m_no_of_disk_attributes)
+    {
+      bits |= ScanOp::SCAN_DD;
+    }
+    
+    bool mm = (bits & ScanOp::SCAN_DD);
+    if (tablePtr.p->m_attributes[mm].m_no_of_varsize > 0) {
+      bits |= ScanOp::SCAN_VS;
       
-      ndbrequire(frag.m_lcp_scan_op == c_lcp_scan_op);
-      c_scanOpPool.getPtr(scanPtr, frag.m_lcp_scan_op);
-      ndbrequire(scanPtr.p->m_fragPtrI == fragPtr.i);
-      bits |= ScanOp::SCAN_LCP;
-      if (tablePtr.p->m_attributes[MM].m_no_of_varsize > 0) {
-        bits |= ScanOp::SCAN_VS;
-      }
+      // disk pages have fixed page format
+      ndbrequire(! (bits & ScanOp::SCAN_DD));
+    }
+    if (! AccScanReq::getReadCommittedFlag(req->requestInfo)) {
+      if (AccScanReq::getLockMode(req->requestInfo) == 0)
+        bits |= ScanOp::SCAN_LOCK_SH;
+      else
+        bits |= ScanOp::SCAN_LOCK_EX;
     }
 
     if (AccScanReq::getNRScanFlag(req->requestInfo))
@@ -112,6 +108,13 @@ Dbtup::execACC_SCANREQ(Signal* signal)
       jam();
       scanPtr.p->m_endPage = RNIL;
     }
+
+    if (AccScanReq::getLcpScanFlag(req->requestInfo))
+    {
+      jam();
+      ndbrequire((bits & ScanOp::SCAN_DD) == 0);
+      ndbrequire((bits & ScanOp::SCAN_LOCK) == 0);
+    }
     
     // set up scan op
     new (scanPtr.p) ScanOp();
@@ -618,6 +621,24 @@ Dbtup::scanNext(Signal* signal, ScanOpPtr scanPtr)
 
   if (lcp && lcp_list != RNIL)
     goto found_lcp_keep;
+
+  switch(pos.m_get){
+  case ScanPos::Get_next_tuple:
+  case ScanPos::Get_next_tuple_fs:
+    jam();
+    key.m_page_idx += size;
+    // fall through
+  case ScanPos::Get_tuple:
+  case ScanPos::Get_tuple_fs:
+    jam();
+    /**
+     * We need to refetch page after timeslice
+     */
+    pos.m_get = ScanPos::Get_page;
+    break;
+  default:
+    break;
+  }
   
   while (true) {
     switch (pos.m_get) {
@@ -1141,16 +1162,17 @@ Dbtup::releaseScanOp(ScanOpPtr& scanPtr)
   fragPtr.i = scanPtr.p->m_fragPtrI;
   ptrCheckGuard(fragPtr, cnoOfFragrec, fragrecord);
 
-  if(! (scanPtr.p->m_bits & ScanOp::SCAN_LCP))
+  if(scanPtr.p->m_bits & ScanOp::SCAN_LCP)
   {
-    LocalDLList<ScanOp> list(c_scanOpPool, fragPtr.p->m_scanList);    
-    list.release(scanPtr);
+    jam();
+    fragPtr.p->m_lcp_scan_op = RNIL;
+    scanPtr.p->m_fragPtrI = RNIL;
   }
   else
   {
-    ndbrequire(fragPtr.p->m_lcp_scan_op == scanPtr.i);
-    fragPtr.p->m_lcp_scan_op = RNIL;
-    scanPtr.p->m_fragPtrI = RNIL;
+    jam();
+    LocalDLList<ScanOp> list(c_scanOpPool, fragPtr.p->m_scanList);    
+    list.release(scanPtr);
   }
 }
 
@@ -1163,21 +1185,24 @@ Dbtup::execLCP_FRAG_ORD(Signal* signal)
   tablePtr.i = req->tableId;
   ptrCheckGuard(tablePtr, cnoOfTablerec, tablerec);
 
-  jam();
-  FragrecordPtr fragPtr;
-  Uint32 fragId = req->fragmentId;
-  fragPtr.i = RNIL;
-  getFragmentrec(fragPtr, fragId, tablePtr.p);
-  ndbrequire(fragPtr.i != RNIL);
-  Fragrecord& frag = *fragPtr.p;
-  
-  ndbrequire(frag.m_lcp_scan_op == RNIL && c_lcp_scan_op != RNIL);
-  frag.m_lcp_scan_op = c_lcp_scan_op;
-  ScanOpPtr scanPtr;
-  c_scanOpPool.getPtr(scanPtr, frag.m_lcp_scan_op);
-  ndbrequire(scanPtr.p->m_fragPtrI == RNIL);
-  scanPtr.p->m_fragPtrI = fragPtr.i;
-  
-  scanFirst(signal, scanPtr);
-  scanPtr.p->m_state = ScanOp::First;
+  if (tablePtr.p->m_no_of_disk_attributes)
+  {
+    jam();
+    FragrecordPtr fragPtr;
+    Uint32 fragId = req->fragmentId;
+    fragPtr.i = RNIL;
+    getFragmentrec(fragPtr, fragId, tablePtr.p);
+    ndbrequire(fragPtr.i != RNIL);
+    Fragrecord& frag = *fragPtr.p;
+    
+    ndbrequire(frag.m_lcp_scan_op == RNIL && c_lcp_scan_op != RNIL);
+    frag.m_lcp_scan_op = c_lcp_scan_op;
+    ScanOpPtr scanPtr;
+    c_scanOpPool.getPtr(scanPtr, frag.m_lcp_scan_op);
+    ndbrequire(scanPtr.p->m_fragPtrI == RNIL);
+    scanPtr.p->m_fragPtrI = fragPtr.i;
+    
+    scanFirst(signal, scanPtr);
+    scanPtr.p->m_state = ScanOp::First;
+  }
 }
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp
index 12d5f8aba38..a1e350853ce 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp
@@ -106,6 +106,11 @@ void Dbtup::scanProcedure(Signal* signal,
   regOperPtr->attrinbufLen = lenAttrInfo;
   regOperPtr->currentAttrinbufLen = 0;
   regOperPtr->storedProcPtr = storedPtr.i;
+  if (lenAttrInfo >= ZATTR_BUFFER_SIZE) { // yes ">="
+    jam();
+    // send REF and change state to ignore the ATTRINFO to come
+    storedSeizeAttrinbufrecErrorLab(signal, regOperPtr, ZSTORED_TOO_MUCH_ATTRINFO_ERROR);
+  }
 }//Dbtup::scanProcedure()
 
 void Dbtup::copyProcedure(Signal* signal,
@@ -146,7 +151,7 @@ bool Dbtup::storedProcedureAttrInfo(Signal* signal,
   Uint32 RnoFree = cnoFreeAttrbufrec;
   if (ERROR_INSERTED(4004) && !copyProcedure) {
     CLEAR_ERROR_INSERT_VALUE;
-    storedSeizeAttrinbufrecErrorLab(signal, regOperPtr);
+    storedSeizeAttrinbufrecErrorLab(signal, regOperPtr, ZSTORED_SEIZE_ATTRINBUFREC_ERROR);
     return false;
   }//if
   regOperPtr->currentAttrinbufLen += length;
@@ -162,7 +167,7 @@ bool Dbtup::storedProcedureAttrInfo(Signal* signal,
     regAttrPtr.p->attrbuf[ZBUF_NEXT] = RNIL;
   } else {
     jam();
-    storedSeizeAttrinbufrecErrorLab(signal, regOperPtr);
+    storedSeizeAttrinbufrecErrorLab(signal, regOperPtr, ZSTORED_SEIZE_ATTRINBUFREC_ERROR);
     return false;
   }//if
   if (regOperPtr->firstAttrinbufrec == RNIL) {
@@ -190,7 +195,7 @@ bool Dbtup::storedProcedureAttrInfo(Signal* signal,
   }//if
   if (ERROR_INSERTED(4005) && !copyProcedure) {
     CLEAR_ERROR_INSERT_VALUE;
-    storedSeizeAttrinbufrecErrorLab(signal, regOperPtr);
+    storedSeizeAttrinbufrecErrorLab(signal, regOperPtr, ZSTORED_SEIZE_ATTRINBUFREC_ERROR);
     return false;
   }//if
 
@@ -212,7 +217,8 @@ bool Dbtup::storedProcedureAttrInfo(Signal* signal,
 }//Dbtup::storedProcedureAttrInfo()
 
 void Dbtup::storedSeizeAttrinbufrecErrorLab(Signal* signal,
-                                            Operationrec* regOperPtr)
+                                            Operationrec* regOperPtr,
+                                            Uint32 errorCode)
 {
   StoredProcPtr storedPtr;
   c_storedProcPool.getPtr(storedPtr, regOperPtr->storedProcPtr);
@@ -224,7 +230,7 @@ void Dbtup::storedSeizeAttrinbufrecErrorLab(Signal* signal,
   regOperPtr->m_any_value = 0;
   set_trans_state(regOperPtr, TRANS_ERROR_WAIT_STORED_PROCREQ);
   signal->theData[0] = regOperPtr->userpointer;
-  signal->theData[1] = ZSTORED_SEIZE_ATTRINBUFREC_ERROR;
+  signal->theData[1] = errorCode;
   signal->theData[2] = regOperPtr->storedProcPtr;
   sendSignal(DBLQH_REF, GSN_STORED_PROCREF, signal, 3, JBB);
 }//Dbtup::storedSeizeAttrinbufrecErrorLab()
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
index 09d71a19add..0ae6d0f4ac6 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
@@ -369,7 +369,8 @@ Dbtup::dropTrigger(Tablerec* table, const DropTrigReq* req, BlockNumber sender)
 void
 Dbtup::checkImmediateTriggersAfterInsert(KeyReqStruct *req_struct,
                                          Operationrec *regOperPtr, 
-                                         Tablerec *regTablePtr)
+                                         Tablerec *regTablePtr,
+                                         bool disk)
 {
   if(refToBlock(req_struct->TC_ref) != DBTC) {
     return;
@@ -380,14 +381,16 @@ Dbtup::checkImmediateTriggersAfterInsert(KeyReqStruct *req_struct,
     jam();
     fireImmediateTriggers(req_struct,
                           regTablePtr->afterInsertTriggers,
-                          regOperPtr);
+                          regOperPtr,
+                          disk);
   }
 }
 
 void
 Dbtup::checkImmediateTriggersAfterUpdate(KeyReqStruct *req_struct,
                                          Operationrec* regOperPtr, 
-                                         Tablerec* regTablePtr)
+                                         Tablerec* regTablePtr,
+                                         bool disk)
 {
   if(refToBlock(req_struct->TC_ref) != DBTC) {
     return;
@@ -398,21 +401,24 @@ Dbtup::checkImmediateTriggersAfterUpdate(KeyReqStruct *req_struct,
     jam();
     fireImmediateTriggers(req_struct,
                           regTablePtr->afterUpdateTriggers,
-                          regOperPtr);
+                          regOperPtr,
+                          disk);
   }
   if ((regOperPtr->op_struct.primary_replica) &&
       (!(regTablePtr->constraintUpdateTriggers.isEmpty()))) {
     jam();
     fireImmediateTriggers(req_struct,
                           regTablePtr->constraintUpdateTriggers,
-                          regOperPtr);
+                          regOperPtr,
+                          disk);
   }
 }
 
 void
 Dbtup::checkImmediateTriggersAfterDelete(KeyReqStruct *req_struct,
                                          Operationrec* regOperPtr, 
-                                         Tablerec* regTablePtr)
+                                         Tablerec* regTablePtr,
+                                         bool disk)
 {
   if(refToBlock(req_struct->TC_ref) != DBTC) {
     return;
@@ -423,7 +429,8 @@ Dbtup::checkImmediateTriggersAfterDelete(KeyReqStruct *req_struct,
     jam();
     executeTriggers(req_struct,
                     regTablePtr->afterDeleteTriggers,
-                    regOperPtr);
+                    regOperPtr,
+                    disk);
   }
 }
 
@@ -547,7 +554,8 @@ end:
 void 
 Dbtup::fireImmediateTriggers(KeyReqStruct *req_struct,
                              DLList<TupTriggerData>& triggerList, 
-                             Operationrec* const regOperPtr)
+                             Operationrec* const regOperPtr,
+                             bool disk)
 {
   TriggerPtr trigPtr;
   triggerList.first(trigPtr);
@@ -558,7 +566,8 @@ Dbtup::fireImmediateTriggers(KeyReqStruct *req_struct,
       jam();
       executeTrigger(req_struct,
                      trigPtr.p,
-                     regOperPtr);
+                     regOperPtr,
+                     disk);
     }//if
     triggerList.next(trigPtr);
   }//while
@@ -621,7 +630,8 @@ Dbtup::fireDetachedTriggers(KeyReqStruct *req_struct,
 
 void Dbtup::executeTriggers(KeyReqStruct *req_struct,
                             DLList<TupTriggerData>& triggerList, 
-                            Operationrec* regOperPtr)
+                            Operationrec* regOperPtr,
+                            bool disk)
 {
   TriggerPtr trigPtr;
   triggerList.first(trigPtr);
@@ -629,7 +639,8 @@ void Dbtup::executeTriggers(KeyReqStruct *req_struct,
     jam();
     executeTrigger(req_struct,
                    trigPtr.p,
-                   regOperPtr);
+                   regOperPtr,
+                   disk);
     triggerList.next(trigPtr);
 
   }
diff --git a/storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp b/storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp
index a0643848530..8cef61038a6 100644
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp
@@ -217,7 +217,8 @@ Dbtux::execTUX_BOUND_INFO(Signal* signal)
       // fill in any gap
       while (maxAttrId[j] <= attrId) {
         jam();
-        BoundInfo& b = boundInfo[j][maxAttrId[j]++];
+        BoundInfo& b = boundInfo[j][maxAttrId[j]];
+        maxAttrId[j]++;
         b.type2 = -1;
       }
       BoundInfo& b = boundInfo[j][attrId];
@@ -986,7 +987,8 @@ Dbtux::scanVisible(ScanOpPtr scanPtr, TreeEnt ent)
   const ScanOp& scan = *scanPtr.p;
   const Frag& frag = *c_fragPool.getPtr(scan.m_fragPtrI);
   Uint32 tableFragPtrI = frag.m_tupTableFragPtrI;
-  Uint32 tupAddr = getTupAddr(frag, ent);
+  Uint32 pageId = ent.m_tupLoc.getPageId();
+  Uint32 pageOffset = ent.m_tupLoc.getPageOffset();
   Uint32 tupVersion = ent.m_tupVersion;
   // check for same tuple twice in row
   if (scan.m_scanEnt.m_tupLoc == ent.m_tupLoc)
@@ -996,8 +998,9 @@ Dbtux::scanVisible(ScanOpPtr scanPtr, TreeEnt ent)
   }
   Uint32 transId1 = scan.m_transId1;
   Uint32 transId2 = scan.m_transId2;
+  bool dirty = scan.m_readCommitted;
   Uint32 savePointId = scan.m_savePointId;
-  bool ret = c_tup->tuxQueryTh(tableFragPtrI, tupAddr, tupVersion, transId1, transId2, savePointId);
+  bool ret = c_tup->tuxQueryTh(tableFragPtrI, pageId, pageOffset, tupVersion, transId1, transId2, dirty, savePointId);
   jamEntry();
   return ret;
 }
diff --git a/storage/ndb/src/kernel/blocks/lgman.cpp b/storage/ndb/src/kernel/blocks/lgman.cpp
index 0481f7b399b..53cb1e113e1 100644
--- a/storage/ndb/src/kernel/blocks/lgman.cpp
+++ b/storage/ndb/src/kernel/blocks/lgman.cpp
@@ -547,6 +547,22 @@ Lgman::execCREATE_FILE_REQ(Signal* signal)
       break;
     }
     
+    if(ERROR_INSERTED(15000) ||
+       (sizeof(void*) == 4 && req->file_size_hi & 0xFFFFFFFF))
+    {
+      jam();
+      if(signal->getNoOfSections())
+        releaseSections(signal);
+
+      CreateFileImplRef* ref= (CreateFileImplRef*)signal->getDataPtr();
+      ref->senderData = senderData;
+      ref->senderRef = reference();
+      ref->errorCode = CreateFileImplRef::FileSizeTooLarge;
+      sendSignal(senderRef, GSN_CREATE_FILE_REF, signal,
+                 CreateFileImplRef::SignalLength, JBB);
+      return;
+    }
+
     new (file_ptr.p) Undofile(req, ptr.i);
 
     Local_undofile_list tmp(m_file_pool, ptr.p->m_meta_files);
@@ -902,7 +918,7 @@ Lgman::alloc_logbuffer_memory(Ptr<Logfile_group> ptr, Uint32 bytes)
     {
       Uint32 ptrI;
       Uint32 cnt = pages > 64 ? 64 : pages;
-      m_ctx.m_mm.alloc(&ptrI, &cnt, 1);
+      m_ctx.m_mm.alloc_pages(RG_DISK_OPERATIONS, &ptrI, &cnt, 1);
       if (cnt)
       {
 	Buffer_idx range;
@@ -1021,7 +1037,7 @@ Lgman::free_logbuffer_memory(Ptr<Logfile_group> ptr)
     ndbrequire(map.next(it));
     tmp[1] = *it.data;
     
-    m_ctx.m_mm.release(range.m_ptr_i, range.m_idx);
+    m_ctx.m_mm.release_pages(RG_DISK_OPERATIONS, range.m_ptr_i, range.m_idx);
     map.next(it);
   }
   map.release();
diff --git a/storage/ndb/src/kernel/blocks/suma/Suma.cpp b/storage/ndb/src/kernel/blocks/suma/Suma.cpp
index 113b63a19d3..5f0510cf43a 100644
--- a/storage/ndb/src/kernel/blocks/suma/Suma.cpp
+++ b/storage/ndb/src/kernel/blocks/suma/Suma.cpp
@@ -4908,6 +4908,21 @@ Suma::release_gci(Signal* signal, Uint32 buck, Uint32 gci)
     if(gci >= head.m_max_gci)
     {
       jam();
+      if (ERROR_INSERTED(13034))
+      {
+        jam();
+        SET_ERROR_INSERT_VALUE(13035);
+        return;
+      }
+      if (ERROR_INSERTED(13035))
+      {
+        CLEAR_ERROR_INSERT_VALUE;
+        NodeReceiverGroup rg(CMVMI, c_nodes_in_nodegroup_mask);
+        rg.m_nodes.clear(getOwnNodeId());
+        signal->theData[0] = 9999;
+        sendSignal(rg, GSN_NDB_TAMPER, signal, 1, JBA);
+        return;
+      }
       head.m_page_pos = 0;
       head.m_max_gci = gci;
       head.m_last_gci = 0;
@@ -4979,7 +4994,6 @@ Suma::start_resend(Signal* signal, Uint32 buck)
 
   if(min > max)
   {
-    ndbrequire(pos.m_page_pos <= 2);
     ndbrequire(pos.m_page_id == bucket->m_buffer_tail);
     m_active_buckets.set(buck);
     m_gcp_complete_rep_count ++;
diff --git a/storage/ndb/src/kernel/blocks/suma/SumaInit.cpp b/storage/ndb/src/kernel/blocks/suma/SumaInit.cpp
index bf5c07b5b97..0248833978c 100644
--- a/storage/ndb/src/kernel/blocks/suma/SumaInit.cpp
+++ b/storage/ndb/src/kernel/blocks/suma/SumaInit.cpp
@@ -27,6 +27,8 @@ Suma::Suma(Block_context& ctx) :
   Restart(*this),
   c_gcp_list(c_gcp_pool)
 {
+  BLOCK_CONSTRUCTOR(Suma);
+
   // Add received signals
   addRecSignal(GSN_READ_CONFIG_REQ, &Suma::execREAD_CONFIG_REQ);
   addRecSignal(GSN_STTOR, &Suma::execSTTOR);
diff --git a/storage/ndb/src/kernel/blocks/tsman.cpp b/storage/ndb/src/kernel/blocks/tsman.cpp
index 3a7003d56c8..8e68e118f98 100644
--- a/storage/ndb/src/kernel/blocks/tsman.cpp
+++ b/storage/ndb/src/kernel/blocks/tsman.cpp
@@ -537,6 +537,22 @@ Tsman::execCREATE_FILE_REQ(Signal* signal){
       break;
     }
     
+    if(ERROR_INSERTED(16000) ||
+       (sizeof(void*) == 4 && req->file_size_hi & 0xFFFFFFFF))
+    {
+      jam();
+      if(signal->getNoOfSections())
+        releaseSections(signal);
+
+      CreateFileImplRef* ref= (CreateFileImplRef*)signal->getDataPtr();
+      ref->senderData = senderData;
+      ref->senderRef = reference();
+      ref->errorCode = CreateFileImplRef::FileSizeTooLarge;
+      sendSignal(senderRef, GSN_CREATE_FILE_REF, signal,
+                 CreateFileImplRef::SignalLength, JBB);
+      return;
+    }
+ 
     new (file_ptr.p) Datafile(req);
     Local_datafile_list tmp(m_file_pool, ptr.p->m_meta_files);
     tmp.add(file_ptr);
diff --git a/storage/ndb/src/kernel/vm/DLHashTable.hpp b/storage/ndb/src/kernel/vm/DLHashTable.hpp
index df56dcb8846..b9d5f7c597f 100644
--- a/storage/ndb/src/kernel/vm/DLHashTable.hpp
+++ b/storage/ndb/src/kernel/vm/DLHashTable.hpp
@@ -46,8 +46,8 @@ public:
   /**
    * Seize element from pool - return i
    *
-   * Note must be either added using <b>add</b> or released 
-   * using <b>release</b>
+   * Note *must* be added using <b>add</b> (even before hash.release)
+   *             or be released using pool
    */
   bool seize(Ptr<T> &);
 
@@ -360,7 +360,14 @@ DLHashTableImpl<P, T, U>::remove(Ptr<T> & ptr)
   else 
   {
     const Uint32 hv = ptr.p->hashValue() & mask;  
-    hashValues[hv] = next;
+    if (hashValues[hv] == ptr.i)
+    {
+      hashValues[hv] = next;
+    }
+    else
+    {
+      // Will add assert in 5.1
+    }
   }
   
   if(next != RNIL)
@@ -386,7 +393,14 @@ DLHashTableImpl<P, T, U>::release(Ptr<T> & ptr)
   else 
   {
     const Uint32 hv = ptr.p->hashValue() & mask;  
-    hashValues[hv] = next;
+    if (hashValues[hv] == ptr.i)
+    {
+      hashValues[hv] = next;
+    }
+    else
+    {
+      // Will add assert in 5.1
+    }
   }
   
   if(next != RNIL)
diff --git a/storage/ndb/src/kernel/vm/DLHashTable2.hpp b/storage/ndb/src/kernel/vm/DLHashTable2.hpp
index 23ced757d8b..05340317adb 100644
--- a/storage/ndb/src/kernel/vm/DLHashTable2.hpp
+++ b/storage/ndb/src/kernel/vm/DLHashTable2.hpp
@@ -42,8 +42,8 @@ public:
   /**
    * Seize element from pool - return i
    *
-   * Note must be either added using <b>add</b> or released 
-   * using <b>release</b>
+   * Note *must* be added using <b>add</b> (even before hash.release)
+   *             or be released using pool
    */
   bool seize(Ptr<T> &);
 
@@ -374,7 +374,14 @@ DLHashTable2<T, U>::remove(Ptr<T> & ptr){
     prevP->nextHash = next;
   } else {
     const Uint32 hv = ptr.p->hashValue() & mask;  
-    hashValues[hv] = next;
+    if (hashValues[hv] == ptr.i)
+    {
+      hashValues[hv] = next;
+    }
+    else
+    {
+      // Will add assert in 5.1
+    }
   }
   
   if(next != RNIL){
@@ -395,7 +402,14 @@ DLHashTable2<T, U>::release(Ptr<T> & ptr){
     prevP->nextHash = next;
   } else {
     const Uint32 hv = ptr.p->hashValue() & mask;  
-    hashValues[hv] = next;
+    if (hashValues[hv] == ptr.i)
+    {
+      hashValues[hv] = next;
+    }
+    else
+    {
+      // Will add assert in 5.1
+    }
   }
   
   if(next != RNIL){
diff --git a/storage/ndb/src/kernel/vm/NdbdSuperPool.cpp b/storage/ndb/src/kernel/vm/NdbdSuperPool.cpp
index 14545e23820..717c354a180 100644
--- a/storage/ndb/src/kernel/vm/NdbdSuperPool.cpp
+++ b/storage/ndb/src/kernel/vm/NdbdSuperPool.cpp
@@ -48,7 +48,7 @@ NdbdSuperPool::NdbdSuperPool(class Ndbd_mem_manager & mm,
 {
   m_memRoot = m_mm.get_memroot();
   
-  m_shift = Ndbd_mem_manager::log2((1 << (BMW_2LOG + 2)) / pageSize) - 1;
+  m_shift = Ndbd_mem_manager::ndb_log2((1 << (BMW_2LOG + 2)) / pageSize) - 1;
   m_add = (1 << m_shift) - 1;
 }
 
diff --git a/storage/ndb/src/kernel/vm/Pool.cpp b/storage/ndb/src/kernel/vm/Pool.cpp
index 29c4aec4ee3..f252a601ac2 100644
--- a/storage/ndb/src/kernel/vm/Pool.cpp
+++ b/storage/ndb/src/kernel/vm/Pool.cpp
@@ -20,7 +20,8 @@
 void*
 Pool_context::alloc_page(Uint32 type_id, Uint32 *i)
 {
-  return m_block->m_ctx.m_mm.alloc_page(type_id, i);
+  return m_block->m_ctx.m_mm.alloc_page(type_id, i,
+                                        Ndbd_mem_manager::NDB_ZONE_LO);
 }
   
 void 
diff --git a/storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp b/storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp
index 70637a362d0..e2100e66baa 100644
--- a/storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp
+++ b/storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp
@@ -25,19 +25,22 @@ extern EventLogger g_eventLogger;
 extern EventLogger g_eventLogger;
 #endif
 
-#ifdef NDBD_MALLOC_METHOD
-#if NDBD_MALLOC_METHOD == sbrk
-static const char * f_method = "sbrk";
+static int f_method_idx = 0;
+#ifdef NDBD_MALLOC_METHOD_SBRK
+static const char * f_method = "SMsm";
 #else
-static const char * f_method = "malloc";
-#endif
-#elif SIZEOF_CHARP == 8
-static const char * f_method = "sbrk";
-#else
-static const char * f_method = "malloc";
+static const char * f_method = "MSms";
 #endif
 #define MAX_CHUNKS 10
 
+#define ZONE_LO 0
+#define ZONE_HI 1
+
+/**
+ * POOL_RECORD_BITS == 13 => 32 - 13 = 19 bits for page
+ */
+#define ZONE_LO_BOUND (1u << 19)
+
 struct InitChunk
 {
   Uint32 m_cnt;
@@ -54,28 +57,42 @@ do_malloc(Uint32 pages, InitChunk* chunk)
   pages += 1;
   void * ptr = 0;
   Uint32 sz = pages;
-  if (strcmp(f_method, "sbrk") == 0)
+
+retry:
+  char method = f_method[f_method_idx];
+  switch(method){
+  case 0:
+    return false;
+  case 'S':
+  case 's':
   {
     ptr = 0;
     while (ptr == 0)
     {
       ptr = sbrk(sizeof(Alloc_page) * sz);
+      
       if (ptr == (void*)-1)
       {
+	if (method == 'S')
+	{
+	  f_method_idx++;
+	  goto retry;
+	}
+	
 	ptr = 0;
 	sz = 1 + (9 * sz) / 10;
 	if (pages >= 32 && sz < 32)
 	{
 	  sz = pages;
-	  f_method = "malloc";
-	  g_eventLogger.info("sbrk(%lld) failed, trying malloc",
-			     (Uint64)(sizeof(Alloc_page) * sz));
-	  break;
+	  f_method_idx++;
+	  goto retry;
 	}
       }
     }
+    break;
   }
-  if (strcmp(f_method, "malloc") == 0)
+  case 'M':
+  case 'm':
   {
     ptr = 0;
     while (ptr == 0)
@@ -83,15 +100,26 @@ do_malloc(Uint32 pages, InitChunk* chunk)
       ptr = malloc(sizeof(Alloc_page) * sz);
       if (ptr == 0)
       {
+	if (method == 'M')
+	{
+	  f_method_idx++;
+	  goto retry;
+	}
+
 	sz = 1 + (9 * sz) / 10;
 	if (pages >= 32 && sz < 32)
 	{
-	  return false;
+	  f_method_idx++;
+	  goto retry;
 	}
       }
     }
+    break;
   }
-
+  default:
+    return false;
+  }
+  
   chunk->m_cnt = sz;
   chunk->m_ptr = (Alloc_page*)ptr;
   const UintPtr align = sizeof(Alloc_page) - 1;
@@ -125,7 +153,7 @@ do_malloc(Uint32 pages, InitChunk* chunk)
 }
 
 Uint32
-Ndbd_mem_manager::log2(Uint32 input)
+Ndbd_mem_manager::ndb_log2(Uint32 input)
 {
   input = input | (input >> 8);
   input = input | (input >> 4);
@@ -151,6 +179,12 @@ Ndbd_mem_manager::Ndbd_mem_manager()
   }
 }
 
+/**
+ * m_min = reserved
+ * m_curr = current
+ * m_max = max alloc, 0 = no limit
+ */
+
 void
 Ndbd_mem_manager::set_resource_limit(const Resource_limit& rl)
 {
@@ -176,6 +210,40 @@ Ndbd_mem_manager::get_resource_limit(Uint32 id, Resource_limit& rl) const
   return false;
 }
 
+static
+inline
+void
+check_resource_limits(Resource_limit* rl)
+{
+#ifdef VM_TRACE
+  Uint32 curr = 0;
+  Uint32 res_alloc = 0;
+  Uint32 shared_alloc = 0;
+  Uint32 sumres = 0;
+  for (Uint32 i = 1; i<XX_RL_COUNT; i++)
+  {
+    curr += rl[i].m_curr;
+    sumres += rl[i].m_min;
+    assert(rl[i].m_max == 0 || rl[i].m_curr <= rl[i].m_max);
+    if (rl[i].m_curr > rl[i].m_min)
+    {
+      shared_alloc += rl[i].m_curr - rl[i].m_min;
+      res_alloc += rl[i].m_min;
+    }
+    else
+    {
+      res_alloc += rl[i].m_curr;
+    }
+  }
+  assert(curr == rl[0].m_curr);
+  assert(res_alloc + shared_alloc == curr);
+  assert(res_alloc <= sumres);
+  assert(sumres == res_alloc + rl[0].m_min);
+  assert(rl[0].m_curr <= rl[0].m_max);
+#endif
+}
+
+
 bool
 Ndbd_mem_manager::init(bool alloc_less_memory)
 {
@@ -292,6 +360,8 @@ Ndbd_mem_manager::init(bool alloc_less_memory)
     grow(chunks[i].m_start, chunks[i].m_cnt);
   }
   
+  check_resource_limits(m_resource_limit);
+
   return true;
 }
 
@@ -321,35 +391,68 @@ Ndbd_mem_manager::grow(Uint32 start, Uint32 cnt)
     cnt--; // last page is always marked as empty
   }
   
-  if (!m_used_bitmap_pages.get(start_bmp))
-  {
-    if (start != (start_bmp << BPP_2LOG))
-    {
-      ndbout_c("ndbd_malloc_impl.cpp:%d:grow(%d, %d) %d!=%d"
-	       " - Unable to use due to bitmap pages missaligned!!",
-	       __LINE__, start, cnt, start, (start_bmp << BPP_2LOG));
-      g_eventLogger.error("ndbd_malloc_impl.cpp:%d:grow(%d, %d)"
-			  " - Unable to use due to bitmap pages missaligned!!",
-			  __LINE__, start, cnt);
-      return;
-    }
+  for (Uint32 i = 0; i<m_used_bitmap_pages.size(); i++)
+    if (m_used_bitmap_pages[i] == start_bmp)
+      goto found;
 
+  if (start != (start_bmp << BPP_2LOG))
+  {
+    
+    ndbout_c("ndbd_malloc_impl.cpp:%d:grow(%d, %d) %d!=%d not using %uMb"
+	     " - Unable to use due to bitmap pages missaligned!!",
+	     __LINE__, start, cnt, start, (start_bmp << BPP_2LOG),
+	     (cnt >> (20 - 15)));
+    g_eventLogger.error("ndbd_malloc_impl.cpp:%d:grow(%d, %d) not using %uMb"
+			" - Unable to use due to bitmap pages missaligned!!",
+			__LINE__, start, cnt,
+			(cnt >> (20 - 15)));
+
+    dump();
+    return;
+  }
+  
 #ifdef UNIT_TEST
-    ndbout_c("creating bitmap page %d", start_bmp);
+  ndbout_c("creating bitmap page %d", start_bmp);
 #endif
-    
+  
+  {
     Alloc_page* bmp = m_base_page + start;
     memset(bmp, 0, sizeof(Alloc_page));
-    m_used_bitmap_pages.set(start_bmp);
     cnt--;
     start++;
   }
-
+  m_used_bitmap_pages.push_back(start_bmp);
+  
+found:
   if (cnt)
   {
     m_resource_limit[0].m_curr += cnt;
     m_resource_limit[0].m_max += cnt;
-    release(start, cnt);
+    if (start >= ZONE_LO_BOUND)
+    {
+      Uint64 mbytes = ((Uint64(cnt) * 32) + 1023) / 1024;
+      ndbout_c("Adding %uMb to ZONE_HI (%u,%u)", (Uint32)mbytes, start, cnt);
+      release(start, cnt);
+    }
+    else if (start + cnt <= ZONE_LO_BOUND)
+    {
+      Uint64 mbytes = ((Uint64(cnt)*32) + 1023) / 1024;
+      ndbout_c("Adding %uMb to ZONE_LO (%u,%u)", (Uint32)mbytes, start, cnt);
+      release(start, cnt);      
+    }
+    else
+    {
+      Uint32 cnt0 = ZONE_LO_BOUND - start;
+      Uint32 cnt1 = start + cnt - ZONE_LO_BOUND;
+      Uint64 mbytes0 = ((Uint64(cnt0)*32) + 1023) / 1024;
+      Uint64 mbytes1 = ((Uint64(cnt1)*32) + 1023) / 1024;
+      ndbout_c("Adding %uMb to ZONE_LO (split %u,%u)", (Uint32)mbytes0,
+               start, cnt0);
+      ndbout_c("Adding %uMb to ZONE_HI (split %u,%u)", (Uint32)mbytes1,
+               ZONE_LO_BOUND, cnt1);
+      release(start, cnt0);
+      release(ZONE_LO_BOUND, cnt1);
+    }
   }
 }
 
@@ -362,64 +465,82 @@ Ndbd_mem_manager::release(Uint32 start, Uint32 cnt)
   
   set(start, start+cnt-1);
   
-  release_impl(start, cnt);
+  Uint32 zone = start < ZONE_LO_BOUND ? 0 : 1;
+  release_impl(zone, start, cnt);
 }
 
 void
-Ndbd_mem_manager::release_impl(Uint32 start, Uint32 cnt)
+Ndbd_mem_manager::release_impl(Uint32 zone, Uint32 start, Uint32 cnt)
 {
   assert(start);  
 
   Uint32 test = check(start-1, start+cnt);
-  if (test & 1)
+  if (start != ZONE_LO_BOUND && test & 1)
   {
     Free_page_data *fd = get_free_page_data(m_base_page + start - 1, 
 					    start - 1);
     Uint32 sz = fd->m_size;
     Uint32 left = start - sz;
-    remove_free_list(left, fd->m_list);
+    remove_free_list(zone, left, fd->m_list);
     cnt += sz;
     start = left;
   }
  
   Uint32 right = start + cnt;
-  if (test & 2)
+  if (right != ZONE_LO_BOUND && test & 2)
   {
     Free_page_data *fd = get_free_page_data(m_base_page+right, right);
     Uint32 sz = fd->m_size;
-    remove_free_list(right, fd->m_list);
+    remove_free_list(zone, right, fd->m_list);
     cnt += sz;
   }
   
-  insert_free_list(start, cnt);
+  insert_free_list(zone, start, cnt);
 }
 
 void
-Ndbd_mem_manager::alloc(Uint32* ret, Uint32 *pages, Uint32 min)
+Ndbd_mem_manager::alloc(AllocZone zone, 
+                        Uint32* ret, Uint32 *pages, Uint32 min)
+{
+  if (zone == NDB_ZONE_ANY)
+  {
+    Uint32 save = * pages;
+    alloc_impl(ZONE_HI, ret, pages, min);
+    if (*pages)
+      return;
+    * pages = save;
+  }
+  
+  alloc_impl(ZONE_LO, ret, pages, min);
+}
+
+void
+Ndbd_mem_manager::alloc_impl(Uint32 zone, 
+                             Uint32* ret, Uint32 *pages, Uint32 min)
 {
   Int32 i;
   Uint32 start;
   Uint32 cnt = * pages;
-  Uint32 list = log2(cnt - 1);
+  Uint32 list = ndb_log2(cnt - 1);
   
   assert(cnt);
   assert(list <= 16);
 
   for (i = list; i < 16; i++) 
   {
-    if ((start = m_buddy_lists[i]))
+    if ((start = m_buddy_lists[zone][i]))
     {
 /* ---------------------------------------------------------------- */
 /*       PROPER AMOUNT OF PAGES WERE FOUND. NOW SPLIT THE FOUND     */
 /*       AREA AND RETURN THE PART NOT NEEDED.                       */
 /* ---------------------------------------------------------------- */
       
-      Uint32 sz = remove_free_list(start, i);
+      Uint32 sz = remove_free_list(zone, start, i);
       Uint32 extra = sz - cnt;
       assert(sz >= cnt);
       if (extra)
       {
-	insert_free_list(start + cnt, extra);
+	insert_free_list(zone, start + cnt, extra);
 	clear_and_set(start, start+cnt-1);
       }
       else
@@ -427,8 +548,7 @@ Ndbd_mem_manager::alloc(Uint32* ret, Uint32 *pages, Uint32 min)
 	clear(start, start+cnt-1);
       }
       * ret = start;
-      m_resource_limit[0].m_curr += cnt;
-      assert(m_resource_limit[0].m_curr <= m_resource_limit[0].m_max);
+      assert(m_resource_limit[0].m_curr + cnt <= m_resource_limit[0].m_max);
       return;
     }
   }
@@ -438,17 +558,17 @@ Ndbd_mem_manager::alloc(Uint32* ret, Uint32 *pages, Uint32 min)
    *   search in other lists...
    */
 
-  Int32 min_list = log2(min - 1);
+  Int32 min_list = ndb_log2(min - 1);
   assert((Int32)list >= min_list);
   for (i = list - 1; i >= min_list; i--) 
   {
-    if ((start = m_buddy_lists[i]))
+    if ((start = m_buddy_lists[zone][i]))
     {
-      Uint32 sz = remove_free_list(start, i);
+      Uint32 sz = remove_free_list(zone, start, i);
       Uint32 extra = sz - cnt;
       if (sz > cnt)
       {
-	insert_free_list(start + cnt, extra);	
+	insert_free_list(zone, start + cnt, extra);	
 	sz -= extra;
 	clear_and_set(start, start+sz-1);
       }
@@ -459,8 +579,7 @@ Ndbd_mem_manager::alloc(Uint32* ret, Uint32 *pages, Uint32 min)
 
       * ret = start;
       * pages = sz;
-      m_resource_limit[0].m_curr += sz;
-      assert(m_resource_limit[0].m_curr <= m_resource_limit[0].m_max);
+      assert(m_resource_limit[0].m_curr + sz <= m_resource_limit[0].m_max);
       return;
     }
   }
@@ -468,12 +587,12 @@ Ndbd_mem_manager::alloc(Uint32* ret, Uint32 *pages, Uint32 min)
 }
 
 void
-Ndbd_mem_manager::insert_free_list(Uint32 start, Uint32 size)
+Ndbd_mem_manager::insert_free_list(Uint32 zone, Uint32 start, Uint32 size)
 {
-  Uint32 list = log2(size) - 1;
+  Uint32 list = ndb_log2(size) - 1;
   Uint32 last = start + size - 1;
 
-  Uint32 head = m_buddy_lists[list];
+  Uint32 head = m_buddy_lists[zone][list];
   Free_page_data* fd_first = get_free_page_data(m_base_page+start, 
 						start);
   fd_first->m_list = list;
@@ -495,11 +614,11 @@ Ndbd_mem_manager::insert_free_list(Uint32 start, Uint32 size)
     fd->m_prev = start;
   }
   
-  m_buddy_lists[list] = start;
+  m_buddy_lists[zone][list] = start;
 }
 
 Uint32 
-Ndbd_mem_manager::remove_free_list(Uint32 start, Uint32 list)
+Ndbd_mem_manager::remove_free_list(Uint32 zone, Uint32 start, Uint32 list)
 {
   Free_page_data* fd = get_free_page_data(m_base_page+start, start);
   Uint32 size = fd->m_size;
@@ -509,7 +628,7 @@ Ndbd_mem_manager::remove_free_list(Uint32 start, Uint32 list)
   
   if (prev)
   {
-    assert(m_buddy_lists[list] != start);
+    assert(m_buddy_lists[zone][list] != start);
     fd = get_free_page_data(m_base_page+prev, prev);
     assert(fd->m_next == start);
     assert(fd->m_list == list);
@@ -517,8 +636,8 @@ Ndbd_mem_manager::remove_free_list(Uint32 start, Uint32 list)
   }
   else
   {
-    assert(m_buddy_lists[list] == start);
-    m_buddy_lists[list] = next;
+    assert(m_buddy_lists[zone][list] == start);
+    m_buddy_lists[zone][list] = next;
   }
   
   if (next)
@@ -535,42 +654,62 @@ Ndbd_mem_manager::remove_free_list(Uint32 start, Uint32 list)
 void
 Ndbd_mem_manager::dump() const
 {
-  for(Uint32 i = 0; i<16; i++)
+  for (Uint32 zone = 0; zone < 2; zone ++)
   {
-    printf(" list: %d - ", i);
-    Uint32 head = m_buddy_lists[i];
-    while(head)
+    for (Uint32 i = 0; i<16; i++)
     {
-      Free_page_data* fd = get_free_page_data(m_base_page+head, head); 
-      printf("[ i: %d prev %d next %d list %d size %d ] ", 
-	     head, fd->m_prev, fd->m_next, fd->m_list, fd->m_size);
-      head = fd->m_next;
+      printf(" list: %d - ", i);
+      Uint32 head = m_buddy_lists[zone][i];
+      while(head)
+      {
+        Free_page_data* fd = get_free_page_data(m_base_page+head, head); 
+        printf("[ i: %d prev %d next %d list %d size %d ] ", 
+               head, fd->m_prev, fd->m_next, fd->m_list, fd->m_size);
+        head = fd->m_next;
+      }
+      printf("EOL\n");
+    }
+    
+    for (Uint32 i = 0; i<XX_RL_COUNT; i++)
+    {
+      printf("ri: %d min: %d curr: %d max: %d\n",
+             i, 
+             m_resource_limit[i].m_min,
+             m_resource_limit[i].m_curr,
+             m_resource_limit[i].m_max);
     }
-    printf("EOL\n");
   }
 }
 
 void*
-Ndbd_mem_manager::alloc_page(Uint32 type, Uint32* i)
+Ndbd_mem_manager::alloc_page(Uint32 type, Uint32* i, AllocZone zone)
 {
   Uint32 idx = type & RG_MASK;
   assert(idx && idx < XX_RL_COUNT);
   Resource_limit tot = m_resource_limit[0];
   Resource_limit rl = m_resource_limit[idx];
 
-  Uint32 add = (rl.m_curr < rl.m_min) ? 0 : 1; // Over min ?
+  Uint32 cnt = 1;
+  Uint32 res0 = (rl.m_curr < rl.m_min) ? 1 : 0;
   Uint32 limit = (rl.m_max == 0 || rl.m_curr < rl.m_max) ? 0 : 1; // Over limit
   Uint32 free = (tot.m_min + tot.m_curr < tot.m_max) ? 1 : 0; // Has free
   
-  if (likely(add == 0 || (limit == 0 && free == 1)))
+  assert(tot.m_min >= res0);
+
+  if (likely(res0 == 1 || (limit == 0 && free == 1)))
   {
-    Uint32 cnt = 1;
-    alloc(i, &cnt, 1);
-    assert(cnt);
-    m_resource_limit[0].m_curr = tot.m_curr + add;
-    m_resource_limit[idx].m_curr = rl.m_curr + 1;
-    return m_base_page + *i;
+    alloc(zone, i, &cnt, 1);
+    if (likely(cnt))
+    {
+      m_resource_limit[0].m_curr = tot.m_curr + cnt;
+      m_resource_limit[0].m_min = tot.m_min - res0;
+      m_resource_limit[idx].m_curr = rl.m_curr + cnt;
+
+      check_resource_limits(m_resource_limit);
+      return m_base_page + *i;
+    }
   }
+
   return 0;
 }
 
@@ -582,10 +721,102 @@ Ndbd_mem_manager::release_page(Uint32 type, Uint32 i)
   Resource_limit tot = m_resource_limit[0];
   Resource_limit rl = m_resource_limit[idx];
   
-  Uint32 sub = (rl.m_curr < rl.m_min) ? 0 : 1; // Over min ?
+  Uint32 sub = (rl.m_curr <= rl.m_min) ? 1 : 0; // Over min ?
   release(i, 1);
-  m_resource_limit[0].m_curr = tot.m_curr - sub;
+  m_resource_limit[0].m_curr = tot.m_curr - 1;
+  m_resource_limit[0].m_min = tot.m_min + sub;
   m_resource_limit[idx].m_curr = rl.m_curr - 1;
+
+  check_resource_limits(m_resource_limit);
+}
+
+void
+Ndbd_mem_manager::alloc_pages(Uint32 type, Uint32* i, Uint32 *cnt, Uint32 min)
+{
+  Uint32 idx = type & RG_MASK;
+  assert(idx && idx < XX_RL_COUNT);
+  Resource_limit tot = m_resource_limit[0];
+  Resource_limit rl = m_resource_limit[idx];
+
+  Uint32 req = *cnt;
+
+  Uint32 max = rl.m_max - rl.m_curr;
+  Uint32 res0 = rl.m_min - rl.m_curr;
+  Uint32 free_shared = tot.m_max - (tot.m_min + tot.m_curr);
+
+  Uint32 res1;
+  if (rl.m_curr + req <= rl.m_min)
+  {
+    // all is reserved...
+    res0 = req;
+    res1 = 0;
+  }
+  else
+  {
+    req = rl.m_max ? max : req;
+    res0 = (rl.m_curr > rl.m_min) ? 0 : res0;
+    res1 = req - res0;
+    
+    if (unlikely(res1 > free_shared))
+    {
+      res1 = free_shared;
+      req = res0 + res1;
+    }
+  }
+
+  // req = pages to alloc
+  // res0 = portion that is reserved
+  // res1 = part that is over reserver
+  assert (res0 + res1 == req);
+  assert (tot.m_min >= res0);
+  
+  if (likely(req))
+  {
+    // Hi order allocations can always use any zone
+    alloc(NDB_ZONE_ANY, i, &req, 1); 
+    * cnt = req;
+    if (unlikely(req < res0)) // Got min than what was reserved :-(
+    {
+      res0 = req;
+    }
+    assert(tot.m_min >= res0);
+    assert(tot.m_curr + req <= tot.m_max);
+    
+    m_resource_limit[0].m_curr = tot.m_curr + req;
+    m_resource_limit[0].m_min = tot.m_min - res0;
+    m_resource_limit[idx].m_curr = rl.m_curr + req;
+    check_resource_limits(m_resource_limit);
+    return ;
+  }
+  * cnt = req;
+  return;
+}
+
+void
+Ndbd_mem_manager::release_pages(Uint32 type, Uint32 i, Uint32 cnt)
+{
+  Uint32 idx = type & RG_MASK;
+  assert(idx && idx < XX_RL_COUNT);
+  Resource_limit tot = m_resource_limit[0];
+  Resource_limit rl = m_resource_limit[idx];
+  
+  release(i, cnt);
+
+  Uint32 currnew = rl.m_curr - cnt;
+  if (rl.m_curr > rl.m_min)
+  {
+    if (currnew < rl.m_min)
+    {
+      m_resource_limit[0].m_min = tot.m_min + (rl.m_min - currnew);
+    }
+  }
+  else
+  {
+    m_resource_limit[0].m_min = tot.m_min + cnt;
+  }
+  m_resource_limit[0].m_curr = tot.m_curr - cnt;
+  m_resource_limit[idx].m_curr = currnew;
+  check_resource_limits(m_resource_limit);
 }
 
 #ifdef UNIT_TEST
@@ -781,3 +1012,4 @@ main(int argc, char** argv)
 template class Vector<Chunk>;
 
 #endif
+template class Vector<Uint32>;
diff --git a/storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp b/storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp
index d87927d9c45..78e41f1cabd 100644
--- a/storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp
+++ b/storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp
@@ -20,6 +20,7 @@
 #include <Bitmask.hpp>
 #include <assert.h>
 #include "Pool.hpp"
+#include <Vector.hpp>
 
 /**
  * 13 -> 8192 words -> 32768 bytes
@@ -59,46 +60,53 @@ public:
   bool init(bool allow_alloc_less_than_requested = true);
   void* get_memroot() const { return (void*)m_base_page;}
   
-  void alloc(Uint32* ret, Uint32 *pages, Uint32 min_requested);
-  void release(Uint32 start, Uint32 cnt);
-  
   void dump() const ;
   
-  void* alloc_page(Uint32 type, Uint32* i);
+  enum AllocZone
+  {
+    NDB_ZONE_LO  = 0, // Only allocate with page_id < (1 << 13)
+    NDB_ZONE_ANY = 1  // Allocate with any page_id
+  };
+
+  void* alloc_page(Uint32 type, Uint32* i, enum AllocZone);
   void release_page(Uint32 type, Uint32 i);
   
-  void* alloc_pages(Uint32 type, Uint32* i, Uint32 *cnt, Uint32 min = 1);
-  void release_pages(Uint32 type, Uint32 i, void*p, Uint32 cnt);
+  void alloc_pages(Uint32 type, Uint32* i, Uint32 *cnt, Uint32 min = 1);
+  void release_pages(Uint32 type, Uint32 i, Uint32 cnt);
   
   /**
    * Compute 2log of size 
    * @note size = 0     -> 0
    * @note size > 65536 -> 16
    */
-  static Uint32 log2(Uint32 size);
+  static Uint32 ndb_log2(Uint32 size);
 
 private:
   void grow(Uint32 start, Uint32 cnt);
 
-#define XX_RL_COUNT 3
+#define XX_RL_COUNT 4
   /**
    * Return pointer to free page data on page
    */
   static Free_page_data* get_free_page_data(Alloc_page*, Uint32 idx);
-  Bitmask<1> m_used_bitmap_pages;
+  Vector<Uint32> m_used_bitmap_pages;
   
-  Uint32 m_buddy_lists[16];
+  Uint32 m_buddy_lists[2][16];
   Resource_limit m_resource_limit[XX_RL_COUNT]; // RG_COUNT in record_types.hpp
   Alloc_page * m_base_page;
   
-  void release_impl(Uint32 start, Uint32 cnt);  
-  void insert_free_list(Uint32 start, Uint32 cnt);
-  Uint32 remove_free_list(Uint32 start, Uint32 list);
+  void release_impl(Uint32 zone, Uint32 start, Uint32 cnt);  
+  void insert_free_list(Uint32 zone, Uint32 start, Uint32 cnt);
+  Uint32 remove_free_list(Uint32 zone, Uint32 start, Uint32 list);
 
   void set(Uint32 first, Uint32 last);
   void clear(Uint32 first, Uint32 last);
   void clear_and_set(Uint32 first, Uint32 last);
   Uint32 check(Uint32 first, Uint32 last);
+
+  void alloc(AllocZone, Uint32* ret, Uint32 *pages, Uint32 min_requested);
+  void alloc_impl(Uint32 zone, Uint32* ret, Uint32 *pages, Uint32 min);
+  void release(Uint32 start, Uint32 cnt);
 };
 
 inline
diff --git a/storage/ndb/src/kernel/vm/pc.hpp b/storage/ndb/src/kernel/vm/pc.hpp
index 194d5534646..cf03f676ae1 100644
--- a/storage/ndb/src/kernel/vm/pc.hpp
+++ b/storage/ndb/src/kernel/vm/pc.hpp
@@ -49,7 +49,7 @@
   theEmulatedJamBlockNumber = number(); \
   Uint32 tEmulatedJamIndex = theEmulatedJamIndex; \
   *(Uint32*)(theEmulatedJam + tEmulatedJamIndex) = \
-    ((theEmulatedJamBlockNumber << 20) | line); \
+    ((theEmulatedJamBlockNumber << 20) | (line)); \
   theEmulatedJamIndex = (tEmulatedJamIndex + 4) & JAM_MASK; }
 
 #else
@@ -72,7 +72,7 @@
   theEmulatedJamBlockNumber = number(); \
   Uint32 tEmulatedJamIndex = theEmulatedJamIndex; \
   *(Uint32*)((UintPtr)theEmulatedJam + (Uint32)tEmulatedJamIndex) = \
-    ((theEmulatedJamBlockNumber << 20) | line); \
+    ((theEmulatedJamBlockNumber << 20) | (line)); \
   theEmulatedJamIndex = (tEmulatedJamIndex + 4) & JAM_MASK; }
 
 #endif
@@ -231,6 +231,6 @@
 #define MEMCOPY_PAGE(to, from, page_size_in_bytes) \
   memcpy((void*)(to), (void*)(from), (size_t)(page_size_in_bytes));
 #define MEMCOPY_NO_WORDS(to, from, no_of_words) \
-  memcpy((to), (void*)(from), (size_t)(no_of_words << 2));
+  memcpy((to), (void*)(from), (size_t)((no_of_words) << 2));
 
 #endif
diff --git a/storage/ndb/src/mgmapi/ndb_logevent.cpp b/storage/ndb/src/mgmapi/ndb_logevent.cpp
index ed72db297ab..fbf026fd79d 100644
--- a/storage/ndb/src/mgmapi/ndb_logevent.cpp
+++ b/storage/ndb/src/mgmapi/ndb_logevent.cpp
@@ -256,7 +256,7 @@ struct Ndb_logevent_body_row ndb_logevent_body[]= {
   ROW( ReceiveBytesStatistic, "mean_received_bytes", 2, mean_received_bytes),
 
   ROW( MemoryUsage, "gth",          1, gth),
-  ROW( MemoryUsage, "page_size_kb", 2, page_size_kb),
+  ROW( MemoryUsage, "page_size_bytes", 2, page_size_bytes),
   ROW( MemoryUsage, "pages_used",   3, pages_used),
   ROW( MemoryUsage, "pages_total",  4, pages_total),
   ROW( MemoryUsage, "block",        5, block),
diff --git a/storage/ndb/src/mgmclient/CommandInterpreter.cpp b/storage/ndb/src/mgmclient/CommandInterpreter.cpp
index 9e8910c9649..7057525efc7 100644
--- a/storage/ndb/src/mgmclient/CommandInterpreter.cpp
+++ b/storage/ndb/src/mgmclient/CommandInterpreter.cpp
@@ -859,10 +859,14 @@ event_thread_run(void* p)
   {
     do_event_thread= 1;
     do {
-      if (ndb_logevent_get_next(log_handle, &log_event, 2000) <= 0)
-        continue;
-      Guard g(printmutex);
-      printLogEvent(&log_event);
+      int res= ndb_logevent_get_next(log_handle, &log_event, 2000);
+      if (res > 0)
+      {
+        Guard g(printmutex);
+        printLogEvent(&log_event);
+      }
+      else if (res < 0)
+        break;
     } while(do_event_thread);
     ndb_mgm_destroy_logevent_handle(&log_handle);
   }
@@ -2663,8 +2667,9 @@ CommandInterpreter::executeStartBackup(char* parameters, bool interactive)
   {
     int count = 0;
     int retry = 0;
+    int res;
     do {
-      if (ndb_logevent_get_next(log_handle, &log_event, 60000) > 0)
+      if ((res= ndb_logevent_get_next(log_handle, &log_event, 60000)) > 0)
       {
         int print = 0;
         switch (log_event.type) {
@@ -2694,7 +2699,7 @@ CommandInterpreter::executeStartBackup(char* parameters, bool interactive)
       {
         retry++;
       }
-    } while(count < 2 && retry < 3);
+    } while(res >= 0 && count < 2 && retry < 3);
 
     if (retry >= 3)
       ndbout << "get backup event failed for " << retry << " times" << endl;
diff --git a/storage/ndb/src/mgmsrv/ConfigInfo.cpp b/storage/ndb/src/mgmsrv/ConfigInfo.cpp
index 9cbb7d93ceb..6e560ff2701 100644
--- a/storage/ndb/src/mgmsrv/ConfigInfo.cpp
+++ b/storage/ndb/src/mgmsrv/ConfigInfo.cpp
@@ -397,7 +397,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
     ConfigInfo::CI_INT,
     MANDATORY,
     "1",
-    STR_VALUE(MAX_NODES) },
+    STR_VALUE(MAX_DATA_NODE_ID) },
 
   {
     CFG_NODE_ID,
@@ -409,7 +409,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
     ConfigInfo::CI_INT,
     MANDATORY,
     "1",
-    STR_VALUE(MAX_NODES) },
+    STR_VALUE(MAX_DATA_NODE_ID) },
 
   {
     KEY_INTERNAL,
@@ -1404,7 +1404,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
     ConfigInfo::CI_INT,
     MANDATORY,
     "1",
-    STR_VALUE(MAX_NODES) },
+    STR_VALUE(MAX_NODES_ID) },
 
   {
     CFG_NODE_ID,
@@ -1416,7 +1416,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
     ConfigInfo::CI_INT,
     MANDATORY,
     "1",
-    STR_VALUE(MAX_NODES) },
+    STR_VALUE(MAX_NODES_ID) },
 
   {
     KEY_INTERNAL,
@@ -1547,7 +1547,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
     ConfigInfo::CI_INT,
     MANDATORY,
     "1",
-    STR_VALUE(MAX_NODES) },
+    STR_VALUE(MAX_NODES_ID) },
   
   {
     CFG_NODE_ID,
@@ -1559,7 +1559,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
     ConfigInfo::CI_INT,
     MANDATORY,
     "1",
-    STR_VALUE(MAX_NODES) },
+    STR_VALUE(MAX_NODES_ID) },
   
   {
     CFG_LOG_DESTINATION,
diff --git a/storage/ndb/src/ndbapi/Ndb.cpp b/storage/ndb/src/ndbapi/Ndb.cpp
index 15647861eef..e6a1c2cfcfd 100644
--- a/storage/ndb/src/ndbapi/Ndb.cpp
+++ b/storage/ndb/src/ndbapi/Ndb.cpp
@@ -942,6 +942,7 @@ Parameters:     aTableName (IN) : The table name.
                 step       (IN) : Specifies the step between the 
                                   autoincrement values.
                 start      (IN) : Start value for first value
+Returns:        0 if succesful, -1 if error encountered
 Remark:		Returns a new autoincrement value to the application.
                 The autoincrement values can be increased by steps
                 (default 1) and a number of values can be prefetched
@@ -1072,9 +1073,18 @@ Ndb::getTupleIdFromNdb(const NdbTableImpl* table,
   DBUG_RETURN(0);
 }
 
+/****************************************************************************
+int readAutoIncrementValue( const char* aTableName,
+                            Uint64 & autoValue);
+
+Parameters:     aTableName (IN) : The table name.
+                autoValue  (OUT) : The current autoincrement value
+Returns:        0 if succesful, -1 if error encountered
+Remark:         Returns the current autoincrement value to the application.
+****************************************************************************/
 int
 Ndb::readAutoIncrementValue(const char* aTableName,
-                            Uint64 & tupleId)
+                            Uint64 & autoValue)
 {
   DBUG_ENTER("Ndb::readAutoIncrementValue");
   ASSERT_NOT_MYSQLD;
@@ -1088,15 +1098,15 @@ Ndb::readAutoIncrementValue(const char* aTableName,
   }
   const NdbTableImpl* table = info->m_table_impl;
   TupleIdRange & range = info->m_tuple_id_range;
-  if (readTupleIdFromNdb(table, range, tupleId) == -1)
+  if (readTupleIdFromNdb(table, range, autoValue) == -1)
     DBUG_RETURN(-1);
-  DBUG_PRINT("info", ("value %lu", (ulong)tupleId));
+  DBUG_PRINT("info", ("value %lu", (ulong)autoValue));
   DBUG_RETURN(0);
 }
 
 int
 Ndb::readAutoIncrementValue(const NdbDictionary::Table * aTable,
-                            Uint64 & tupleId)
+                            Uint64 & autoValue)
 {
   DBUG_ENTER("Ndb::readAutoIncrementValue");
   ASSERT_NOT_MYSQLD;
@@ -1111,23 +1121,23 @@ Ndb::readAutoIncrementValue(const NdbDictionary::Table * aTable,
     DBUG_RETURN(-1);
   }
   TupleIdRange & range = info->m_tuple_id_range;
-  if (readTupleIdFromNdb(table, range, tupleId) == -1)
+  if (readTupleIdFromNdb(table, range, autoValue) == -1)
     DBUG_RETURN(-1);
-  DBUG_PRINT("info", ("value %lu", (ulong)tupleId));
+  DBUG_PRINT("info", ("value %lu", (ulong)autoValue));
   DBUG_RETURN(0);
 }
 
 int
 Ndb::readAutoIncrementValue(const NdbDictionary::Table * aTable,
-                            TupleIdRange & range, Uint64 & tupleId)
+                            TupleIdRange & range, Uint64 & autoValue)
 {
   DBUG_ENTER("Ndb::readAutoIncrementValue");
   assert(aTable != 0);
   const NdbTableImpl* table = & NdbTableImpl::getImpl(*aTable);
 
-  if (readTupleIdFromNdb(table, range, tupleId) == -1)
+  if (readTupleIdFromNdb(table, range, autoValue) == -1)
     DBUG_RETURN(-1);
-  DBUG_PRINT("info", ("value %lu", (ulong)tupleId));
+  DBUG_PRINT("info", ("value %lu", (ulong)autoValue));
   DBUG_RETURN(0);
 }
 
@@ -1155,9 +1165,20 @@ Ndb::readTupleIdFromNdb(const NdbTableImpl* table,
   DBUG_RETURN(0);
 }
 
+/****************************************************************************
+int setAutoIncrementValue( const char* aTableName,
+                           Uint64 autoValue,
+                           bool modify);
+
+Parameters:     aTableName (IN) : The table name.
+                autoValue  (IN) : The new autoincrement value
+                modify     (IN) : Modify existing value (not initialization)
+Returns:        0 if succesful, -1 if error encountered
+Remark:         Sets a new autoincrement value for the application.
+****************************************************************************/
 int
 Ndb::setAutoIncrementValue(const char* aTableName,
-                           Uint64 tupleId, bool increase)
+                           Uint64 autoValue, bool modify)
 {
   DBUG_ENTER("Ndb::setAutoIncrementValue");
   ASSERT_NOT_MYSQLD;
@@ -1171,14 +1192,14 @@ Ndb::setAutoIncrementValue(const char* aTableName,
   }
   const NdbTableImpl* table = info->m_table_impl;
   TupleIdRange & range = info->m_tuple_id_range;
-  if (setTupleIdInNdb(table, range, tupleId, increase) == -1)
+  if (setTupleIdInNdb(table, range, autoValue, modify) == -1)
     DBUG_RETURN(-1);
   DBUG_RETURN(0);
 }
 
 int
 Ndb::setAutoIncrementValue(const NdbDictionary::Table * aTable,
-                           Uint64 tupleId, bool increase)
+                           Uint64 autoValue, bool modify)
 {
   DBUG_ENTER("Ndb::setAutoIncrementValue");
   ASSERT_NOT_MYSQLD;
@@ -1193,52 +1214,55 @@ Ndb::setAutoIncrementValue(const NdbDictionary::Table * aTable,
     DBUG_RETURN(-1);
   }
   TupleIdRange & range = info->m_tuple_id_range;
-  if (setTupleIdInNdb(table, range, tupleId, increase) == -1)
+  if (setTupleIdInNdb(table, range, autoValue, modify) == -1)
     DBUG_RETURN(-1);
   DBUG_RETURN(0);
 }
 
 int
 Ndb::setAutoIncrementValue(const NdbDictionary::Table * aTable,
-                           TupleIdRange & range, Uint64 tupleId,
-                           bool increase)
+                           TupleIdRange & range, Uint64 autoValue,
+                           bool modify)
 {
   DBUG_ENTER("Ndb::setAutoIncrementValue");
   assert(aTable != 0);
   const NdbTableImpl* table = & NdbTableImpl::getImpl(*aTable);
 
-  if (setTupleIdInNdb(table, range, tupleId, increase) == -1)
+  if (setTupleIdInNdb(table, range, autoValue, modify) == -1)
     DBUG_RETURN(-1);
   DBUG_RETURN(0);
 }
 
 int
 Ndb::setTupleIdInNdb(const NdbTableImpl* table,
-                     TupleIdRange & range, Uint64 tupleId, bool increase)
+                     TupleIdRange & range, Uint64 tupleId, bool modify)
 {
   DBUG_ENTER("Ndb::setTupleIdInNdb");
-  if (increase)
+  if (modify)
   {
-    if (range.m_first_tuple_id != range.m_last_tuple_id)
+    if (checkTupleIdInNdb(range, tupleId))
     {
-      assert(range.m_first_tuple_id < range.m_last_tuple_id);
-      if (tupleId <= range.m_first_tuple_id + 1)
-	DBUG_RETURN(0);
-      if (tupleId <= range.m_last_tuple_id)
+      if (range.m_first_tuple_id != range.m_last_tuple_id)
       {
-	range.m_first_tuple_id = tupleId - 1;
-        DBUG_PRINT("info", 
-                   ("Setting next auto increment cached value to %lu",
-                    (ulong)tupleId));  
-	DBUG_RETURN(0);
+        assert(range.m_first_tuple_id < range.m_last_tuple_id);
+        if (tupleId <= range.m_first_tuple_id + 1)
+          DBUG_RETURN(0);
+        if (tupleId <= range.m_last_tuple_id)
+        {
+          range.m_first_tuple_id = tupleId - 1;
+          DBUG_PRINT("info", 
+                     ("Setting next auto increment cached value to %lu",
+                      (ulong)tupleId));  
+          DBUG_RETURN(0);
+        }
       }
+      /*
+       * if tupleId <= NEXTID, do nothing.  otherwise update NEXTID to
+       * tupleId and set cached range to first = last = tupleId - 1.
+       */
+      if (opTupleIdOnNdb(table, range, tupleId, 2) == -1)
+        DBUG_RETURN(-1);
     }
-    /*
-     * if tupleId <= NEXTID, do nothing.  otherwise update NEXTID to
-     * tupleId and set cached range to first = last = tupleId - 1.
-     */
-    if (opTupleIdOnNdb(table, range, tupleId, 2) == -1)
-      DBUG_RETURN(-1);
   }
   else
   {
@@ -1277,6 +1301,39 @@ int Ndb::initAutoIncrement()
   return 0;
 }
 
+bool
+Ndb::checkUpdateAutoIncrementValue(TupleIdRange & range, Uint64 autoValue)
+{
+  return(checkTupleIdInNdb(range, autoValue) != 0);
+}
+
+int
+Ndb::checkTupleIdInNdb(TupleIdRange & range, Uint64 tupleId)
+{
+  DBUG_ENTER("Ndb::checkTupleIdIndNdb");
+  if ((range.m_first_tuple_id != ~(Uint64)0) &&
+      (range.m_first_tuple_id > tupleId))
+  {
+   /*
+    * If we have ever cached a value in this object and this cached
+    * value is larger than the value we're trying to set then we
+    * need not check with the real value in the SYSTAB_0 table.
+    */
+    DBUG_RETURN(0);
+  }
+  if (range.m_highest_seen > tupleId)
+  {
+    /*
+     * Although we've never cached any higher value we have read
+     * a higher value and again it isn't necessary to change the
+     * auto increment value.
+     */
+    DBUG_RETURN(0);
+  }
+  DBUG_RETURN(1);
+}
+
+
 int
 Ndb::opTupleIdOnNdb(const NdbTableImpl* table,
                     TupleIdRange & range, Uint64 & opValue, Uint32 op)
@@ -1342,15 +1399,15 @@ Ndb::opTupleIdOnNdb(const NdbTableImpl* table,
       tOperation->write_attr("NEXTID", 1);
       tOperation->interpret_exit_ok();
       tOperation->def_label(0);
-      tOperation->interpret_exit_nok(9999);
-      
+      tOperation->interpret_exit_ok();
+      tRecAttrResult = tOperation->getValue("NEXTID");
       if (tConnection->execute( NdbTransaction::Commit ) == -1)
       {
-        if (tConnection->theError.code != 9999)
-          goto error_handler;
+        goto error_handler;
       }
       else
       {
+        range.m_highest_seen = tRecAttrResult->u_64_value();
         DBUG_PRINT("info", 
                    ("Setting next auto increment value (db) to %lu",
                     (ulong) opValue));  
@@ -1363,7 +1420,7 @@ Ndb::opTupleIdOnNdb(const NdbTableImpl* table,
       tRecAttrResult = tOperation->getValue("NEXTID");
       if (tConnection->execute( NdbTransaction::Commit ) == -1 )
         goto error_handler;
-      opValue = tRecAttrResult->u_64_value(); // out
+      range.m_highest_seen = opValue = tRecAttrResult->u_64_value(); // out
       break;
     default:
       goto error_handler;
@@ -1819,11 +1876,7 @@ Ndb::printState(const char* fmt, ...)
   NdbMutex_Lock(ndb_print_state_mutex);
   bool dups = false;
   unsigned i;
-  ndbout << buf << " ndb=" << hex << this << dec;
-#ifndef NDB_WIN32
-  ndbout << " thread=" << (int)pthread_self();
-#endif
-  ndbout << endl;
+  ndbout << buf << " ndb=" << hex << (void*)this << endl;
   for (unsigned n = 0; n < MAX_NDB_NODES; n++) {
     NdbTransaction* con = theConnectionArray[n];
     if (con != 0) {
diff --git a/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp b/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
index ab6d90ad59e..0d226a97621 100644
--- a/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
+++ b/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
@@ -43,6 +43,7 @@
 #include <NdbEnv.h>
 #include <NdbMem.h>
 #include <util/version.h>
+#include <NdbSleep.h>
 
 #define DEBUG_PRINT 0
 #define INCOMPATIBLE_VERSION -2
@@ -1777,7 +1778,23 @@ NdbDictInterface::dictSignal(NdbApiSignal* sig,
 {
   DBUG_ENTER("NdbDictInterface::dictSignal");
   DBUG_PRINT("enter", ("useMasterNodeId: %d", node_specification));
-  for(Uint32 i = 0; i<RETRIES; i++){
+
+  int sleep = 50;
+  int mod = 5;
+
+  for(Uint32 i = 0; i<RETRIES; i++)
+  {
+    if (i > 0)
+      NdbSleep_MilliSleep(sleep + 10 * (rand() % mod));
+    if (i == RETRIES / 2)
+    {
+      mod = 10;
+    }
+    if (i == 3*RETRIES/4)
+    {
+      sleep = 100;
+    }
+
     m_buffer.clear();
 
     // Protected area
@@ -2340,6 +2357,22 @@ NdbDictionaryImpl::createTable(NdbTableImpl &t)
 { 
   DBUG_ENTER("NdbDictionaryImpl::createTable");
 
+  
+  bool autoIncrement = false;
+  Uint64 initialValue = 0;
+  for (Uint32 i = 0; i < t.m_columns.size(); i++) {
+    const NdbColumnImpl* c = t.m_columns[i];
+    assert(c != NULL);
+    if (c->m_autoIncrement) {
+      if (autoIncrement) {
+        m_error.code = 4335;
+        DBUG_RETURN(-1);
+      }
+      autoIncrement = true;
+      initialValue = c->m_autoIncrementInitialValue;
+    }
+  }
+ 
   // if the new name has not been set, use the copied name
   if (t.m_newExternalName.empty())
   {
@@ -2377,21 +2410,6 @@ NdbDictionaryImpl::createTable(NdbTableImpl &t)
 
   // auto-increment - use "t" because initial value is not in DICT
   {
-    bool autoIncrement = false;
-    Uint64 initialValue = 0;
-    for (Uint32 i = 0; i < t.m_columns.size(); i++) {
-      const NdbColumnImpl* c = t.m_columns[i];
-      assert(c != NULL);
-      if (c->m_autoIncrement) {
-        if (autoIncrement) {
-          m_error.code = 4335;
-          delete t2;
-          DBUG_RETURN(-1);
-        }
-        autoIncrement = true;
-        initialValue = c->m_autoIncrementInitialValue;
-      }
-    }
     if (autoIncrement) {
       // XXX unlikely race condition - t.m_id may no longer be same table
       // the tuple id range is not used on input
diff --git a/storage/ndb/src/ndbapi/NdbScanOperation.cpp b/storage/ndb/src/ndbapi/NdbScanOperation.cpp
index afbec070ac8..96a3ce4332e 100644
--- a/storage/ndb/src/ndbapi/NdbScanOperation.cpp
+++ b/storage/ndb/src/ndbapi/NdbScanOperation.cpp
@@ -1340,29 +1340,41 @@ NdbIndexScanOperation::readTuples(LockMode lm,
     if(insertATTRINFO(word) == -1)
       res = -1;
   }
-  if(!res && order_by){
-    m_ordered = true;
+  if (!res)
+  {
+    /**
+     * Note that it is valid to have order_desc true and order_by false.
+     *
+     * This means that there will be no merge sort among partitions, but
+     * each partition will still be returned in descending sort order.
+     *
+     * This is useful eg. if it is known that the scan spans only one
+     * partition.
+     */
     if (order_desc) {
       m_descending = true;
       ScanTabReq * req = CAST_PTR(ScanTabReq, theSCAN_TABREQ->getDataPtrSend());
       ScanTabReq::setDescendingFlag(req->requestInfo, true);
     }
-    Uint32 cnt = m_accessTable->getNoOfColumns() - 1;
-    m_sort_columns = cnt; // -1 for NDB$NODE
-    m_current_api_receiver = m_sent_receivers_count;
-    m_api_receivers_count = m_sent_receivers_count;
+    if (order_by) {
+      m_ordered = true;
+      Uint32 cnt = m_accessTable->getNoOfColumns() - 1;
+      m_sort_columns = cnt; // -1 for NDB$NODE
+      m_current_api_receiver = m_sent_receivers_count;
+      m_api_receivers_count = m_sent_receivers_count;
     
-    m_sort_columns = cnt;
-    for(Uint32 i = 0; i<cnt; i++){
-      const NdbColumnImpl* key = m_accessTable->m_index->m_columns[i];
-      const NdbColumnImpl* col = m_currentTable->getColumn(key->m_keyInfoPos);
-      NdbRecAttr* tmp = NdbScanOperation::getValue_impl(col, (char*)-1);
-      UintPtr newVal = UintPtr(tmp);
-      theTupleKeyDefined[i][0] = FAKE_PTR;
-      theTupleKeyDefined[i][1] = (newVal & 0xFFFFFFFF);
+      m_sort_columns = cnt;
+      for(Uint32 i = 0; i<cnt; i++){
+        const NdbColumnImpl* key = m_accessTable->m_index->m_columns[i];
+        const NdbColumnImpl* col = m_currentTable->getColumn(key->m_keyInfoPos);
+        NdbRecAttr* tmp = NdbScanOperation::getValue_impl(col, (char*)-1);
+        UintPtr newVal = UintPtr(tmp);
+        theTupleKeyDefined[i][0] = FAKE_PTR;
+        theTupleKeyDefined[i][1] = (newVal & 0xFFFFFFFF);
 #if (SIZEOF_CHARP == 8)
-      theTupleKeyDefined[i][2] = (newVal >> 32);
+        theTupleKeyDefined[i][2] = (newVal >> 32);
 #endif
+      }
     }
   }
   m_this_bound_start = 0;
diff --git a/storage/ndb/src/ndbapi/ndberror.c b/storage/ndb/src/ndbapi/ndberror.c
index e7f946118f2..363e25fc519 100644
--- a/storage/ndb/src/ndbapi/ndberror.c
+++ b/storage/ndb/src/ndbapi/ndberror.c
@@ -314,6 +314,7 @@ ErrorBundle ErrorCodes[] = {
   { 242,  DMEC, AE, "Zero concurrency in scan"},
   { 244,  DMEC, AE, "Too high concurrency in scan"},
   { 269,  DMEC, AE, "No condition and attributes to read in scan"},
+  { 874,  DMEC, AE, "Too much attrinfo (e.g. scan filter) for scan in tuple manager" },
   { 4600, DMEC, AE, "Transaction is already started"},
   { 4601, DMEC, AE, "Transaction is not started"},
   { 4602, DMEC, AE, "You must call getNdbOperation before executeScan" },
@@ -426,6 +427,7 @@ ErrorBundle ErrorCodes[] = {
   { 1512, DMEC, SE, "File read error" },
   { 1513, DMEC, IE, "Filegroup not online" },
   { 1514, DMEC, SE, "Currently there is a limit of one logfile group" },
+  { 1515, DMEC, SE, "Currently there is a 4G limit of one undo/data-file in 32-bit host" },
   
   { 773,  DMEC, SE, "Out of string memory, please modify StringMemory config parameter" },
   { 775,  DMEC, SE, "Create file is not supported when Diskless=1" },
@@ -625,6 +627,8 @@ ErrorBundle ErrorCodes[] = {
   { 4274, DMEC, IE, "Corrupted main table PK in blob operation" },
   { 4275, DMEC, AE, "The blob method is incompatible with operation type or lock mode" },
   { 4294, DMEC, AE, "Scan filter is too large, discarded" },
+  { 2810, DMEC, TR, "No space left on the device" },
+  { 2815, DMEC, TR, "Error in reading files, please check file system" },
 
   { NO_CONTACT_WITH_PROCESS, DMEC, AE,
     "No contact with the process (dead ?)."},
diff --git a/storage/ndb/test/include/AtrtClient.hpp b/storage/ndb/test/include/AtrtClient.hpp
new file mode 100644
index 00000000000..5728aca2500
--- /dev/null
+++ b/storage/ndb/test/include/AtrtClient.hpp
@@ -0,0 +1,56 @@
+/* Copyright (C) 2003 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
+#ifndef ATRT_CLIENT_HPP
+#define ATRT_CLIENT_HPP
+
+#include <DbUtil.hpp>
+
+class AtrtClient: public DbUtil {
+public:
+
+  enum AtrtCommandType {
+    ATCT_CHANGE_VERSION= 1,
+    ATCT_RESET_PROC= 2
+  };
+
+  AtrtClient(const char* _user= "root",
+             const char* _password= "",
+             const char* _suffix= ".1.atrt");
+  AtrtClient(MYSQL*);
+  ~AtrtClient();
+
+
+  // Command functions
+  bool changeVersion(int process_id, const char* process_args);
+  bool resetProc(int process_id);
+
+  // Query functions
+  bool getConnectString(int cluster_id, SqlResultSet& result);
+  bool getClusters(SqlResultSet& result);
+  bool getMgmds(int cluster_id, SqlResultSet& result);
+  bool getNdbds(int cluster_id, SqlResultSet& result);
+
+private:
+  int writeCommand(AtrtCommandType _type,
+                   const Properties& args);
+  bool readCommand(uint command_id,
+                   SqlResultSet& result);
+
+  bool doCommand(AtrtCommandType _type,
+                 const Properties& args);
+};
+
+#endif
diff --git a/storage/ndb/test/include/DbUtil.hpp b/storage/ndb/test/include/DbUtil.hpp
new file mode 100755
index 00000000000..d865c92f9a3
--- /dev/null
+++ b/storage/ndb/test/include/DbUtil.hpp
@@ -0,0 +1,176 @@
+/* Copyright (C) 2007 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
+// dbutil.h: interface for the database utilities class.
+// Supplies a database to the test application
+
+#ifndef DBUTIL_HPP
+#define DBUTIL_HPP
+
+#include <NDBT.hpp>
+#include <BaseString.hpp>
+#include <Properties.hpp>
+#include <Vector.hpp>
+#include <mysql.h>
+
+//#define DEBUG
+#define  DIE_UNLESS(expr) \
+           ((void) ((expr) ? 0 : (Die(__FILE__, __LINE__, #expr), 0)))
+#define DIE(expr) \
+          Die(__FILE__, __LINE__, #expr)
+#define myerror(msg) printError(msg)
+#define mysterror(stmt, msg) printStError(stmt, msg)
+#define  CheckStmt(stmt) \
+{ \
+if ( stmt == 0) \
+  myerror(NULL); \
+DIE_UNLESS(stmt != 0); \
+}
+
+#define  check_execute(stmt, r) \
+{ \
+if (r) \
+  mysterror(stmt, NULL); \
+DIE_UNLESS(r == 0);\
+}
+
+
+class SqlResultSet : public Properties {
+public:
+
+  // Get row with number
+  bool get_row(int row_num);
+  // Load next row
+  bool next(void);
+  // Reset iterator
+  void reset(void);
+  // Remove current row from resultset
+  void remove();
+
+  SqlResultSet();
+  ~SqlResultSet();
+
+  const char* column(const char* col_name);
+  uint columnAsInt(const char* col_name);
+
+  uint insertId();
+  uint affectedRows();
+  uint numRows(void);
+  uint mysqlErrno();
+  const char* mysqlError();
+  const char* mysqlSqlstate();
+
+private:
+  uint get_int(const char* name);
+  const char* get_string(const char* name);
+
+  const Properties* m_curr_row;
+  uint m_curr_row_num;
+};
+
+
+#define DBU_FAILED 1
+#define DBU_OK 0
+
+class DbUtil
+{
+public:
+
+  DbUtil(MYSQL* mysql);
+  DbUtil(const char* dbname = "mysql",
+         const char* user = "root",
+         const char* pass = "",
+         const char* suffix = NULL);
+  ~DbUtil();
+
+  bool doQuery(const char* query);
+  bool doQuery(const char* query, SqlResultSet& result);
+  bool doQuery(const char* query, const Properties& args, SqlResultSet& result);
+
+  bool doQuery(BaseString& str);
+  bool doQuery(BaseString& str, SqlResultSet& result);
+  bool doQuery(BaseString& str, const Properties& args, SqlResultSet& result);
+
+  bool waitConnected(int timeout);
+
+  /* Deprecated, see connect() */
+  void  databaseLogin(const char * system,
+                      const char * usr,
+                      const char * password,
+                      unsigned int portIn,
+                      const char * sockIn,
+                      bool transactional);
+
+  const char * getDbName()  {return m_dbname.c_str();};
+  const char * getUser()    {return m_user.c_str();};
+  const char * getPassword(){return m_pass.c_str();};
+  const char * getHost()    {return m_host.c_str();};
+  const char * getSocket()  {return m_socket.c_str();};
+  const char * getServerType(){return mysql_get_server_info(m_mysql);};
+  const char * getError();
+
+  MYSQL * getMysql(){return m_mysql;};
+  MYSQL_STMT * STDCALL mysqlSimplePrepare(const char *query);
+
+  void databaseLogout();
+  void mysqlCloseStmHandle(MYSQL_STMT *my_stmt);
+
+  int connect();
+  void disconnect();
+  int selectDb();
+  int selectDb(const char *);
+  int createDb(BaseString&);
+  int getErrorNumber();
+
+  unsigned long selectCountTable(const char * table);
+
+protected:
+
+  bool runQuery(const char* query,
+               const Properties& args,
+               SqlResultSet& rows);
+
+  bool isConnected();
+
+  MYSQL * m_mysql;
+  bool m_free_mysql; /* Don't free mysql* if allocated elsewhere */
+
+private:
+
+  bool m_connected;
+
+  BaseString m_host;       // Computer to connect to
+  BaseString m_user;       // MySQL User
+  BaseString m_pass;       // MySQL User Password
+  BaseString m_dbname;     // Database to use
+  BaseString m_socket;     // MySQL Server Unix Socket
+  BaseString m_default_file;
+  BaseString m_default_group;
+
+  unsigned int m_port;     // MySQL Server port
+
+  void setDbName(const char * name){m_dbname.assign(name);};
+  void setUser(const char * user_name){m_user.assign(user_name);};
+  void setPassword(const char * password){m_pass.assign(password);};
+  void setHost(const char * system){m_host.assign(system);};
+  void setPort(unsigned int portIn){m_port=portIn;};
+  void setSocket(const char * sockIn){m_socket.assign(sockIn);};
+  void printError(const char *msg);
+  void printStError(MYSQL_STMT *stmt, const char *msg);
+  void die(const char *file, int line, const char *expr); // stop program
+
+};
+#endif
+
diff --git a/storage/ndb/test/include/dbutil.hpp b/storage/ndb/test/include/dbutil.hpp
deleted file mode 100755
index 2b36965715f..00000000000
--- a/storage/ndb/test/include/dbutil.hpp
+++ /dev/null
@@ -1,97 +0,0 @@
-// dbutil.h: interface for the database utilities class.
-//////////////////////////////////////////////////////////////////////
-// Supplies a database to the test application
-//////////////////////////////////////////////////////////////////////
-
-#ifndef DBUTIL_HPP
-#define DBUTIL_HPP
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-#include <time.h>
-#include <stdio.h>
-#include <string.h>
-#include <mysql.h>
-//include "rand.h"
-#include <stdlib.h>
-
-//#define DEBUG
-#define  DIE_UNLESS(expr) \
-           ((void) ((expr) ? 0 : (Die(__FILE__, __LINE__, #expr), 0)))
-#define DIE(expr) \
-          Die(__FILE__, __LINE__, #expr)
-#define myerror(msg) PrintError(msg)
-#define mysterror(stmt, msg) PrintStError(stmt, msg)
-#define  CheckStmt(stmt) \
-{ \
-if ( stmt == 0) \
-  myerror(NULL); \
-DIE_UNLESS(stmt != 0); \
-}
-
-#define  check_execute(stmt, r) \
-{ \
-if (r) \
-  mysterror(stmt, NULL); \
-DIE_UNLESS(r == 0);\
-}
-
-#define TRUE 1
-#define FALSE 0
-
-
-class dbutil
-{
-public:
-
-  dbutil(const char * databaseName);
-  ~dbutil();
-
-  void  DatabaseLogin(const char * system,
-                      const char * usr,
-                      const char * password,
-                      unsigned int portIn,
-                      const char * sockIn,
-                      bool transactional);
-  char * GetDbName(){return dbs;};
-  char * GetUser(){return user;};
-  char * GetPassword(){return pass;};
-  char * GetHost(){return host;};
-  char * GetSocket(){return socket;};
-  const char * GetServerType(){return mysql_get_server_info(myDbHandel);};
-  MYSQL* GetDbHandel(){return myDbHandel;};
-  MYSQL_STMT *STDCALL MysqlSimplePrepare(const char *query);
-  int Select_DB();
-  int Do_Query(char * stm);
-  const char * GetError();
-  int GetErrorNumber();
-  unsigned long SelectCountTable(const char * table);
-
-private:
-
-  //Connect variables
-  char * databaseName; //hold results file name
-  char host[256];                   // Computer to connect to
-  char user[256];                   // MySQL User
-  char pass[256];                   // MySQL User Password
-  char dbs[256];                    // Database to use (TPCB)
-  unsigned int port;               // MySQL Server port
-  char socket[256];             // MySQL Server Unix Socket
-  MYSQL  *myDbHandel;
-
-  void DatabaseLogout();
-
-  void SetDbName(const char * name){strcpy((char *)dbs, name);};
-  void SetUser(const char * userName){strcpy((char *)user, userName);};
-  void SetPassword(const char * password){strcpy((char *)pass,password);};
-  void SetHost(const char * system){strcpy((char*)host, system);};
-  void SetPort(unsigned int portIn){port=portIn;};
-  void SetSocket(const char * sockIn){strcpy((char *)socket, sockIn);};
-  void PrintError(const char *msg);
-  void PrintStError(MYSQL_STMT *stmt, const char *msg);
-  void Die(const char *file, int line, const char *expr); // stop program
-  
-};
-#endif
-
diff --git a/storage/ndb/test/ndbapi/Makefile.am b/storage/ndb/test/ndbapi/Makefile.am
index ad509dbbafe..81bb346417f 100644
--- a/storage/ndb/test/ndbapi/Makefile.am
+++ b/storage/ndb/test/ndbapi/Makefile.am
@@ -52,7 +52,9 @@ testBitfield \
 DbCreate DbAsyncGenerator \
 testSRBank \
 test_event_merge \
-testIndexStat
+testIndexStat \
+testNDBT \
+NdbRepStress
 
 EXTRA_PROGRAMS = \
  test_event \
@@ -98,7 +100,10 @@ ndbapi_slow_select_SOURCES = slow_select.cpp
 testReadPerf_SOURCES = testReadPerf.cpp
 testLcp_SOURCES = testLcp.cpp
 testPartitioning_SOURCES = testPartitioning.cpp
+testNDBT_SOURCES = testNDBT.cpp
+testNDBT_LDADD = $(LDADD) $(top_srcdir)/libmysql_r/libmysqlclient_r.la
 testBitfield_SOURCES = testBitfield.cpp
+NdbRepStress_SOURCES = acrt/NdbRepStress.cpp
 DbCreate_SOURCES = bench/mainPopulate.cpp bench/dbPopulate.cpp bench/userInterface.cpp bench/dbPopulate.h bench/userInterface.h bench/testData.h bench/testDefinitions.h bench/ndb_schema.hpp bench/ndb_error.hpp
 DbAsyncGenerator_SOURCES = bench/mainAsyncGenerator.cpp bench/asyncGenerator.cpp bench/ndb_async2.cpp bench/dbGenerator.h bench/macros.h bench/userInterface.h bench/testData.h bench/testDefinitions.h bench/ndb_schema.hpp bench/ndb_error.hpp
 testSRBank_SOURCES = testSRBank.cpp
@@ -115,8 +120,10 @@ include $(top_srcdir)/storage/ndb/config/type_ndbapitest.mk.am
 ##testIndex_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
 ##testSystemRestart_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
 ##testTransactions_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
+NdbRepStress_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/test/include -I$(top_srcdir)/include
 testBackup_LDADD = $(LDADD) bank/libbank.a
 testSRBank_LDADD = bank/libbank.a $(LDADD) 
+NdbRepStress_LDADD = $(LDADD) $(top_builddir)/libmysql_r/libmysqlclient_r.la
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%
diff --git a/storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp b/storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp
new file mode 100644
index 00000000000..644405636ba
--- /dev/null
+++ b/storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp
@@ -0,0 +1,456 @@
+/* Copyright (C) 2003 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
+#include <NDBT_Test.hpp>
+#include <NDBT_ReturnCodes.h>
+#include <HugoTransactions.hpp>
+#include <UtilTransactions.hpp>
+#include <DbUtil.hpp>
+#include <mysql.h>
+
+/*
+Will include restart testing in future phases
+#include <NdbRestarter.hpp>
+#include <NdbRestarts.hpp>
+*/
+
+/**** TOOL SECTION ****/
+
+static uint
+urandom()
+{
+  uint r = (uint)random();
+  return r;
+}
+
+static uint
+urandom(uint m)
+{
+  if (m == 0)
+    return NDBT_OK;
+  uint r = urandom();
+  r = r % m;
+  return r;
+}
+
+#define GETNDB(ps) ((NDBT_NdbApiStep*)ps)->getNdb()
+/*
+*/
+
+int 
+syncSlaveWithMaster()
+{
+  /* 
+     We need to look at the MAX epoch of the
+     mysql.ndb_binlog_index table so we will
+     know when the slave has caught up
+  */
+
+  SqlResultSet result;
+  unsigned int masterEpoch = 0;
+  unsigned int slaveEpoch = 0;
+  unsigned int slaveEpochOld = 0;
+  int maxLoops = 100;
+  int loopCnt = 0;
+  
+  //Create a DbUtil object for the master
+  DbUtil master("mysql","");
+
+  //Login to Master
+  if (!master.connect())
+  {
+    return NDBT_FAILED;
+  } 
+
+    //Get max epoch from master
+  if(master.doQuery("SELECT MAX(epoch) FROM mysql.ndb_binlog_index", result))
+  {
+    return NDBT_FAILED;
+  }
+  masterEpoch = result.columnAsInt("epoch");
+  
+  /*
+     Now we will pull current epoch from slave. If not the
+     same as master, we will continue to retrieve the epoch
+     and compare until it matches or we reach the max loops
+     allowed.
+  */
+
+  //Create a dbutil object for the slave
+  DbUtil slave("mysql",".slave");
+
+  //Login to slave
+  if (!slave.connect())
+  {
+    return NDBT_FAILED;
+  }
+
+  while(slaveEpoch != masterEpoch && loopCnt < maxLoops)
+  {
+    if(slave.doQuery("SELECT epoch FROM mysql.ndb_apply_status",result))
+    {
+      return NDBT_FAILED;
+    }
+    slaveEpoch = result.columnAsInt("epoch");
+   
+    if(slaveEpoch != slaveEpochOld)
+    {
+      slaveEpochOld = slaveEpoch;
+      if(loopCnt > 0)
+        loopCnt--;
+      sleep(3);
+    }
+    else
+    {
+      sleep(1);
+      loopCnt++;
+    }
+  }
+
+  if(slaveEpoch != masterEpoch)
+  {
+    g_err << "Slave not in sync with master!" << endl;
+    return NDBT_FAILED;
+  }
+  return NDBT_OK;
+}
+
+int
+verifySlaveLoad(BaseString &table)
+{
+  //BaseString  sqlStm;
+  BaseString  db;
+  unsigned int masterCount = 0;
+  unsigned int slaveCount  = 0;
+ 
+  db.assign("TEST_DB");
+  //sqlStm.assfmt("SELECT COUNT(*) FROM %s", table);
+
+  //First thing to do is sync slave
+  if(syncSlaveWithMaster())
+  {
+    g_err << "Verify Load -> Syncing with slave failed" << endl;
+    return NDBT_FAILED;
+  }
+
+  //Now that slave is sync we can verify load
+  DbUtil master(db.c_str()," ");
+
+  //Login to Master
+  if (!master.connect())
+  {
+    return NDBT_FAILED;
+  }
+
+  if((masterCount = master.selectCountTable(table.c_str())) == 0 )
+  {
+    return NDBT_FAILED;
+  }
+  
+  //Create a DB Object for slave
+  DbUtil slave(db.c_str(),".slave");
+
+  //Login to slave
+  if (!slave.connect())
+  {
+    return NDBT_FAILED;
+  }
+
+  if((slaveCount = slave.selectCountTable(table.c_str())) == 0 )
+  {
+    return NDBT_FAILED;
+  }
+  
+  if(slaveCount != masterCount)
+  {
+    g_err << "Verify Load -> Slave Count != Master Count "
+          << endl;
+    return NDBT_FAILED;
+  }
+  return NDBT_OK;
+}
+
+int
+createTEST_DB(NDBT_Context* ctx, NDBT_Step* step)
+{
+  BaseString cdb;
+  cdb.assign("TEST_DB");
+
+  //Create a dbutil object
+  DbUtil master("mysql","");
+
+  if (master.connect())
+  {
+    if (master.createDb(cdb) == NDBT_OK)
+    {
+      return NDBT_OK;
+    }
+  }
+  return NDBT_FAILED;
+}
+
+int
+dropTEST_DB(NDBT_Context* ctx, NDBT_Step* step)
+{
+  //Create an SQL Object
+  DbUtil master("mysql","");
+
+  //Login to Master
+  if (!master.connect())
+  {
+    return NDBT_FAILED;
+  }
+
+  if(master.doQuery("DROP DATABASE TEST_DB") != NDBT_OK)
+  {
+    return NDBT_FAILED;
+  }
+
+  if(syncSlaveWithMaster() != NDBT_OK)
+  {
+    g_err << "Drop DB -> Syncing with slave failed"
+          << endl;
+    return NDBT_FAILED;
+  }
+  return NDBT_OK;
+}
+
+int
+verifySlave(BaseString& sqlStm, BaseString& db, BaseString& column)
+{
+  SqlResultSet result;
+  float       masterSum;
+  float       slaveSum;
+
+  //Create SQL Objects
+  DbUtil     master(db.c_str(),"");
+  DbUtil     slave(db.c_str(),".slave");
+
+  if(syncSlaveWithMaster() != NDBT_OK)
+  {
+    g_err << "Verify Slave rep1 -> Syncing with slave failed"
+          << endl;
+    return NDBT_FAILED;
+  }
+
+  //Login to Master
+  if (!master.connect())
+  {
+    return NDBT_FAILED;
+  }
+
+  if(master.doQuery(sqlStm.c_str(),result) != NDBT_OK)
+  {
+    return NDBT_FAILED;
+  }
+  masterSum = result.columnAsInt(column.c_str());
+  
+  //Login to slave
+  if (!slave.connect())
+  {
+    return NDBT_FAILED;
+  }
+
+  if(slave.doQuery(sqlStm.c_str(),result) != NDBT_OK)
+  {
+     return NDBT_FAILED;
+  }
+  slaveSum = result.columnAsInt(column.c_str());
+  
+  if(masterSum != slaveSum)
+  {
+    g_err << "VerifySlave -> masterSum != slaveSum..." << endl;
+    return NDBT_FAILED;
+  }
+  return NDBT_OK;
+}
+
+
+/**** Test Section ****/
+
+int 
+createDB(NDBT_Context* ctx, NDBT_Step* step)
+{
+  BaseString cdb;
+  cdb.assign("TEST_DB");
+
+  //Create a dbutil object
+  DbUtil master("mysql","");
+
+  if (master.connect())
+  {
+    if (master.createDb(cdb) == NDBT_OK)
+    {
+      return NDBT_OK;
+    }
+  }
+  return NDBT_FAILED;
+}
+
+int
+createTable_rep1(NDBT_Context* ctx, NDBT_Step* step)
+{
+  BaseString table;
+  BaseString db;
+
+  table.assign("rep1");
+  db.assign("TEST_DB");
+
+  //Ensure slave is up and ready
+  if(syncSlaveWithMaster() != NDBT_OK)
+  {
+    g_err << "Create Table -> Syncing with slave failed"
+          << endl;
+    return NDBT_FAILED;
+  }
+
+  //Create an SQL Object
+  DbUtil master(db.c_str(),"");
+
+  //Login to Master
+  if (!master.connect())
+  {
+    return NDBT_FAILED;
+  }
+
+  if (master.doQuery("CREATE TABLE rep1 (c1 MEDIUMINT NOT NULL AUTO_INCREMENT,"
+                     " c2 FLOAT, c3 CHAR(5), c4 bit(8), c5 FLOAT, c6 INT,"
+                     " c7 INT, PRIMARY KEY (c1))ENGINE=NDB"))
+  {
+    return NDBT_FAILED;
+  }
+  ctx->setProperty("TABLES",table.c_str());
+  HugoTransactions hugoTrans(*ctx->getTab());
+
+  if (hugoTrans.loadTable(GETNDB(step), ctx->getNumRecords(), 1, true, 0) != NDBT_OK)
+  {
+    g_err << "Create Table -> Load failed!" << endl;
+    return NDBT_FAILED;
+  }
+
+  if(verifySlaveLoad(table)!= NDBT_OK)
+  {
+    g_err << "Create Table -> Failed on verify slave load!" 
+          << endl;
+    return NDBT_FAILED;
+  }
+  //else everything is okay  
+  return NDBT_OK;
+}
+
+int
+stressNDB_rep1(NDBT_Context* ctx, NDBT_Step* step)
+{
+  const NdbDictionary::Table * table= ctx->getTab();
+  HugoTransactions hugoTrans(* table);
+  while(!ctx->isTestStopped())
+  {
+    if (hugoTrans.pkUpdateRecords(GETNDB(step), ctx->getNumRecords(), 1, 30) != 0)
+    {
+      g_err << "pkUpdate Failed!" << endl;
+      return NDBT_FAILED;
+    }
+    if (hugoTrans.scanUpdateRecords(GETNDB(step), ctx->getNumRecords(), 1, 30) != 0)
+    {
+      g_err << "scanUpdate Failed!" << endl;
+      return NDBT_FAILED;
+    }
+  }
+  return NDBT_OK;
+}
+
+int
+stressSQL_rep1(NDBT_Context* ctx, NDBT_Step* step)
+{
+  BaseString sqlStm;
+
+  DbUtil master("TEST_DB","");
+  int loops = ctx->getNumLoops();
+  uint record = 0;
+
+  //Login to Master
+  if (!master.connect())
+  {
+    ctx->stopTest();
+    return NDBT_FAILED;
+  }
+
+  for (int j= 0; loops == 0 || j < loops; j++)
+  {
+    record = urandom(ctx->getNumRecords());
+    sqlStm.assfmt("UPDATE TEST_DB.rep1 SET c2 = 33.3221 where c1 =  %u", record);
+    if(master.doQuery(sqlStm.c_str()))
+    {
+      return NDBT_FAILED;
+    }
+  }
+  ctx->stopTest();
+  return NDBT_OK;
+}
+
+int
+verifySlave_rep1(NDBT_Context* ctx, NDBT_Step* step)
+{
+  BaseString sql;
+  BaseString db;
+  BaseString column;
+
+  sql.assign("SELECT SUM(c3) FROM rep1");
+  db.assign("TEST_DB");
+  column.assign("c3");
+
+  if (verifySlave(sql,db,column) != NDBT_OK)
+    return NDBT_FAILED;
+  return NDBT_OK;
+}
+
+/* TOOLS LIST
+
+ syncSlaveWithMaster() 
+ {ensures slave is at same epoch as master}
+
+ verifySlaveLoad(BaseString *table) 
+ {ensures slave table has same record count as master}
+
+ createTEST_DB() 
+ {Creates TEST_DB database on master}
+
+ dropTEST_DB() 
+ {Drops TEST_DB database on master} 
+
+ verifySlave(BaseString& sql, BaseSting& db, BaseSting& column) 
+ {The SQL statement must sum a column and will verify
+  that the sum of the column is equal on master & slave}
+*/
+                     
+
+NDBT_TESTSUITE(NdbRepStress);
+TESTCASE("PHASE_I_Stress","Basic Replication Stressing") 
+{
+  INITIALIZER(createDB);
+  INITIALIZER(createTable_rep1);
+  STEP(stressNDB_rep1);
+  STEP(stressSQL_rep1);
+  FINALIZER(verifySlave_rep1);
+  FINALIZER(dropTEST_DB);
+}
+NDBT_TESTSUITE_END(NdbRepStress);
+
+int main(int argc, const char** argv){
+  ndb_init();
+  NdbRepStress.setCreateAllTables(true);
+  return NdbRepStress.execute(argc, argv);
+}
+
diff --git a/storage/ndb/test/ndbapi/testBitfield.cpp b/storage/ndb/test/ndbapi/testBitfield.cpp
index 8ba8f3d92ef..41bb7b4622c 100644
--- a/storage/ndb/test/ndbapi/testBitfield.cpp
+++ b/storage/ndb/test/ndbapi/testBitfield.cpp
@@ -4,6 +4,8 @@
 #include <NDBT.hpp>
 #include <NdbApi.hpp>
 #include <HugoTransactions.hpp>
+#include <Bitmask.hpp>
+#include <Vector.hpp>
 
 static const char* _dbname = "TEST_DB";
 static int g_loops = 7;
@@ -37,6 +39,7 @@ static int unique_indexes(Ndb*, const NdbDictionary::Table* tab);
 static int ordered_indexes(Ndb*, const NdbDictionary::Table* tab);
 static int node_restart(Ndb*, const NdbDictionary::Table* tab);
 static int system_restart(Ndb*, const NdbDictionary::Table* tab);
+static int testBitmask();
 
 int 
 main(int argc, char** argv){
@@ -49,6 +52,15 @@ main(int argc, char** argv){
 			       ndb_std_get_one_option)))
     return NDBT_ProgramExit(NDBT_WRONGARGS);
 
+  int res = NDBT_FAILED;
+
+  /* Run cluster-independent tests */
+  for (int i=0; i<(10*g_loops); i++)
+  {
+    if (NDBT_OK != (res= testBitmask()))
+      return NDBT_ProgramExit(res);
+  }
+  
   Ndb_cluster_connection con(opt_connect_str);
   if(con.connect(12, 5, 1))
   {
@@ -60,7 +72,6 @@ main(int argc, char** argv){
   pNdb = new Ndb(&con, _dbname);  
   pNdb->init();
   while (pNdb->waitUntilReady() != 0);
-  int res = NDBT_FAILED;
 
   NdbDictionary::Dictionary * dict = pNdb->getDictionary();
 
@@ -121,14 +132,12 @@ create_random_table(Ndb* pNdb)
   do {
     NdbDictionary::Table tab;
     Uint32 cols = 1 + (rand() % (NDB_MAX_ATTRIBUTES_IN_TABLE - 1));
-    Uint32 keys = NDB_MAX_NO_OF_ATTRIBUTES_IN_KEY;
     Uint32 length = 4090;
-    Uint32 key_size = NDB_MAX_KEYSIZE_IN_WORDS;
     
     BaseString name; 
     name.assfmt("TAB_%d", rand() & 65535);
     tab.setName(name.c_str());
-    for(int i = 0; i<cols && length > 2; i++)
+    for(Uint32 i = 0; i<cols && length > 2; i++)
     {
       NdbDictionary::Column col;
       name.assfmt("COL_%d", i);
@@ -206,3 +215,394 @@ system_restart(Ndb* pNdb, const NdbDictionary::Table* tab)
 {
   return 0;
 }
+
+/* Note : folowing classes test functionality of storage/ndb/src/common/util/Bitmask.cpp
+ * and were originally defined there.
+ * Set BITMASK_DEBUG to 1 to get more test debugging info.
+ */
+#define BITMASK_DEBUG 0
+
+static
+bool cmp(const Uint32 b1[], const Uint32 b2[], Uint32 len)
+{
+  Uint32 sz32 = (len + 31) >> 5;
+  for(Uint32 i = 0; i<len; i++)
+  {
+    if(BitmaskImpl::get(sz32, b1, i) ^ BitmaskImpl::get(sz32, b2, i))
+      return false;
+  }
+  return true;
+}
+
+static
+void print(const Uint32 src[], Uint32 len, Uint32 pos = 0)
+{
+  printf("b'");
+  for(unsigned i = 0; i<len; i++)
+  {
+    if(BitmaskImpl::get((pos + len + 31) >> 5, src, i+pos))
+      printf("1");
+    else
+      printf("0");
+    if((i & 31) == 31)
+      printf(" ");
+  }
+}
+
+static int lrand()
+{
+  return rand();
+}
+
+static
+void rand(Uint32 dst[], Uint32 len)
+{
+  for(Uint32 i = 0; i<len; i++)
+    BitmaskImpl::set((len + 31) >> 5, dst, i, (lrand() % 1000) > 500);
+}
+
+static
+int checkNoTramplingGetSetField(const Uint32 totalTests)
+{
+  const Uint32 numWords= 67;
+  const Uint32 maxBitsToCopy= (numWords * 32);
+  Uint32 sourceBuf[numWords];
+  Uint32 targetBuf[numWords];
+
+  ndbout << "Testing : Bitmask NoTrampling\n";
+
+  memset(sourceBuf, 0x00, (numWords*4));
+
+  for (Uint32 test=0; test<totalTests; test++)
+  {
+    /* Always copy at least 1 bit */
+    Uint32 srcStart= rand() % (maxBitsToCopy -1);
+    Uint32 length= (rand() % ((maxBitsToCopy -1) - srcStart)) + 1;
+
+    if (BITMASK_DEBUG)
+      ndbout << "Testing start %u, length %u \n"
+             << srcStart
+             << length;
+    // Set target to all ones.
+    memset(targetBuf, 0xff, (numWords*4));
+
+    BitmaskImpl::getField(numWords, sourceBuf, srcStart, length, targetBuf);
+
+    // Check that there is no trampling
+    Uint32 firstUntrampledWord= (length + 31)/32;
+
+    for (Uint32 word=0; word< numWords; word++)
+    {
+      Uint32 targetWord= targetBuf[word];
+      if (BITMASK_DEBUG)
+        ndbout << "word=%d, targetWord=%u, firstUntrampledWord..=%u"
+               << word << targetWord << firstUntrampledWord;
+
+      if (! (word < firstUntrampledWord) ?
+          (targetWord == 0) :
+          (targetWord == 0xffffffff))
+      {
+        ndbout << "Notrampling getField failed for srcStart "
+               << srcStart
+               << " length " << length
+               << " at word " << word << "\n";
+        ndbout << "word=%d, targetWord=%u, firstUntrampledWord..=%u"
+               << word << targetWord << firstUntrampledWord;
+        return -1;
+      }
+
+    }
+
+    /* Set target back to all ones. */
+    memset(targetBuf, 0xff, (numWords*4));
+
+    BitmaskImpl::setField(numWords, targetBuf, srcStart, length, sourceBuf);
+
+    /* Check we've got all ones, with zeros only where expected */
+    for (Uint32 word=0; word< numWords; word++)
+    {
+      Uint32 targetWord= targetBuf[word];
+
+      for (Uint32 bit=0; bit< 32; bit++)
+      {
+        Uint32 bitNum= (word << 5) + bit;
+        bool expectedValue= !((bitNum >= srcStart) &&
+                              (bitNum < (srcStart + length)));
+        bool actualValue= (((targetWord >> bit) & 1) == 1);
+        if (BITMASK_DEBUG)
+          ndbout << "bitNum=%u expectedValue=%u, actual value=%u"
+                 << bitNum << expectedValue << actualValue;
+
+        if (actualValue != expectedValue)
+        {
+          ndbout << "Notrampling setField failed for srcStart "
+                 << srcStart
+                 << " length " << length
+                 << " at word " << word << " bit " << bit <<  "\n";
+          ndbout << "bitNum=%u expectedValue=%u, actual value=%u"
+                 << bitNum << expectedValue << actualValue;
+          return -1;
+        }
+      }
+    }
+
+  }
+
+  return 0;
+}
+
+static
+int simple(int pos, int size)
+{
+  ndbout << "Testing : Bitmask simple pos: " << pos << " size: " << size << "\n";
+  Vector<Uint32> _mask;
+  Vector<Uint32> _src;
+  Vector<Uint32> _dst;
+  Uint32 sz32 = (size + pos + 32) >> 5;
+  const Uint32 sz = 4 * sz32;
+
+  Uint32 zero = 0;
+  _mask.fill(sz32+1, zero);
+  _src.fill(sz32+1, zero);
+  _dst.fill(sz32+1, zero);
+
+  Uint32 * src = _src.getBase();
+  Uint32 * dst = _dst.getBase();
+  Uint32 * mask = _mask.getBase();
+
+  memset(src, 0x0, sz);
+  memset(dst, 0x0, sz);
+  memset(mask, 0xFF, sz);
+  rand(src, size);
+  BitmaskImpl::setField(sz32, mask, pos, size, src);
+  BitmaskImpl::getField(sz32, mask, pos, size, dst);
+  if (BITMASK_DEBUG)
+  {
+    printf("src: "); print(src, size+31); printf("\n");
+    printf("msk: "); print(mask, (sz32 << 5) + 31); printf("\n");
+    printf("dst: "); print(dst, size+31); printf("\n");
+  }
+  return (cmp(src, dst, size+31)?0 : -1);
+};
+
+struct Alloc
+{
+  Uint32 pos;
+  Uint32 size;
+  Vector<Uint32> data;
+};
+
+static
+int
+testRanges(Uint32 bitmask_size)
+{
+  Vector<Alloc> alloc_list;
+  bitmask_size = (bitmask_size + 31) & ~31;
+  Uint32 sz32 = (bitmask_size >> 5);
+  Vector<Uint32> alloc_mask;
+  Vector<Uint32> test_mask;
+
+  ndbout_c("Testing : Bitmask ranges for bitmask of size %d", bitmask_size);
+  Uint32 zero = 0;
+  alloc_mask.fill(sz32, zero);
+  test_mask.fill(sz32, zero);
+
+  /* Loop a number of times, setting and clearing bits in the mask
+   * and tracking the modifications in a separate structure.
+   * Check that both structures remain in sync
+   */
+  for(int i = 0; i<5000; i++)
+  {
+    Vector<Uint32> tmp;
+    tmp.fill(sz32, zero);
+
+    Uint32 pos = lrand() % (bitmask_size - 1);
+    Uint32 free = 0;
+    if(BitmaskImpl::get(sz32, alloc_mask.getBase(), pos))
+    {
+      // Bit was allocated
+      // 1) Look up allocation
+      // 2) Check data
+      // 3) free it
+      size_t j;
+      Uint32 min, max;
+      for(j = 0; j<alloc_list.size(); j++)
+      {
+	min = alloc_list[j].pos;
+	max = min + alloc_list[j].size;
+	if(pos >= min && pos < max)
+	{
+	  break;
+	}
+      }
+      if (! ((pos >= min) && (pos < max)))
+      {
+        printf("Failed with pos %u, min %u, max %u\n",
+               pos, min, max);
+        return -1;
+      }
+      BitmaskImpl::getField(sz32, test_mask.getBase(), min, max-min,
+			    tmp.getBase());
+      if(BITMASK_DEBUG)
+      {
+	printf("freeing [ %d %d ]", min, max);
+	printf("- mask: ");
+	print(tmp.getBase(), max - min);
+
+	printf(" save: ");
+	size_t k;
+	Alloc& a = alloc_list[j];
+	for(k = 0; k<a.data.size(); k++)
+	  printf("%.8x ", a.data[k]);
+	printf("\n");
+      }
+      if(!cmp(tmp.getBase(), alloc_list[j].data.getBase(), max - min))
+      {
+	return -1;
+      }
+      while(min < max)
+	BitmaskImpl::clear(sz32, alloc_mask.getBase(), min++);
+      alloc_list.erase(j);
+    }
+    else
+    {
+      Vector<Uint32> tmp;
+      tmp.fill(sz32, zero);
+
+      // Bit was free
+      // 1) Check how much space is avaiable
+      // 2) Create new allocation of lrandom size
+      // 3) Fill data with lrandom data
+      // 4) Update alloc mask
+      while(pos+free < bitmask_size &&
+	    !BitmaskImpl::get(sz32, alloc_mask.getBase(), pos+free))
+	free++;
+
+      Uint32 sz =
+	(free <= 64 && ((lrand() % 100) > 80)) ? free : (lrand() % free);
+      sz = sz ? sz : 1;
+      sz = pos + sz == bitmask_size ? sz - 1 : sz;
+      Alloc a;
+      a.pos = pos;
+      a.size = sz;
+      a.data.fill(((sz+31)>> 5)-1, zero);
+      if(BITMASK_DEBUG)
+	printf("pos %d -> alloc [ %d %d ]", pos, pos, pos+sz);
+      for(size_t j = 0; j<sz; j++)
+      {
+	BitmaskImpl::set(sz32, alloc_mask.getBase(), pos+j);
+	if((lrand() % 1000) > 500)
+	  BitmaskImpl::set((sz + 31) >> 5, a.data.getBase(), j);
+      }
+      if(BITMASK_DEBUG)
+      {
+	printf("- mask: ");
+	print(a.data.getBase(), sz);
+	printf("\n");
+      }
+      BitmaskImpl::setField(sz32, test_mask.getBase(), pos, sz,
+			    a.data.getBase());
+      alloc_list.push_back(a);
+    }
+  }
+
+#define NDB_BM_SUPPORT_RANGE
+#ifdef NDB_BM_SUPPORT_RANGE
+  for(Uint32 i = 0; i<1000; i++)
+  {
+    Uint32 sz32 = 10+rand() % 100;
+    Uint32 zero = 0;
+    Vector<Uint32> map;
+    map.fill(sz32, zero);
+
+    Uint32 sz = 32 * sz32;
+    Uint32 start = (rand() % sz);
+    Uint32 stop = start + ((rand() % (sz - start)) & 0xFFFFFFFF);
+
+    Vector<Uint32> check;
+    check.fill(sz32, zero);
+
+    /* Verify range setting method works correctly */
+    for(Uint32 j = 0; j<sz; j++)
+    {
+      bool expect = (j >= start && j<stop);
+      if(expect)
+	BitmaskImpl::set(sz32, check.getBase(), j);
+    }
+
+    BitmaskImpl::set_range(sz32, map.getBase(), start, stop);
+    if (!BitmaskImpl::equal(sz32, map.getBase(), check.getBase()))
+    {
+      ndbout_c(" FAIL 1 sz: %d [ %d %d ]", sz, start, stop);
+      printf("check: ");
+      for(Uint32 j = 0; j<sz32; j++)
+	printf("%.8x ", check[j]);
+      printf("\n");
+
+      printf("map  : ");
+      for(Uint32 j = 0; j<sz32; j++)
+	printf("%.8x ", map[j]);
+      printf("\n");
+      return -1;
+    }
+
+    map.clear();
+    check.clear();
+
+    /* Verify range clearing method works correctly */
+    Uint32 one = ~(Uint32)0;
+    map.fill(sz32, one);
+    check.fill(sz32, one);
+
+    for(Uint32 j = 0; j<sz; j++)
+    {
+      bool expect = (j >= start && j<stop);
+      if(expect)
+	BitmaskImpl::clear(sz32, check.getBase(), j);
+    }
+
+    BitmaskImpl::clear_range(sz32, map.getBase(), start, stop);
+    if (!BitmaskImpl::equal(sz32, map.getBase(), check.getBase()))
+    {
+      ndbout_c(" FAIL 2 sz: %d [ %d %d ]", sz, start, stop);
+      printf("check: ");
+      for(Uint32 j = 0; j<sz32; j++)
+	printf("%.8x ", check[j]);
+      printf("\n");
+
+      printf("map  : ");
+      for(Uint32 j = 0; j<sz32; j++)
+	printf("%.8x ", map[j]);
+      printf("\n");
+      return -1;
+    }
+  }
+#endif
+
+  return 0;
+}
+
+static
+int
+testBitmask()
+{
+  /* Some testcases from storage/ndb/src/common/util/Bitmask.cpp */
+  int res= 0;
+
+  if ((res= checkNoTramplingGetSetField(100 /* totalTests */)) != 0)
+    return res;
+
+  if ((res= simple(rand() % 33, // position
+                   (rand() % 63)+1) // size
+       ) != 0)
+    return res;
+
+  if ((res= testRanges(1+(rand() % 1000) // bitmask size
+                       )) != 0)
+    return res;
+
+  return 0;
+}
+
+template class Vector<Alloc>;
+template class Vector<Uint32>;
diff --git a/storage/ndb/test/ndbapi/testDict.cpp b/storage/ndb/test/ndbapi/testDict.cpp
index e1b8f2b3c7f..ae940074067 100644
--- a/storage/ndb/test/ndbapi/testDict.cpp
+++ b/storage/ndb/test/ndbapi/testDict.cpp
@@ -2357,6 +2357,168 @@ runBug24631(NDBT_Context* ctx, NDBT_Step* step)
   return NDBT_OK;
 }
 
+int
+runBug29186(NDBT_Context* ctx, NDBT_Step* step)
+{
+  int lgError = 15000;
+  int tsError = 16000;
+  int res;
+  char lgname[256];
+  char ufname[256];
+  char tsname[256];
+  char dfname[256];
+
+  NdbRestarter restarter;
+
+  if (restarter.getNumDbNodes() < 2){
+    ctx->stopTest();
+    return NDBT_OK;
+  }
+
+  Ndb* pNdb = GETNDB(step);
+  NdbDictionary::Dictionary* pDict = pNdb->getDictionary();
+  NdbDictionary::Dictionary::List list;
+
+  if (pDict->listObjects(list) == -1)
+    return NDBT_FAILED;
+
+  // 1.create logfile group
+  const char * lgfound = 0;
+
+  for (Uint32 i = 0; i<list.count; i++)
+  {
+    switch(list.elements[i].type){
+    case NdbDictionary::Object::LogfileGroup:
+      lgfound = list.elements[i].name;
+      break;
+    default:
+      break;
+    }
+    if (lgfound)
+      break;
+  }
+
+  if (lgfound == 0)
+  {
+    BaseString::snprintf(lgname, sizeof(lgname), "LG-%u", rand());
+    NdbDictionary::LogfileGroup lg;
+
+    lg.setName(lgname);
+    lg.setUndoBufferSize(8*1024*1024);
+    if(pDict->createLogfileGroup(lg) != 0)
+    {
+      g_err << "Failed to create logfilegroup:"
+            << endl << pDict->getNdbError() << endl;
+      return NDBT_FAILED;
+    }
+  }
+  else
+  {
+    BaseString::snprintf(lgname, sizeof(lgname), "%s", lgfound);
+  }
+
+  if(restarter.waitClusterStarted(60)){
+    g_err << "waitClusterStarted failed"<< endl;
+    return NDBT_FAILED;
+  }
+ 
+  if(restarter.insertErrorInAllNodes(lgError) != 0){
+    g_err << "failed to set error insert"<< endl;
+    return NDBT_FAILED;
+  }
+
+  g_info << "error inserted"  << endl;
+  g_info << "waiting some before add log file"  << endl;
+  g_info << "starting create log file group"  << endl;
+
+  NdbDictionary::Undofile uf;
+  BaseString::snprintf(ufname, sizeof(ufname), "%s-%u", lgname, rand());
+  uf.setPath(ufname);
+  uf.setSize(2*1024*1024);
+  uf.setLogfileGroup(lgname);
+
+  if(pDict->createUndofile(uf) == 0)
+  {
+    g_err << "Create log file group should fail on error_insertion " << lgError << endl;
+    return NDBT_FAILED;
+  }
+
+  //clear lg error
+  if(restarter.insertErrorInAllNodes(15099) != 0){
+    g_err << "failed to set error insert"<< endl;
+    return NDBT_FAILED;
+  }
+  NdbSleep_SecSleep(5);
+
+  //lg error has been cleared, so we can add undo file
+  if(pDict->createUndofile(uf) != 0)
+  {
+    g_err << "Failed to create undofile:"
+          << endl << pDict->getNdbError() << endl;
+    return NDBT_FAILED;
+  }
+
+  if(restarter.waitClusterStarted(60)){
+    g_err << "waitClusterStarted failed"<< endl;
+    return NDBT_FAILED;
+  }
+
+  if(restarter.insertErrorInAllNodes(tsError) != 0){
+    g_err << "failed to set error insert"<< endl;
+    return NDBT_FAILED;
+  }
+  g_info << "error inserted"  << endl;
+  g_info << "waiting some before create table space"  << endl;
+  g_info << "starting create table space"  << endl;
+
+  //r = runCreateTablespace(ctx, step);
+  BaseString::snprintf(tsname,  sizeof(tsname), "TS-%u", rand());
+  BaseString::snprintf(dfname, sizeof(dfname), "%s-%u-1.dat", tsname, rand());
+
+  NdbDictionary::Tablespace ts;
+  ts.setName(tsname);
+  ts.setExtentSize(1024*1024);
+  ts.setDefaultLogfileGroup(lgname);
+
+  if(pDict->createTablespace(ts) != 0)
+  {
+    g_err << "Failed to create tablespace:"
+          << endl << pDict->getNdbError() << endl;
+    return NDBT_FAILED;
+  }
+
+  NdbDictionary::Datafile df;
+  df.setPath(dfname);
+  df.setSize(1*1024*1024);
+  df.setTablespace(tsname);
+
+  if(pDict->createDatafile(df) == 0)
+  {
+    g_err << "Create table space should fail on error_insertion " << tsError << endl;
+    return NDBT_FAILED;
+  }
+  //Clear the inserted error
+  if(restarter.insertErrorInAllNodes(16099) != 0){
+    g_err << "failed to set error insert"<< endl;
+    return NDBT_FAILED;
+  }
+  NdbSleep_SecSleep(5);
+
+  if (pDict->dropTablespace(pDict->getTablespace(tsname)) != 0)
+  {
+    g_err << "Failed to drop tablespace: " << pDict->getNdbError() << endl;
+    return NDBT_FAILED;
+  }
+
+  if (lgfound == 0)
+  {
+    if (pDict->dropLogfileGroup(pDict->getLogfileGroup(lgname)) != 0)
+      return NDBT_FAILED;
+  }
+
+  return NDBT_OK;
+}
+
 struct RandSchemaOp
 {
   struct Obj 
@@ -3123,6 +3285,10 @@ TESTCASE("Bug24631",
          ""){
   INITIALIZER(runBug24631);
 }
+TESTCASE("Bug29186",
+         ""){
+  INITIALIZER(runBug29186);
+}
 NDBT_TESTSUITE_END(testDict);
 
 int main(int argc, const char** argv){
diff --git a/storage/ndb/test/ndbapi/testInterpreter.cpp b/storage/ndb/test/ndbapi/testInterpreter.cpp
index 0dc032ba7aa..22b810107b4 100644
--- a/storage/ndb/test/ndbapi/testInterpreter.cpp
+++ b/storage/ndb/test/ndbapi/testInterpreter.cpp
@@ -77,6 +77,11 @@ int runTestIncValue32(NDBT_Context* ctx, NDBT_Step* step){
   const NdbDictionary::Table * pTab = ctx->getTab();
   Ndb* pNdb = GETNDB(step);
 
+  if (strcmp(pTab->getName(), "T1") != 0) {
+    g_err << "runTestBug19537: skip, table != T1" << endl;
+    return NDBT_OK;
+  }
+
 
   NdbConnection* pTrans = pNdb->startTransaction();
   if (pTrans == NULL){
@@ -258,6 +263,84 @@ int runTestBug19537(NDBT_Context* ctx, NDBT_Step* step){
 }
 
 
+int runTestBug34107(NDBT_Context* ctx, NDBT_Step* step){
+  int result = NDBT_OK;
+  const NdbDictionary::Table * pTab = ctx->getTab();
+  Ndb* pNdb = GETNDB(step);
+
+  int i;
+  for (i = 0; i <= 1; i++) {
+    g_info << "bug34107:" << (i == 0 ? " small" : " too big") << endl;
+
+    NdbConnection* pTrans = pNdb->startTransaction();
+    if (pTrans == NULL){
+      ERR(pNdb->getNdbError());
+      return NDBT_FAILED;
+    }
+    
+    NdbScanOperation* pOp = pTrans->getNdbScanOperation(pTab->getName());
+    if (pOp == NULL) {
+      ERR(pTrans->getNdbError());
+      pNdb->closeTransaction(pTrans);
+      return NDBT_FAILED;
+    }
+    
+    if (pOp->readTuples() == -1) {
+      ERR(pOp->getNdbError());
+      pNdb->closeTransaction(pTrans);
+      return NDBT_FAILED;
+    }
+
+    int n = i == 0 ? 10000 : 30000;
+    int k;
+
+    for (k = 0; k < n; k++) {
+
+      // inserts 1 word ATTRINFO
+
+      if (pOp->interpret_exit_ok() == -1) {
+        ERR(pOp->getNdbError());
+        pNdb->closeTransaction(pTrans);
+        return NDBT_FAILED;
+      }
+    }
+      
+    if (pTrans->execute(NoCommit) == -1) {
+      ERR(pTrans->getNdbError());
+      pNdb->closeTransaction(pTrans);
+      return NDBT_FAILED;
+    }
+
+    int ret;
+    while ((ret = pOp->nextResult()) == 0)
+      ;
+    g_info << "ret=" << ret << " err=" << pOp->getNdbError().code << endl;
+
+    if (i == 0 && ret != 1) {
+      ERR(pTrans->getNdbError());
+      pNdb->closeTransaction(pTrans);
+      return NDBT_FAILED;
+    }
+
+    if (i == 1 && ret != -1) {
+      g_err << "unexpected big filter success" << endl;
+      pNdb->closeTransaction(pTrans);
+      return NDBT_FAILED;
+    }
+    if (i == 1 && pOp->getNdbError().code != 874) {
+      g_err << "unexpected big filter error code, wanted 874" << endl;
+      ERR(pTrans->getNdbError());
+      pNdb->closeTransaction(pTrans);
+      return NDBT_FAILED;
+    }
+
+    pNdb->closeTransaction(pTrans);
+  }
+
+  return NDBT_OK;
+}
+
+
 NDBT_TESTSUITE(testInterpreter);
 TESTCASE("IncValue32", 
 	 "Test incValue for 32 bit integer\n"){ 
@@ -277,6 +360,12 @@ TESTCASE("Bug19537",
   INITIALIZER(runTestBug19537);
   FINALIZER(runClearTable);
 }
+TESTCASE("Bug34107",
+         "Test too big scan filter (error 874)\n"){
+  INITIALIZER(runLoadTable);
+  INITIALIZER(runTestBug34107);
+  FINALIZER(runClearTable);
+}
 #if 0
 TESTCASE("MaxTransactions", 
 	 "Start transactions until no more can be created\n"){ 
diff --git a/storage/ndb/test/ndbapi/testNDBT.cpp b/storage/ndb/test/ndbapi/testNDBT.cpp
new file mode 100644
index 00000000000..9c911b9a9d9
--- /dev/null
+++ b/storage/ndb/test/ndbapi/testNDBT.cpp
@@ -0,0 +1,173 @@
+/* Copyright (C) 2003 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
+#include <NDBT.hpp>
+#include <NDBT_Test.hpp>
+#include <DbUtil.hpp>
+#include <AtrtClient.hpp>
+
+
+int runTestAtrtClient(NDBT_Context* ctx, NDBT_Step* step){
+  AtrtClient atrt;
+
+  SqlResultSet clusters;
+  if (!atrt.getClusters(clusters))
+    return NDBT_FAILED;
+
+  int i= 0;
+  while(clusters.next())
+  {
+    ndbout << clusters.column("name") << endl;
+    if (i++ == 1){
+      ndbout << "removing: " << clusters.column("name") << endl;
+      clusters.remove();
+    }
+  }
+
+  clusters.reset();
+  while(clusters.next())
+  {
+    ndbout << clusters.column("name") << endl;
+  }
+
+  return NDBT_OK;
+}
+
+
+int runTestDbUtil(NDBT_Context* ctx, NDBT_Step* step){
+  DbUtil sql;
+
+  {
+    // Select all rows from mysql.user
+    SqlResultSet result;
+    if (!sql.doQuery("SELECT * FROM mysql.user", result))
+      return NDBT_FAILED;
+    // result.print();
+
+    while(result.next())
+    {
+      ndbout << result.column("host") << ", "
+             << result.column("uSer") << ", "
+             << result.columnAsInt("max_updates") << ", "
+             << endl;
+    }
+
+    result.reset();
+    while(result.next())
+    {
+      ndbout << result.column("host") << endl;
+    }
+  }
+
+  {
+    // No column name, query should fail
+    Properties args;
+    SqlResultSet result;
+    if (sql.doQuery("SELECT * FROM mysql.user WHERE name=?", args, result))
+      return NDBT_FAILED;
+    result.print();
+  }
+
+  {
+    // Select nonexisiting rows from mysql.user
+    Properties args;
+    SqlResultSet result;
+    args.put("0", "no_such_host");
+    if (!sql.doQuery("SELECT * FROM mysql.user WHERE host=?", args, result))
+      return NDBT_FAILED;
+    ndbout << "no rows" << endl;
+    result.print();
+
+    // Change args to an find one row
+    args.clear();
+    args.put("0", "localhost");
+    if (!sql.doQuery("SELECT host, user FROM mysql.user WHERE host=?",
+                     args, result))
+      return NDBT_FAILED;
+    result.print();
+  }
+
+  {
+    if (!sql.doQuery("CREATE TABLE sql_client_test (a int, b varchar(255))"))
+      return NDBT_FAILED;
+
+    if (!sql.doQuery("INSERT INTO sql_client_test VALUES(1, 'hello'), (2, 'bye')"))
+      return NDBT_FAILED;
+
+    // Select all rows from sql_client_test
+    SqlResultSet result;
+    if (!sql.doQuery("SELECT * FROM sql_client_test", result))
+      return NDBT_FAILED;
+    // result.print();
+
+    while(result.next())
+    {
+    }
+
+    // Select second row from sql_client_test
+    Properties args;
+    args.put("0", 2);
+    if (!sql.doQuery("SELECT * FROM sql_client_test WHERE a=?", args,result))
+      return NDBT_FAILED;
+    result.print();
+
+    result.reset();
+    while(result.next())
+    {
+      ndbout << "a: " << result.columnAsInt("a") << endl;
+        ndbout << "b: " << result.column("b") << endl;
+      if (result.columnAsInt("a") != 2){
+        ndbout << "hepp1" << endl;
+        return NDBT_FAILED;
+      }
+
+      if (strcmp(result.column("b"), "bye")){
+        ndbout << "hepp2" << endl;
+        return NDBT_FAILED;
+      }
+
+    }
+
+    if (sql.selectCountTable("sql_client_test") != 2)
+    {
+      ndbout << "Got wrong count" << endl;
+      return NDBT_FAILED;
+    }
+
+
+    if (!sql.doQuery("DROP TABLE sql_client_test"))
+      return NDBT_FAILED;
+
+  }
+
+  return NDBT_OK;
+}
+
+NDBT_TESTSUITE(testNDBT);
+TESTCASE("AtrtClient",
+	 "Test AtrtClient class"){
+  INITIALIZER(runTestAtrtClient);
+}
+TESTCASE("DbUtil",
+	 "Test DbUtil class"){
+  INITIALIZER(runTestDbUtil);
+}
+NDBT_TESTSUITE_END(testNDBT);
+
+int main(int argc, const char** argv){
+  ndb_init();
+  return testNDBT.execute(argc, argv);
+}
+
diff --git a/storage/ndb/test/ndbapi/testNodeRestart.cpp b/storage/ndb/test/ndbapi/testNodeRestart.cpp
index 751134c43c5..17c81fd0a26 100644
--- a/storage/ndb/test/ndbapi/testNodeRestart.cpp
+++ b/storage/ndb/test/ndbapi/testNodeRestart.cpp
@@ -23,6 +23,7 @@
 #include <signaldata/DumpStateOrd.hpp>
 #include <Bitmask.hpp>
 #include <RefConvert.hpp>
+#include <NdbEnv.h>
 
 int runLoadTable(NDBT_Context* ctx, NDBT_Step* step){
 
@@ -121,15 +122,57 @@ int runPkReadUntilStopped(NDBT_Context* ctx, NDBT_Step* step){
 int runPkUpdateUntilStopped(NDBT_Context* ctx, NDBT_Step* step){
   int result = NDBT_OK;
   int records = ctx->getNumRecords();
+  int multiop = ctx->getProperty("MULTI_OP", 1);
+  Ndb* pNdb = GETNDB(step);
   int i = 0;
-  HugoTransactions hugoTrans(*ctx->getTab());
-  while (ctx->isTestStopped() == false) {
+
+  HugoOperations hugoOps(*ctx->getTab());
+  while (ctx->isTestStopped() == false)
+  {
     g_info << i << ": ";
-    int rows = (rand()%records)+1;
-    int batch = (rand()%rows)+1;
-    if (hugoTrans.pkUpdateRecords(GETNDB(step), rows, batch) != 0){
-      return NDBT_FAILED;
+    int batch = (rand()%records)+1;
+    int row = rand() % records;
+
+    if (batch > 25)
+      batch = 25;
+
+    if(row + batch > records)
+      batch = records - row;
+
+    if(hugoOps.startTransaction(pNdb) != 0)
+      goto err;
+
+    if(hugoOps.pkUpdateRecord(pNdb, row, batch, rand()) != 0)
+      goto err;
+
+    for (int j = 1; j<multiop; j++)
+    {
+      if(hugoOps.execute_NoCommit(pNdb) != 0)
+	goto err;
+
+      if(hugoOps.pkUpdateRecord(pNdb, row, batch, rand()) != 0)
+        goto err;
+    }
+
+    if(hugoOps.execute_Commit(pNdb) != 0)
+      goto err;
+
+    hugoOps.closeTransaction(pNdb);
+
+    continue;
+
+err:
+    NdbConnection* pCon = hugoOps.getTransaction();
+    if(pCon == 0)
+      continue;
+    NdbError error = pCon->getNdbError();
+    hugoOps.closeTransaction(pNdb);
+    if (error.status == NdbError::TemporaryError){
+      NdbSleep_MilliSleep(50);
+      continue;
     }
+    return NDBT_FAILED;
+
     i++;
   }
   return result;
@@ -230,7 +273,7 @@ int runRestarter(NDBT_Context* ctx, NDBT_Step* step){
     return NDBT_OK;
   }
 
-  if(restarter.waitClusterStarted(60) != 0){
+  if(restarter.waitClusterStarted() != 0){
     g_err << "Cluster failed to start" << endl;
     return NDBT_FAILED;
   }
@@ -241,13 +284,27 @@ int runRestarter(NDBT_Context* ctx, NDBT_Step* step){
     int id = lastId % restarter.getNumDbNodes();
     int nodeId = restarter.getDbNodeId(id);
     ndbout << "Restart node " << nodeId << endl; 
-    if(restarter.restartOneDbNode(nodeId, false, false, true) != 0){
+    if(restarter.restartOneDbNode(nodeId, false, true, true) != 0){
       g_err << "Failed to restartNextDbNode" << endl;
       result = NDBT_FAILED;
       break;
     }    
 
-    if(restarter.waitClusterStarted(60) != 0){
+    if (restarter.waitNodesNoStart(&nodeId, 1))
+    {
+      g_err << "Failed to waitNodesNoStart" << endl;
+      result = NDBT_FAILED;
+      break;
+    }
+
+    if (restarter.startNodes(&nodeId, 1))
+    {
+      g_err << "Failed to start node" << endl;
+      result = NDBT_FAILED;
+      break;
+    }
+
+    if(restarter.waitClusterStarted() != 0){
       g_err << "Cluster failed to start" << endl;
       result = NDBT_FAILED;
       break;
@@ -1883,6 +1940,178 @@ runBug32160(NDBT_Context* ctx, NDBT_Step* step)
   return NDBT_OK;
 }
 
+int
+runBug34216(NDBT_Context* ctx, NDBT_Step* step)
+{
+  int result = NDBT_OK;
+  int loops = ctx->getNumLoops();
+  NdbRestarter restarter;
+  int i = 0;
+  int lastId = 0;
+  HugoOperations hugoOps(*ctx->getTab());
+  int records = ctx->getNumRecords();
+  Ndb* pNdb = GETNDB(step);
+
+  if (restarter.getNumDbNodes() < 2)
+  {
+    ctx->stopTest();
+    return NDBT_OK;
+  }
+
+  if(restarter.waitClusterStarted() != 0){
+    g_err << "Cluster failed to start" << endl;
+    return NDBT_FAILED;
+  }
+
+  char buf[100];
+  const char * off = NdbEnv_GetEnv("NDB_ERR_OFFSET", buf, sizeof(buf));
+  int offset = off ? atoi(off) : 0;
+
+  while(i<loops && result != NDBT_FAILED && !ctx->isTestStopped())
+  {
+    int id = lastId % restarter.getNumDbNodes();
+    int nodeId = restarter.getDbNodeId(id);
+    int err = 5048 + ((i+offset) % 2);
+
+    int val2[] = { DumpStateOrd::CmvmiSetRestartOnErrorInsert, 1 };
+
+    if(hugoOps.startTransaction(pNdb) != 0)
+      goto err;
+
+    nodeId = hugoOps.getTransaction()->getConnectedNodeId();
+    ndbout << "Restart node " << nodeId << " " << err <<endl;
+
+    if (restarter.dumpStateOneNode(nodeId, val2, 2))
+      return NDBT_FAILED;
+
+    if(restarter.insertErrorInNode(nodeId, err) != 0){
+      g_err << "Failed to restartNextDbNode" << endl;
+      result = NDBT_FAILED;
+      break;
+    }
+
+    if (restarter.insertErrorInNode(nodeId, 8057) != 0)
+    {
+      g_err << "Failed to insert error 8057" << endl;
+      result = NDBT_FAILED;
+      break;
+    }
+
+    int rows = 10;
+    int batch = 1;
+    int row = (records - rows) ? rand() % (records - rows) : 0;
+
+    if(hugoOps.pkUpdateRecord(pNdb, row, batch, rand()) != 0)
+      goto err;
+
+    for (int l = 1; l<5; l++)
+    {
+      if (hugoOps.execute_NoCommit(pNdb) != 0)
+        goto err;
+
+      if(hugoOps.pkUpdateRecord(pNdb, row, batch, rand()) != 0)
+        goto err;
+    }
+
+    hugoOps.execute_Commit(pNdb);
+    hugoOps.closeTransaction(pNdb);
+
+    if (restarter.waitNodesNoStart(&nodeId, 1))
+    {
+      g_err << "Failed to waitNodesNoStart" << endl;
+      result = NDBT_FAILED;
+      break;
+    }
+
+    if (restarter.startNodes(&nodeId, 1))
+    {
+      g_err << "Failed to startNodes" << endl;
+      result = NDBT_FAILED;
+      break;
+    }
+
+    if(restarter.waitClusterStarted() != 0){
+      g_err << "Cluster failed to start" << endl;
+      result = NDBT_FAILED;
+      break;
+    }
+
+    lastId++;
+    i++;
+  }
+
+  ctx->stopTest();
+
+  return result;
+err:
+  return NDBT_FAILED;
+}
+
+
+int
+runNF_commit(NDBT_Context* ctx, NDBT_Step* step)
+{
+  int result = NDBT_OK;
+  int loops = ctx->getNumLoops();
+  NdbRestarter restarter;
+  if (restarter.getNumDbNodes() < 2)
+  {
+    ctx->stopTest();
+    return NDBT_OK;
+  }
+
+  if(restarter.waitClusterStarted() != 0){
+    g_err << "Cluster failed to start" << endl;
+    return NDBT_FAILED;
+  }
+
+  int i = 0;
+  while(i<loops && result != NDBT_FAILED && !ctx->isTestStopped())
+  {
+    int nodeId = restarter.getDbNodeId(rand() % restarter.getNumDbNodes());
+    int err = 5048;
+
+    ndbout << "Restart node " << nodeId << " " << err <<endl;
+
+    int val2[] = { DumpStateOrd::CmvmiSetRestartOnErrorInsert, 1 };
+    if (restarter.dumpStateOneNode(nodeId, val2, 2))
+      return NDBT_FAILED;
+
+    if(restarter.insertErrorInNode(nodeId, err) != 0){
+      g_err << "Failed to restartNextDbNode" << endl;
+      result = NDBT_FAILED;
+      break;
+    }
+
+    if (restarter.waitNodesNoStart(&nodeId, 1))
+    {
+      g_err << "Failed to waitNodesNoStart" << endl;
+      result = NDBT_FAILED;
+      break;
+    }
+
+    if (restarter.startNodes(&nodeId, 1))
+    {
+      g_err << "Failed to startNodes" << endl;
+      result = NDBT_FAILED;
+      break;
+    }
+
+    if(restarter.waitClusterStarted() != 0){
+      g_err << "Cluster failed to start" << endl;
+      result = NDBT_FAILED;
+      break;
+    }
+
+    i++;
+  }
+
+  ctx->stopTest();
+
+  return result;
+}
+
+
 NDBT_TESTSUITE(testNodeRestart);
 TESTCASE("NoLoad", 
 	 "Test that one node at a time can be stopped and then restarted "\
@@ -2255,6 +2484,21 @@ TESTCASE("Bug29364", ""){
 TESTCASE("Bug32160", ""){
   INITIALIZER(runBug32160);
 }
+TESTCASE("Bug34216", ""){
+  INITIALIZER(runCheckAllNodesStarted);
+  INITIALIZER(runLoadTable);
+  STEP(runBug34216);
+  FINALIZER(runClearTable);
+}
+TESTCASE("mixedmultiop", ""){
+  TC_PROPERTY("MULTI_OP", 5);
+  INITIALIZER(runCheckAllNodesStarted);
+  INITIALIZER(runLoadTable);
+  STEP(runNF_commit);
+  STEP(runPkUpdateUntilStopped);
+  STEP(runPkUpdateUntilStopped);
+  FINALIZER(runClearTable);
+}
 NDBT_TESTSUITE_END(testNodeRestart);
 
 int main(int argc, const char** argv){
diff --git a/storage/ndb/test/ndbapi/testOIBasic.cpp b/storage/ndb/test/ndbapi/testOIBasic.cpp
index 8f77f0bb062..4e1c8400768 100644
--- a/storage/ndb/test/ndbapi/testOIBasic.cpp
+++ b/storage/ndb/test/ndbapi/testOIBasic.cpp
@@ -36,10 +36,11 @@
 
 struct Opt {
   // common options
-  unsigned m_batch;
+  uint m_batch;
   const char* m_bound;
   const char* m_case;
   bool m_collsp;
+  bool m_cont;
   bool m_core;
   const char* m_csname;
   CHARSET_INFO* m_cs;
@@ -47,26 +48,29 @@ struct Opt {
   bool m_dups;
   NdbDictionary::Object::FragmentType m_fragtype;
   const char* m_index;
-  unsigned m_loop;
+  uint m_loop;
   bool m_msglock;
   bool m_nologging;
   bool m_noverify;
-  unsigned m_pctnull;
-  unsigned m_rows;
-  unsigned m_samples;
-  unsigned m_scanbatch;
-  unsigned m_scanpar;
-  unsigned m_scanstop;
+  uint m_pctnull;
+  uint m_rows;
+  uint m_samples;
+  uint m_scanbatch;
+  uint m_scanpar;
+  uint m_scanstop;
   int m_seed;
-  unsigned m_subloop;
+  const char* m_skip;
+  uint m_sloop;
+  uint m_ssloop;
   const char* m_table;
-  unsigned m_threads;
+  uint m_threads;
   int m_v;      // int for lint
   Opt() :
     m_batch(32),
     m_bound("01234"),
     m_case(0),
     m_collsp(false),
+    m_cont(false),
     m_core(false),
     m_csname("random"),
     m_cs(0),
@@ -85,7 +89,9 @@ struct Opt {
     m_scanpar(0),
     m_scanstop(0),
     m_seed(-1),
-    m_subloop(4),
+    m_skip(0),
+    m_sloop(4),
+    m_ssloop(4),
     m_table(0),
     m_threads(4),
     m_v(1) {
@@ -107,6 +113,7 @@ printhelp()
     << "  -bound xyz    use only these bound types 0-4 [" << d.m_bound << "]" << endl
     << "  -case abc     only given test cases (letters a-z)" << endl
     << "  -collsp       use strnncollsp instead of strnxfrm" << endl
+    << "  -cont         on error continue to next test case [" << d.m_cont << "]" << endl
     << "  -core         core dump on error [" << d.m_core << "]" << endl
     << "  -csname S     charset or collation [" << d.m_csname << "]" << endl
     << "  -die nnn      exit immediately on NDB error code nnn" << endl
@@ -122,7 +129,9 @@ printhelp()
     << "  -scanbatch N  scan batch 0=default [" << d.m_scanbatch << "]" << endl
     << "  -scanpar N    scan parallel 0=default [" << d.m_scanpar << "]" << endl
     << "  -seed N       srandom seed 0=loop number -1=random [" << d.m_seed << "]" << endl
-    << "  -subloop N    subtest (and subsubtest) loop count [" << d.m_subloop << "]" << endl
+    << "  -skip abc     skip given test cases (letters a-z)" << endl
+    << "  -sloop N      level 2 (sub)loop count [" << d.m_sloop << "]" << endl
+    << "  -ssloop N     level 3 (sub)loop count [" << d.m_ssloop << "]" << endl
     << "  -table xyz    only given table numbers (digits 0-9)" << endl
     << "  -threads N    number of threads [" << d.m_threads << "]" << endl
     << "  -vN           verbosity [" << d.m_v << "]" << endl
@@ -142,17 +151,17 @@ static const char* hexstr = "0123456789abcdef";
 
 // random ints
 
-static unsigned
-urandom(unsigned n)
+static uint
+urandom(uint n)
 {
   if (n == 0)
     return 0;
-  unsigned i = random() % n;
+  uint i = random() % n;
   return i;
 }
 
 static int
-irandom(unsigned n)
+irandom(uint n)
 {
   if (n == 0)
     return 0;
@@ -163,7 +172,7 @@ irandom(unsigned n)
 }
 
 static bool
-randompct(unsigned pct)
+randompct(uint pct)
 {
   if (pct == 0)
     return false;
@@ -172,15 +181,15 @@ randompct(unsigned pct)
   return urandom(100) < pct;
 }
 
-static unsigned
-random_coprime(unsigned n)
+static uint
+random_coprime(uint n)
 {
-    unsigned prime[] = { 101, 211, 307, 401, 503, 601, 701, 809, 907 };
-    unsigned count = sizeof(prime) / sizeof(prime[0]);
+    uint prime[] = { 101, 211, 307, 401, 503, 601, 701, 809, 907 };
+    uint count = sizeof(prime) / sizeof(prime[0]);
     if (n == 0)
       return 0;
     while (1) {
-      unsigned i = urandom(count);
+      uint i = urandom(count);
       if (n % prime[i] != 0)
         return prime[i];
     }
@@ -189,16 +198,16 @@ random_coprime(unsigned n)
 // random re-sequence of 0...(n-1)
 
 struct Rsq {
-  Rsq(unsigned n);
-  unsigned next();
+  Rsq(uint n);
+  uint next();
 private:
-  unsigned m_n;
-  unsigned m_i;
-  unsigned m_start;
-  unsigned m_prime;
+  uint m_n;
+  uint m_i;
+  uint m_start;
+  uint m_prime;
 };
 
-Rsq::Rsq(unsigned n)
+Rsq::Rsq(uint n)
 {
   m_n = n;
   m_i = 0;
@@ -206,7 +215,7 @@ Rsq::Rsq(unsigned n)
   m_prime = random_coprime(n);
 }
 
-unsigned
+uint
 Rsq::next()
 {
   assert(m_n != 0);
@@ -216,30 +225,16 @@ Rsq::next()
 // log and error macros
 
 static NdbMutex *ndbout_mutex = NULL;
-
-static unsigned getthrno();
-
-static const char*
-getthrstr()
-{
-  static char buf[20];
-  unsigned n = getthrno();
-  if (n == (unsigned)-1)
-    strcpy(buf, "");
-  else {
-    unsigned m =
-      g_opt.m_threads < 10 ? 1 :
-      g_opt.m_threads < 100 ? 2 : 3;
-    sprintf(buf, "[%0*u] ", m, n);
-  }
-  return buf;
-}
+static const char* getthrprefix();
 
 #define LLN(n, s) \
   do { \
     if ((n) > g_opt.m_v) break; \
     if (g_opt.m_msglock) NdbMutex_Lock(ndbout_mutex); \
-    ndbout << getthrstr() << s << endl; \
+    ndbout << getthrprefix(); \
+    if ((n) > 2) \
+      ndbout << "line " << __LINE__ << ": "; \
+    ndbout << s << endl; \
     if (g_opt.m_msglock) NdbMutex_Unlock(ndbout_mutex); \
   } while(0)
 
@@ -250,6 +245,8 @@ getthrstr()
 #define LL4(s) LLN(4, s)
 #define LL5(s) LLN(5, s)
 
+#define HEX(x)  hex << (x) << dec
+
 // following check a condition and return -1 on failure
 
 #undef CHK      // simple check
@@ -281,53 +278,58 @@ getthrstr()
 class Thr;
 class Con;
 class Tab;
+class ITab;
 class Set;
 class Tmr;
 
 struct Par : public Opt {
-  unsigned m_no;
+  uint m_no;
   Con* m_con;
   Con& con() const { assert(m_con != 0); return *m_con; }
   const Tab* m_tab;
   const Tab& tab() const { assert(m_tab != 0); return *m_tab; }
+  const ITab* m_itab;
+  const ITab& itab() const { assert(m_itab != 0); return *m_itab; }
   Set* m_set;
   Set& set() const { assert(m_set != 0); return *m_set; }
   Tmr* m_tmr;
   Tmr& tmr() const { assert(m_tmr != 0); return *m_tmr; }
   char m_currcase[2];
-  unsigned m_lno;
-  unsigned m_slno;
-  unsigned m_totrows;
+  uint m_lno;
+  uint m_slno;
+  uint m_totrows;
   // value calculation
-  unsigned m_range;
-  unsigned m_pctrange;
-  unsigned m_pctbrange;
+  uint m_range;
+  uint m_pctrange;
+  uint m_pctbrange;
   int m_bdir;
   bool m_noindexkeyupdate;
   // choice of key
   bool m_randomkey;
   // do verify after read
   bool m_verify;
-  // deadlock possible
-  bool m_deadlock;
-  // abort percentabge
-  unsigned m_abortpct;
+  // errors to catch (see Con)
+  bool m_catcherr;
+  // abort percentage
+  uint m_abortpct;
   NdbOperation::LockMode m_lockmode;
   // scan options
   bool m_tupscan;
   bool m_ordered;
   bool m_descending;
-  // timer location
+  // threads used by current test case
+  uint m_usedthreads;
   Par(const Opt& opt) :
     Opt(opt),
     m_no(0),
     m_con(0),
     m_tab(0),
+    m_itab(0),
     m_set(0),
     m_tmr(0),
     m_lno(0),
     m_slno(0),
-    m_totrows(m_threads * m_rows),
+    m_totrows(0),
     m_range(m_rows),
     m_pctrange(40),
     m_pctbrange(80),
@@ -335,39 +337,40 @@ struct Par : public Opt {
     m_noindexkeyupdate(false),
     m_randomkey(false),
     m_verify(false),
-    m_deadlock(false),
+    m_catcherr(0),
     m_abortpct(0),
     m_lockmode(NdbOperation::LM_Read),
     m_tupscan(false),
     m_ordered(false),
-    m_descending(false)
+    m_descending(false),
+    m_usedthreads(0)
   {
     m_currcase[0] = 0;
   }
 };
 
 static bool
-usetable(Par par, unsigned i)
+usetable(Par par, uint i)
 {
   return par.m_table == 0 || strchr(par.m_table, '0' + i) != 0;
 }
 
 static bool
-useindex(Par par, unsigned i)
+useindex(Par par, uint i)
 {
   return par.m_index == 0 || strchr(par.m_index, '0' + i) != 0;
 }
 
-static unsigned
-thrrow(Par par, unsigned j)
+static uint
+thrrow(Par par, uint j)
 {
-  return par.m_threads * j + par.m_no;
+  return par.m_usedthreads * j + par.m_no;
 }
 
 static bool
-isthrrow(Par par, unsigned i)
+isthrrow(Par par, uint i)
 {
-  return i % par.m_threads == par.m_no;
+  return i % par.m_usedthreads == par.m_no;
 }
 
 // timer
@@ -375,13 +378,13 @@ isthrrow(Par par, unsigned i)
 struct Tmr {
   void clr();
   void on();
-  void off(unsigned cnt = 0);
+  void off(uint cnt = 0);
   const char* time();
   const char* pct(const Tmr& t1);
   const char* over(const Tmr& t1);
   NDB_TICKS m_on;
-  unsigned m_ms;
-  unsigned m_cnt;
+  uint m_ms;
+  uint m_cnt;
   char m_time[100];
   char m_text[100];
   Tmr() { clr(); }
@@ -401,7 +404,7 @@ Tmr::on()
 }
 
 void
-Tmr::off(unsigned cnt)
+Tmr::off(uint cnt)
 {
   NDB_TICKS off = NdbTick_CurrentMillisecond();
   assert(m_on != 0 && off >= m_on);
@@ -446,53 +449,18 @@ Tmr::over(const Tmr& t1)
   return m_text;
 }
 
-// list of ints
-
-struct Lst {
-  Lst();
-  unsigned m_arr[1000];
-  unsigned m_cnt;
-  void push(unsigned i);
-  unsigned cnt() const;
-  void reset();
-};
-
-Lst::Lst() :
-  m_cnt(0)
-{
-}
-
-void
-Lst::push(unsigned i)
-{
-  assert(m_cnt < sizeof(m_arr)/sizeof(m_arr[0]));
-  m_arr[m_cnt++] = i;
-}
-
-unsigned
-Lst::cnt() const
-{
-  return m_cnt;
-}
-
-void
-Lst::reset()
-{
-  m_cnt = 0;
-}
-
 // character sets
 
-static const unsigned maxcsnumber = 512;
-static const unsigned maxcharcount = 32;
-static const unsigned maxcharsize = 4;
-static const unsigned maxxmulsize = 8;
+static const uint maxcsnumber = 512;
+static const uint maxcharcount = 32;
+static const uint maxcharsize = 4;
+static const uint maxxmulsize = 8;
 
 // single mb char
 struct Chr {
-  unsigned char m_bytes[maxcharsize];
-  unsigned char m_xbytes[maxxmulsize * maxcharsize];
-  unsigned m_size;
+  uchar m_bytes[maxcharsize];
+  uchar m_xbytes[maxxmulsize * maxcharsize];
+  uint m_size;
   Chr();
 };
 
@@ -506,7 +474,7 @@ Chr::Chr()
 // charset and random valid chars to use
 struct Chs {
   CHARSET_INFO* m_cs;
-  unsigned m_xmul;
+  uint m_xmul;
   Chr* m_chr;
   Chs(CHARSET_INFO* cs);
   ~Chs();
@@ -523,22 +491,22 @@ Chs::Chs(CHARSET_INFO* cs) :
     m_xmul = 1;
   assert(m_xmul <= maxxmulsize);
   m_chr = new Chr [maxcharcount];
-  unsigned i = 0;
-  unsigned miss1 = 0;
-  unsigned miss2 = 0;
-  unsigned miss3 = 0;
-  unsigned miss4 = 0;
+  uint i = 0;
+  uint miss1 = 0;
+  uint miss2 = 0;
+  uint miss3 = 0;
+  uint miss4 = 0;
   while (i < maxcharcount) {
-    unsigned char* bytes = m_chr[i].m_bytes;
-    unsigned char* xbytes = m_chr[i].m_xbytes;
-    unsigned& size = m_chr[i].m_size;
+    uchar* bytes = m_chr[i].m_bytes;
+    uchar* xbytes = m_chr[i].m_xbytes;
+    uint& size = m_chr[i].m_size;
     bool ok;
     size = m_cs->mbminlen + urandom(m_cs->mbmaxlen - m_cs->mbminlen + 1);
     assert(m_cs->mbminlen <= size && size <= m_cs->mbmaxlen);
     // prefer longer chars
     if (size == m_cs->mbminlen && m_cs->mbminlen < m_cs->mbmaxlen && urandom(5) != 0)
       continue;
-    for (unsigned j = 0; j < size; j++) {
+    for (uint j = 0; j < size; j++) {
       bytes[j] = urandom(256);
     }
     int not_used;
@@ -550,13 +518,13 @@ Chs::Chs(CHARSET_INFO* cs) :
     }
     // check no proper prefix wellformed
     ok = true;
-    for (unsigned j = 1; j < size; j++) {
+    for (uint j = 1; j < size; j++) {
       if ((*cs->cset->well_formed_len)(cs, sbytes, sbytes + j, 1, &not_used) == j) {
         ok = false;
         break;
       }
     }
-    if (! ok) {
+    if (!ok) {
       miss2++;
       continue;
     }
@@ -566,37 +534,37 @@ Chs::Chs(CHARSET_INFO* cs) :
     int xlen = (*cs->coll->strnxfrm)(cs, xbytes, m_xmul * size, bytes, size);
     // check we got something
     ok = false;
-    for (unsigned j = 0; j < xlen; j++) {
+    for (uint j = 0; j < xlen; j++) {
       if (xbytes[j] != 0) {
         ok = true;
         break;
       }
     }
-    if (! ok) {
+    if (!ok) {
       miss3++;
       continue;
     }
     // check for duplicate (before normalize)
     ok = true;
-    for (unsigned j = 0; j < i; j++) {
+    for (uint j = 0; j < i; j++) {
       const Chr& chr = m_chr[j];
       if (chr.m_size == size && memcmp(chr.m_bytes, bytes, size) == 0) {
         ok = false;
         break;
       }
     }
-    if (! ok) {
+    if (!ok) {
       miss4++;
       continue;
     }
     i++;
   }
   bool disorder = true;
-  unsigned bubbles = 0;
+  uint bubbles = 0;
   while (disorder) {
     disorder = false;
-    for (unsigned i = 1; i < maxcharcount; i++) {
-      unsigned len = sizeof(m_chr[i].m_xbytes);
+    for (uint i = 1; i < maxcharcount; i++) {
+      uint len = sizeof(m_chr[i].m_xbytes);
       if (memcmp(m_chr[i-1].m_xbytes, m_chr[i].m_xbytes, len) > 0) {
         Chr chr = m_chr[i];
         m_chr[i] = m_chr[i-1];
@@ -627,7 +595,7 @@ static Chs* cslist[maxcsnumber];
 static void
 resetcslist()
 {
-  for (unsigned i = 0; i < maxcsnumber; i++) {
+  for (uint i = 0; i < maxcsnumber; i++) {
     delete cslist[i];
     cslist[i] = 0;
   }
@@ -641,7 +609,7 @@ getcs(Par par)
     cs = par.m_cs;
   } else {
     while (1) {
-      unsigned n = urandom(maxcsnumber);
+      uint n = urandom(maxcsnumber);
       cs = get_charset(n, MYF(0));
       if (cs != 0) {
         // prefer complex charsets
@@ -667,24 +635,24 @@ struct Col {
     Longvarchar = NdbDictionary::Column::Longvarchar
   };
   const class Tab& m_tab;
-  unsigned m_num;
+  uint m_num;
   const char* m_name;
   bool m_pk;
   Type m_type;
-  unsigned m_length;
-  unsigned m_bytelength;        // multiplied by char width
-  unsigned m_attrsize;          // base type size
-  unsigned m_headsize;          // length bytes
-  unsigned m_bytesize;          // full value size
+  uint m_length;
+  uint m_bytelength;        // multiplied by char width
+  uint m_attrsize;          // base type size
+  uint m_headsize;          // length bytes
+  uint m_bytesize;          // full value size
   bool m_nullable;
   const Chs* m_chs;
-  Col(const class Tab& tab, unsigned num, const char* name, bool pk, Type type, unsigned length, bool nullable, const Chs* chs);
+  Col(const class Tab& tab, uint num, const char* name, bool pk, Type type, uint length, bool nullable, const Chs* chs);
   ~Col();
   bool equal(const Col& col2) const;
   void wellformed(const void* addr) const;
 };
 
-Col::Col(const class Tab& tab, unsigned num, const char* name, bool pk, Type type, unsigned length, bool nullable, const Chs* chs) :
+Col::Col(const class Tab& tab, uint num, const char* name, bool pk, Type type, uint length, bool nullable, const Chs* chs) :
   m_tab(tab),
   m_num(num),
   m_name(strcpy(new char [strlen(name) + 1], name)),
@@ -735,7 +703,7 @@ Col::wellformed(const void* addr) const
     {
       CHARSET_INFO* cs = m_chs->m_cs;
       const char* src = (const char*)addr;
-      unsigned len = m_bytelength;
+      uint len = m_bytelength;
       int not_used;
       assert((*cs->cset->well_formed_len)(cs, src, src + len, 0xffff, &not_used) == len);
     }
@@ -743,9 +711,9 @@ Col::wellformed(const void* addr) const
   case Col::Varchar:
     {
       CHARSET_INFO* cs = m_chs->m_cs;
-      const unsigned char* src = (const unsigned char*)addr;
+      const uchar* src = (const uchar*)addr;
       const char* ssrc = (const char*)src;
-      unsigned len = src[0];
+      uint len = src[0];
       int not_used;
       assert(len <= m_bytelength);
       assert((*cs->cset->well_formed_len)(cs, ssrc + 1, ssrc + 1 + len, 0xffff, &not_used) == len);
@@ -754,9 +722,9 @@ Col::wellformed(const void* addr) const
   case Col::Longvarchar:
     {
       CHARSET_INFO* cs = m_chs->m_cs;
-      const unsigned char* src = (const unsigned char*)addr;
+      const uchar* src = (const uchar*)addr;
       const char* ssrc = (const char*)src;
-      unsigned len = src[0] + (src[1] << 8);
+      uint len = src[0] + (src[1] << 8);
       int not_used;
       assert(len <= m_bytelength);
       assert((*cs->cset->well_formed_len)(cs, ssrc + 2, ssrc + 2 + len, 0xffff, &not_used) == len);
@@ -774,7 +742,7 @@ operator<<(NdbOut& out, const Col& col)
   out << "col[" << col.m_num << "] " << col.m_name;
   switch (col.m_type) {
   case Col::Unsigned:
-    out << " unsigned";
+    out << " uint";
     break;
   case Col::Char:
     {
@@ -808,13 +776,13 @@ operator<<(NdbOut& out, const Col& col)
 
 struct ICol {
   const class ITab& m_itab;
-  unsigned m_num;
+  uint m_num;
   const Col& m_col;
-  ICol(const class ITab& itab, unsigned num, const Col& col);
+  ICol(const class ITab& itab, uint num, const Col& col);
   ~ICol();
 };
 
-ICol::ICol(const class ITab& itab, unsigned num, const Col& col) :
+ICol::ICol(const class ITab& itab, uint num, const Col& col) :
   m_itab(itab),
   m_num(num),
   m_col(col)
@@ -842,47 +810,47 @@ struct ITab {
   const class Tab& m_tab;
   const char* m_name;
   Type m_type;
-  unsigned m_icols;
+  uint m_icols;
   const ICol** m_icol;
-  unsigned m_colmask;
-  ITab(const class Tab& tab, const char* name, Type type, unsigned icols);
+  uint m_keymask;
+  ITab(const class Tab& tab, const char* name, Type type, uint icols);
   ~ITab();
-  void icoladd(unsigned k, const ICol* icolptr);
+  void icoladd(uint k, const ICol* icolptr);
 };
 
-ITab::ITab(const class Tab& tab, const char* name, Type type, unsigned icols) :
+ITab::ITab(const class Tab& tab, const char* name, Type type, uint icols) :
   m_tab(tab),
   m_name(strcpy(new char [strlen(name) + 1], name)),
   m_type(type),
   m_icols(icols),
   m_icol(new const ICol* [icols + 1]),
-  m_colmask(0)
+  m_keymask(0)
 {
-  for (unsigned k = 0; k <= m_icols; k++)
+  for (uint k = 0; k <= m_icols; k++)
     m_icol[k] = 0;
 }
 
 ITab::~ITab()
 {
   delete [] m_name;
-  for (unsigned i = 0; i < m_icols; i++)
+  for (uint i = 0; i < m_icols; i++)
     delete m_icol[i];
   delete [] m_icol;
 }
 
 void
-ITab::icoladd(unsigned k, const ICol* icolptr)
+ITab::icoladd(uint k, const ICol* icolptr)
 {
   assert(k == icolptr->m_num && k < m_icols && m_icol[k] == 0);
   m_icol[k] = icolptr;
-  m_colmask |= (1 << icolptr->m_col.m_num);
+  m_keymask |= (1 << icolptr->m_col.m_num);
 }
 
 static NdbOut&
 operator<<(NdbOut& out, const ITab& itab)
 {
   out << "itab " << itab.m_name << " icols=" << itab.m_icols;
-  for (unsigned k = 0; k < itab.m_icols; k++) {
+  for (uint k = 0; k < itab.m_icols; k++) {
     const ICol& icol = *itab.m_icol[k];
     out << endl << icol;
   }
@@ -893,56 +861,60 @@ operator<<(NdbOut& out, const ITab& itab)
 
 struct Tab {
   const char* m_name;
-  unsigned m_cols;
+  uint m_cols;
   const Col** m_col;
-  unsigned m_itabs;
+  uint m_pkmask;
+  uint m_itabs;
   const ITab** m_itab;
-  unsigned m_orderedindexes;
-  unsigned m_hashindexes;
+  uint m_orderedindexes;
+  uint m_hashindexes;
   // pk must contain an Unsigned column
-  unsigned m_keycol;
-  void coladd(unsigned k, Col* colptr);
-  void itabadd(unsigned j, ITab* itab);
-  Tab(const char* name, unsigned cols, unsigned itabs, unsigned keycol);
+  uint m_keycol;
+  void coladd(uint k, Col* colptr);
+  void itabadd(uint j, ITab* itab);
+  Tab(const char* name, uint cols, uint itabs, uint keycol);
   ~Tab();
 };
 
-Tab::Tab(const char* name, unsigned cols, unsigned itabs, unsigned keycol) :
+Tab::Tab(const char* name, uint cols, uint itabs, uint keycol) :
   m_name(strcpy(new char [strlen(name) + 1], name)),
   m_cols(cols),
   m_col(new const Col* [cols + 1]),
+  m_pkmask(0),
   m_itabs(itabs),
   m_itab(new const ITab* [itabs + 1]),
   m_orderedindexes(0),
   m_hashindexes(0),
   m_keycol(keycol)
 {
-  for (unsigned k = 0; k <= cols; k++)
+  for (uint k = 0; k <= cols; k++)
     m_col[k] = 0;
-  for (unsigned j = 0; j <= itabs; j++)
+  for (uint j = 0; j <= itabs; j++)
     m_itab[j] = 0;
 }
 
 Tab::~Tab()
 {
   delete [] m_name;
-  for (unsigned i = 0; i < m_cols; i++)
+  for (uint i = 0; i < m_cols; i++)
     delete m_col[i];
   delete [] m_col;
-  for (unsigned i = 0; i < m_itabs; i++)
+  for (uint i = 0; i < m_itabs; i++)
     delete m_itab[i];
   delete [] m_itab;
 }
 
 void
-Tab::coladd(unsigned k, Col* colptr)
+Tab::coladd(uint k, Col* colptr)
 {
   assert(k == colptr->m_num && k < m_cols && m_col[k] == 0);
   m_col[k] = colptr;
+  if (colptr->m_pk)
+    m_pkmask |= (1 << k);
 }
 
 void
-Tab::itabadd(unsigned j, ITab* itabptr)
+Tab::itabadd(uint j, ITab* itabptr)
 {
   assert(j < m_itabs && m_itab[j] == 0 && itabptr != 0);
   m_itab[j] = itabptr;
@@ -956,11 +928,11 @@ static NdbOut&
 operator<<(NdbOut& out, const Tab& tab)
 {
   out << "tab " << tab.m_name << " cols=" << tab.m_cols;
-  for (unsigned k = 0; k < tab.m_cols; k++) {
+  for (uint k = 0; k < tab.m_cols; k++) {
     const Col& col =  *tab.m_col[k];
     out << endl << col;
   }
-  for (unsigned i = 0; i < tab.m_itabs; i++) {
+  for (uint i = 0; i < tab.m_itabs; i++) {
     if (tab.m_itab[i] == 0)
       continue;
     const ITab& itab = *tab.m_itab[i];
@@ -972,20 +944,20 @@ operator<<(NdbOut& out, const Tab& tab)
 // make table structs
 
 static const Tab** tablist = 0;
-static unsigned tabcount = 0;
+static uint tabcount = 0;
 
 static void
 verifytables()
 {
-  for (unsigned j = 0; j < tabcount; j++) {
+  for (uint j = 0; j < tabcount; j++) {
     const Tab* t = tablist[j];
     if (t == 0)
       continue;
     assert(t->m_cols != 0 && t->m_col != 0);
-    for (unsigned k = 0; k < t->m_cols; k++) {
+    for (uint k = 0; k < t->m_cols; k++) {
       const Col* c = t->m_col[k];
       assert(c != 0 && c->m_num == k);
-      assert(! (c->m_pk && c->m_nullable));
+      assert(!(c->m_pk && c->m_nullable));
     }
     assert(t->m_col[t->m_cols] == 0);
     {
@@ -994,16 +966,16 @@ verifytables()
       assert(c->m_pk && c->m_type == Col::Unsigned);
     }
     assert(t->m_itabs != 0 && t->m_itab != 0);
-    for (unsigned i = 0; i < t->m_itabs; i++) {
+    for (uint i = 0; i < t->m_itabs; i++) {
       const ITab* x = t->m_itab[i];
       if (x == 0)
         continue;
       assert(x != 0 && x->m_icols != 0 && x->m_icol != 0);
-      for (unsigned k = 0; k < x->m_icols; k++) {
+      for (uint k = 0; k < x->m_icols; k++) {
         const ICol* c = x->m_icol[k];
         assert(c != 0 && c->m_num == k && c->m_col.m_num < t->m_cols);
         if (x->m_type == ITab::UniqueHashIndex) {
-          assert(! c->m_col.m_nullable);
+          assert(!c->m_col.m_nullable);
         }
       }
     }
@@ -1019,11 +991,11 @@ makebuiltintables(Par par)
   tabcount = 3;
   if (tablist == 0) {
     tablist = new const Tab* [tabcount];
-    for (unsigned j = 0; j < tabcount; j++) {
+    for (uint j = 0; j < tabcount; j++) {
       tablist[j] = 0;
     }
   } else {
-    for (unsigned j = 0; j < tabcount; j++) {
+    for (uint j = 0; j < tabcount; j++) {
       delete tablist[j];
       tablist[j] = 0;
     }
@@ -1202,7 +1174,8 @@ static Ndb_cluster_connection* g_ncc = 0;
 struct Con {
   Ndb* m_ndb;
   NdbDictionary::Dictionary* m_dic;
-  NdbConnection* m_tx;
+  NdbTransaction* m_tx;
+  Uint64 m_txid;
   NdbOperation* m_op;
   NdbIndexOperation* m_indexop;
   NdbScanOperation* m_scanop;
@@ -1210,10 +1183,16 @@ struct Con {
   NdbScanFilter* m_scanfilter;
   enum ScanMode { ScanNo = 0, Committed, Latest, Exclusive };
   ScanMode m_scanmode;
-  enum ErrType { ErrNone = 0, ErrDeadlock, ErrNospace, ErrOther };
+  enum ErrType {
+    ErrNone = 0,
+    ErrDeadlock = 1,
+    ErrNospace = 2,
+    ErrOther = 4
+  };
   ErrType m_errtype;
+  char m_errname[100];
   Con() :
-    m_ndb(0), m_dic(0), m_tx(0), m_op(0), m_indexop(0),
+    m_ndb(0), m_dic(0), m_tx(0), m_txid(0), m_op(0), m_indexop(0),
     m_scanop(0), m_indexscanop(0), m_scanfilter(0),
     m_scanmode(ScanNo), m_errtype(ErrNone) {}
   ~Con() {
@@ -1237,18 +1216,20 @@ struct Con {
   int setBound(int num, int type, const void* value);
   int beginFilter(int group);
   int endFilter();
-  int setFilter(int num, int cond, const void* value, unsigned len);
-  int execute(ExecType t);
-  int execute(ExecType t, bool& deadlock, bool& nospace);
+  int setFilter(int num, int cond, const void* value, uint len);
+  int execute(ExecType et);
+  int execute(ExecType et, uint& err);
+  int readTuple(Par par);
   int readTuples(Par par);
   int readIndexTuples(Par par);
   int executeScan();
   int nextScanResult(bool fetchAllowed);
-  int nextScanResult(bool fetchAllowed, bool& deadlock);
+  int nextScanResult(bool fetchAllowed, uint& err);
   int updateScanTuple(Con& con2);
   int deleteScanTuple(Con& con2);
   void closeScan();
   void closeTransaction();
+  const char* errname(uint err);
   void printerror(NdbOut& out);
 };
 
@@ -1259,7 +1240,7 @@ Con::connect()
   m_ndb = new Ndb(g_ncc, "TEST_DB");
   CHKCON(m_ndb->init() == 0, *this);
   CHKCON(m_ndb->waitUntilReady(30) == 0, *this);
-  m_tx = 0, m_op = 0;
+  m_tx = 0, m_txid = 0, m_op = 0;
   return 0;
 }
 
@@ -1274,7 +1255,7 @@ void
 Con::disconnect()
 {
   delete m_ndb;
-  m_ndb = 0, m_dic = 0, m_tx = 0, m_op = 0;
+  m_ndb = 0, m_dic = 0, m_tx = 0, m_txid = 0, m_op = 0;
 }
 
 int
@@ -1284,6 +1265,7 @@ Con::startTransaction()
   if (m_tx != 0)
     closeTransaction();
   CHKCON((m_tx = m_ndb->startTransaction()) != 0, *this);
+  m_txid = m_tx->getTransactionId();
   return 0;
 }
 
@@ -1307,7 +1289,7 @@ int
 Con::getNdbIndexOperation(const ITab& itab, const Tab& tab)
 {
   assert(m_tx != 0);
-  unsigned tries = 0;
+  uint tries = 0;
   while (1) {
     if (getNdbIndexOperation1(itab, tab) == 0)
       break;
@@ -1337,7 +1319,7 @@ int
 Con::getNdbIndexScanOperation(const ITab& itab, const Tab& tab)
 {
   assert(m_tx != 0);
-  unsigned tries = 0;
+  uint tries = 0;
   while (1) {
     if (getNdbIndexScanOperation1(itab, tab) == 0)
       break;
@@ -1405,7 +1387,7 @@ Con::endFilter()
 }
 
 int
-Con::setFilter(int num, int cond, const void* value, unsigned len)
+Con::setFilter(int num, int cond, const void* value, uint len)
 {
   assert(m_tx != 0 && m_scanfilter != 0);
   CHKCON(m_scanfilter->cmp((NdbScanFilter::BinaryCondition)cond, num, value, len) == 0, *this);
@@ -1413,34 +1395,46 @@ Con::setFilter(int num, int cond, const void* value, unsigned len)
 }
 
 int
-Con::execute(ExecType t)
+Con::execute(ExecType et)
 {
   assert(m_tx != 0);
-  CHKCON(m_tx->execute(t) == 0, *this);
+  CHKCON(m_tx->execute(et) == 0, *this);
   return 0;
 }
 
 int
-Con::execute(ExecType t, bool& deadlock, bool& nospace)
+Con::execute(ExecType et, uint& err)
 {
-  int ret = execute(t);
-  if (ret != 0 && deadlock && m_errtype == ErrDeadlock) {
-    LL3("caught deadlock");
-    ret = 0;
-  } else {
-    deadlock = false;
-  }
-  if (ret != 0 && nospace && m_errtype == ErrNospace) {
-    LL3("caught nospace");
-    ret = 0;
-  } else {
-    nospace = false;
+  int ret = execute(et);
+  // err in: errors to catch, out: error caught
+  const uint errin = err;
+  err = 0;
+  if (ret == -1) {
+    if (m_errtype == ErrDeadlock && (errin & ErrDeadlock)) {
+      LL3("caught deadlock");
+      err = ErrDeadlock;
+      ret = 0;
+    }
+    if (m_errtype == ErrNospace && (errin & ErrNospace)) {
+      LL3("caught nospace");
+      err = ErrNospace;
+      ret = 0;
+    }
   }
   CHK(ret == 0);
   return 0;
 }
 
 int
+Con::readTuple(Par par)
+{
+  assert(m_tx != 0 && m_op != 0);
+  NdbOperation::LockMode lm = par.m_lockmode;
+  CHKCON(m_op->readTuple(lm) == 0, *this);
+  return 0;
+}
+
+int
 Con::readTuples(Par par)
 {
   assert(m_tx != 0 && m_scanop != 0);
@@ -1477,23 +1471,25 @@ Con::nextScanResult(bool fetchAllowed)
   int ret;
   assert(m_scanop != 0);
   CHKCON((ret = m_scanop->nextResult(fetchAllowed)) != -1, *this);
-  assert(ret == 0 || ret == 1 || (! fetchAllowed && ret == 2));
+  assert(ret == 0 || ret == 1 || (!fetchAllowed && ret == 2));
   return ret;
 }
 
 int
-Con::nextScanResult(bool fetchAllowed, bool& deadlock)
+Con::nextScanResult(bool fetchAllowed, uint& err)
 {
   int ret = nextScanResult(fetchAllowed);
+  // err in: errors to catch, out: error caught
+  const uint errin = err;
+  err = 0;
   if (ret == -1) {
-    if (deadlock && m_errtype == ErrDeadlock) {
+    if (m_errtype == ErrDeadlock && (errin & ErrDeadlock)) {
       LL3("caught deadlock");
+      err = ErrDeadlock;
       ret = 0;
     }
-  } else {
-    deadlock = false;
   }
-  CHK(ret == 0 || ret == 1 || (! fetchAllowed && ret == 2));
+  CHK(ret == 0 || ret == 1 || (!fetchAllowed && ret == 2));
   return ret;
 }
 
@@ -1502,6 +1498,7 @@ Con::updateScanTuple(Con& con2)
 {
   assert(con2.m_tx != 0);
   CHKCON((con2.m_op = m_scanop->updateCurrentTuple(con2.m_tx)) != 0, *this);
+  con2.m_txid = m_txid; // in the kernel
   return 0;
 }
 
@@ -1510,6 +1507,7 @@ Con::deleteScanTuple(Con& con2)
 {
   assert(con2.m_tx != 0);
   CHKCON(m_scanop->deleteCurrentTuple(con2.m_tx) == 0, *this);
+  con2.m_txid = m_txid; // in the kernel
   return 0;
 }
 
@@ -1527,15 +1525,26 @@ Con::closeTransaction()
 {
   assert(m_ndb != 0 && m_tx != 0);
   m_ndb->closeTransaction(m_tx);
-  m_tx = 0, m_op = 0;
+  m_tx = 0, m_txid = 0, m_op = 0;
   m_scanop = 0, m_indexscanop = 0;
 }
 
+const char*
+Con::errname(uint err)
+{
+  sprintf(m_errname, "0x%x", err);
+  if (err & ErrDeadlock)
+    strcat(m_errname, ",deadlock");
+  if (err & ErrNospace)
+    strcat(m_errname, ",nospace");
+  return m_errname;
+}
+
 void
 Con::printerror(NdbOut& out)
 {
   m_errtype = ErrOther;
-  unsigned any = 0;
+  uint any = 0;
   int code;
   int die = 0;
   if (m_ndb) {
@@ -1563,7 +1572,7 @@ Con::printerror(NdbOut& out)
       }
     }
   }
-  if (! any) {
+  if (!any) {
     LL0("failed but no NDB error code");
   }
   if (die) {
@@ -1589,7 +1598,7 @@ invalidateindex(Par par)
 {
   Con& con = par.con();
   const Tab& tab = par.tab();
-  for (unsigned i = 0; i < tab.m_itabs; i++) {
+  for (uint i = 0; i < tab.m_itabs; i++) {
     if (tab.m_itab[i] == 0)
       continue;
     const ITab& itab = *tab.m_itab[i];
@@ -1639,7 +1648,7 @@ createtable(Par par)
   if (par.m_nologging) {
     t.setLogging(false);
   }
-  for (unsigned k = 0; k < tab.m_cols; k++) {
+  for (uint k = 0; k < tab.m_cols; k++) {
     const Col& col = *tab.m_col[k];
     NdbDictionary::Column c(col.m_name);
     c.setType((NdbDictionary::Column::Type)col.m_type);
@@ -1677,7 +1686,7 @@ static int
 dropindex(Par par)
 {
   const Tab& tab = par.tab();
-  for (unsigned i = 0; i < tab.m_itabs; i++) {
+  for (uint i = 0; i < tab.m_itabs; i++) {
     if (tab.m_itab[i] == 0)
       continue;
     const ITab& itab = *tab.m_itab[i];
@@ -1699,7 +1708,7 @@ createindex(Par par, const ITab& itab)
   if (par.m_nologging || itab.m_type == ITab::OrderedIndex) {
     x.setLogging(false);
   }
-  for (unsigned k = 0; k < itab.m_icols; k++) {
+  for (uint k = 0; k < itab.m_icols; k++) {
     const ICol& icol = *itab.m_icol[k];
     const Col& col = icol.m_col;
     x.addColumnName(col.m_name);
@@ -1714,7 +1723,7 @@ static int
 createindex(Par par)
 {
   const Tab& tab = par.tab();
-  for (unsigned i = 0; i < tab.m_itabs; i++) {
+  for (uint i = 0; i < tab.m_itabs; i++) {
     if (tab.m_itab[i] == 0)
       continue;
     const ITab& itab = *tab.m_itab[i];
@@ -1731,27 +1740,29 @@ struct Val {
   const Col& m_col;
   union {
   Uint32 m_uint32;
-  unsigned char* m_char;
-  unsigned char* m_varchar;
-  unsigned char* m_longvarchar;
+  uchar* m_char;
+  uchar* m_varchar;
+  uchar* m_longvarchar;
   };
+  bool m_null;
+  // construct
   Val(const Col& col);
   ~Val();
   void copy(const Val& val2);
   void copy(const void* addr);
   const void* dataaddr() const;
-  bool m_null;
-  int equal(Par par) const;
-  int equal(Par par, const ICol& icol) const;
-  int setval(Par par) const;
-  void calc(Par par, unsigned i);
-  void calckey(Par par, unsigned i);
-  void calckeychars(Par par, unsigned i, unsigned& n, unsigned char* buf);
+  void calc(Par par, uint i);
+  void calckey(Par par, uint i);
+  void calckeychars(Par par, uint i, uint& n, uchar* buf);
   void calcnokey(Par par);
-  void calcnokeychars(Par par, unsigned& n, unsigned char* buf);
-  int verify(Par par, const Val& val2) const;
+  void calcnokeychars(Par par, uint& n, uchar* buf);
+  // operations
+  int setval(Par par) const;
+  int setval(Par par, const ICol& icol) const;
+  // compare
   int cmp(Par par, const Val& val2) const;
-  int cmpchars(Par par, const unsigned char* buf1, unsigned len1, const unsigned char* buf2, unsigned len2) const;
+  int cmpchars(Par par, const uchar* buf1, uint len1, const uchar* buf2, uint len2) const;
+  int verify(Par par, const Val& val2) const;
 private:
   Val& operator=(const Val& val2);
 };
@@ -1759,20 +1770,26 @@ private:
 static NdbOut&
 operator<<(NdbOut& out, const Val& val);
 
+// construct
+
 Val::Val(const Col& col) :
   m_col(col)
 {
   switch (col.m_type) {
   case Col::Unsigned:
+    m_uint32 = 0x7e7e7e7e;
     break;
   case Col::Char:
-    m_char = new unsigned char [col.m_bytelength];
+    m_char = new uchar [col.m_bytelength];
+    memset(m_char, 0x7e, col.m_bytelength);
     break;
   case Col::Varchar:
-    m_varchar = new unsigned char [1 + col.m_bytelength];
+    m_varchar = new uchar [1 + col.m_bytelength];
+    memset(m_char, 0x7e, 1 + col.m_bytelength);
     break;
   case Col::Longvarchar:
-    m_longvarchar = new unsigned char [2 + col.m_bytelength];
+    m_longvarchar = new uchar [2 + col.m_bytelength];
+    memset(m_char, 0x7e, 2 + col.m_bytelength);
     break;
   default:
     assert(false);
@@ -1858,52 +1875,17 @@ Val::dataaddr() const
   return 0;
 }
 
-int
-Val::equal(Par par) const
-{
-  Con& con = par.con();
-  const Col& col = m_col;
-  assert(col.m_pk && ! m_null);
-  const char* addr = (const char*)dataaddr();
-  LL5("equal [" << col << "] " << *this);
-  CHK(con.equal(col.m_num, addr) == 0);
-  return 0;
-}
-
-int
-Val::equal(Par par, const ICol& icol) const
-{
-  Con& con = par.con();
-  assert(! m_null);
-  const char* addr = (const char*)dataaddr();
-  LL5("equal [" << icol << "] " << *this);
-  CHK(con.equal(icol.m_num, addr) == 0);
-  return 0;
-}
-
-int
-Val::setval(Par par) const
-{
-  Con& con = par.con();
-  const Col& col = m_col;
-  assert(! col.m_pk);
-  const char* addr = ! m_null ? (const char*)dataaddr() : 0;
-  LL5("setval [" << col << "] " << *this);
-  CHK(con.setValue(col.m_num, addr) == 0);
-  return 0;
-}
-
 void
-Val::calc(Par par, unsigned i)
+Val::calc(Par par, uint i)
 {
   const Col& col = m_col;
   col.m_pk ? calckey(par, i) : calcnokey(par);
-  if (! m_null)
+  if (!m_null)
     col.wellformed(dataaddr());
 }
 
 void
-Val::calckey(Par par, unsigned i)
+Val::calckey(Par par, uint i)
 {
   const Col& col = m_col;
   m_null = false;
@@ -1915,7 +1897,7 @@ Val::calckey(Par par, unsigned i)
     {
       const Chs* chs = col.m_chs;
       CHARSET_INFO* cs = chs->m_cs;
-      unsigned n = 0;
+      uint n = 0;
       calckeychars(par, i, n, m_char);
       // extend by appropriate space
       (*cs->cset->fill)(cs, (char*)&m_char[n], col.m_bytelength - n, 0x20);
@@ -1923,7 +1905,7 @@ Val::calckey(Par par, unsigned i)
     break;
   case Col::Varchar:
     {
-      unsigned n = 0;
+      uint n = 0;
       calckeychars(par, i, n, m_varchar + 1);
       // set length and pad with nulls
       m_varchar[0] = n;
@@ -1932,7 +1914,7 @@ Val::calckey(Par par, unsigned i)
     break;
   case Col::Longvarchar:
     {
-      unsigned n = 0;
+      uint n = 0;
       calckeychars(par, i, n, m_longvarchar + 2);
       // set length and pad with nulls
       m_longvarchar[0] = (n & 0xff);
@@ -1947,13 +1929,13 @@ Val::calckey(Par par, unsigned i)
 }
 
 void
-Val::calckeychars(Par par, unsigned i, unsigned& n, unsigned char* buf)
+Val::calckeychars(Par par, uint i, uint& n, uchar* buf)
 {
   const Col& col = m_col;
   const Chs* chs = col.m_chs;
   CHARSET_INFO* cs = chs->m_cs;
   n = 0;
-  unsigned len = 0;
+  uint len = 0;
   while (len < col.m_length) {
     if (i % (1 + n) == 0) {
       break;
@@ -1980,7 +1962,7 @@ Val::calcnokey(Par par)
     if (r < 0 && par.m_bdir > 0 || r > 0 && par.m_bdir < 0)
       r = -r;
   }
-  unsigned v = par.m_range + r;
+  uint v = par.m_range + r;
   switch (col.m_type) {
   case Col::Unsigned:
     m_uint32 = v;
@@ -1989,7 +1971,7 @@ Val::calcnokey(Par par)
     {
       const Chs* chs = col.m_chs;
       CHARSET_INFO* cs = chs->m_cs;
-      unsigned n = 0;
+      uint n = 0;
       calcnokeychars(par, n, m_char);
       // extend by appropriate space
       (*cs->cset->fill)(cs, (char*)&m_char[n], col.m_bytelength - n, 0x20);
@@ -1997,7 +1979,7 @@ Val::calcnokey(Par par)
     break;
   case Col::Varchar:
     {
-      unsigned n = 0;
+      uint n = 0;
       calcnokeychars(par, n, m_varchar + 1);
       // set length and pad with nulls
       m_varchar[0] = n;
@@ -2006,7 +1988,7 @@ Val::calcnokey(Par par)
     break;
   case Col::Longvarchar:
     {
-      unsigned n = 0;
+      uint n = 0;
       calcnokeychars(par, n, m_longvarchar + 2);
       // set length and pad with nulls
       m_longvarchar[0] = (n & 0xff);
@@ -2021,24 +2003,24 @@ Val::calcnokey(Par par)
 }
 
 void
-Val::calcnokeychars(Par par, unsigned& n, unsigned char* buf)
+Val::calcnokeychars(Par par, uint& n, uchar* buf)
 {
   const Col& col = m_col;
   const Chs* chs = col.m_chs;
   CHARSET_INFO* cs = chs->m_cs;
   n = 0;
-  unsigned len = 0;
+  uint len = 0;
   while (len < col.m_length) {
     if (urandom(1 + col.m_bytelength) == 0) {
       break;
     }
-    unsigned half = maxcharcount / 2;
+    uint half = maxcharcount / 2;
     int r = irandom((par.m_pctrange * half) / 100);
     if (par.m_bdir != 0 && urandom(10) != 0) {
       if (r < 0 && par.m_bdir > 0 || r > 0 && par.m_bdir < 0)
         r = -r;
     }
-    unsigned i = half + r;
+    uint i = half + r;
     assert(i < maxcharcount);
     const Chr& chr = chs->m_chr[i];
     assert(n + chr.m_size <= col.m_bytelength);
@@ -2048,13 +2030,39 @@ Val::calcnokeychars(Par par, unsigned& n, unsigned char* buf)
   }
 }
 
+// operations
+
 int
-Val::verify(Par par, const Val& val2) const
+Val::setval(Par par) const
 {
-  CHK(cmp(par, val2) == 0);
+  Con& con = par.con();
+  const Col& col = m_col;
+  if (col.m_pk) {
+    assert(!m_null);
+    const char* addr = (const char*)dataaddr();
+    LL5("setval pk [" << col << "] " << *this);
+    CHK(con.equal(col.m_num, addr) == 0);
+  } else {
+    const char* addr = !m_null ? (const char*)dataaddr() : 0;
+    LL5("setval non-pk [" << col << "] " << *this);
+    CHK(con.setValue(col.m_num, addr) == 0);
+  }
+  return 0;
+}
+
+int
+Val::setval(Par par, const ICol& icol) const
+{
+  Con& con = par.con();
+  assert(!m_null);
+  const char* addr = (const char*)dataaddr();
+  LL5("setval key [" << icol << "] " << *this);
+  CHK(con.equal(icol.m_num, addr) == 0);
   return 0;
 }
 
+// compare
+
 int
 Val::cmp(Par par, const Val& val2) const
 {
@@ -2062,9 +2070,9 @@ Val::cmp(Par par, const Val& val2) const
   const Col& col2 = val2.m_col;
   assert(col.equal(col2));
   if (m_null || val2.m_null) {
-    if (! m_null)
+    if (!m_null)
       return +1;
-    if (! val2.m_null)
+    if (!val2.m_null)
       return -1;
     return 0;
   }
@@ -2084,21 +2092,21 @@ Val::cmp(Par par, const Val& val2) const
     break;
   case Col::Char:
     {
-      unsigned len = col.m_bytelength;
+      uint len = col.m_bytelength;
       return cmpchars(par, m_char, len, val2.m_char, len);
     }
     break;
   case Col::Varchar:
     {
-      unsigned len1 = m_varchar[0];
-      unsigned len2 = val2.m_varchar[0];
+      uint len1 = m_varchar[0];
+      uint len2 = val2.m_varchar[0];
       return cmpchars(par, m_varchar + 1, len1, val2.m_varchar + 1, len2);
     }
     break;
   case Col::Longvarchar:
     {
-      unsigned len1 = m_longvarchar[0] + (m_longvarchar[1] << 8);
-      unsigned len2 = val2.m_longvarchar[0] + (val2.m_longvarchar[1] << 8);
+      uint len1 = m_longvarchar[0] + (m_longvarchar[1] << 8);
+      uint len2 = val2.m_longvarchar[0] + (val2.m_longvarchar[1] << 8);
       return cmpchars(par, m_longvarchar + 2, len1, val2.m_longvarchar + 2, len2);
     }
     break;
@@ -2110,17 +2118,17 @@ Val::cmp(Par par, const Val& val2) const
 }
 
 int
-Val::cmpchars(Par par, const unsigned char* buf1, unsigned len1, const unsigned char* buf2, unsigned len2) const
+Val::cmpchars(Par par, const uchar* buf1, uint len1, const uchar* buf2, uint len2) const
 {
   const Col& col = m_col;
   const Chs* chs = col.m_chs;
   CHARSET_INFO* cs = chs->m_cs;
   int k;
-  if (! par.m_collsp) {
-    unsigned char x1[maxxmulsize * 8000];
-    unsigned char x2[maxxmulsize * 8000];
+  if (!par.m_collsp) {
+    uchar x1[maxxmulsize * 8000];
+    uchar x2[maxxmulsize * 8000];
     // make strxfrm pad both to same length
-    unsigned len = maxxmulsize * col.m_bytelength;
+    uint len = maxxmulsize * col.m_bytelength;
     int n1 = NdbSqlUtil::strnxfrm_bug7284(cs, x1, chs->m_xmul * len, buf1, len1);
     int n2 = NdbSqlUtil::strnxfrm_bug7284(cs, x2, chs->m_xmul * len, buf2, len2);
     assert(n1 != -1 && n1 == n2);
@@ -2131,8 +2139,17 @@ Val::cmpchars(Par par, const unsigned char* buf1, unsigned len1, const unsigned
   return k < 0 ? -1 : k > 0 ? +1 : 0;
 }
 
+int
+Val::verify(Par par, const Val& val2) const
+{
+  CHK(cmp(par, val2) == 0);
+  return 0;
+}
+
+// print
+
 static void
-printstring(NdbOut& out, const unsigned char* str, unsigned len, bool showlen)
+printstring(NdbOut& out, const uchar* str, uint len, bool showlen)
 {
   char buf[4 * 8000];
   char *p = buf;
@@ -2141,12 +2158,12 @@ printstring(NdbOut& out, const unsigned char* str, unsigned len, bool showlen)
     sprintf(p, "%u:", len);
     p += strlen(p);
   }
-  for (unsigned i = 0; i < len; i++) {
-    unsigned char c = str[i];
+  for (uint i = 0; i < len; i++) {
+    uchar c = str[i];
     if (c == '\\') {
       *p++ = '\\';
       *p++ = c;
-    } else if (0x20 <= c && c < 0x7e) {
+    } else if (0x20 <= c && c <= 0x7e) {
       *p++ = c;
     } else {
       *p++ = '\\';
@@ -2173,19 +2190,19 @@ operator<<(NdbOut& out, const Val& val)
     break;
   case Col::Char:
     {
-      unsigned len = col.m_bytelength;
+      uint len = col.m_bytelength;
       printstring(out, val.m_char, len, false);
     }
     break;
   case Col::Varchar:
     {
-      unsigned len = val.m_varchar[0];
+      uint len = val.m_varchar[0];
       printstring(out, val.m_varchar + 1, len, true);
     }
     break;
   case Col::Longvarchar:
     {
-      unsigned len = val.m_longvarchar[0] + (val.m_longvarchar[1] << 8);
+      uint len = val.m_longvarchar[0] + (val.m_longvarchar[1] << 8);
       printstring(out, val.m_longvarchar + 2, len, true);
     }
     break;
@@ -2202,16 +2219,36 @@ operator<<(NdbOut& out, const Val& val)
 struct Row {
   const Tab& m_tab;
   Val** m_val;
-  bool m_exist;
-  enum Op { NoOp = 0, ReadOp = 1, InsOp = 2, UpdOp = 4, DelOp = 8, AnyOp = 15 };
-  Op m_pending;
-  Row* m_dbrow;  // copy of db row before update
+  enum St {
+    StUndef = 0,
+    StDefine = 1,
+    StPrepare = 2,
+    StCommit = 3
+  };
+  enum Op {
+    OpNone = 0,
+    OpIns = 2,
+    OpUpd = 4,
+    OpDel = 8,
+    OpRead = 16,
+    OpReadEx = 32,
+    OpReadCom = 64,
+    OpDML = 2 | 4 | 8,
+    OpREAD = 16 | 32 | 64
+  };
+  St m_st;
+  Op m_op;
+  Uint64 m_txid;
+  Row* m_bi;
+  // construct
   Row(const Tab& tab);
   ~Row();
-  void copy(const Row& row2);
-  void calc(Par par, unsigned i, unsigned mask = 0);
-  const Row& dbrow() const;
-  int verify(Par par, const Row& row2, bool pkonly) const;
+  void copy(const Row& row2, bool copy_bi);
+  void copyval(const Row& row2, uint colmask = ~0);
+  void calc(Par par, uint i, uint colmask = ~0);
+  // operations
+  int setval(Par par, uint colmask = ~0);
+  int setval(Par par, const ITab& itab);
   int insrow(Par par);
   int updrow(Par par);
   int updrow(Par par, const ITab& itab);
@@ -2220,120 +2257,132 @@ struct Row {
   int selrow(Par par);
   int selrow(Par par, const ITab& itab);
   int setrow(Par par);
+  // compare
   int cmp(Par par, const Row& row2) const;
   int cmp(Par par, const Row& row2, const ITab& itab) const;
+  int verify(Par par, const Row& row2, bool pkonly) const;
 private:
   Row& operator=(const Row& row2);
 };
 
+static NdbOut&
+operator<<(NdbOut& out, const Row* rowp);
+
+static NdbOut&
+operator<<(NdbOut& out, const Row& row);
+
+// construct
+
 Row::Row(const Tab& tab) :
   m_tab(tab)
 {
   m_val = new Val* [tab.m_cols];
-  for (unsigned k = 0; k < tab.m_cols; k++) {
+  for (uint k = 0; k < tab.m_cols; k++) {
     const Col& col = *tab.m_col[k];
     m_val[k] = new Val(col);
   }
-  m_exist = false;
-  m_pending = NoOp;
-  m_dbrow = 0;
+  m_st = StUndef;
+  m_op = OpNone;
+  m_txid = 0;
+  m_bi = 0;
 }
 
 Row::~Row()
 {
   const Tab& tab = m_tab;
-  for (unsigned k = 0; k < tab.m_cols; k++) {
+  for (uint k = 0; k < tab.m_cols; k++) {
     delete m_val[k];
   }
   delete [] m_val;
-  delete m_dbrow;
+  delete m_bi;
 }
 
 void
-Row::copy(const Row& row2)
+Row::copy(const Row& row2, bool copy_bi)
+{
+  const Tab& tab = m_tab;
+  copyval(row2);
+  m_st = row2.m_st;
+  m_op = row2.m_op;
+  m_txid = row2.m_txid;
+  assert(m_bi == 0);
+  if (copy_bi && row2.m_bi != 0) {
+    m_bi = new Row(tab);
+    m_bi->copy(*row2.m_bi, copy_bi);
+  }
+}
+
+void
+Row::copyval(const Row& row2, uint colmask)
 {
   const Tab& tab = m_tab;
   assert(&tab == &row2.m_tab);
-  for (unsigned k = 0; k < tab.m_cols; k++) {
+  for (uint k = 0; k < tab.m_cols; k++) {
     Val& val = *m_val[k];
     const Val& val2 = *row2.m_val[k];
-    val.copy(val2);
-  }
-  m_exist = row2.m_exist;
-  m_pending = row2.m_pending;
-  if (row2.m_dbrow == 0) {
-    m_dbrow = 0;
-  } else {
-    assert(row2.m_dbrow->m_dbrow == 0);
-    if (m_dbrow == 0)
-      m_dbrow = new Row(tab);
-    m_dbrow->copy(*row2.m_dbrow);
+    if ((1 << k) & colmask)
+      val.copy(val2);
   }
 }
 
 void
-Row::calc(Par par, unsigned i, unsigned mask)
+Row::calc(Par par, uint i, uint colmask)
 {
   const Tab& tab = m_tab;
-  for (unsigned k = 0; k < tab.m_cols; k++) {
-    if (! (mask & (1 << k))) {
+  for (uint k = 0; k < tab.m_cols; k++) {
+    if ((1 << k) & colmask) {
       Val& val = *m_val[k];
       val.calc(par, i);
     }
   }
 }
 
-const Row&
-Row::dbrow() const
-{
-  if (m_dbrow == 0)
-    return *this;
-  assert(m_pending == Row::UpdOp || m_pending == Row::DelOp);
-  return *m_dbrow;
-}
+// operations
 
 int
-Row::verify(Par par, const Row& row2, bool pkonly) const
+Row::setval(Par par, uint colmask)
 {
   const Tab& tab = m_tab;
-  const Row& row1 = *this;
-  assert(&row1.m_tab == &row2.m_tab && row1.m_exist && row2.m_exist);
-  for (unsigned k = 0; k < tab.m_cols; k++) {
-    const Col& col = row1.m_val[k]->m_col;
-    if (! pkonly || col.m_pk) {
-      const Val& val1 = *row1.m_val[k];
-      const Val& val2 = *row2.m_val[k];
-      CHK(val1.verify(par, val2) == 0);
+  Rsq rsq(tab.m_cols);
+  for (uint k = 0; k < tab.m_cols; k++) {
+    uint k2 = rsq.next();
+    if ((1 << k2) & colmask) {
+      const Val& val = *m_val[k2];
+      CHK(val.setval(par) == 0);
     }
   }
   return 0;
 }
 
 int
+Row::setval(Par par, const ITab& itab)
+{
+  Con& con = par.con();
+  Rsq rsq(itab.m_icols);
+  for (uint k = 0; k < itab.m_icols; k++) {
+    uint k2 = rsq.next();
+    const ICol& icol = *itab.m_icol[k2];
+    const Col& col = icol.m_col;
+    uint m = col.m_num;
+    const Val& val = *m_val[m];
+    CHK(val.setval(par, icol) == 0);
+  }
+  return 0;
+}
+
+int
 Row::insrow(Par par)
 {
   Con& con = par.con();
   const Tab& tab = m_tab;
-  assert(! m_exist);
   CHK(con.getNdbOperation(tab) == 0);
   CHKCON(con.m_op->insertTuple() == 0, con);
-  Rsq rsq1(tab.m_cols);
-  for (unsigned k = 0; k < tab.m_cols; k++) {
-    unsigned k2 = rsq1.next();
-    const Val& val = *m_val[k2];
-    const Col& col = val.m_col;
-    if (col.m_pk)
-      CHK(val.equal(par) == 0);
-  }
-  Rsq rsq2(tab.m_cols);
-  for (unsigned k = 0; k < tab.m_cols; k++) {
-    unsigned k2 = rsq2.next();
-    const Val& val = *m_val[k2];
-    const Col& col = val.m_col;
-    if (! col.m_pk)
-      CHK(val.setval(par) == 0);
-  }
-  m_pending = InsOp;
+  CHK(setval(par, tab.m_pkmask) == 0);
+  CHK(setval(par, ~tab.m_pkmask) == 0);
+  assert(m_st == StUndef);
+  m_st = StDefine;
+  m_op = OpIns;
+  m_txid = con.m_txid;
   return 0;
 }
 
@@ -2342,26 +2391,14 @@ Row::updrow(Par par)
 {
   Con& con = par.con();
   const Tab& tab = m_tab;
-  assert(m_exist);
   CHK(con.getNdbOperation(tab) == 0);
   CHKCON(con.m_op->updateTuple() == 0, con);
-  Rsq rsq1(tab.m_cols);
-  for (unsigned k = 0; k < tab.m_cols; k++) {
-    unsigned k2 = rsq1.next();
-    const Val& val = *m_val[k2];
-    const Col& col = val.m_col;
-    if (col.m_pk)
-      CHK(val.equal(par) == 0);
-  }
-  Rsq rsq2(tab.m_cols);
-  for (unsigned k = 0; k < tab.m_cols; k++) {
-    unsigned k2 = rsq2.next();
-    const Val& val = *m_val[k2];
-    const Col& col = val.m_col;
-    if (! col.m_pk)
-      CHK(val.setval(par) == 0);
-  }
-  m_pending = UpdOp;
+  CHK(setval(par, tab.m_pkmask) == 0);
+  CHK(setval(par, ~tab.m_pkmask) == 0);
+  assert(m_st == StUndef);
+  m_st = StDefine;
+  m_op = OpUpd;
+  m_txid = con.m_txid;
   return 0;
 }
 
@@ -2371,27 +2408,14 @@ Row::updrow(Par par, const ITab& itab)
   Con& con = par.con();
   const Tab& tab = m_tab;
   assert(itab.m_type == ITab::UniqueHashIndex && &itab.m_tab == &tab);
-  assert(m_exist);
   CHK(con.getNdbIndexOperation(itab, tab) == 0);
   CHKCON(con.m_op->updateTuple() == 0, con);
-  Rsq rsq1(itab.m_icols);
-  for (unsigned k = 0; k < itab.m_icols; k++) {
-    unsigned k2 = rsq1.next();
-    const ICol& icol = *itab.m_icol[k2];
-    const Col& col = icol.m_col;
-    unsigned m = col.m_num;
-    const Val& val = *m_val[m];
-    CHK(val.equal(par, icol) == 0);
-  }
-  Rsq rsq2(tab.m_cols);
-  for (unsigned k = 0; k < tab.m_cols; k++) {
-    unsigned k2 = rsq2.next();
-    const Val& val = *m_val[k2];
-    const Col& col = val.m_col;
-    if (! col.m_pk)
-      CHK(val.setval(par) == 0);
-  }
-  m_pending = UpdOp;
+  CHK(setval(par, itab) == 0);
+  CHK(setval(par, ~tab.m_pkmask) == 0);
+  assert(m_st == StUndef);
+  m_st = StDefine;
+  m_op = OpUpd;
+  m_txid = con.m_txid;
   return 0;
 }
 
@@ -2400,18 +2424,13 @@ Row::delrow(Par par)
 {
   Con& con = par.con();
   const Tab& tab = m_tab;
-  assert(m_exist);
   CHK(con.getNdbOperation(m_tab) == 0);
   CHKCON(con.m_op->deleteTuple() == 0, con);
-  Rsq rsq1(tab.m_cols);
-  for (unsigned k = 0; k < tab.m_cols; k++) {
-    unsigned k2 = rsq1.next();
-    const Val& val = *m_val[k2];
-    const Col& col = val.m_col;
-    if (col.m_pk)
-      CHK(val.equal(par) == 0);
-  }
-  m_pending = DelOp;
+  CHK(setval(par, tab.m_pkmask) == 0);
+  assert(m_st == StUndef);
+  m_st = StDefine;
+  m_op = OpDel;
+  m_txid = con.m_txid;
   return 0;
 }
 
@@ -2421,19 +2440,13 @@ Row::delrow(Par par, const ITab& itab)
   Con& con = par.con();
   const Tab& tab = m_tab;
   assert(itab.m_type == ITab::UniqueHashIndex && &itab.m_tab == &tab);
-  assert(m_exist);
   CHK(con.getNdbIndexOperation(itab, tab) == 0);
   CHKCON(con.m_op->deleteTuple() == 0, con);
-  Rsq rsq1(itab.m_icols);
-  for (unsigned k = 0; k < itab.m_icols; k++) {
-    unsigned k2 = rsq1.next();
-    const ICol& icol = *itab.m_icol[k2];
-    const Col& col = icol.m_col;
-    unsigned m = col.m_num;
-    const Val& val = *m_val[m];
-    CHK(val.equal(par, icol) == 0);
-  }
-  m_pending = DelOp;
+  CHK(setval(par, itab) == 0);
+  assert(m_st == StUndef);
+  m_st = StDefine;
+  m_op = OpDel;
+  m_txid = con.m_txid;
   return 0;
 }
 
@@ -2443,15 +2456,9 @@ Row::selrow(Par par)
   Con& con = par.con();
   const Tab& tab = m_tab;
   CHK(con.getNdbOperation(m_tab) == 0);
-  CHKCON(con.m_op->readTuple() == 0, con);
-  Rsq rsq1(tab.m_cols);
-  for (unsigned k = 0; k < tab.m_cols; k++) {
-    unsigned k2 = rsq1.next();
-    const Val& val = *m_val[k2];
-    const Col& col = val.m_col;
-    if (col.m_pk)
-      CHK(val.equal(par) == 0);
-  }
+  CHKCON(con.readTuple(par) == 0, con);
+  CHK(setval(par, tab.m_pkmask) == 0);
+  // TODO state
   return 0;
 }
 
@@ -2462,16 +2469,9 @@ Row::selrow(Par par, const ITab& itab)
   const Tab& tab = m_tab;
   assert(itab.m_type == ITab::UniqueHashIndex && &itab.m_tab == &tab);
   CHK(con.getNdbIndexOperation(itab, tab) == 0);
-  CHKCON(con.m_op->readTuple() == 0, con);
-  Rsq rsq1(itab.m_icols);
-  for (unsigned k = 0; k < itab.m_icols; k++) {
-    unsigned k2 = rsq1.next();
-    const ICol& icol = *itab.m_icol[k2];
-    const Col& col = icol.m_col;
-    unsigned m = col.m_num;
-    const Val& val = *m_val[m];
-    CHK(val.equal(par, icol) == 0);
-  }
+  CHKCON(con.readTuple(par) == 0, con);
+  CHK(setval(par, itab) == 0);
+  // TODO state
   return 0;
 }
 
@@ -2480,25 +2480,23 @@ Row::setrow(Par par)
 {
   Con& con = par.con();
   const Tab& tab = m_tab;
-  Rsq rsq1(tab.m_cols);
-  for (unsigned k = 0; k < tab.m_cols; k++) {
-    unsigned k2 = rsq1.next();
-    const Val& val = *m_val[k2];
-    const Col& col = val.m_col;
-    if (! col.m_pk)
-      CHK(val.setval(par) == 0);
-  }
-  m_pending = UpdOp;
+  CHK(setval(par, ~tab.m_pkmask) == 0);
+  assert(m_st == StUndef);
+  m_st = StDefine;
+  m_op = OpUpd;
+  m_txid = con.m_txid;
   return 0;
 }
 
+// compare
+
 int
 Row::cmp(Par par, const Row& row2) const
 {
   const Tab& tab = m_tab;
   assert(&tab == &row2.m_tab);
   int c = 0;
-  for (unsigned k = 0; k < tab.m_cols; k++) {
+  for (uint k = 0; k < tab.m_cols; k++) {
     const Val& val = *m_val[k];
     const Val& val2 = *row2.m_val[k];
     if ((c = val.cmp(par, val2)) != 0)
@@ -2512,10 +2510,10 @@ Row::cmp(Par par, const Row& row2, const ITab& itab) const
 {
   const Tab& tab = m_tab;
   int c = 0;
-  for (unsigned i = 0; i < itab.m_icols; i++) {
+  for (uint i = 0; i < itab.m_icols; i++) {
     const ICol& icol = *itab.m_icol[i];
     const Col& col = icol.m_col;
-    unsigned k = col.m_num;
+    uint k = col.m_num;
     assert(k < tab.m_cols);
     const Val& val = *m_val[k];
     const Val& val2 = *row2.m_val[k];
@@ -2525,19 +2523,70 @@ Row::cmp(Par par, const Row& row2, const ITab& itab) const
   return c;
 }
 
+int
+Row::verify(Par par, const Row& row2, bool pkonly) const
+{
+  const Tab& tab = m_tab;
+  const Row& row1 = *this;
+  assert(&row1.m_tab == &row2.m_tab);
+  for (uint k = 0; k < tab.m_cols; k++) {
+    const Col& col = row1.m_val[k]->m_col;
+    if (!pkonly || col.m_pk) {
+      const Val& val1 = *row1.m_val[k];
+      const Val& val2 = *row2.m_val[k];
+      CHK(val1.verify(par, val2) == 0);
+    }
+  }
+  return 0;
+}
+
+// print
+
+static NdbOut&
+operator<<(NdbOut& out, const Row::St st)
+{
+  if (st == Row::StUndef)
+    out << "StUndef";
+  else if (st == Row::StDefine)
+    out << "StDefine";
+  else if (st == Row::StPrepare)
+    out << "StPrepare";
+  else if (st == Row::StCommit)
+    out << "StCommit";
+  else
+    out << "st=" << st;
+  return out;
+}
+
 static NdbOut&
 operator<<(NdbOut& out, const Row::Op op)
 {
-  if (op == Row::NoOp)
-    out << "NoOp";
-  else if (op == Row::InsOp)
-    out << "InsOp";
-  else if (op == Row::UpdOp)
-    out << "UpdOp";
-  else if (op == Row::DelOp)
-    out << "DelOp";
+  if (op == Row::OpNone)
+    out << "OpNone";
+  else if (op == Row::OpIns)
+    out << "OpIns";
+  else if (op == Row::OpUpd)
+    out << "OpUpd";
+  else if (op == Row::OpDel)
+    out << "OpDel";
+  else if (op == Row::OpRead)
+    out << "OpRead";
+  else if (op == Row::OpReadEx)
+    out << "OpReadEx";
+  else if (op == Row::OpReadCom)
+    out << "OpReadCom";
   else
-    out << op;
+    out << "op=" << op;
+  return out;
+}
+
+static NdbOut&
+operator<<(NdbOut& out, const Row* rowp)
+{
+  if (rowp == 0)
+    out << "[null]";
+  else
+    out << *rowp;
   return out;
 }
 
@@ -2545,26 +2594,18 @@ static NdbOut&
 operator<<(NdbOut& out, const Row& row)
 {
   const Tab& tab = row.m_tab;
-  for (unsigned i = 0; i < tab.m_cols; i++) {
+  out << "[";
+  for (uint i = 0; i < tab.m_cols; i++) {
     if (i > 0)
       out << " ";
     out << *row.m_val[i];
   }
-  out << " exist=" << row.m_exist;
-  if (row.m_pending)
-    out << " pending=" << row.m_pending;
-  if (row.m_dbrow != 0)
-    out << " [dbrow=" << *row.m_dbrow << "]";
-  return out;
-}
-
-static NdbOut&
-operator<<(NdbOut& out, const Row* rowptr)
-{
-  if (rowptr == 0)
-    out << "null";
-  else
-    out << *rowptr;
+  out << " " << row.m_st;
+  out << " " << row.m_op;
+  out << " " << HEX(row.m_txid);
+  if (row.m_bi != 0)
+    out << " " << row.m_bi;
+  out << "]";
   return out;
 }
 
@@ -2572,45 +2613,38 @@ operator<<(NdbOut& out, const Row* rowptr)
 
 struct Set {
   const Tab& m_tab;
-  unsigned m_rows;
+  uint m_rows;
   Row** m_row;
-  unsigned* m_rowkey; // maps row number (from 0) in scan to tuple key
+  uint* m_rowkey; // maps row number (from 0) in scan to tuple key
   Row* m_keyrow;
   NdbRecAttr** m_rec;
-  Set(const Tab& tab, unsigned rows);
+  // construct
+  Set(const Tab& tab, uint rows);
   ~Set();
   void reset();
-  unsigned count() const;
-  // old and new values
-  bool exist(unsigned i) const;
-  void dbsave(unsigned i);
-  void calc(Par par, unsigned i, unsigned mask = 0);
-  bool pending(unsigned i, unsigned mask) const;
-  void notpending(unsigned i, ExecType et = Commit);
-  void notpending(const Lst& lst, ExecType et = Commit);
-  void dbdiscard(unsigned i);
-  void dbdiscard(const Lst& lst);
-  const Row& dbrow(unsigned i) const;
+  bool compat(Par par, uint i, const Row::Op op) const;
+  void push(uint i);
+  void copyval(uint i, uint colmask = ~0); // from bi
+  void calc(Par par, uint i, uint colmask = ~0);
+  uint count() const;
+  const Row* getrow(uint i, bool dirty = false) const;
+  // transaction
+  void post(Par par, ExecType et);
   // operations
-  int insrow(Par par, unsigned i);
-  int updrow(Par par, unsigned i);
-  int updrow(Par par, const ITab& itab, unsigned i);
-  int delrow(Par par, unsigned i);
-  int delrow(Par par, const ITab& itab, unsigned i);
+  int insrow(Par par, uint i);
+  int updrow(Par par, uint i);
+  int updrow(Par par, const ITab& itab, uint i);
+  int delrow(Par par, uint i);
+  int delrow(Par par, const ITab& itab, uint i);
   int selrow(Par par, const Row& keyrow);
   int selrow(Par par, const ITab& itab, const Row& keyrow);
-  // set and get
-  void setkey(Par par, const Row& keyrow);
-  void setkey(Par par, const ITab& itab, const Row& keyrow);
-  int setrow(Par par, unsigned i);
+  int setrow(Par par, uint i);
   int getval(Par par);
-  int getkey(Par par, unsigned* i);
-  int putval(unsigned i, bool force, unsigned n = ~0);
-  // sort rows in-place according to ordered index
+  int getkey(Par par, uint* i);
+  int putval(uint i, bool force, uint n = ~0);
+  // compare
   void sort(Par par, const ITab& itab);
-  void sort(Par par, const ITab& itab, unsigned lo, unsigned hi);
-  // verify
-  int verify(Par par, const Set& set2, bool pkonly) const;
+  int verify(Par par, const Set& set2, bool pkonly, bool dirty = false) const;
   int verifyorder(Par par, const ITab& itab, bool descending) const;
   // protect structure
   NdbMutex* m_mutex;
@@ -2621,26 +2655,27 @@ struct Set {
     NdbMutex_Unlock(m_mutex);
   }
 private:
+  void sort(Par par, const ITab& itab, uint lo, uint hi);
   Set& operator=(const Set& set2);
 };
 
-Set::Set(const Tab& tab, unsigned rows) :
+// construct
+
+Set::Set(const Tab& tab, uint rows) :
   m_tab(tab)
 {
   m_rows = rows;
   m_row = new Row* [m_rows];
-  for (unsigned i = 0; i < m_rows; i++) {
-    // allocate on need to save space
+  for (uint i = 0; i < m_rows; i++) {
     m_row[i] = 0;
   }
-  m_rowkey = new unsigned [m_rows];
-  for (unsigned n = 0; n < m_rows; n++) {
-    // initialize to null
+  m_rowkey = new uint [m_rows];
+  for (uint n = 0; n < m_rows; n++) {
     m_rowkey[n] = ~0;
   }
   m_keyrow = new Row(tab);
   m_rec = new NdbRecAttr* [tab.m_cols];
-  for (unsigned k = 0; k < tab.m_cols; k++) {
+  for (uint k = 0; k < tab.m_cols; k++) {
     m_rec[k] = 0;
   }
   m_mutex = NdbMutex_Create();
@@ -2649,7 +2684,7 @@ Set::Set(const Tab& tab, unsigned rows) :
 
 Set::~Set()
 {
-  for (unsigned i = 0; i < m_rows; i++) {
+  for (uint i = 0; i < m_rows; i++) {
     delete m_row[i];
   }
   delete [] m_row;
@@ -2662,132 +2697,203 @@ Set::~Set()
 void
 Set::reset()
 {
-  for (unsigned i = 0; i < m_rows; i++) {
-    if (m_row[i] != 0) {
-      Row& row = *m_row[i];
-      row.m_exist = false;
-    }
-  }
-}
-
-unsigned
-Set::count() const
-{
-  unsigned count = 0;
-  for (unsigned i = 0; i < m_rows; i++) {
-    if (m_row[i] != 0) {
-      Row& row = *m_row[i];
-      if (row.m_exist)
-        count++;
-    }
+  for (uint i = 0; i < m_rows; i++) {
+    m_row[i] = 0;
   }
-  return count;
 }
 
-// old and new values
-
+// this sucks
 bool
-Set::exist(unsigned i) const
+Set::compat(Par par, uint i, const Row::Op op) const
 {
-  assert(i < m_rows);
-  if (m_row[i] == 0)    // not allocated => not exist
-    return false;
-  return m_row[i]->m_exist;
+  Con& con = par.con();
+  int ret = -1;
+  int place = 0;
+  do {
+    const Row* rowp = getrow(i);
+    if (rowp == 0) {
+      ret = op == Row::OpIns;
+      place = 1;
+      break;
+    }
+    const Row& row = *rowp;
+    if (!(op & Row::OpREAD)) {
+      if (row.m_st == Row::StDefine || row.m_st == Row::StPrepare) {
+        assert(row.m_op & Row::OpDML);
+        assert(row.m_txid != 0);
+        if (con.m_txid != row.m_txid) {
+          ret = false;
+          place = 2;
+          break;
+        }
+        if (row.m_op != Row::OpDel) {
+          ret = op == Row::OpUpd || op == Row::OpDel;
+          place = 3;
+          break;
+        }
+        ret = op == Row::OpIns;
+        place = 4;
+        break;
+      }
+      if (row.m_st == Row::StCommit) {
+        assert(row.m_op == Row::OpNone);
+        assert(row.m_txid == 0);
+        ret = op == Row::OpUpd || op == Row::OpDel;
+        place = 5;
+        break;
+      }
+    }
+    if (op & Row::OpREAD) {
+      bool dirty =
+        con.m_txid != row.m_txid &&
+        par.m_lockmode == NdbOperation::LM_CommittedRead;
+      const Row* rowp2 = getrow(i, dirty);
+      if (rowp2 == 0 || rowp2->m_op == Row::OpDel) {
+        ret = false;
+        place = 6;
+        break;
+      }
+      ret = true;
+      place = 7;
+      break;
+    }
+  } while (0);
+  LL4("compat ret=" << ret << " place=" << place);
+  assert(ret == false || ret == true);
+  return ret;
 }
 
 void
-Set::dbsave(unsigned i)
+Set::push(uint i)
 {
   const Tab& tab = m_tab;
-  assert(i < m_rows && m_row[i] != 0);
+  assert(i < m_rows);
+  Row* bi = m_row[i];
+  m_row[i] = new Row(tab);
   Row& row = *m_row[i];
-  LL5("dbsave " << i << ": " << row);
-  assert(row.m_exist && ! row.m_pending && row.m_dbrow == 0);
-  // could swap pointers but making copy is safer
-  Row* rowptr = new Row(tab);
-  rowptr->copy(row);
-  row.m_dbrow = rowptr;
+  row.m_bi = bi;
+  if (bi != 0)
+    row.copyval(*bi);
 }
 
 void
-Set::calc(Par par, unsigned i, unsigned mask)
+Set::copyval(uint i, uint colmask)
 {
-  const Tab& tab = m_tab;
-  if (m_row[i] == 0)
-    m_row[i] = new Row(tab);
+  assert(m_row[i] != 0);
   Row& row = *m_row[i];
-  row.calc(par, i, mask);
-}
-
-bool
-Set::pending(unsigned i, unsigned mask) const
-{
-  assert(i < m_rows);
-  if (m_row[i] == 0)    // not allocated => not pending
-    return Row::NoOp;
-  return m_row[i]->m_pending & mask;
+  assert(row.m_bi != 0);
+  row.copyval(*row.m_bi, colmask);
 }
 
 void
-Set::notpending(unsigned i, ExecType et)
+Set::calc(Par par, uint i, uint colmask)
 {
   assert(m_row[i] != 0);
   Row& row = *m_row[i];
-  if (et == Commit) {
-    if (row.m_pending == Row::InsOp)
-      row.m_exist = true;
-    if (row.m_pending == Row::DelOp)
-      row.m_exist = false;
-  } else {
-    if (row.m_pending == Row::InsOp)
-      row.m_exist = false;
-    if (row.m_pending == Row::DelOp)
-      row.m_exist = true;
-  }
-  row.m_pending = Row::NoOp;
+  row.calc(par, i, colmask);
 }
 
-void
-Set::notpending(const Lst& lst, ExecType et)
+uint
+Set::count() const
 {
-  for (unsigned j = 0; j < lst.m_cnt; j++) {
-    unsigned i = lst.m_arr[j];
-    notpending(i, et);
+  uint count = 0;
+  for (uint i = 0; i < m_rows; i++) {
+    if (m_row[i] != 0)
+      count++;
   }
+  return count;
 }
 
-void
-Set::dbdiscard(unsigned i)
+const Row*
+Set::getrow(uint i, bool dirty) const
 {
-  assert(m_row[i] != 0);
-  Row& row = *m_row[i];
-  LL5("dbdiscard " << i << ": " << row);
-  assert(row.m_dbrow != 0);
-  delete row.m_dbrow;
-  row.m_dbrow = 0;
+  assert(i < m_rows);
+  const Row* rowp = m_row[i];
+  if (dirty) {
+    while (rowp != 0) {
+      bool b1 = rowp->m_op == Row::OpNone;
+      bool b2 = rowp->m_st == Row::StCommit;
+      assert(b1 == b2);
+      if (b1) {
+        assert(rowp->m_bi == 0);
+        break;
+      }
+      rowp = rowp->m_bi;
+    }
+  }
+  return rowp;
 }
 
-const Row&
-Set::dbrow(unsigned i) const
-{
-  assert(m_row[i] != 0);
-  Row& row = *m_row[i];
-  return row.dbrow();
-}
+// transaction
 
 void
-Set::dbdiscard(const Lst& lst)
+Set::post(Par par, ExecType et)
 {
-  for (unsigned j = 0; j < lst.m_cnt; j++) {
-    unsigned i = lst.m_arr[j];
-    dbdiscard(i);
+  LL4("post");
+  Con& con = par.con();
+  assert(con.m_txid != 0);
+  uint i;
+  for (i = 0; i < m_rows; i++) {
+    Row* rowp = m_row[i];
+    if (rowp == 0) {
+      LL5("skip " << i << " " << rowp);
+      continue;
+    }
+    if (rowp->m_st == Row::StCommit) {
+      assert(rowp->m_op == Row::OpNone);
+      assert(rowp->m_txid == 0);
+      assert(rowp->m_bi == 0);
+      LL5("skip committed " << i << " " << rowp);
+      continue;
+    }
+    assert(rowp->m_st == Row::StDefine || rowp->m_st == Row::StPrepare);
+    assert(rowp->m_txid != 0);
+    if (con.m_txid != rowp->m_txid) {
+      LL5("skip txid " << i << " " << HEX(con.m_txid) << " " << rowp);
+      continue;
+    }
+    // TODO read ops
+    assert(rowp->m_op & Row::OpDML);
+    LL4("post BEFORE " << rowp);
+    if (et == NoCommit) {
+      if (rowp->m_st == Row::StDefine) {
+        rowp->m_st = Row::StPrepare;
+        Row* bi = rowp->m_bi;
+        while (bi != 0 && bi->m_st == Row::StDefine) {
+          bi->m_st = Row::StPrepare;
+          bi = bi->m_bi;
+        }
+      }
+    } else if (et == Commit) {
+      if (rowp->m_op != Row::OpDel) {
+        rowp->m_st = Row::StCommit;
+        rowp->m_op = Row::OpNone;
+        rowp->m_txid = 0;
+        delete rowp->m_bi;
+        rowp->m_bi = 0;
+      } else {
+        delete rowp;
+        rowp = 0;
+      }
+    } else if (et == Rollback) {
+      while (rowp != 0 && rowp->m_st != Row::StCommit) {
+        Row* tmp = rowp;
+        rowp = rowp->m_bi;
+        tmp->m_bi = 0;
+        delete tmp;
+      }
+    } else {
+      assert(false);
+    }
+    m_row[i] = rowp;
+    LL4("post AFTER " << rowp);
   }
 }
 
 // operations
 
 int
-Set::insrow(Par par, unsigned i)
+Set::insrow(Par par, uint i)
 {
   assert(m_row[i] != 0);
   Row& row = *m_row[i];
@@ -2796,7 +2902,7 @@ Set::insrow(Par par, unsigned i)
 }
 
 int
-Set::updrow(Par par, unsigned i)
+Set::updrow(Par par, uint i)
 {
   assert(m_row[i] != 0);
   Row& row = *m_row[i];
@@ -2805,7 +2911,7 @@ Set::updrow(Par par, unsigned i)
 }
 
 int
-Set::updrow(Par par, const ITab& itab, unsigned i)
+Set::updrow(Par par, const ITab& itab, uint i)
 {
   assert(m_row[i] != 0);
   Row& row = *m_row[i];
@@ -2814,7 +2920,7 @@ Set::updrow(Par par, const ITab& itab, unsigned i)
 }
 
 int
-Set::delrow(Par par, unsigned i)
+Set::delrow(Par par, uint i)
 {
   assert(m_row[i] != 0);
   Row& row = *m_row[i];
@@ -2823,7 +2929,7 @@ Set::delrow(Par par, unsigned i)
 }
 
 int
-Set::delrow(Par par, const ITab& itab, unsigned i)
+Set::delrow(Par par, const ITab& itab, uint i)
 {
   assert(m_row[i] != 0);
   Row& row = *m_row[i];
@@ -2836,8 +2942,8 @@ Set::selrow(Par par, const Row& keyrow)
 {
   Con& con = par.con();
   const Tab& tab = par.tab();
-  setkey(par, keyrow);
-  LL5("selrow " << tab.m_name << ": keyrow: " << keyrow);
+  LL5("selrow " << tab.m_name << " keyrow " << keyrow);
+  m_keyrow->copyval(keyrow, tab.m_pkmask);
   CHK(m_keyrow->selrow(par) == 0);
   CHK(getval(par) == 0);
   return 0;
@@ -2847,45 +2953,15 @@ int
 Set::selrow(Par par, const ITab& itab, const Row& keyrow)
 {
   Con& con = par.con();
-  setkey(par, itab, keyrow);
-  LL5("selrow " << itab.m_name << ": keyrow: " << keyrow);
+  LL5("selrow " << itab.m_name << " keyrow " << keyrow);
+  m_keyrow->copyval(keyrow, itab.m_keymask);
   CHK(m_keyrow->selrow(par, itab) == 0);
   CHK(getval(par) == 0);
   return 0;
 }
 
-// set and get
-
-void
-Set::setkey(Par par, const Row& keyrow)
-{
-  const Tab& tab = m_tab;
-  for (unsigned k = 0; k < tab.m_cols; k++) {
-    const Col& col = *tab.m_col[k];
-    if (col.m_pk) {
-      Val& val1 = *m_keyrow->m_val[k];
-      const Val& val2 = *keyrow.dbrow().m_val[k];
-      val1.copy(val2);
-    }
-  }
-}
-
-void
-Set::setkey(Par par, const ITab& itab, const Row& keyrow)
-{
-  const Tab& tab = m_tab;
-  for (unsigned k = 0; k < itab.m_icols; k++) {
-    const ICol& icol = *itab.m_icol[k];
-    const Col& col = icol.m_col;
-    unsigned m = col.m_num;
-    Val& val1 = *m_keyrow->m_val[m];
-    const Val& val2 = *keyrow.dbrow().m_val[m];
-    val1.copy(val2);
-  }
-}
-
 int
-Set::setrow(Par par, unsigned i)
+Set::setrow(Par par, uint i)
 {
   Con& con = par.con();
   assert(m_row[i] != 0);
@@ -2899,18 +2975,18 @@ Set::getval(Par par)
   Con& con = par.con();
   const Tab& tab = m_tab;
   Rsq rsq1(tab.m_cols);
-  for (unsigned k = 0; k < tab.m_cols; k++) {
-    unsigned k2 = rsq1.next();
+  for (uint k = 0; k < tab.m_cols; k++) {
+    uint k2 = rsq1.next();
     CHK(con.getValue(k2, m_rec[k2]) == 0);
   }
   return 0;
 }
 
 int
-Set::getkey(Par par, unsigned* i)
+Set::getkey(Par par, uint* i)
 {
   const Tab& tab = m_tab;
-  unsigned k = tab.m_keycol;
+  uint k = tab.m_keycol;
   assert(m_rec[k] != 0);
   const char* aRef = m_rec[k]->aRef();
   Uint32 key = *(const Uint32*)aRef;
@@ -2921,14 +2997,18 @@ Set::getkey(Par par, unsigned* i)
 }
 
 int
-Set::putval(unsigned i, bool force, unsigned n)
+Set::putval(uint i, bool force, uint n)
 {
   const Tab& tab = m_tab;
-  if (m_row[i] == 0)
-    m_row[i] = new Row(tab);
+  LL4("putval key=" << i << " row=" << n << " old=" << m_row[i]);
+  if (m_row[i] != 0) {
+    assert(force);
+    delete m_row[i];
+    m_row[i] = 0;
+  }
+  m_row[i] = new Row(tab);
   Row& row = *m_row[i];
-  CHK(! row.m_exist || force);
-  for (unsigned k = 0; k < tab.m_cols; k++) {
+  for (uint k = 0; k < tab.m_cols; k++) {
     Val& val = *row.m_val[k];
     NdbRecAttr* rec = m_rec[k];
     assert(rec != 0);
@@ -2940,13 +3020,13 @@ Set::putval(unsigned i, bool force, unsigned n)
     val.copy(aRef);
     val.m_null = false;
   }
-  if (! row.m_exist)
-    row.m_exist = true;
   if (n != ~0)
     m_rowkey[n] = i;
   return 0;
 }
 
+// compare
+
 void
 Set::sort(Par par, const ITab& itab)
 {
@@ -2955,12 +3035,12 @@ Set::sort(Par par, const ITab& itab)
 }
 
 void
-Set::sort(Par par, const ITab& itab, unsigned lo, unsigned hi)
+Set::sort(Par par, const ITab& itab, uint lo, uint hi)
 {
   assert(lo < m_rows && hi < m_rows && lo <= hi);
   Row* const p = m_row[lo];
-  unsigned i = lo;
-  unsigned j = hi;
+  uint i = lo;
+  uint j = hi;
   while (i < j) {
     while (i < j && m_row[j]->cmp(par, *p, itab) >= 0)
       j--;
@@ -2982,22 +3062,48 @@ Set::sort(Par par, const ITab& itab, unsigned lo, unsigned hi)
     sort(par, itab, i + 1, hi);
 }
 
+/*
+ * set1 (self) is from dml and can contain un-committed operations.
+ * set2 is from read and contains no operations.  "dirty" applies
+ * to set1: false = use latest row, true = use committed row.
+ */
 int
-Set::verify(Par par, const Set& set2, bool pkonly) const
-{
-  assert(&m_tab == &set2.m_tab && m_rows == set2.m_rows);
-  LL4("verify set1 count=" << count() << " vs set2 count=" << set2.count());
-  for (unsigned i = 0; i < m_rows; i++) {
+Set::verify(Par par, const Set& set2, bool pkonly, bool dirty) const
+{
+  const Set& set1 = *this;
+  assert(&set1.m_tab == &set2.m_tab && set1.m_rows == set2.m_rows);
+  LL3("verify dirty:" << dirty);
+  for (uint i = 0; i < set1.m_rows; i++) {
+    // the row versions we actually compare
+    const Row* row1p = set1.getrow(i, dirty);
+    const Row* row2p = set2.getrow(i);
     bool ok = true;
-    if (exist(i) != set2.exist(i)) {
-      ok = false;
-    } else if (exist(i)) {
-      if (dbrow(i).verify(par, set2.dbrow(i), pkonly) != 0)
+    int place = 0;
+    if (row1p == 0) {
+      if (row2p != 0) {
+        ok = false;
+        place = 1;
+      }
+    } else {
+      Row::Op op1 = row1p->m_op;
+      if (op1 != Row::OpDel) {
+        if (row2p == 0) {
+          ok = false;
+          place = 2;
+        } else if (row1p->verify(par, *row2p, pkonly) == -1) {
+          ok = false;
+          place = 3;
+        }
+      } else if (row2p != 0) {
         ok = false;
+        place = 4;
+      }
     }
-    if (! ok) {
-      LL1("verify failed: key=" << i << " row1=" << m_row[i] << " row2=" << set2.m_row[i]);
-      CHK(0 == 1);
+    if (!ok) {
+      LL1("verify " << i << " failed at " << place);
+      LL1("row1 " << row1p);
+      LL1("row2 " << row2p);
+      CHK(false);
     }
   }
   return 0;
@@ -3007,18 +3113,17 @@ int
 Set::verifyorder(Par par, const ITab& itab, bool descending) const
 {
   const Tab& tab = m_tab;
-  for (unsigned n = 0; n < m_rows; n++) {
-    unsigned i2 = m_rowkey[n];
+  for (uint n = 0; n < m_rows; n++) {
+    uint i2 = m_rowkey[n];
     if (i2 == ~0)
       break;
     if (n == 0)
       continue;
-    unsigned i1 = m_rowkey[n - 1];
-    assert(i1 < m_rows && i2 < m_rows);
+    uint i1 = m_rowkey[n - 1];
+    assert(m_row[i1] != 0 && m_row[i2] != 0);
     const Row& row1 = *m_row[i1];
     const Row& row2 = *m_row[i2];
-    assert(row1.m_exist && row2.m_exist);
-    if (! descending)
+    if (!descending)
       CHK(row1.cmp(par, row2, itab) <= 0);
     else
       CHK(row1.cmp(par, row2, itab) >= 0);
@@ -3026,10 +3131,12 @@ Set::verifyorder(Par par, const ITab& itab, bool descending) const
   return 0;
 }
 
+// print
+
 static NdbOut&
 operator<<(NdbOut& out, const Set& set)
 {
-  for (unsigned i = 0; i < set.m_rows; i++) {
+  for (uint i = 0; i < set.m_rows; i++) {
     const Row& row = *set.m_row[i];
     if (i > 0)
       out << endl;
@@ -3058,8 +3165,8 @@ int
 BVal::setbnd(Par par) const
 {
   Con& con = par.con();
-  assert(g_compare_null || ! m_null);
-  const char* addr = ! m_null ? (const char*)dataaddr() : 0;
+  assert(g_compare_null || !m_null);
+  const char* addr = !m_null ? (const char*)dataaddr() : 0;
   const ICol& icol = m_icol;
   CHK(con.setBound(icol.m_num, m_type, addr) == 0);
   return 0;
@@ -3068,7 +3175,7 @@ BVal::setbnd(Par par) const
 int
 BVal::setflt(Par par) const
 {
-  static unsigned index_bound_to_filter_bound[5] = {
+  static uint index_bound_to_filter_bound[5] = {
     NdbScanFilter::COND_GE,
     NdbScanFilter::COND_GT,
     NdbScanFilter::COND_LE,
@@ -3076,12 +3183,12 @@ BVal::setflt(Par par) const
     NdbScanFilter::COND_EQ
   };
   Con& con = par.con();
-  assert(g_compare_null || ! m_null);
-  const char* addr = ! m_null ? (const char*)dataaddr() : 0;
+  assert(g_compare_null || !m_null);
+  const char* addr = !m_null ? (const char*)dataaddr() : 0;
   const ICol& icol = m_icol;
   const Col& col = icol.m_col;
-  unsigned length = col.m_bytesize;
-  unsigned cond = index_bound_to_filter_bound[m_type];
+  uint length = col.m_bytesize;
+  uint cond = index_bound_to_filter_bound[m_type];
   CHK(con.setFilter(col.m_num, cond, addr, length) == 0);
   return 0;
 }
@@ -3104,27 +3211,27 @@ operator<<(NdbOut& out, const BVal& bval)
 struct BSet {
   const Tab& m_tab;
   const ITab& m_itab;
-  unsigned m_alloc;
-  unsigned m_bvals;
+  uint m_alloc;
+  uint m_bvals;
   BVal** m_bval;
-  BSet(const Tab& tab, const ITab& itab, unsigned rows);
+  BSet(const Tab& tab, const ITab& itab);
   ~BSet();
   void reset();
   void calc(Par par);
-  void calcpk(Par par, unsigned i);
+  void calcpk(Par par, uint i);
   int setbnd(Par par) const;
   int setflt(Par par) const;
   void filter(Par par, const Set& set, Set& set2) const;
 };
 
-BSet::BSet(const Tab& tab, const ITab& itab, unsigned rows) :
+BSet::BSet(const Tab& tab, const ITab& itab) :
   m_tab(tab),
   m_itab(itab),
   m_alloc(2 * itab.m_icols),
   m_bvals(0)
 {
   m_bval = new BVal* [m_alloc];
-  for (unsigned i = 0; i < m_alloc; i++) {
+  for (uint i = 0; i < m_alloc; i++) {
     m_bval[i] = 0;
   }
 }
@@ -3138,7 +3245,7 @@ void
 BSet::reset()
 {
   while (m_bvals > 0) {
-    unsigned i = --m_bvals;
+    uint i = --m_bvals;
     delete m_bval[i];
     m_bval[i] = 0;
   }
@@ -3150,10 +3257,10 @@ BSet::calc(Par par)
   const ITab& itab = m_itab;
   par.m_pctrange = par.m_pctbrange;
   reset();
-  for (unsigned k = 0; k < itab.m_icols; k++) {
+  for (uint k = 0; k < itab.m_icols; k++) {
     const ICol& icol = *itab.m_icol[k];
     const Col& col = icol.m_col;
-    for (unsigned i = 0; i <= 1; i++) {
+    for (uint i = 0; i <= 1; i++) {
       if (m_bvals == 0 && urandom(100) == 0)
         return;
       if (m_bvals != 0 && urandom(3) == 0)
@@ -3162,7 +3269,7 @@ BSet::calc(Par par)
       BVal& bval = *new BVal(icol);
       m_bval[m_bvals++] = &bval;
       bval.m_null = false;
-      unsigned sel;
+      uint sel;
       do {
         // equality bound only on i==0
         sel = urandom(5 - i);
@@ -3175,7 +3282,7 @@ BSet::calc(Par par)
         bval.m_type = 4;
       if (k + 1 < itab.m_icols)
         bval.m_type = 4;
-      if (! g_compare_null)
+      if (!g_compare_null)
         par.m_pctnull = 0;
       if (bval.m_type == 0 || bval.m_type == 1)
         par.m_bdir = -1;
@@ -3199,11 +3306,11 @@ BSet::calc(Par par)
 }
 
 void
-BSet::calcpk(Par par, unsigned i)
+BSet::calcpk(Par par, uint i)
 {
   const ITab& itab = m_itab;
   reset();
-  for (unsigned k = 0; k < itab.m_icols; k++) {
+  for (uint k = 0; k < itab.m_icols; k++) {
     const ICol& icol = *itab.m_icol[k];
     const Col& col = icol.m_col;
     assert(col.m_pk);
@@ -3220,14 +3327,14 @@ BSet::setbnd(Par par) const
 {
   if (m_bvals != 0) {
     Rsq rsq1(m_bvals);
-    for (unsigned j = 0; j < m_bvals; j++) {
-      unsigned j2 = rsq1.next();
+    for (uint j = 0; j < m_bvals; j++) {
+      uint j2 = rsq1.next();
       const BVal& bval = *m_bval[j2];
       CHK(bval.setbnd(par) == 0);
     }
     // duplicate
     if (urandom(5) == 0) {
-      unsigned j3 = urandom(m_bvals);
+      uint j3 = urandom(m_bvals);
       const BVal& bval = *m_bval[j3];
       CHK(bval.setbnd(par) == 0);
     }
@@ -3243,14 +3350,14 @@ BSet::setflt(Par par) const
   CHK(con.beginFilter(NdbScanFilter::AND) == 0);
   if (m_bvals != 0) {
     Rsq rsq1(m_bvals);
-    for (unsigned j = 0; j < m_bvals; j++) {
-      unsigned j2 = rsq1.next();
+    for (uint j = 0; j < m_bvals; j++) {
+      uint j2 = rsq1.next();
       const BVal& bval = *m_bval[j2];
       CHK(bval.setflt(par) == 0);
     }
     // duplicate
     if (urandom(5) == 0) {
-      unsigned j3 = urandom(m_bvals);
+      uint j3 = urandom(m_bvals);
       const BVal& bval = *m_bval[j3];
       CHK(bval.setflt(par) == 0);
     }
@@ -3266,57 +3373,59 @@ BSet::filter(Par par, const Set& set, Set& set2) const
   const ITab& itab = m_itab;
   assert(&tab == &set2.m_tab && set.m_rows == set2.m_rows);
   assert(set2.count() == 0);
-  for (unsigned i = 0; i < set.m_rows; i++) {
-    if (! set.exist(i))
-      continue;
+  for (uint i = 0; i < set.m_rows; i++) {
     set.lock();
-    const Row& row = set.dbrow(i);
-    set.unlock();
-    if (! g_store_null_key) {
-      bool ok1 = false;
-      for (unsigned k = 0; k < itab.m_icols; k++) {
-        const ICol& icol = *itab.m_icol[k];
+    do {
+      if (set.m_row[i] == 0) {
+        break;
+      }
+      const Row& row = *set.m_row[i];
+      if (!g_store_null_key) {
+        bool ok1 = false;
+        for (uint k = 0; k < itab.m_icols; k++) {
+          const ICol& icol = *itab.m_icol[k];
+          const Col& col = icol.m_col;
+          const Val& val = *row.m_val[col.m_num];
+          if (!val.m_null) {
+            ok1 = true;
+            break;
+          }
+        }
+        if (!ok1)
+          break;
+      }
+      bool ok2 = true;
+      for (uint j = 0; j < m_bvals; j++) {
+        const BVal& bval = *m_bval[j];
+        const ICol& icol = bval.m_icol;
         const Col& col = icol.m_col;
         const Val& val = *row.m_val[col.m_num];
-        if (! val.m_null) {
-          ok1 = true;
-          break;
+        int ret = bval.cmp(par, val);
+        LL5("cmp: ret=" << ret << " " << bval << " vs " << val);
+        if (bval.m_type == 0)
+          ok2 = (ret <= 0);
+        else if (bval.m_type == 1)
+          ok2 = (ret < 0);
+        else if (bval.m_type == 2)
+          ok2 = (ret >= 0);
+        else if (bval.m_type == 3)
+          ok2 = (ret > 0);
+        else if (bval.m_type == 4)
+          ok2 = (ret == 0);
+        else {
+          assert(false);
         }
+        if (!ok2)
+          break;
       }
-      if (! ok1)
-        continue;
-    }
-    bool ok2 = true;
-    for (unsigned j = 0; j < m_bvals; j++) {
-      const BVal& bval = *m_bval[j];
-      const ICol& icol = bval.m_icol;
-      const Col& col = icol.m_col;
-      const Val& val = *row.m_val[col.m_num];
-      int ret = bval.cmp(par, val);
-      LL5("cmp: ret=" << ret << " " << bval << " vs " << val);
-      if (bval.m_type == 0)
-        ok2 = (ret <= 0);
-      else if (bval.m_type == 1)
-        ok2 = (ret < 0);
-      else if (bval.m_type == 2)
-        ok2 = (ret >= 0);
-      else if (bval.m_type == 3)
-        ok2 = (ret > 0);
-      else if (bval.m_type == 4)
-        ok2 = (ret == 0);
-      else {
-        assert(false);
-      }
-      if (! ok2)
+      if (!ok2)
         break;
-    }
-    if (! ok2)
-      continue;
-    if (set2.m_row[i] == 0)
+      assert(set2.m_row[i] == 0);
       set2.m_row[i] = new Row(tab);
-    Row& row2 = *set2.m_row[i];
-    assert(! row2.m_exist);
-    row2.copy(row);
+      Row& row2 = *set2.m_row[i];
+      row2.copy(row, true);
+    } while (0);
+    set.unlock();
   }
 }
 
@@ -3324,7 +3433,7 @@ static NdbOut&
 operator<<(NdbOut& out, const BSet& bset)
 {
   out << "bounds=" << bset.m_bvals;
-  for (unsigned j = 0; j < bset.m_bvals; j++) {
+  for (uint j = 0; j < bset.m_bvals; j++) {
     const BVal& bval = *bset.m_bval[j];
     out << " [bound " << j << ": " << bval << "]";
   }
@@ -3341,59 +3450,40 @@ pkinsert(Par par)
   Set& set = par.set();
   LL3("pkinsert " << tab.m_name);
   CHK(con.startTransaction() == 0);
-  Lst lst;
-  for (unsigned j = 0; j < par.m_rows; j++) {
-    unsigned j2 = ! par.m_randomkey ? j : urandom(par.m_rows);
-    unsigned i = thrrow(par, j2);
+  uint batch = 0;
+  for (uint j = 0; j < par.m_rows; j++) {
+    uint j2 = !par.m_randomkey ? j : urandom(par.m_rows);
+    uint i = thrrow(par, j2);
     set.lock();
-    if (set.exist(i) || set.pending(i, Row::AnyOp)) {
+    if (!set.compat(par, i, Row::OpIns)) {
+      LL3("pkinsert SKIP " << i << " " << set.getrow(i));
       set.unlock();
-      continue;
-    }
-    set.calc(par, i);
-    CHK(set.insrow(par, i) == 0);
-    set.unlock();
-    LL4("pkinsert " << i << ": " << *set.m_row[i]);
-    lst.push(i);
-    if (lst.cnt() == par.m_batch) {
-      bool deadlock = par.m_deadlock;
-      bool nospace = true;
-      ExecType et = randompct(par.m_abortpct) ? Rollback : Commit;
-      CHK(con.execute(et, deadlock, nospace) == 0);
-      con.closeTransaction();
-      if (deadlock) {
-        LL1("pkinsert: stop on deadlock [at 1]");
-        return 0;
-      }
-      if (nospace) {
-        LL1("pkinsert: cnt=" << j << " stop on nospace");
-        return 0;
-      }
+    } else {
+      set.push(i);
+      set.calc(par, i);
+      CHK(set.insrow(par, i) == 0);
+      set.unlock();
+      LL4("pkinsert key=" << i << " " << set.getrow(i));
+      batch++;
+    }
+    bool lastbatch = (batch != 0 && j + 1 == par.m_rows);
+    if (batch == par.m_batch || lastbatch) {
+      uint err = par.m_catcherr;
+      ExecType et = !randompct(par.m_abortpct) ? Commit : Rollback;
+      CHK(con.execute(et, err) == 0);
       set.lock();
-      set.notpending(lst, et);
+      set.post(par, !err ? et : Rollback);
       set.unlock();
-      lst.reset();
-      CHK(con.startTransaction() == 0);
-    }
-  }
-  if (lst.cnt() != 0) {
-    bool deadlock = par.m_deadlock;
-    bool nospace = true;
-    ExecType et = randompct(par.m_abortpct) ? Rollback : Commit;
-    CHK(con.execute(et, deadlock, nospace) == 0);
-    con.closeTransaction();
-    if (deadlock) {
-      LL1("pkinsert: stop on deadlock [at 2]");
-      return 0;
-    }
-    if (nospace) {
-      LL1("pkinsert: end: stop on nospace");
-      return 0;
+      if (err) {
+        LL1("pkinsert key=" << i << " stop on " << con.errname(err));
+        break;
+      }
+      batch = 0;
+      if (!lastbatch) {
+        con.closeTransaction();
+        CHK(con.startTransaction() == 0);
+      }
     }
-    set.lock();
-    set.notpending(lst, et);
-    set.unlock();
-    return 0;
   }
   con.closeTransaction();
   return 0;
@@ -3407,59 +3497,40 @@ pkupdate(Par par)
   Set& set = par.set();
   LL3("pkupdate " << tab.m_name);
   CHK(con.startTransaction() == 0);
-  Lst lst;
-  bool deadlock = false;
-  bool nospace = false;
-  for (unsigned j = 0; j < par.m_rows; j++) {
-    unsigned j2 = ! par.m_randomkey ? j : urandom(par.m_rows);
-    unsigned i = thrrow(par, j2);
+  uint batch = 0;
+  for (uint j = 0; j < par.m_rows; j++) {
+    uint j2 = !par.m_randomkey ? j : urandom(par.m_rows);
+    uint i = thrrow(par, j2);
     set.lock();
-    if (! set.exist(i) || set.pending(i, Row::AnyOp)) {
-      set.unlock();
-      continue;
-    }
-    set.dbsave(i);
-    set.calc(par, i);
-    CHK(set.updrow(par, i) == 0);
-    set.unlock();
-    LL4("pkupdate " << i << ": " << *set.m_row[i]);
-    lst.push(i);
-    if (lst.cnt() == par.m_batch) {
-      deadlock = par.m_deadlock;
-      nospace = true;
-      ExecType et = randompct(par.m_abortpct) ? Rollback : Commit;
-      CHK(con.execute(et, deadlock, nospace) == 0);
-      if (deadlock) {
-        LL1("pkupdate: stop on deadlock [at 1]");
-        break;
-      }
-      if (nospace) {
-        LL1("pkupdate: cnt=" << j << " stop on nospace [at 1]");
-        break;
-      }
-      con.closeTransaction();
-      set.lock();
-      set.notpending(lst, et);
-      set.dbdiscard(lst);
+    if (!set.compat(par, i, Row::OpUpd)) {
+      LL3("pkupdate SKIP " << i << " " << set.getrow(i));
       set.unlock();
-      lst.reset();
-      CHK(con.startTransaction() == 0);
-    }
-  }
-  if (! deadlock && ! nospace && lst.cnt() != 0) {
-    deadlock = par.m_deadlock;
-    nospace = true;
-    ExecType et = randompct(par.m_abortpct) ? Rollback : Commit;
-    CHK(con.execute(et, deadlock, nospace) == 0);
-    if (deadlock) {
-      LL1("pkupdate: stop on deadlock [at 2]");
-    } else if (nospace) {
-      LL1("pkupdate: end: stop on nospace [at 2]");
     } else {
+      set.push(i);
+      set.copyval(i, tab.m_pkmask);
+      set.calc(par, i, ~tab.m_pkmask);
+      CHK(set.updrow(par, i) == 0);
+      set.unlock();
+      LL4("pkupdate key=" << i << " " << set.getrow(i));
+      batch++;
+    }
+    bool lastbatch = (batch != 0 && j + 1 == par.m_rows);
+    if (batch == par.m_batch || lastbatch) {
+      uint err = par.m_catcherr;
+      ExecType et = !randompct(par.m_abortpct) ? Commit : Rollback;
+      CHK(con.execute(et, err) == 0);
       set.lock();
-      set.notpending(lst, et);
-      set.dbdiscard(lst);
+      set.post(par, !err ? et : Rollback);
       set.unlock();
+      if (err) {
+        LL1("pkupdate key=" << i << ": stop on " << con.errname(err));
+        break;
+      }
+      batch = 0;
+      if (!lastbatch) {
+        con.closeTransaction();
+        CHK(con.startTransaction() == 0);
+      }
     }
   }
   con.closeTransaction();
@@ -3474,49 +3545,39 @@ pkdelete(Par par)
   Set& set = par.set();
   LL3("pkdelete " << tab.m_name);
   CHK(con.startTransaction() == 0);
-  Lst lst;
-  bool deadlock = false;
-  bool nospace = false;
-  for (unsigned j = 0; j < par.m_rows; j++) {
-    unsigned j2 = ! par.m_randomkey ? j : urandom(par.m_rows);
-    unsigned i = thrrow(par, j2);
+  uint batch = 0;
+  for (uint j = 0; j < par.m_rows; j++) {
+    uint j2 = !par.m_randomkey ? j : urandom(par.m_rows);
+    uint i = thrrow(par, j2);
     set.lock();
-    if (! set.exist(i) || set.pending(i, Row::AnyOp)) {
+    if (!set.compat(par, i, Row::OpDel)) {
+      LL3("pkdelete SKIP " << i << " " << set.getrow(i));
       set.unlock();
-      continue;
-    }
-    CHK(set.delrow(par, i) == 0);
-    set.unlock();
-    LL4("pkdelete " << i << ": " << *set.m_row[i]);
-    lst.push(i);
-    if (lst.cnt() == par.m_batch) {
-      deadlock = par.m_deadlock;
-      nospace = true;
-      ExecType et = randompct(par.m_abortpct) ? Rollback : Commit;
-      CHK(con.execute(et, deadlock, nospace) == 0);
-      if (deadlock) {
-        LL1("pkdelete: stop on deadlock [at 1]");
-        break;
-      }
-      con.closeTransaction();
-      set.lock();
-      set.notpending(lst, et);
-      set.unlock();
-      lst.reset();
-      CHK(con.startTransaction() == 0);
-    }
-  }
-  if (! deadlock && ! nospace && lst.cnt() != 0) {
-    deadlock = par.m_deadlock;
-    nospace = true;
-    ExecType et = randompct(par.m_abortpct) ? Rollback : Commit;
-    CHK(con.execute(et, deadlock, nospace) == 0);
-    if (deadlock) {
-      LL1("pkdelete: stop on deadlock [at 2]");
     } else {
+      set.push(i);
+      set.copyval(i, tab.m_pkmask);
+      CHK(set.delrow(par, i) == 0);
+      set.unlock();
+      LL4("pkdelete key=" << i << " " << set.getrow(i));
+      batch++;
+    }
+    bool lastbatch = (batch != 0 && j + 1 == par.m_rows);
+    if (batch == par.m_batch || lastbatch) {
+      uint err = par.m_catcherr;
+      ExecType et = !randompct(par.m_abortpct) ? Commit : Rollback;
+      CHK(con.execute(et, err) == 0);
       set.lock();
-      set.notpending(lst, et);
+      set.post(par, !err ? et : Rollback);
       set.unlock();
+      if (err) {
+        LL1("pkdelete key=" << i << " stop on " << con.errname(err));
+        break;
+      }
+      batch = 0;
+      if (!lastbatch) {
+        con.closeTransaction();
+        CHK(con.startTransaction() == 0);
+      }
     }
   }
   con.closeTransaction();
@@ -3533,9 +3594,11 @@ pkread(Par par)
   // expected
   const Set& set1 = set;
   Set set2(tab, set.m_rows);
-  for (unsigned i = 0; i < set.m_rows; i++) {
+  for (uint i = 0; i < set.m_rows; i++) {
     set.lock();
-    if (! set.exist(i)) {
+    // TODO lock mode
+    if (!set.compat(par, i, Row::OpREAD)) {
+      LL3("pkread SKIP " << i << " " << set.getrow(i));
       set.unlock();
       continue;
     }
@@ -3543,10 +3606,10 @@ pkread(Par par)
     CHK(con.startTransaction() == 0);
     CHK(set2.selrow(par, *set1.m_row[i]) == 0);
     CHK(con.execute(Commit) == 0);
-    unsigned i2 = (unsigned)-1;
+    uint i2 = (uint)-1;
     CHK(set2.getkey(par, &i2) == 0 && i == i2);
     CHK(set2.putval(i, false) == 0);
-    LL4("row " << set2.count() << ": " << *set2.m_row[i]);
+    LL4("row " << set2.count() << " " << set2.getrow(i));
     con.closeTransaction();
   }
   if (par.m_verify)
@@ -3555,7 +3618,7 @@ pkread(Par par)
 }
 
 static int
-pkreadfast(Par par, unsigned count)
+pkreadfast(Par par, uint count)
 {
   Con& con = par.con();
   const Tab& tab = par.tab();
@@ -3563,9 +3626,9 @@ pkreadfast(Par par, unsigned count)
   LL3("pkfast " << tab.m_name);
   Row keyrow(tab);
   // not batched on purpose
-  for (unsigned j = 0; j < count; j++) {
-    unsigned i = urandom(set.m_rows);
-    assert(set.exist(i));
+  for (uint j = 0; j < count; j++) {
+    uint i = urandom(set.m_rows);
+    assert(set.compat(par, i, Row::OpREAD));
     CHK(con.startTransaction() == 0);
     // define key
     keyrow.calc(par, i);
@@ -3585,53 +3648,46 @@ static int
 hashindexupdate(Par par, const ITab& itab)
 {
   Con& con = par.con();
+  const Tab& tab = par.tab();
   Set& set = par.set();
   LL3("hashindexupdate " << itab.m_name);
   CHK(con.startTransaction() == 0);
-  Lst lst;
-  bool deadlock = false;
-  bool nospace = false;
-  for (unsigned j = 0; j < par.m_rows; j++) {
-    unsigned j2 = ! par.m_randomkey ? j : urandom(par.m_rows);
-    unsigned i = thrrow(par, j2);
+  uint batch = 0;
+  for (uint j = 0; j < par.m_rows; j++) {
+    uint j2 = !par.m_randomkey ? j : urandom(par.m_rows);
+    uint i = thrrow(par, j2);
     set.lock();
-    if (! set.exist(i) || set.pending(i, Row::AnyOp)) {
+    if (!set.compat(par, i, Row::OpUpd)) {
+      LL3("hashindexupdate SKIP " << i << " " << set.getrow(i));
       set.unlock();
-      continue;
-    }
-    set.dbsave(i);
-    // index key columns are not re-calculated
-    set.calc(par, i, itab.m_colmask);
-    CHK(set.updrow(par, itab, i) == 0);
-    set.unlock();
-    LL4("hashindexupdate " << i << ": " << *set.m_row[i]);
-    lst.push(i);
-    if (lst.cnt() == par.m_batch) {
-      deadlock = par.m_deadlock;
-      CHK(con.execute(Commit, deadlock, nospace) == 0);
-      if (deadlock) {
-        LL1("hashindexupdate: stop on deadlock [at 1]");
-        break;
-      }
-      con.closeTransaction();
-      set.lock();
-      set.notpending(lst);
-      set.dbdiscard(lst);
-      set.unlock();
-      lst.reset();
-      CHK(con.startTransaction() == 0);
-    }
-  }
-  if (! deadlock && lst.cnt() != 0) {
-    deadlock = par.m_deadlock;
-    CHK(con.execute(Commit, deadlock, nospace) == 0);
-    if (deadlock) {
-      LL1("hashindexupdate: stop on deadlock [at 2]");
     } else {
+      // table pk and index key are not updated
+      set.push(i);
+      uint keymask = tab.m_pkmask | itab.m_keymask;
+      set.copyval(i, keymask);
+      set.calc(par, i, ~keymask);
+      CHK(set.updrow(par, itab, i) == 0);
+      set.unlock();
+      LL4("hashindexupdate " << i << " " << set.getrow(i));
+      batch++;
+    }
+    bool lastbatch = (batch != 0 && j + 1 == par.m_rows);
+    if (batch == par.m_batch || lastbatch) {
+      uint err = par.m_catcherr;
+      ExecType et = !randompct(par.m_abortpct) ? Commit : Rollback;
+      CHK(con.execute(et, err) == 0);
       set.lock();
-      set.notpending(lst);
-      set.dbdiscard(lst);
+      set.post(par, !err ? et : Rollback);
       set.unlock();
+      if (err) {
+        LL1("hashindexupdate " << i << " stop on " << con.errname(err));
+        break;
+      }
+      batch = 0;
+      if (!lastbatch) {
+        con.closeTransaction();
+        CHK(con.startTransaction() == 0);
+      }
     }
   }
   con.closeTransaction();
@@ -3645,45 +3701,39 @@ hashindexdelete(Par par, const ITab& itab)
   Set& set = par.set();
   LL3("hashindexdelete " << itab.m_name);
   CHK(con.startTransaction() == 0);
-  Lst lst;
-  bool deadlock = false;
-  bool nospace = false;
-  for (unsigned j = 0; j < par.m_rows; j++) {
-    unsigned j2 = ! par.m_randomkey ? j : urandom(par.m_rows);
-    unsigned i = thrrow(par, j2);
+  uint batch = 0;
+  for (uint j = 0; j < par.m_rows; j++) {
+    uint j2 = !par.m_randomkey ? j : urandom(par.m_rows);
+    uint i = thrrow(par, j2);
     set.lock();
-    if (! set.exist(i) || set.pending(i, Row::AnyOp)) {
-      set.unlock();
-      continue;
-    }
-    CHK(set.delrow(par, itab, i) == 0);
-    set.unlock();
-    LL4("hashindexdelete " << i << ": " << *set.m_row[i]);
-    lst.push(i);
-    if (lst.cnt() == par.m_batch) {
-      deadlock = par.m_deadlock;
-      CHK(con.execute(Commit, deadlock, nospace) == 0);
-      if (deadlock) {
-        LL1("hashindexdelete: stop on deadlock [at 1]");
-        break;
-      }
-      con.closeTransaction();
-      set.lock();
-      set.notpending(lst);
+    if (!set.compat(par, i, Row::OpDel)) {
+      LL3("hashindexdelete SKIP " << i << " " << set.getrow(i));
       set.unlock();
-      lst.reset();
-      CHK(con.startTransaction() == 0);
-    }
-  }
-  if (! deadlock && lst.cnt() != 0) {
-    deadlock = par.m_deadlock;
-    CHK(con.execute(Commit, deadlock, nospace) == 0);
-    if (deadlock) {
-      LL1("hashindexdelete: stop on deadlock [at 2]");
     } else {
+      set.push(i);
+      set.copyval(i, itab.m_keymask);
+      CHK(set.delrow(par, itab, i) == 0);
+      set.unlock();
+      LL4("hashindexdelete " << i << " " << set.getrow(i));
+      batch++;
+    }
+    bool lastbatch = (batch != 0 && j + 1 == par.m_rows);
+    if (batch == par.m_batch || lastbatch) {
+      uint err = par.m_catcherr;
+      ExecType et = !randompct(par.m_abortpct) ? Commit : Rollback;
+      CHK(con.execute(et, err) == 0);
       set.lock();
-      set.notpending(lst);
+      set.post(par, !err ? et : Rollback);
       set.unlock();
+      if (err) {
+        LL1("hashindexdelete " << i << " stop on " << con.errname(err));
+        break;
+      }
+      batch = 0;
+      if (!lastbatch) {
+        con.closeTransaction();
+        CHK(con.startTransaction() == 0);
+      }
     }
   }
   con.closeTransaction();
@@ -3700,9 +3750,11 @@ hashindexread(Par par, const ITab& itab)
   // expected
   const Set& set1 = set;
   Set set2(tab, set.m_rows);
-  for (unsigned i = 0; i < set.m_rows; i++) {
+  for (uint i = 0; i < set.m_rows; i++) {
     set.lock();
-    if (! set.exist(i)) {
+    // TODO lock mode
+    if (!set.compat(par, i, Row::OpREAD)) {
+      LL3("hashindexread SKIP " << i << " " << set.getrow(i));
       set.unlock();
       continue;
     }
@@ -3710,10 +3762,10 @@ hashindexread(Par par, const ITab& itab)
     CHK(con.startTransaction() == 0);
     CHK(set2.selrow(par, itab, *set1.m_row[i]) == 0);
     CHK(con.execute(Commit) == 0);
-    unsigned i2 = (unsigned)-1;
+    uint i2 = (uint)-1;
     CHK(set2.getkey(par, &i2) == 0 && i == i2);
     CHK(set2.putval(i, false) == 0);
-    LL4("row " << set2.count() << ": " << *set2.m_row[i]);
+    LL4("row " << set2.count() << " " << *set2.m_row[i]);
     con.closeTransaction();
   }
   if (par.m_verify)
@@ -3731,40 +3783,39 @@ scanreadtable(Par par)
   const Set& set = par.set();
   // expected
   const Set& set1 = set;
-  LL3("scanread " << tab.m_name << " lockmode=" << par.m_lockmode << " tupscan=" << par.m_tupscan << " expect=" << set1.count() << " verify=" << par.m_verify);
+  LL3("scanreadtable " << tab.m_name << " lockmode=" << par.m_lockmode << " tupscan=" << par.m_tupscan << " expect=" << set1.count() << " verify=" << par.m_verify);
   Set set2(tab, set.m_rows);
   CHK(con.startTransaction() == 0);
   CHK(con.getNdbScanOperation(tab) == 0);
   CHK(con.readTuples(par) == 0);
   set2.getval(par);
   CHK(con.executeScan() == 0);
-  unsigned n = 0;
-  bool deadlock = false;
+  uint n = 0;
   while (1) {
     int ret;
-    deadlock = par.m_deadlock;
-    CHK((ret = con.nextScanResult(true, deadlock)) == 0 || ret == 1);
+    uint err = par.m_catcherr;
+    CHK((ret = con.nextScanResult(true, err)) == 0 || ret == 1);
     if (ret == 1)
       break;
-    if (deadlock) {
-      LL1("scanreadtable: stop on deadlock");
+    if (err) {
+      LL1("scanreadtable stop on " << con.errname(err));
       break;
     }
-    unsigned i = (unsigned)-1;
+    uint i = (uint)-1;
     CHK(set2.getkey(par, &i) == 0);
     CHK(set2.putval(i, false, n) == 0);
-    LL4("row " << n << ": " << *set2.m_row[i]);
+    LL4("row " << n << " " << *set2.m_row[i]);
     n++;
   }
   con.closeTransaction();
   if (par.m_verify)
     CHK(set1.verify(par, set2, false) == 0);
-  LL3("scanread " << tab.m_name << " done rows=" << n);
+  LL3("scanreadtable " << tab.m_name << " done rows=" << n);
   return 0;
 }
 
 static int
-scanreadtablefast(Par par, unsigned countcheck)
+scanreadtablefast(Par par, uint countcheck)
 {
   Con& con = par.con();
   const Tab& tab = par.tab();
@@ -3777,7 +3828,7 @@ scanreadtablefast(Par par, unsigned countcheck)
   NdbRecAttr* rec;
   CHK(con.getValue((Uint32)0, rec) == 0);
   CHK(con.executeScan() == 0);
-  unsigned count = 0;
+  uint count = 0;
   while (1) {
     int ret;
     CHK((ret = con.nextScanResult(true)) == 0 || ret == 1);
@@ -3797,7 +3848,7 @@ calcscanbounds(Par par, const ITab& itab, BSet& bset, const Set& set, Set& set1)
   while (true) {
     bset.calc(par);
     bset.filter(par, set, set1);
-    unsigned n = set1.count();
+    uint n = set1.count();
     // prefer proper subset
     if (0 < n && n < set.m_rows)
       break;
@@ -3819,7 +3870,7 @@ scanreadindex(Par par, const ITab& itab, BSet& bset, bool calc)
   } else {
     bset.filter(par, set, set1);
   }
-  LL3("scanread " << itab.m_name << " " << bset << " lockmode=" << par.m_lockmode << " expect=" << set1.count() << " ordered=" << par.m_ordered << " descending=" << par.m_descending << " verify=" << par.m_verify);
+  LL3("scanreadindex " << itab.m_name << " " << bset << " lockmode=" << par.m_lockmode << " expect=" << set1.count() << " ordered=" << par.m_ordered << " descending=" << par.m_descending << " verify=" << par.m_verify);
   Set set2(tab, set.m_rows);
   CHK(con.startTransaction() == 0);
   CHK(con.getNdbIndexScanOperation(itab, tab) == 0);
@@ -3827,22 +3878,21 @@ scanreadindex(Par par, const ITab& itab, BSet& bset, bool calc)
   CHK(bset.setbnd(par) == 0);
   set2.getval(par);
   CHK(con.executeScan() == 0);
-  unsigned n = 0;
-  bool deadlock = false;
+  uint n = 0;
   while (1) {
     int ret;
-    deadlock = par.m_deadlock;
-    CHK((ret = con.nextScanResult(true, deadlock)) == 0 || ret == 1);
+    uint err = par.m_catcherr;
+    CHK((ret = con.nextScanResult(true, err)) == 0 || ret == 1);
     if (ret == 1)
       break;
-    if (deadlock) {
-      LL1("scanreadindex: stop on deadlock");
+    if (err) {
+      LL1("scanreadindex stop on " << con.errname(err));
       break;
     }
-    unsigned i = (unsigned)-1;
+    uint i = (uint)-1;
     CHK(set2.getkey(par, &i) == 0);
     CHK(set2.putval(i, par.m_dups, n) == 0);
-    LL4("key " << i << " row " << n << ": " << *set2.m_row[i]);
+    LL4("key " << i << " row " << n << " " << *set2.m_row[i]);
     n++;
   }
   con.closeTransaction();
@@ -3851,12 +3901,12 @@ scanreadindex(Par par, const ITab& itab, BSet& bset, bool calc)
     if (par.m_ordered)
       CHK(set2.verifyorder(par, itab, par.m_descending) == 0);
   }
-  LL3("scanread " << itab.m_name << " done rows=" << n);
+  LL3("scanreadindex " << itab.m_name << " done rows=" << n);
   return 0;
 }
 
 static int
-scanreadindexfast(Par par, const ITab& itab, const BSet& bset, unsigned countcheck)
+scanreadindexfast(Par par, const ITab& itab, const BSet& bset, uint countcheck)
 {
   Con& con = par.con();
   const Tab& tab = par.tab();
@@ -3871,7 +3921,7 @@ scanreadindexfast(Par par, const ITab& itab, const BSet& bset, unsigned countche
   NdbRecAttr* rec;
   CHK(con.getValue((Uint32)0, rec) == 0);
   CHK(con.executeScan() == 0);
-  unsigned count = 0;
+  uint count = 0;
   while (1) {
     int ret;
     CHK((ret = con.nextScanResult(true)) == 0 || ret == 1);
@@ -3904,22 +3954,21 @@ scanreadfilter(Par par, const ITab& itab, BSet& bset, bool calc)
   CHK(bset.setflt(par) == 0);
   set2.getval(par);
   CHK(con.executeScan() == 0);
-  unsigned n = 0;
-  bool deadlock = false;
+  uint n = 0;
   while (1) {
     int ret;
-    deadlock = par.m_deadlock;
-    CHK((ret = con.nextScanResult(true, deadlock)) == 0 || ret == 1);
+    uint err = par.m_catcherr;
+    CHK((ret = con.nextScanResult(true, err)) == 0 || ret == 1);
     if (ret == 1)
       break;
-    if (deadlock) {
-      LL1("scanfilter: stop on deadlock");
+    if (err) {
+      LL1("scanfilter stop on " << con.errname(err));
       break;
     }
-    unsigned i = (unsigned)-1;
+    uint i = (uint)-1;
     CHK(set2.getkey(par, &i) == 0);
     CHK(set2.putval(i, par.m_dups, n) == 0);
-    LL4("key " << i << " row " << n << ": " << *set2.m_row[i]);
+    LL4("key " << i << " row " << n << " " << *set2.m_row[i]);
     n++;
   }
   con.closeTransaction();
@@ -3934,9 +3983,9 @@ static int
 scanreadindex(Par par, const ITab& itab)
 {
   const Tab& tab = par.tab();
-  for (unsigned i = 0; i < par.m_subloop; i++) {
+  for (uint i = 0; i < par.m_ssloop; i++) {
     if (itab.m_type == ITab::OrderedIndex) {
-      BSet bset(tab, itab, par.m_rows);
+      BSet bset(tab, itab);
       CHK(scanreadfilter(par, itab, bset, true) == 0);
       CHK(scanreadindex(par, itab, bset, true) == 0);
     }
@@ -3948,7 +3997,7 @@ static int
 scanreadindex(Par par)
 {
   const Tab& tab = par.tab();
-  for (unsigned i = 0; i < tab.m_itabs; i++) {
+  for (uint i = 0; i < tab.m_itabs; i++) {
     if (tab.m_itab[i] == 0)
       continue;
     const ITab& itab = *tab.m_itab[i];
@@ -3985,7 +4034,7 @@ timescanpkindex(Par par)
 {
   const Tab& tab = par.tab();
   const ITab& itab = *tab.m_itab[0];    // 1st index is on PK
-  BSet bset(tab, itab, par.m_rows);
+  BSet bset(tab, itab);
   par.tmr().on();
   CHK(scanreadindexfast(par, itab, bset, par.m_totrows) == 0);
   par.tmr().off(par.set().m_rows);
@@ -3996,7 +4045,7 @@ static int
 timepkreadtable(Par par)
 {
   par.tmr().on();
-  unsigned count = par.m_samples;
+  uint count = par.m_samples;
   if (count == 0)
     count = par.m_totrows;
   CHK(pkreadfast(par, count) == 0);
@@ -4009,13 +4058,13 @@ timepkreadindex(Par par)
 {
   const Tab& tab = par.tab();
   const ITab& itab = *tab.m_itab[0];    // 1st index is on PK
-  BSet bset(tab, itab, par.m_rows);
-  unsigned count = par.m_samples;
+  BSet bset(tab, itab);
+  uint count = par.m_samples;
   if (count == 0)
     count = par.m_totrows;
   par.tmr().on();
-  for (unsigned j = 0; j < count; j++) {
-    unsigned i = urandom(par.m_totrows);
+  for (uint j = 0; j < count; j++) {
+    uint i = urandom(par.m_totrows);
     bset.calcpk(par, i);
     CHK(scanreadindexfast(par, itab, bset, 1) == 0);
   }
@@ -4031,7 +4080,7 @@ scanupdatetable(Par par)
   Con& con = par.con();
   const Tab& tab = par.tab();
   Set& set = par.set();
-  LL3("scan update " << tab.m_name);
+  LL3("scanupdatetable " << tab.m_name);
   Set set2(tab, set.m_rows);
   par.m_lockmode = NdbOperation::LM_Exclusive;
   CHK(con.startTransaction() == 0);
@@ -4039,87 +4088,70 @@ scanupdatetable(Par par)
   CHK(con.readTuples(par) == 0);
   set2.getval(par);
   CHK(con.executeScan() == 0);
-  unsigned count = 0;
+  uint count = 0;
   // updating trans
   Con con2;
   con2.connect(con);
   CHK(con2.startTransaction() == 0);
-  Lst lst;
-  bool deadlock = false;
-  bool nospace = false;
+  uint batch = 0;
   while (1) {
     int ret;
-    deadlock = par.m_deadlock;
-    CHK((ret = con.nextScanResult(true, deadlock)) == 0 || ret == 1);
-    if (ret == 1)
+    uint32 err = par.m_catcherr;
+    CHK((ret = con.nextScanResult(true, err)) != -1);
+    if (ret != 0)
       break;
-    if (deadlock) {
-      LL1("scanupdatetable: stop on deadlock [at 1]");
+    if (err) {
+      LL1("scanupdatetable [scan] stop on " << con.errname(err));
       break;
     }
     if (par.m_scanstop != 0 && urandom(par.m_scanstop) == 0) {
       con.closeScan();
       break;
     }
-    do {
-      unsigned i = (unsigned)-1;
+    while (1) {
+      uint i = (uint)-1;
       CHK(set2.getkey(par, &i) == 0);
-      const Row& row = *set.m_row[i];
       set.lock();
-      if (! set.exist(i) || set.pending(i, Row::AnyOp)) {
-        LL4("scan update " << tab.m_name << ": skip: " << row);
+      if (!set.compat(par, i, Row::OpUpd)) {
+        LL3("scanupdatetable SKIP " << i << " " << set.getrow(i));
       } else {
         CHKTRY(set2.putval(i, false) == 0, set.unlock());
         CHKTRY(con.updateScanTuple(con2) == 0, set.unlock());
         Par par2 = par;
         par2.m_con = &con2;
-        set.dbsave(i);
-        set.calc(par, i);
+        set.push(i);
+        set.calc(par, i, ~tab.m_pkmask);
         CHKTRY(set.setrow(par2, i) == 0, set.unlock());
-        LL4("scan update " << tab.m_name << ": " << row);
-        lst.push(i);
+        LL4("scanupdatetable " << i << " " << set.getrow(i));
+        batch++;
       }
       set.unlock();
-      if (lst.cnt() == par.m_batch) {
-        deadlock = par.m_deadlock;
-        CHK(con2.execute(Commit, deadlock, nospace) == 0);
-        if (deadlock) {
-          LL1("scanupdatetable: stop on deadlock [at 2]");
-          goto out;
-        }
-        con2.closeTransaction();
+      CHK((ret = con.nextScanResult(false)) != -1);
+      bool lastbatch = (batch != 0 && ret != 0);
+      if (batch == par.m_batch || lastbatch) {
+        uint err = par.m_catcherr;
+        ExecType et = Commit;
+        CHK(con2.execute(et, err) == 0);
         set.lock();
-        set.notpending(lst);
-        set.dbdiscard(lst);
+        set.post(par, !err ? et : Rollback);
         set.unlock();
-        count += lst.cnt();
-        lst.reset();
-        CHK(con2.startTransaction() == 0);
-      }
-      CHK((ret = con.nextScanResult(false)) == 0 || ret == 1 || ret == 2);
-      if (ret == 2 && lst.cnt() != 0) {
-        deadlock = par.m_deadlock;
-        CHK(con2.execute(Commit, deadlock, nospace) == 0);
-        if (deadlock) {
-          LL1("scanupdatetable: stop on deadlock [at 3]");
+        if (err) {
+          LL1("scanupdatetable [update] stop on " << con2.errname(err));
           goto out;
         }
+        LL4("scanupdatetable committed batch");
+        count += batch;
+        batch = 0;
         con2.closeTransaction();
-        set.lock();
-        set.notpending(lst);
-        set.dbdiscard(lst);
-        set.unlock();
-        count += lst.cnt();
-        lst.reset();
         CHK(con2.startTransaction() == 0);
       }
-    } while (ret == 0);
-    if (ret == 1)
-      break;
+      if (ret != 0)
+        break;
+    }
   }
 out:
   con2.closeTransaction();
-  LL3("scan update " << tab.m_name << " rows updated=" << count);
+  LL3("scanupdatetable " << tab.m_name << " rows updated=" << count);
   con.closeTransaction();
   return 0;
 }
@@ -4137,7 +4169,7 @@ scanupdateindex(Par par, const ITab& itab, BSet& bset, bool calc)
   } else {
     bset.filter(par, set, set1);
   }
-  LL3("scan update " << itab.m_name << " " << bset << " expect=" << set1.count() << " ordered=" << par.m_ordered << " descending=" << par.m_descending << " verify=" << par.m_verify);
+  LL3("scanupdateindex " << itab.m_name << " " << bset << " expect=" << set1.count() << " ordered=" << par.m_ordered << " descending=" << par.m_descending << " verify=" << par.m_verify);
   Set set2(tab, set.m_rows);
   par.m_lockmode = NdbOperation::LM_Exclusive;
   CHK(con.startTransaction() == 0);
@@ -4146,83 +4178,67 @@ scanupdateindex(Par par, const ITab& itab, BSet& bset, bool calc)
   CHK(bset.setbnd(par) == 0);
   set2.getval(par);
   CHK(con.executeScan() == 0);
-  unsigned count = 0;
+  uint count = 0;
   // updating trans
   Con con2;
   con2.connect(con);
   CHK(con2.startTransaction() == 0);
-  Lst lst;
-  bool deadlock = false;
-  bool nospace = false;
+  uint batch = 0;
   while (1) {
     int ret;
-    deadlock = par.m_deadlock;
-    CHK((ret = con.nextScanResult(true, deadlock)) == 0 || ret == 1);
-    if (ret == 1)
+    uint err = par.m_catcherr;
+    CHK((ret = con.nextScanResult(true, err)) != -1);
+    if (ret != 0)
       break;
-    if (deadlock) {
-      LL1("scanupdateindex: stop on deadlock [at 1]");
+    if (err) {
+      LL1("scanupdateindex [scan] stop on " << con.errname(err));
       break;
     }
     if (par.m_scanstop != 0 && urandom(par.m_scanstop) == 0) {
       con.closeScan();
       break;
     }
-    do {
-      unsigned i = (unsigned)-1;
+    while (1) {
+      uint i = (uint)-1;
       CHK(set2.getkey(par, &i) == 0);
-      const Row& row = *set.m_row[i];
       set.lock();
-      if (! set.exist(i) || set.pending(i, Row::AnyOp)) {
-        LL4("scan update " << itab.m_name << ": skip: " << row);
+      if (!set.compat(par, i, Row::OpUpd)) {
+        LL4("scanupdateindex SKIP " << set.getrow(i));
       } else {
         CHKTRY(set2.putval(i, par.m_dups) == 0, set.unlock());
         CHKTRY(con.updateScanTuple(con2) == 0, set.unlock());
         Par par2 = par;
         par2.m_con = &con2;
-        set.dbsave(i);
-        set.calc(par, i, ! par.m_noindexkeyupdate ? 0 : itab.m_colmask);
+        set.push(i);
+        uint colmask = !par.m_noindexkeyupdate ? ~0 : ~itab.m_keymask;
+        set.calc(par, i, colmask);
         CHKTRY(set.setrow(par2, i) == 0, set.unlock());
-        LL4("scan update " << itab.m_name << ": " << row);
-        lst.push(i);
+        LL4("scanupdateindex " << i << " " << set.getrow(i));
+        batch++;
       }
       set.unlock();
-      if (lst.cnt() == par.m_batch) {
-        deadlock = par.m_deadlock;
-        CHK(con2.execute(Commit, deadlock, nospace) == 0);
-        if (deadlock) {
-          LL1("scanupdateindex: stop on deadlock [at 2]");
-          goto out;
-        }
-        con2.closeTransaction();
-        LL4("scanupdateindex: committed batch [at 1]");
+      CHK((ret = con.nextScanResult(false)) != -1);
+      bool lastbatch = (batch != 0 && ret != 0);
+      if (batch == par.m_batch || lastbatch) {
+        uint err = par.m_catcherr;
+        ExecType et = Commit;
+        CHK(con2.execute(et, err) == 0);
         set.lock();
-        set.notpending(lst);
-        set.dbdiscard(lst);
+        set.post(par, !err ? et : Rollback);
         set.unlock();
-        count += lst.cnt();
-        lst.reset();
-        CHK(con2.startTransaction() == 0);
-      }
-      CHK((ret = con.nextScanResult(false)) == 0 || ret == 1 || ret == 2);
-      if (ret == 2 && lst.cnt() != 0) {
-        deadlock = par.m_deadlock;
-        CHK(con2.execute(Commit, deadlock, nospace) == 0);
-        if (deadlock) {
-          LL1("scanupdateindex: stop on deadlock [at 3]");
+        if (err) {
+          LL1("scanupdateindex [update] stop on " << con2.errname(err));
           goto out;
         }
+        LL4("scanupdateindex committed batch");
+        count += batch;
+        batch = 0;
         con2.closeTransaction();
-        LL4("scanupdateindex: committed batch [at 2]");
-        set.lock();
-        set.notpending(lst);
-        set.dbdiscard(lst);
-        set.unlock();
-        count += lst.cnt();
-        lst.reset();
         CHK(con2.startTransaction() == 0);
       }
-    } while (ret == 0);
+      if (ret != 0)
+        break;
+    }
   }
 out:
   con2.closeTransaction();
@@ -4231,7 +4247,7 @@ out:
     if (par.m_ordered)
       CHK(set2.verifyorder(par, itab, par.m_descending) == 0);
   }
-  LL3("scan update " << itab.m_name << " rows updated=" << count);
+  LL3("scanupdateindex " << itab.m_name << " rows updated=" << count);
   con.closeTransaction();
   return 0;
 }
@@ -4240,9 +4256,9 @@ static int
 scanupdateindex(Par par, const ITab& itab)
 {
   const Tab& tab = par.tab();
-  for (unsigned i = 0; i < par.m_subloop; i++) {
+  for (uint i = 0; i < par.m_ssloop; i++) {
     if (itab.m_type == ITab::OrderedIndex) {
-      BSet bset(tab, itab, par.m_rows);
+      BSet bset(tab, itab);
       CHK(scanupdateindex(par, itab, bset, true) == 0);
     } else {
       CHK(hashindexupdate(par, itab) == 0);
@@ -4255,7 +4271,7 @@ static int
 scanupdateindex(Par par)
 {
   const Tab& tab = par.tab();
-  for (unsigned i = 0; i < tab.m_itabs; i++) {
+  for (uint i = 0; i < tab.m_itabs; i++) {
     if (tab.m_itab[i] == 0)
       continue;
     const ITab& itab = *tab.m_itab[i];
@@ -4294,14 +4310,14 @@ readverifyfull(Par par)
     CHK(scanreadtable(par) == 0);
   }
   // each thread scans different indexes
-  for (unsigned i = 0; i < tab.m_itabs; i++) {
-    if (i % par.m_threads != par.m_no)
+  for (uint i = 0; i < tab.m_itabs; i++) {
+    if (i % par.m_usedthreads != par.m_no)
       continue;
     if (tab.m_itab[i] == 0)
       continue;
     const ITab& itab = *tab.m_itab[i];
     if (itab.m_type == ITab::OrderedIndex) {
-      BSet bset(tab, itab, par.m_rows);
+      BSet bset(tab, itab);
       CHK(scanreadindex(par, itab, bset, false) == 0);
     } else {
       CHK(hashindexread(par, itab) == 0);
@@ -4317,7 +4333,7 @@ readverifyindex(Par par)
     return 0;
   par.m_verify = true;
   par.m_lockmode = NdbOperation::LM_CommittedRead;
-  unsigned sel = urandom(10);
+  uint sel = urandom(10);
   if (sel < 9) {
     par.m_ordered = true;
     par.m_descending = (sel < 5);
@@ -4331,8 +4347,8 @@ pkops(Par par)
 {
   const Tab& tab = par.tab();
   par.m_randomkey = true;
-  for (unsigned i = 0; i < par.m_subloop; i++) {
-    unsigned j = 0;
+  for (uint i = 0; i < par.m_ssloop; i++) {
+    uint j = 0;
     while (j < tab.m_itabs) {
       if (tab.m_itab[j] != 0) {
         const ITab& itab = *tab.m_itab[j];
@@ -4341,7 +4357,7 @@ pkops(Par par)
       }
       j++;
     }
-    unsigned sel = urandom(10);
+    uint sel = urandom(10);
     if (par.m_slno % 2 == 0) {
       // favor insert
       if (sel < 8) {
@@ -4389,8 +4405,8 @@ static int
 pkupdatescanread(Par par)
 {
   par.m_dups = true;
-  par.m_deadlock = true;
-  unsigned sel = urandom(10);
+  par.m_catcherr |= Con::ErrDeadlock;
+  uint sel = urandom(10);
   if (sel < 5) {
     CHK(pkupdate(par) == 0);
   } else if (sel < 6) {
@@ -4411,9 +4427,9 @@ static int
 mixedoperations(Par par)
 {
   par.m_dups = true;
-  par.m_deadlock = true;
+  par.m_catcherr |= Con::ErrDeadlock;
   par.m_scanstop = par.m_totrows;       // randomly close scans
-  unsigned sel = urandom(10);
+  uint sel = urandom(10);
   if (sel < 2) {
     CHK(pkdelete(par) == 0);
   } else if (sel < 4) {
@@ -4434,8 +4450,8 @@ static int
 parallelorderedupdate(Par par)
 {
   const Tab& tab = par.tab();
-  unsigned k = 0;
-  for (unsigned i = 0; i < tab.m_itabs; i++) {
+  uint k = 0;
+  for (uint i = 0; i < tab.m_itabs; i++) {
     if (tab.m_itab[i] == 0)
       continue;
     const ITab& itab = *tab.m_itab[i];
@@ -4447,10 +4463,11 @@ parallelorderedupdate(Par par)
       par.m_noindexkeyupdate = true;
       par.m_ordered = true;
       par.m_descending = (par.m_slno != 0);
+      par.m_dups = false;
       par.m_verify = true;
-      BSet bset(tab, itab, par.m_rows); // empty bounds
+      BSet bset(tab, itab); // empty bounds
       // prefer empty bounds
-      unsigned sel = urandom(10);
+      uint sel = urandom(10);
       CHK(scanupdateindex(par, itab, bset, sel < 2) == 0);
     }
   }
@@ -4469,6 +4486,418 @@ pkupdateindexbuild(Par par)
   return 0;
 }
 
+// savepoint tests (single thread for now)
+
+struct Spt {
+  enum Res { Committed, Latest, Deadlock };
+  bool m_same; // same transaction
+  NdbOperation::LockMode m_lm;
+  Res m_res;
+};
+
+static Spt sptlist[] = {
+  { 1, NdbOperation::LM_Read, Spt::Latest },
+  { 1, NdbOperation::LM_Exclusive, Spt::Latest },
+  { 1, NdbOperation::LM_CommittedRead, Spt::Latest },
+  { 0, NdbOperation::LM_Read, Spt::Deadlock },
+  { 0, NdbOperation::LM_Exclusive, Spt::Deadlock },
+  { 0, NdbOperation::LM_CommittedRead, Spt::Committed }
+};
+static uint sptcount = sizeof(sptlist)/sizeof(sptlist[0]);
+
+static int
+savepointreadpk(Par par, Spt spt)
+{
+  LL3("savepointreadpk");
+  Con& con = par.con();
+  const Tab& tab = par.tab();
+  Set& set = par.set();
+  const Set& set1 = set;
+  Set set2(tab, set.m_rows);
+  uint n = 0;
+  for (uint i = 0; i < set.m_rows; i++) {
+    set.lock();
+    if (!set.compat(par, i, Row::OpREAD)) {
+      LL4("savepointreadpk SKIP " << i << " " << set.getrow(i));
+      set.unlock();
+      continue;
+    }
+    set.unlock();
+    CHK(set2.selrow(par, *set1.m_row[i]) == 0);
+    uint err = par.m_catcherr | Con::ErrDeadlock;
+    ExecType et = NoCommit;
+    CHK(con.execute(et, err) == 0);
+    if (err) {
+      if (err & Con::ErrDeadlock) {
+        CHK(spt.m_res == Spt::Deadlock);
+        // all rows have same behaviour
+        CHK(n == 0);
+      }
+      LL1("savepointreadpk stop on " << con.errname(err));
+      break;
+    }
+    uint i2 = (uint)-1;
+    CHK(set2.getkey(par, &i2) == 0 && i == i2);
+    CHK(set2.putval(i, false) == 0);
+    LL4("row " << set2.count() << " " << set2.getrow(i));
+    n++;
+  }
+  bool dirty = (!spt.m_same && spt.m_lm == NdbOperation::LM_CommittedRead);
+  if (spt.m_res != Spt::Deadlock)
+    CHK(set1.verify(par, set2, false, dirty) == 0);
+  return 0;
+}
+
+static int
+savepointreadhashindex(Par par, Spt spt)
+{
+  if (spt.m_lm == NdbOperation::LM_CommittedRead && !spt.m_same) {
+    LL1("skip hash index dirty read");
+    return 0;
+  }
+  LL3("savepointreadhashindex");
+  Con& con = par.con();
+  const Tab& tab = par.tab();
+  const ITab& itab = par.itab();
+  Set& set = par.set();
+  const Set& set1 = set;
+  Set set2(tab, set.m_rows);
+  uint n = 0;
+  for (uint i = 0; i < set.m_rows; i++) {
+    set.lock();
+    if (!set.compat(par, i, Row::OpREAD)) {
+      LL3("savepointreadhashindex SKIP " << i << " " << set.getrow(i));
+      set.unlock();
+      continue;
+    }
+    set.unlock();
+    CHK(set2.selrow(par, itab, *set1.m_row[i]) == 0);
+    uint err = par.m_catcherr | Con::ErrDeadlock;
+    ExecType et = NoCommit;
+    CHK(con.execute(et, err) == 0);
+    if (err) {
+      if (err & Con::ErrDeadlock) {
+        CHK(spt.m_res == Spt::Deadlock);
+        // all rows have same behaviour
+        CHK(n == 0);
+      }
+      LL1("savepointreadhashindex stop on " << con.errname(err));
+      break;
+    }
+    uint i2 = (uint)-1;
+    CHK(set2.getkey(par, &i2) == 0 && i == i2);
+    CHK(set2.putval(i, false) == 0);
+    LL4("row " << set2.count() << " " << *set2.m_row[i]);
+    n++;
+  }
+  bool dirty = (!spt.m_same && spt.m_lm == NdbOperation::LM_CommittedRead);
+  if (spt.m_res != Spt::Deadlock)
+    CHK(set1.verify(par, set2, false, dirty) == 0);
+  return 0;
+}
+
+static int
+savepointscantable(Par par, Spt spt)
+{
+  LL3("savepointscantable");
+  Con& con = par.con();
+  const Tab& tab = par.tab();
+  const Set& set = par.set();
+  const Set& set1 = set; // not modifying current set
+  Set set2(tab, set.m_rows); // scan result
+  CHK(con.getNdbScanOperation(tab) == 0);
+  CHK(con.readTuples(par) == 0);
+  set2.getval(par); // getValue all columns
+  CHK(con.executeScan() == 0);
+  bool deadlock = false;
+  uint n = 0;
+  while (1) {
+    int ret;
+    uint err = par.m_catcherr | Con::ErrDeadlock;
+    CHK((ret = con.nextScanResult(true, err)) == 0 || ret == 1);
+    if (ret == 1)
+      break;
+    if (err) {
+      if (err & Con::ErrDeadlock) {
+        CHK(spt.m_res == Spt::Deadlock);
+        // all rows have same behaviour
+        CHK(n == 0);
+        deadlock = true;
+      }
+      LL1("savepointscantable stop on " << con.errname(err));
+      break;
+    }
+    CHK(spt.m_res != Spt::Deadlock);
+    uint i = (uint)-1;
+    CHK(set2.getkey(par, &i) == 0);
+    CHK(set2.putval(i, false, n) == 0);
+    LL4("row " << n << " key " << i << " " << set2.getrow(i));
+    n++;
+  }
+  if (set1.m_rows > 0) {
+    if (!deadlock)
+      CHK(spt.m_res != Spt::Deadlock);
+    else
+      CHK(spt.m_res == Spt::Deadlock);
+  }
+  LL2("savepointscantable " << n << " rows");
+  bool dirty = (!spt.m_same && spt.m_lm == NdbOperation::LM_CommittedRead);
+  if (spt.m_res != Spt::Deadlock)
+    CHK(set1.verify(par, set2, false, dirty) == 0);
+  return 0;
+}
+
+static int
+savepointscanindex(Par par, Spt spt)
+{
+  LL3("savepointscanindex");
+  Con& con = par.con();
+  const Tab& tab = par.tab();
+  const ITab& itab = par.itab();
+  const Set& set = par.set();
+  const Set& set1 = set;
+  Set set2(tab, set.m_rows);
+  CHK(con.getNdbIndexScanOperation(itab, tab) == 0);
+  CHK(con.readIndexTuples(par) == 0);
+  set2.getval(par);
+  CHK(con.executeScan() == 0);
+  bool deadlock = false;
+  uint n = 0;
+  while (1) {
+    int ret;
+    uint err = par.m_catcherr | Con::ErrDeadlock;
+    CHK((ret = con.nextScanResult(true, err)) == 0 || ret == 1);
+    if (ret == 1)
+      break;
+    if (err) {
+      if (err & Con::ErrDeadlock) {
+        CHK(spt.m_res == Spt::Deadlock);
+        // all rows have same behaviour
+        CHK(n == 0);
+        deadlock = true;
+      }
+      LL1("savepointscanindex stop on " << con.errname(err));
+      break;
+    }
+    CHK(spt.m_res != Spt::Deadlock);
+    uint i = (uint)-1;
+    CHK(set2.getkey(par, &i) == 0);
+    CHK(set2.putval(i, par.m_dups, n) == 0);
+    LL4("row " << n << " key " << i << " " << set2.getrow(i));
+    n++;
+  }
+  if (set1.m_rows > 0) {
+    if (!deadlock)
+      CHK(spt.m_res != Spt::Deadlock);
+    else
+      CHK(spt.m_res == Spt::Deadlock);
+  }
+  LL2("savepointscanindex " << n << " rows");
+  bool dirty = (!spt.m_same && spt.m_lm == NdbOperation::LM_CommittedRead);
+  if (spt.m_res != Spt::Deadlock)
+    CHK(set1.verify(par, set2, false, dirty) == 0);
+  return 0;
+}
+
+typedef int (*SptFun)(Par, Spt);
+
+static int
+savepointtest(Par par, Spt spt, SptFun fun)
+{
+  Con& con = par.con();
+  Par par2 = par;
+  Con con2;
+  if (!spt.m_same) {
+    con2.connect(con); // copy ndb reference
+    par2.m_con = &con2;
+    CHK(con2.startTransaction() == 0);
+  }
+  par2.m_lockmode = spt.m_lm;
+  CHK((*fun)(par2, spt) == 0);
+  if (!spt.m_same) {
+    con2.closeTransaction();
+  }
+  return 0;
+}
+
+static int
+savepointtest(Par par, const char* op)
+{
+  Con& con = par.con();
+  const Tab& tab = par.tab();
+  Set& set = par.set();
+  LL2("savepointtest op=\"" << op << "\"");
+  CHK(con.startTransaction() == 0);
+  const char* p = op;
+  char c;
+  while ((c = *p++) != 0) {
+    uint j;
+    for (j = 0; j < par.m_rows; j++) {
+      uint i = thrrow(par, j);
+      if (c == 'c') {
+        ExecType et = Commit;
+        CHK(con.execute(et) == 0);
+        set.lock();
+        set.post(par, et);
+        set.unlock();
+        CHK(con.startTransaction() == 0);
+      } else {
+        set.lock();
+        set.push(i);
+        if (c == 'i') {
+          set.calc(par, i);
+          CHK(set.insrow(par, i) == 0);
+        } else if (c == 'u') {
+          set.copyval(i, tab.m_pkmask);
+          set.calc(par, i, ~tab.m_pkmask);
+          CHK(set.updrow(par, i) == 0);
+        } else if (c == 'd') {
+          set.copyval(i, tab.m_pkmask);
+          CHK(set.delrow(par, i) == 0);
+        } else {
+          assert(false);
+        }
+        set.unlock();
+      }
+    }
+  }
+  {
+    ExecType et = NoCommit;
+    CHK(con.execute(et) == 0);
+    set.lock();
+    set.post(par, et);
+    set.unlock();
+  }
+  for (uint k = 0; k < sptcount; k++) {
+    Spt spt = sptlist[k];
+    LL2("spt lm=" << spt.m_lm << " same=" << spt.m_same);
+    CHK(savepointtest(par, spt, &savepointreadpk) == 0);
+    CHK(savepointtest(par, spt, &savepointscantable) == 0);
+    for (uint i = 0; i < tab.m_itabs; i++) {
+      if (tab.m_itab[i] == 0)
+        continue;
+      const ITab& itab = *tab.m_itab[i];
+      par.m_itab = &itab;
+      if (itab.m_type == ITab::OrderedIndex)
+        CHK(savepointtest(par, spt, &savepointscanindex) == 0);
+      else
+        CHK(savepointtest(par, spt, &savepointreadhashindex) == 0);
+      par.m_itab = 0;
+    }
+  }
+  {
+    ExecType et = Rollback;
+    CHK(con.execute(et) == 0);
+    set.lock();
+    set.post(par, et);
+    set.unlock();
+  }
+  con.closeTransaction();
+  return 0;
+}
+
+static int
+savepointtest(Par par)
+{
+  assert(par.m_usedthreads == 1);
+  const char* oplist[] = {
+    // each based on previous and "c" not last
+    "i",
+    "icu",
+    "uuuuu",
+    "d",
+    "dciuuuuud",
+    0
+  };
+  int i;
+  for (i = 0; oplist[i] != 0; i++) {
+    CHK(savepointtest(par, oplist[i]) == 0);
+  }
+  return 0;
+}
+
+static int
+halloweentest(Par par, const ITab& itab)
+{
+  LL2("halloweentest " << itab.m_name);
+  Con& con = par.con();
+  const Tab& tab = par.tab();
+  Set& set = par.set();
+  CHK(con.startTransaction() == 0);
+  // insert 1 row
+  uint i = 0;
+  set.push(i);
+  set.calc(par, i);
+  CHK(set.insrow(par, i) == 0);
+  CHK(con.execute(NoCommit) == 0);
+  // scan via index until Set m_rows reached
+  uint scancount = 0;
+  bool stop = false;
+  while (!stop) {
+    par.m_lockmode = // makes no difference
+      scancount % 2 == 0 ? NdbOperation::LM_CommittedRead :
+                           NdbOperation::LM_Read;
+    Set set1(tab, set.m_rows); // expected scan result
+    Set set2(tab, set.m_rows); // actual scan result
+    BSet bset(tab, itab);
+    calcscanbounds(par, itab, bset, set, set1);
+    CHK(con.getNdbIndexScanOperation(itab, tab) == 0);
+    CHK(con.readIndexTuples(par) == 0);
+    CHK(bset.setbnd(par) == 0);
+    set2.getval(par);
+    CHK(con.executeScan() == 0);
+    const uint savepoint = i;
+    LL3("scancount=" << scancount << " savepoint=" << savepoint);
+    uint n = 0;
+    while (1) {
+      int ret;
+      CHK((ret = con.nextScanResult(true)) == 0 || ret == 1);
+      if (ret == 1)
+        break;
+      uint k = (uint)-1;
+      CHK(set2.getkey(par, &k) == 0);
+      CHK(set2.putval(k, false, n) == 0);
+      LL3("row=" << n << " key=" << k);
+      CHK(k <= savepoint);
+      if (++i == set.m_rows) {
+        stop = true;
+        break;
+      }
+      set.push(i);
+      set.calc(par, i);
+      CHK(set.insrow(par, i) == 0);
+      CHK(con.execute(NoCommit) == 0);
+      n++;
+    }
+    con.closeScan();
+    LL3("scanrows=" << n);
+    if (!stop) {
+      CHK(set1.verify(par, set2, false) == 0);
+    }
+    scancount++;
+  }
+  CHK(con.execute(Commit) == 0);
+  set.post(par, Commit);
+  assert(set.count() == set.m_rows);
+  CHK(pkdelete(par) == 0);
+  return 0;
+}
+
+static int
+halloweentest(Par par)
+{
+  assert(par.m_usedthreads == 1);
+  const Tab& tab = par.tab();
+  for (uint i = 0; i < tab.m_itabs; i++) {
+    if (tab.m_itab[i] == 0)
+      continue;
+    const ITab& itab = *tab.m_itab[i];
+    if (itab.m_type == ITab::OrderedIndex)
+      CHK(halloweentest(par, itab) == 0);
+  }
+  return 0;
+}
+
 // threads
 
 typedef int (*TFunc)(Par par);
@@ -4477,22 +4906,22 @@ enum TMode { ST = 1, MT = 2 };
 extern "C" { static void* runthread(void* arg); }
 
 struct Thr {
-  enum State { Wait, Start, Stop, Stopped, Exit };
+  enum State { Wait, Start, Stop, Exit };
   State m_state;
   Par m_par;
-  Uint64 m_id;
+  pthread_t m_id;
   NdbThread* m_thread;
   NdbMutex* m_mutex;
   NdbCondition* m_cond;
   TFunc m_func;
   int m_ret;
   void* m_status;
-  Thr(Par par, unsigned n);
+  char m_tmp[20]; // used for debug msg prefix
+  Thr(Par par, uint n);
   ~Thr();
   int run();
   void start();
   void stop();
-  void stopped();
   void exit();
   //
   void lock() {
@@ -4513,10 +4942,9 @@ struct Thr {
   }
 };
 
-Thr::Thr(Par par, unsigned n) :
+Thr::Thr(Par par, uint n) :
   m_state(Wait),
   m_par(par),
-  m_id(0),
   m_thread(0),
   m_mutex(0),
   m_cond(0),
@@ -4533,7 +4961,7 @@ Thr::Thr(Par par, unsigned n) :
   m_cond = NdbCondition_Create();
   assert(m_mutex != 0 && m_cond != 0);
   // run
-  const unsigned stacksize = 256 * 1024;
+  const uint stacksize = 256 * 1024;
   const NDB_THREAD_PRIO prio = NDB_THREAD_PRIO_LOW;
   m_thread = NdbThread_Create(runthread, (void**)this, stacksize, name, prio);
 }
@@ -4558,7 +4986,7 @@ static void*
 runthread(void* arg)
 {
   Thr& thr = *(Thr*)arg;
-  thr.m_id = (Uint64)pthread_self();
+  thr.m_id = pthread_self();
   if (thr.run() < 0) {
     LL1("exit on error");
   } else {
@@ -4589,11 +5017,16 @@ Thr::run()
     LL4("start");
     assert(m_state == Start);
     m_ret = (*m_func)(m_par);
-    m_state = Stopped;
+    m_state = Stop;
     LL4("stop");
     signal();
     unlock();
-    CHK(m_ret == 0);
+    if (m_ret == -1) {
+      if (m_par.m_cont)
+        LL1("continue running due to -cont");
+      else
+        return -1;
+    }
   }
   con.disconnect();
   return 0;
@@ -4612,16 +5045,7 @@ void
 Thr::stop()
 {
   lock();
-  m_state = Stop;
-  signal();
-  unlock();
-}
-
-void
-Thr::stopped()
-{
-  lock();
-  while (m_state != Stopped)
+  while (m_state != Stop)
     wait();
   m_state = Wait;
   unlock();
@@ -4640,27 +5064,44 @@ Thr::exit()
 
 static Thr** g_thrlist = 0;
 
-static unsigned
-getthrno()
+static Thr*
+getthr()
 {
   if (g_thrlist != 0) {
-    Uint64 id = (Uint64)pthread_self();
-    for (unsigned n = 0; n < g_opt.m_threads; n++) {
+    pthread_t id = pthread_self();
+    for (uint n = 0; n < g_opt.m_threads; n++) {
       if (g_thrlist[n] != 0) {
-        const Thr& thr = *g_thrlist[n];
-        if (thr.m_id == id)
-          return thr.m_par.m_no;
+        Thr& thr = *g_thrlist[n];
+        if (pthread_equal(thr.m_id, id))
+          return &thr;
       }
     }
   }
-  return (unsigned)-1;
+  return 0;
+}
+
+// for debug messages (par.m_no not available)
+static const char*
+getthrprefix()
+{
+  Thr* thrp = getthr();
+  if (thrp != 0) {
+    Thr& thr = *thrp;
+    uint n = thr.m_par.m_no;
+    uint m =
+      g_opt.m_threads < 10 ? 1 :
+      g_opt.m_threads < 100 ? 2 : 3;
+    sprintf(thr.m_tmp, "[%0*u] ", m, n);
+    return thr.m_tmp;
+  }
+  return "";
 }
 
 static int
-runstep(Par par, const char* fname, TFunc func, unsigned mode)
+runstep(Par par, const char* fname, TFunc func, uint mode)
 {
   LL2("step: " << fname);
-  const int threads = (mode & ST ? 1 : par.m_threads);
+  const int threads = (mode & ST ? 1 : par.m_usedthreads);
   int n; 
   for (n = 0; n < threads; n++) {
     LL4("start " << n);
@@ -4673,11 +5114,11 @@ runstep(Par par, const char* fname, TFunc func, unsigned mode)
     thr.m_func = func;
     thr.start();
   }
-  unsigned errs = 0;
+  uint errs = 0;
   for (n = threads - 1; n >= 0; n--) {
     LL4("stop " << n);
     Thr& thr = *g_thrlist[n];
-    thr.stopped();
+    thr.stop();
     if (thr.m_ret != 0)
       errs++;
   }
@@ -4689,7 +5130,7 @@ runstep(Par par, const char* fname, TFunc func, unsigned mode)
   CHK(runstep(par, #func, func, mode) == 0)
 
 #define SUBLOOP(par) \
-  "subloop: " << par.m_lno << "/" << par.m_currcase << "/" << \
+  "sloop: " << par.m_lno << "/" << par.m_currcase << "/" << \
   par.m_tab->m_name << "/" << par.m_slno
 
 static int
@@ -4698,7 +5139,7 @@ tbuild(Par par)
   RUNSTEP(par, droptable, ST);
   RUNSTEP(par, createtable, ST);
   RUNSTEP(par, invalidatetable, MT);
-  for (par.m_slno = 0; par.m_slno < par.m_subloop; par.m_slno++) {
+  for (par.m_slno = 0; par.m_slno < par.m_sloop; par.m_slno++) {
     LL1(SUBLOOP(par));
     if (par.m_slno % 3 == 0) {
       RUNSTEP(par, createindex, ST);
@@ -4718,7 +5159,7 @@ tbuild(Par par)
     }
     RUNSTEP(par, readverifyfull, MT);
     // leave last one
-    if (par.m_slno + 1 < par.m_subloop) {
+    if (par.m_slno + 1 < par.m_sloop) {
       RUNSTEP(par, pkdelete, MT);
       RUNSTEP(par, readverifyfull, MT);
       RUNSTEP(par, dropindex, ST);
@@ -4737,7 +5178,7 @@ tindexscan(Par par)
   RUNSTEP(par, invalidateindex, MT);
   RUNSTEP(par, pkinsert, MT);
   RUNSTEP(par, readverifyfull, MT);
-  for (par.m_slno = 0; par.m_slno < par.m_subloop; par.m_slno++) {
+  for (par.m_slno = 0; par.m_slno < par.m_sloop; par.m_slno++) {
     LL1(SUBLOOP(par));
     RUNSTEP(par, readverifyindex, MT);
   }
@@ -4753,7 +5194,7 @@ tpkops(Par par)
   RUNSTEP(par, invalidatetable, MT);
   RUNSTEP(par, createindex, ST);
   RUNSTEP(par, invalidateindex, MT);
-  for (par.m_slno = 0; par.m_slno < par.m_subloop; par.m_slno++) {
+  for (par.m_slno = 0; par.m_slno < par.m_sloop; par.m_slno++) {
     LL1(SUBLOOP(par));
     RUNSTEP(par, pkops, MT);
     LL2("rows=" << par.set().count());
@@ -4772,7 +5213,7 @@ tpkopsread(Par par)
   RUNSTEP(par, createindex, ST);
   RUNSTEP(par, invalidateindex, MT);
   RUNSTEP(par, readverifyfull, MT);
-  for (par.m_slno = 0; par.m_slno < par.m_subloop; par.m_slno++) {
+  for (par.m_slno = 0; par.m_slno < par.m_sloop; par.m_slno++) {
     LL1(SUBLOOP(par));
     RUNSTEP(par, pkupdatescanread, MT);
     RUNSTEP(par, readverifyfull, MT);
@@ -4792,7 +5233,7 @@ tmixedops(Par par)
   RUNSTEP(par, createindex, ST);
   RUNSTEP(par, invalidateindex, MT);
   RUNSTEP(par, readverifyfull, MT);
-  for (par.m_slno = 0; par.m_slno < par.m_subloop; par.m_slno++) {
+  for (par.m_slno = 0; par.m_slno < par.m_sloop; par.m_slno++) {
     LL1(SUBLOOP(par));
     RUNSTEP(par, mixedoperations, MT);
     RUNSTEP(par, readverifyfull, MT);
@@ -4807,7 +5248,7 @@ tbusybuild(Par par)
   RUNSTEP(par, createtable, ST);
   RUNSTEP(par, invalidatetable, MT);
   RUNSTEP(par, pkinsert, MT);
-  for (par.m_slno = 0; par.m_slno < par.m_subloop; par.m_slno++) {
+  for (par.m_slno = 0; par.m_slno < par.m_sloop; par.m_slno++) {
     LL1(SUBLOOP(par));
     RUNSTEP(par, pkupdateindexbuild, MT);
     RUNSTEP(par, invalidateindex, MT);
@@ -4828,7 +5269,7 @@ trollback(Par par)
   RUNSTEP(par, createindex, ST);
   RUNSTEP(par, invalidateindex, MT);
   RUNSTEP(par, readverifyfull, MT);
-  for (par.m_slno = 0; par.m_slno < par.m_subloop; par.m_slno++) {
+  for (par.m_slno = 0; par.m_slno < par.m_sloop; par.m_slno++) {
     LL1(SUBLOOP(par));
     RUNSTEP(par, mixedoperations, MT);
     RUNSTEP(par, readverifyfull, MT);
@@ -4846,7 +5287,7 @@ tparupdate(Par par)
   RUNSTEP(par, createindex, ST);
   RUNSTEP(par, invalidateindex, MT);
   RUNSTEP(par, readverifyfull, MT);
-  for (par.m_slno = 0; par.m_slno < par.m_subloop; par.m_slno++) {
+  for (par.m_slno = 0; par.m_slno < par.m_sloop; par.m_slno++) {
     LL1(SUBLOOP(par));
     RUNSTEP(par, parallelorderedupdate, MT);
     RUNSTEP(par, readverifyfull, MT);
@@ -4855,13 +5296,44 @@ tparupdate(Par par)
 }
 
 static int
+tsavepoint(Par par)
+{
+  RUNSTEP(par, droptable, ST);
+  RUNSTEP(par, createtable, ST);
+  RUNSTEP(par, invalidatetable, MT);
+  RUNSTEP(par, createindex, ST);
+  RUNSTEP(par, invalidateindex, MT);
+  for (par.m_slno = 0; par.m_slno < par.m_sloop; par.m_slno++) {
+    LL1(SUBLOOP(par));
+    RUNSTEP(par, savepointtest, MT);
+    RUNSTEP(par, readverifyfull, MT);
+  }
+  return 0;
+}
+
+static int
+thalloween(Par par)
+{
+  RUNSTEP(par, droptable, ST);
+  RUNSTEP(par, createtable, ST);
+  RUNSTEP(par, invalidatetable, MT);
+  RUNSTEP(par, createindex, ST);
+  RUNSTEP(par, invalidateindex, MT);
+  for (par.m_slno = 0; par.m_slno < par.m_sloop; par.m_slno++) {
+    LL1(SUBLOOP(par));
+    RUNSTEP(par, halloweentest, MT);
+  }
+  return 0;
+}
+
+static int
 ttimebuild(Par par)
 {
   Tmr t1;
   RUNSTEP(par, droptable, ST);
   RUNSTEP(par, createtable, ST);
   RUNSTEP(par, invalidatetable, MT);
-  for (par.m_slno = 0; par.m_slno < par.m_subloop; par.m_slno++) {
+  for (par.m_slno = 0; par.m_slno < par.m_sloop; par.m_slno++) {
     LL1(SUBLOOP(par));
     RUNSTEP(par, pkinsert, MT);
     t1.on();
@@ -4881,7 +5353,7 @@ ttimemaint(Par par)
   RUNSTEP(par, droptable, ST);
   RUNSTEP(par, createtable, ST);
   RUNSTEP(par, invalidatetable, MT);
-  for (par.m_slno = 0; par.m_slno < par.m_subloop; par.m_slno++) {
+  for (par.m_slno = 0; par.m_slno < par.m_sloop; par.m_slno++) {
     LL1(SUBLOOP(par));
     RUNSTEP(par, pkinsert, MT);
     t1.on();
@@ -4911,7 +5383,7 @@ ttimescan(Par par)
   RUNSTEP(par, droptable, ST);
   RUNSTEP(par, createtable, ST);
   RUNSTEP(par, invalidatetable, MT);
-  for (par.m_slno = 0; par.m_slno < par.m_subloop; par.m_slno++) {
+  for (par.m_slno = 0; par.m_slno < par.m_sloop; par.m_slno++) {
     LL1(SUBLOOP(par));
     RUNSTEP(par, pkinsert, MT);
     RUNSTEP(par, createindex, ST);
@@ -4938,7 +5410,7 @@ ttimepkread(Par par)
   RUNSTEP(par, droptable, ST);
   RUNSTEP(par, createtable, ST);
   RUNSTEP(par, invalidatetable, MT);
-  for (par.m_slno = 0; par.m_slno < par.m_subloop; par.m_slno++) {
+  for (par.m_slno = 0; par.m_slno < par.m_sloop; par.m_slno++) {
     LL1(SUBLOOP(par));
     RUNSTEP(par, pkinsert, MT);
     RUNSTEP(par, createindex, ST);
@@ -4981,7 +5453,9 @@ tcaselist[] = {
   TCase("e", tmixedops, "pk operations and scan operations"),
   TCase("f", tbusybuild, "pk operations and index build"),
   TCase("g", trollback, "operations with random rollbacks"),
-  TCase("h", tparupdate, "parallel ordered update (bug20446)"),
+  TCase("h", tparupdate, "parallel ordered update bug#20446"),
+  TCase("i", tsavepoint, "savepoint test locking bug#31477"),
+  TCase("j", thalloween, "savepoint test halloween problem"),
   TCase("t", ttimebuild, "time index build"),
   TCase("u", ttimemaint, "time index maintenance"),
   TCase("v", ttimescan, "time full scan table vs index on pk"),
@@ -4989,14 +5463,14 @@ tcaselist[] = {
   TCase("z", tdrop, "drop test tables")
 };
 
-static const unsigned
+static const uint
 tcasecount = sizeof(tcaselist) / sizeof(tcaselist[0]);
 
 static void
 printcases()
 {
   ndbout << "test cases:" << endl;
-  for (unsigned i = 0; i < tcasecount; i++) {
+  for (uint i = 0; i < tcasecount; i++) {
     const TCase& tcase = tcaselist[i];
     ndbout << "  " << tcase.m_name << " - " << tcase.m_desc << endl;
   }
@@ -5008,13 +5482,13 @@ printtables()
   Par par(g_opt);
   makebuiltintables(par);
   ndbout << "tables and indexes (x=ordered z=hash x0=on pk):" << endl;
-  for (unsigned j = 0; j < tabcount; j++) {
+  for (uint j = 0; j < tabcount; j++) {
     if (tablist[j] == 0)
       continue;
     const Tab& tab = *tablist[j];
     const char* tname = tab.m_name;
     ndbout << "  " << tname;
-    for (unsigned i = 0; i < tab.m_itabs; i++) {
+    for (uint i = 0; i < tab.m_itabs; i++) {
       if (tab.m_itab[i] == 0)
         continue;
       const ITab& itab = *tab.m_itab[i];
@@ -5023,7 +5497,7 @@ printtables()
         iname += strlen(tname);
       ndbout << " " << iname;
       ndbout << "(";
-      for (unsigned k = 0; k < itab.m_icols; k++) {
+      for (uint k = 0; k < itab.m_icols; k++) {
         if (k != 0)
           ndbout << ",";
         const ICol& icol = *itab.m_icol[k];
@@ -5036,14 +5510,48 @@ printtables()
   }
 }
 
+static bool
+setcasepar(Par& par)
+{
+  Opt d;
+  const char* c = par.m_currcase;
+  switch (c[0]) {
+  case 'i':
+    {
+      if (par.m_usedthreads > 1) {
+        par.m_usedthreads = 1;
+        LL1("case " << c << " reduce threads to " << par.m_usedthreads);
+      }
+      const uint rows = 100;
+      if (par.m_rows > rows) {
+        par.m_rows = rows;
+        LL1("case " << c << " reduce rows to " << rows);
+      }
+    }
+    break;
+  case 'j':
+    {
+      if (par.m_usedthreads > 1) {
+        par.m_usedthreads = 1;
+        LL1("case " << c << " reduce threads to " << par.m_usedthreads);
+      }
+    }
+    break;
+  default:
+    break;
+  }
+  return true;
+}
+
 static int
 runtest(Par par)
 {
+  int totret = 0;
   if (par.m_seed == -1) {
     // good enough for daily run
-    unsigned short seed = (unsigned short)getpid();
+    ushort seed = (ushort)getpid();
     LL0("random seed: " << seed);
-    srandom((unsigned)seed);
+    srandom((uint)seed);
   } else if (par.m_seed != 0) {
     LL0("random seed: " << par.m_seed);
     srandom(par.m_seed);
@@ -5061,9 +5569,10 @@ runtest(Par par)
   Con con;
   CHK(con.connect() == 0);
   par.m_con = &con;
+  par.m_catcherr |= Con::ErrNospace;
   // threads
   g_thrlist = new Thr* [par.m_threads];
-  unsigned n;
+  uint n;
   for (n = 0; n < par.m_threads; n++) {
     g_thrlist[n] = 0;
   }
@@ -5078,23 +5587,38 @@ runtest(Par par)
       LL1("random seed: " << par.m_lno);
       srandom(par.m_lno);
     }
-    for (unsigned i = 0; i < tcasecount; i++) {
+    for (uint i = 0; i < tcasecount; i++) {
       const TCase& tcase = tcaselist[i];
-      if (par.m_case != 0 && strchr(par.m_case, tcase.m_name[0]) == 0)
+      if (par.m_case != 0 && strchr(par.m_case, tcase.m_name[0]) == 0 ||
+          par.m_skip != 0 && strchr(par.m_skip, tcase.m_name[0]) != 0) {
         continue;
+      }
       sprintf(par.m_currcase, "%c", tcase.m_name[0]);
+      par.m_usedthreads = par.m_threads;
+      if (!setcasepar(par)) {
+        LL1("case " << tcase.m_name << " cannot run with given options");
+        continue;
+      }
+      par.m_totrows = par.m_usedthreads * par.m_rows;
       makebuiltintables(par);
       LL1("case: " << par.m_lno << "/" << tcase.m_name << " - " << tcase.m_desc);
-      for (unsigned j = 0; j < tabcount; j++) {
+      for (uint j = 0; j < tabcount; j++) {
         if (tablist[j] == 0)
           continue;
         const Tab& tab = *tablist[j];
         par.m_tab = &tab;
         par.m_set = new Set(tab, par.m_totrows);
         LL1("table: " << par.m_lno << "/" << tcase.m_name << "/" << tab.m_name);
-        CHK(tcase.m_func(par) == 0);
+        int ret = tcase.m_func(par);
         delete par.m_set;
         par.m_set = 0;
+        if (ret == -1) {
+          if (!par.m_cont)
+            return -1;
+          totret = -1;
+          LL1("continue to next case due to -cont");
+          break;
+        }
       }
     }
   }
@@ -5110,7 +5634,7 @@ runtest(Par par)
   delete [] g_thrlist;
   g_thrlist = 0;
   con.disconnect();
-  return 0;
+  return totret;
 }
 
 static const char* g_progname = "testOIBasic";
@@ -5119,7 +5643,7 @@ int
 main(int argc,  char** argv)
 {
   ndb_init();
-  unsigned i;
+  uint i;
   ndbout << g_progname;
   for (i = 1; i < argc; i++)
     ndbout << " " << argv[i];
@@ -5156,6 +5680,10 @@ main(int argc,  char** argv)
       g_opt.m_collsp = true;
       continue;
     }
+    if (strcmp(arg, "-cont") == 0) {
+      g_opt.m_cont = true;
+      continue;
+    }
     if (strcmp(arg, "-core") == 0) {
       g_opt.m_core = true;
       continue;
@@ -5252,9 +5780,21 @@ main(int argc,  char** argv)
         continue;
       }
     }
-    if (strcmp(arg, "-subloop") == 0) {
+    if (strcmp(arg, "-skip") == 0) {
+      if (++argv, --argc > 0) {
+        g_opt.m_skip = strdup(argv[0]);
+        continue;
+      }
+    }
+    if (strcmp(arg, "-sloop") == 0) {
+      if (++argv, --argc > 0) {
+        g_opt.m_sloop = atoi(argv[0]);
+        continue;
+      }
+    }
+    if (strcmp(arg, "-ssloop") == 0) {
       if (++argv, --argc > 0) {
-        g_opt.m_subloop = atoi(argv[0]);
+        g_opt.m_ssloop = atoi(argv[0]);
         continue;
       }
     }
diff --git a/storage/ndb/test/ndbapi/test_event.cpp b/storage/ndb/test/ndbapi/test_event.cpp
index 18825d734a4..a7504166065 100644
--- a/storage/ndb/test/ndbapi/test_event.cpp
+++ b/storage/ndb/test/ndbapi/test_event.cpp
@@ -1838,6 +1838,61 @@ runBug31701(NDBT_Context* ctx, NDBT_Step* step)
   return NDBT_OK;
 }
 
+int 
+runBug33793(NDBT_Context* ctx, NDBT_Step* step)
+{
+  int result = NDBT_OK;
+  int loops = ctx->getNumLoops();
+
+  NdbRestarter restarter;
+  
+  if (restarter.getNumDbNodes() < 2){
+    ctx->stopTest();
+    return NDBT_OK;
+  }
+  // This should really wait for applier to start...10s is likely enough
+  NdbSleep_SecSleep(10);
+
+  while (loops-- && ctx->isTestStopped() == false)
+  {
+    int nodeId = restarter.getDbNodeId(rand() % restarter.getNumDbNodes());
+    int nodecount = 0;
+    int nodes[255];
+    printf("nodeid: %u : victims: ", nodeId);
+    for (int i = 0; i<restarter.getNumDbNodes(); i++)
+    {
+      int id = restarter.getDbNodeId(i);
+      if (id == nodeId)
+        continue;
+      
+      if (restarter.getNodeGroup(id) == restarter.getNodeGroup(nodeId))
+      {
+        nodes[nodecount++] = id;
+        printf("%u ", id);
+        int val2[] = { DumpStateOrd::CmvmiSetRestartOnErrorInsert, 1 };
+        if (restarter.dumpStateOneNode(id, val2, 2))
+          return NDBT_FAILED;
+      }
+    }
+    printf("\n"); fflush(stdout);
+
+    restarter.insertErrorInNode(nodeId, 13034);
+    if (restarter.waitNodesNoStart(nodes, nodecount))
+      return NDBT_FAILED;
+    
+    if (restarter.startNodes(nodes, nodecount))
+      return NDBT_FAILED;
+    
+    if (restarter.waitClusterStarted())
+      return NDBT_FAILED;
+  }
+
+  ctx->stopTest();  
+  return NDBT_OK;
+}
+
+
+
 NDBT_TESTSUITE(test_event);
 TESTCASE("BasicEventOperation", 
 	 "Verify that we can listen to Events"
@@ -1975,6 +2030,12 @@ TESTCASE("Bug31701", ""){
   FINALIZER(runDropEvent);
   FINALIZER(runDropShadowTable);
 }
+TESTCASE("Bug33793", ""){
+  INITIALIZER(runCreateEvent);
+  STEP(runEventListenerUntilStopped);
+  STEP(runBug33793);
+  FINALIZER(runDropEvent);
+}
 NDBT_TESTSUITE_END(test_event);
 
 int main(int argc, const char** argv){
diff --git a/storage/ndb/test/run-test/daily-basic-tests.txt b/storage/ndb/test/run-test/daily-basic-tests.txt
index 37db5e01dd6..70c395fab17 100644
--- a/storage/ndb/test/run-test/daily-basic-tests.txt
+++ b/storage/ndb/test/run-test/daily-basic-tests.txt
@@ -1,7 +1,3 @@
-max-time: 3600
-cmd: atrt-mysql-test-run
-args: --force
-
 max-time: 600
 cmd: atrt-testBackup
 args: -n NFMaster T1
@@ -744,10 +740,10 @@ max-time: 1000
 cmd: testNdbApi
 args: -n Bug28443
 
-#max-time: 500
-#cmd: testInterpreter
-#args: T1 
-#
+max-time: 500
+cmd: testInterpreter
+args: T1 
+
 max-time: 150000
 cmd: testOperations
 args:
@@ -1046,3 +1042,15 @@ max-time: 300
 cmd: testSystemRestart
 args: -n Bug22696 T1
 
+max-time: 300
+cmd: test_event
+args: -n Bug33793 T1
+
+max-time: 1200
+cmd: testNodeRestart
+args: -n Bug34216 -l 10 T1 I3 D2
+
+max-time: 1200
+cmd: testNodeRestart
+args: -n mixedmultiop -l 10 T1 I2 I3 D2
+
diff --git a/storage/ndb/test/src/AtrtClient.cpp b/storage/ndb/test/src/AtrtClient.cpp
new file mode 100644
index 00000000000..5183242f841
--- /dev/null
+++ b/storage/ndb/test/src/AtrtClient.cpp
@@ -0,0 +1,215 @@
+/* Copyright (C) 2008 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
+#include <AtrtClient.hpp>
+#include <NDBT_Output.hpp>
+#include <NdbSleep.h>
+
+AtrtClient::AtrtClient(const char* _user,
+                       const char* _password,
+                       const char* _group_suffix)
+ : DbUtil(_user, _password, _group_suffix)
+{
+}
+
+
+AtrtClient::AtrtClient(MYSQL* mysql)
+  : DbUtil(mysql)
+{
+}
+
+
+AtrtClient::~AtrtClient(){
+}
+
+
+int
+AtrtClient::writeCommand(AtrtCommandType _type,
+                         const Properties& args){
+  if (!isConnected())
+    return false;
+
+  BaseString sql;
+  sql.assfmt("INSERT  command ( ");
+
+  const char* name;
+  {
+    Properties::Iterator iter(&args);
+    while((name= iter.next())){
+      sql.appfmt("%s, ", name);
+    }
+  }
+
+  sql.appfmt(" state, cmd) VALUES (");
+
+  {
+    Properties::Iterator iter(&args);
+    while((name= iter.next())){
+      PropertiesType t;
+      Uint32 val_i;
+      BaseString val_s;
+      args.getTypeOf(name, &t);
+      switch(t) {
+      case PropertiesType_Uint32:
+        args.get(name, &val_i);
+        sql.appfmt("%d, ", val_i);
+        break;
+      case PropertiesType_char:
+        args.get(name, val_s);
+        sql.appfmt("'%s', ", val_s.c_str());
+        break;
+      default:
+        assert(false);
+        break;
+      }
+    }
+  }
+
+  sql.appfmt("'new', %d)", _type);
+  if (!doQuery(sql)){
+    return -1;
+  }
+
+  return mysql_insert_id(m_mysql);
+}
+
+
+bool
+AtrtClient::readCommand(uint command_id,
+                        SqlResultSet& result){
+  Properties args;
+  args.put("0", command_id);
+  return runQuery("SELECT * FROM command WHERE id = ?",
+                  args,
+                  result);
+}
+
+
+bool
+AtrtClient::doCommand(AtrtCommandType type,
+                      const Properties& args){
+
+  int running_timeout= 10;
+  int total_timeout= 120;
+  int commandId= writeCommand(type,
+                              args);
+  if (commandId == -1){
+    g_err << "Failed to write command" << endl;
+    return false;
+  }
+
+  while (true){
+
+    SqlResultSet result;
+    if (!readCommand(commandId, result))
+    {
+      result.print();
+      g_err << "Failed to read command "<< commandId << endl;
+      return false;
+    }
+
+    // Get first row
+    result.next();
+
+    // Check if command has completed
+    BaseString state(result.column("state"));
+    if (state == "done") {
+      return true;
+    }
+
+    if (state == "new"){
+      if (!running_timeout--){
+        g_err << "Timeout while waiting for command "
+              << commandId << " to start run" << endl;
+        return false;
+      }
+    }
+    else if (!total_timeout--){
+      g_err << "Timeout while waiting for result of command "
+            << commandId << endl;
+      return false;
+    }
+
+
+    NdbSleep_SecSleep(1);
+  }
+
+  return false;
+}
+
+
+bool
+AtrtClient::changeVersion(int process_id,
+                          const char* process_args){
+  Properties args;
+  args.put("process_id", process_id);
+  args.put("process_args", process_args);
+  return doCommand(ATCT_CHANGE_VERSION, args);
+}
+
+
+bool
+AtrtClient::resetProc(int process_id){
+  Properties args;
+  args.put("process_id", process_id);
+  return doCommand(ATCT_RESET_PROC, args);
+}
+
+
+bool
+AtrtClient::getConnectString(int cluster_id, SqlResultSet& result){
+  Properties args;
+  args.put("0", cluster_id);
+  return doQuery("SELECT value as connectstring " \
+                 "FROM cluster c, process p, host h, options o "    \
+                 "WHERE c.id=p.cluster_id AND p.host_id=h.id AND "  \
+                 "p.id=o.process_id AND c.id=? AND "                    \
+                 "o.name='--ndb-connectstring=' AND type='ndb_mgmd'",
+                 args,
+                 result);
+}
+
+
+bool
+AtrtClient::getClusters(SqlResultSet& result){
+  Properties args;
+  return runQuery("SELECT id, name FROM cluster WHERE name != '.atrt'",
+                  args,
+                  result);
+}
+
+
+bool
+AtrtClient::getMgmds(int cluster_id, SqlResultSet& result){
+  Properties args;
+  args.put("0", cluster_id);
+  return runQuery("SELECT * FROM process WHERE cluster_id=? and type='ndb_mgmd'",
+                  args,
+                  result);
+}
+
+bool
+AtrtClient::getNdbds(int cluster_id, SqlResultSet& result){
+  Properties args;
+  args.put("0", cluster_id);
+  return runQuery("SELECT * FROM process WHERE cluster_id=? and type='ndbd'",
+                  args,
+                  result);
+}
+
+
+
+
+
diff --git a/storage/ndb/test/src/DbUtil.cpp b/storage/ndb/test/src/DbUtil.cpp
new file mode 100755
index 00000000000..a52f45b46a7
--- /dev/null
+++ b/storage/ndb/test/src/DbUtil.cpp
@@ -0,0 +1,677 @@
+/* Copyright (C) 2008 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
+/* DbUtil.cpp: implementation of the database utilities class.*/
+
+#include "DbUtil.hpp"
+#include <NdbSleep.h>
+
+
+/* Constructors */
+
+DbUtil::DbUtil(const char* _dbname,
+               const char* _user,
+               const char* _password,
+               const char* _suffix):
+  m_connected(false),
+  m_dbname(_dbname),
+  m_mysql(NULL),
+  m_free_mysql(true)
+{
+  const char* env= getenv("MYSQL_HOME");
+  if (env && strlen(env))
+  {
+    m_default_file.assfmt("%s/my.cnf", env);
+  }
+
+  if (_suffix != NULL){
+    m_default_group.assfmt("client%s", _suffix);
+  }
+  else {
+    m_default_group.assign("client.1.master");
+  }
+
+  ndbout << "default_file: " << m_default_file.c_str() << endl;
+  ndbout << "default_group: " << m_default_group.c_str() << endl;
+
+  m_user.assign(_user);
+  m_pass.assign(_password);
+}
+
+
+
+DbUtil::DbUtil(MYSQL* mysql):
+  m_connected(true),
+  m_mysql(mysql),
+  m_free_mysql(false)
+{
+}
+
+
+bool
+DbUtil::isConnected(){
+  if (m_connected == true)
+  {
+    assert(m_mysql);
+    return true;
+  }
+  return connect() == 0;
+}
+
+
+bool
+DbUtil::waitConnected(int timeout) {
+  timeout*= 10;
+  while(!isConnected()){
+    if (timeout-- == 0)
+      return false;
+    NdbSleep_MilliSleep(100);
+  }
+  return true;
+}
+
+
+void
+DbUtil::disconnect(){
+  if (m_mysql != NULL){
+    if (m_free_mysql)
+      mysql_close(m_mysql);
+    m_mysql= NULL;
+  }
+  m_connected = false;
+}
+
+
+/* Destructor */
+
+DbUtil::~DbUtil()
+{
+  disconnect();
+}
+
+/* Database Login */
+
+void 
+DbUtil::databaseLogin(const char* system, const char* usr,
+                           const char* password, unsigned int portIn,
+                           const char* sockIn, bool transactional)
+{
+  if (!(m_mysql = mysql_init(NULL)))
+  {
+    myerror("DB Login-> mysql_init() failed");
+    exit(DBU_FAILED);
+  }
+  setUser(usr);
+  setHost(system);
+  setPassword(password);
+  setPort(portIn);
+  setSocket(sockIn);
+
+  if (!(mysql_real_connect(m_mysql, 
+                           m_host.c_str(), 
+                           m_user.c_str(), 
+                           m_pass.c_str(), 
+                           "test", 
+                           m_port, 
+                           m_socket.c_str(), 0)))
+  {
+    myerror("connection failed");
+    mysql_close(m_mysql);
+    exit(DBU_FAILED);
+  }
+
+  m_mysql->reconnect = TRUE;
+
+  /* set AUTOCOMMIT */
+  if(!transactional)
+    mysql_autocommit(m_mysql, TRUE);
+  else
+    mysql_autocommit(m_mysql, FALSE);
+
+  #ifdef DEBUG
+    printf("\n\tConnected to MySQL server version: %s (%lu)\n\n", 
+           mysql_get_server_info(m_mysql),
+           (unsigned long) mysql_get_server_version(m_mysql));
+  #endif
+  selectDb();
+}
+
+/* Database Connect */
+
+int
+DbUtil::connect()
+{
+  if (!(m_mysql = mysql_init(NULL)))
+  {
+    myerror("DB connect-> mysql_init() failed");
+    return DBU_FAILED;
+  }
+
+  /* Load connection parameters file and group */
+  if (mysql_options(m_mysql, MYSQL_READ_DEFAULT_FILE, m_default_file.c_str()) ||
+      mysql_options(m_mysql, MYSQL_READ_DEFAULT_GROUP, m_default_group.c_str()))
+  {
+    myerror("DB Connect -> mysql_options failed");
+    return DBU_FAILED;
+  }
+
+  /*
+    Connect, read settings from my.cnf
+    NOTE! user and password can be stored there as well
+   */
+
+  if (mysql_real_connect(m_mysql, NULL, "root","", m_dbname.c_str(), 
+                         0, NULL, 0) == NULL)
+  {
+    myerror("connection failed");
+    mysql_close(m_mysql);
+    return DBU_FAILED;
+  }
+  selectDb();
+  m_connected = true;
+  return DBU_OK;
+}
+
+
+/* Database Logout */
+
+void
+DbUtil::databaseLogout()
+{
+  if (m_mysql){
+    #ifdef DEBUG
+      printf("\n\tClosing the MySQL database connection ...\n\n");
+    #endif
+    mysql_close(m_mysql);
+  }
+}
+
+/* Prepare MySQL Statements Cont */
+
+MYSQL_STMT *STDCALL 
+DbUtil::mysqlSimplePrepare(const char *query)
+{
+  #ifdef DEBUG
+    printf("Inside DbUtil::mysqlSimplePrepare\n");
+  #endif
+  int m_res = DBU_OK;
+
+  MYSQL_STMT *my_stmt= mysql_stmt_init(this->getMysql());
+  if (my_stmt && (m_res = mysql_stmt_prepare(my_stmt, query, strlen(query)))){
+    this->printStError(my_stmt,"Prepare Statement Failed");
+    mysql_stmt_close(my_stmt);
+    exit(DBU_FAILED);
+  }
+  return my_stmt;
+}
+
+/* Close MySQL Statements Handle */
+
+void 
+DbUtil::mysqlCloseStmHandle(MYSQL_STMT *my_stmt)
+{
+  mysql_stmt_close(my_stmt);
+}
+ 
+/* Error Printing */
+
+void
+DbUtil::printError(const char *msg)
+{
+  if (m_mysql && mysql_errno(m_mysql))
+  {
+    if (m_mysql->server_version)
+      printf("\n [MySQL-%s]", m_mysql->server_version);
+    else
+      printf("\n [MySQL]");
+      printf("[%d] %s\n", getErrorNumber(), getError());
+  }
+  else if (msg)
+    printf(" [MySQL] %s\n", msg);
+}
+
+void
+DbUtil::printStError(MYSQL_STMT *stmt, const char *msg)
+{
+  if (stmt && mysql_stmt_errno(stmt))
+  {
+    if (m_mysql && m_mysql->server_version)
+      printf("\n [MySQL-%s]", m_mysql->server_version);
+    else
+      printf("\n [MySQL]");
+
+    printf("[%d] %s\n", mysql_stmt_errno(stmt),
+    mysql_stmt_error(stmt));
+  }
+  else if (msg)
+    printf("[MySQL] %s\n", msg);
+}
+
+/* Select which database to use */
+
+int
+DbUtil::selectDb()
+{
+  if ((getDbName()) != NULL)
+  {
+    if(mysql_select_db(m_mysql, this->getDbName()))
+    {
+      printError("mysql_select_db failed");
+      return DBU_FAILED;
+    }
+    return DBU_OK;   
+  }
+  printError("getDbName() == NULL");
+  return DBU_FAILED;
+}
+
+int
+DbUtil::selectDb(const char * m_db)
+{
+  {
+    if(mysql_select_db(m_mysql, m_db))
+    {
+      printError("mysql_select_db failed");
+      return DBU_FAILED;
+    }
+    return DBU_OK;
+  }
+}
+
+int
+DbUtil::createDb(BaseString& m_db)
+{
+  BaseString stm;
+  {
+    if(mysql_select_db(m_mysql, m_db.c_str()) == DBU_OK)
+    {
+      stm.assfmt("DROP DATABASE %s", m_db.c_str());
+      if(doQuery(m_db.c_str()) == DBU_FAILED)
+        return DBU_FAILED;
+    }
+    stm.assfmt("CREATE DATABASE %s", m_db.c_str());
+    if(doQuery(m_db.c_str()) == DBU_FAILED)
+      return DBU_FAILED;
+    return DBU_OK;
+  }
+}
+
+
+/* Count Table Rows */
+
+unsigned long
+DbUtil::selectCountTable(const char * table)
+{
+  BaseString query;
+  SqlResultSet result;
+
+  query.assfmt("select count(*) as count from %s", table);
+  if (!doQuery(query, result)) {
+    printError("select count(*) failed");
+    return -1;
+  }
+   return result.columnAsInt("count");
+}
+
+
+/* Run Simple Queries */
+
+
+static bool is_int_type(enum_field_types type){
+  switch(type){
+  case MYSQL_TYPE_TINY:
+  case MYSQL_TYPE_SHORT:
+  case MYSQL_TYPE_LONGLONG:
+  case MYSQL_TYPE_INT24:
+  case MYSQL_TYPE_LONG:
+  case MYSQL_TYPE_ENUM:
+    return true;
+  default:
+    return false;
+  }
+  return false;
+}
+
+
+bool
+DbUtil::runQuery(const char* sql,
+                    const Properties& args,
+                    SqlResultSet& rows){
+
+  rows.clear();
+  if (!isConnected())
+    return false;
+
+  g_debug << "runQuery: " << endl
+          << " sql: '" << sql << "'" << endl;
+
+
+  MYSQL_STMT *stmt= mysql_stmt_init(m_mysql);
+  if (mysql_stmt_prepare(stmt, sql, strlen(sql)))
+  {
+    g_err << "Failed to prepare: " << mysql_error(m_mysql) << endl;
+    return false;
+  }
+
+  uint params= mysql_stmt_param_count(stmt);
+  MYSQL_BIND bind_param[params];
+  bzero(bind_param, sizeof(bind_param));
+
+  for(uint i= 0; i < mysql_stmt_param_count(stmt); i++)
+  {
+    BaseString name;
+    name.assfmt("%d", i);
+    // Parameters are named 0, 1, 2...
+    if (!args.contains(name.c_str()))
+    {
+      g_err << "param " << i << " missing" << endl;
+      assert(false);
+    }
+    PropertiesType t;
+    Uint32 val_i;
+    const char* val_s;
+    args.getTypeOf(name.c_str(), &t);
+    switch(t) {
+    case PropertiesType_Uint32:
+      args.get(name.c_str(), &val_i);
+      bind_param[i].buffer_type= MYSQL_TYPE_LONG;
+      bind_param[i].buffer= (char*)&val_i;
+      g_debug << " param" << name.c_str() << ": " << val_i << endl;
+      break;
+    case PropertiesType_char:
+      args.get(name.c_str(), &val_s);
+      bind_param[i].buffer_type= MYSQL_TYPE_STRING;
+      bind_param[i].buffer= (char*)val_s;
+      bind_param[i].buffer_length= strlen(val_s);
+      g_debug << " param" << name.c_str() << ": " << val_s << endl;
+      break;
+    default:
+      assert(false);
+      break;
+    }
+  }
+  if (mysql_stmt_bind_param(stmt, bind_param))
+  {
+    g_err << "Failed to bind param: " << mysql_error(m_mysql) << endl;
+    mysql_stmt_close(stmt);
+    return false;
+  }
+
+  if (mysql_stmt_execute(stmt))
+  {
+    g_err << "Failed to execute: " << mysql_error(m_mysql) << endl;
+    mysql_stmt_close(stmt);
+    return false;
+  }
+
+  /*
+    Update max_length, making it possible to know how big
+    buffers to allocate
+  */
+  my_bool one= 1;
+  mysql_stmt_attr_set(stmt, STMT_ATTR_UPDATE_MAX_LENGTH, (void*) &one);
+
+  if (mysql_stmt_store_result(stmt))
+  {
+    g_err << "Failed to store result: " << mysql_error(m_mysql) << endl;
+    mysql_stmt_close(stmt);
+    return false;
+  }
+
+  uint row= 0;
+  MYSQL_RES* res= mysql_stmt_result_metadata(stmt);
+  if (res != NULL)
+  {
+    MYSQL_FIELD *fields= mysql_fetch_fields(res);
+    uint num_fields= mysql_num_fields(res);
+    MYSQL_BIND bind_result[num_fields];
+    bzero(bind_result, sizeof(bind_result));
+
+    for (uint i= 0; i < num_fields; i++)
+    {
+      if (is_int_type(fields[i].type)){
+        bind_result[i].buffer_type= MYSQL_TYPE_LONG;
+        bind_result[i].buffer= malloc(sizeof(int));
+      }
+      else
+      {
+        uint max_length= fields[i].max_length + 1;
+        bind_result[i].buffer_type= MYSQL_TYPE_STRING;
+        bind_result[i].buffer= malloc(max_length);
+        bind_result[i].buffer_length= max_length;
+      }
+    }
+
+    if (mysql_stmt_bind_result(stmt, bind_result)){
+      g_err << "Failed to bind result: " << mysql_error(m_mysql) << endl;
+      mysql_stmt_close(stmt);
+      return false;
+    }
+
+    while (mysql_stmt_fetch(stmt) != MYSQL_NO_DATA)
+    {
+      Properties curr(true);
+      for (uint i= 0; i < num_fields; i++){
+        if (is_int_type(fields[i].type))
+          curr.put(fields[i].name, *(int*)bind_result[i].buffer);
+        else
+          curr.put(fields[i].name, (char*)bind_result[i].buffer);
+      }
+      rows.put("row", row++, &curr);
+    }
+
+    mysql_free_result(res);
+
+    for (uint i= 0; i < num_fields; i++)
+      free(bind_result[i].buffer);
+
+  }
+
+  // Save stats in result set
+  rows.put("rows", row);
+  rows.put("affected_rows", mysql_affected_rows(m_mysql));
+  rows.put("mysql_errno", mysql_errno(m_mysql));
+  rows.put("mysql_error", mysql_error(m_mysql));
+  rows.put("mysql_sqlstate", mysql_sqlstate(m_mysql));
+  rows.put("insert_id", mysql_insert_id(m_mysql));
+
+  mysql_stmt_close(stmt);
+  return true;
+}
+
+
+bool
+DbUtil::doQuery(const char* query){
+  const Properties args;
+  SqlResultSet result;
+  return doQuery(query, args, result);
+}
+
+
+bool
+DbUtil::doQuery(const char* query, SqlResultSet& result){
+  Properties args;
+  return doQuery(query, args, result);
+}
+
+
+bool
+DbUtil::doQuery(const char* query, const Properties& args,
+                   SqlResultSet& result){
+  if (!runQuery(query, args, result))
+    return false;
+  result.get_row(0); // Load first row
+  return true;
+}
+
+
+bool
+DbUtil::doQuery(BaseString& str){
+  return doQuery(str.c_str());
+}
+
+
+bool
+DbUtil::doQuery(BaseString& str, SqlResultSet& result){
+  return doQuery(str.c_str(), result);
+}
+
+
+bool
+DbUtil::doQuery(BaseString& str, const Properties& args,
+                   SqlResultSet& result){
+  return doQuery(str.c_str(), args, result);
+}
+
+
+/* Return MySQL Error String */
+
+const char *
+DbUtil::getError()
+{
+  return mysql_error(this->getMysql());
+}
+
+/* Return MySQL Error Number */
+
+int
+DbUtil::getErrorNumber()
+{
+  return mysql_errno(this->getMysql());
+}
+
+/* DIE */
+
+void
+DbUtil::die(const char *file, int line, const char *expr)
+{
+  printf("%s:%d: check failed: '%s'\n", file, line, expr);
+  abort();
+}
+
+
+/* SqlResultSet */
+
+bool
+SqlResultSet::get_row(int row_num){
+  if(!get("row", row_num, &m_curr_row)){
+    return false;
+  }
+  return true;
+}
+
+
+bool
+SqlResultSet::next(void){
+  return get_row(++m_curr_row_num);
+}
+
+
+// Reset iterator
+void SqlResultSet::reset(void){
+  m_curr_row_num= -1;
+  m_curr_row= 0;
+}
+
+
+// Remove row from resultset
+void SqlResultSet::remove(){
+  BaseString row_name;
+  row_name.assfmt("row_%d", m_curr_row_num);
+  Properties::remove(row_name.c_str());
+}
+
+
+SqlResultSet::SqlResultSet(): m_curr_row(0), m_curr_row_num(-1){
+}
+
+
+SqlResultSet::~SqlResultSet(){
+}
+
+
+const char* SqlResultSet::column(const char* col_name){
+  const char* value;
+  if (!m_curr_row){
+    g_err << "ERROR: SqlResultSet::column("<< col_name << ")" << endl
+          << "There is no row loaded, call next() before "
+          << "acessing the column values" << endl;
+    assert(m_curr_row);
+  }
+  if (!m_curr_row->get(col_name, &value))
+    return NULL;
+  return value;
+}
+
+
+uint SqlResultSet::columnAsInt(const char* col_name){
+  uint value;
+  if (!m_curr_row){
+    g_err << "ERROR: SqlResultSet::columnAsInt("<< col_name << ")" << endl
+          << "There is no row loaded, call next() before "
+          << "acessing the column values" << endl;
+    assert(m_curr_row);
+  }
+  if (!m_curr_row->get(col_name, &value))
+    return (uint)-1;
+  return value;
+}
+
+
+uint SqlResultSet::insertId(){
+  return get_int("insert_id");
+}
+
+
+uint SqlResultSet::affectedRows(){
+  return get_int("affected_rows");
+}
+
+
+uint SqlResultSet::numRows(void){
+  return get_int("rows");
+}
+
+
+uint SqlResultSet::mysqlErrno(void){
+  return get_int("mysql_errno");
+}
+
+
+const char* SqlResultSet::mysqlError(void){
+  return get_string("mysql_error");
+}
+
+
+const char* SqlResultSet::mysqlSqlstate(void){
+  return get_string("mysql_sqlstate");
+}
+
+
+uint SqlResultSet::get_int(const char* name){
+  uint value;
+  get(name, &value);
+  return value;
+}
+
+
+const char* SqlResultSet::get_string(const char* name){
+  const char* value;
+  get(name, &value);
+  return value;
+}
+
+/* EOF */
+
diff --git a/storage/ndb/test/src/Makefile.am b/storage/ndb/test/src/Makefile.am
index aa486108235..1e4f30c3f39 100644
--- a/storage/ndb/test/src/Makefile.am
+++ b/storage/ndb/test/src/Makefile.am
@@ -23,10 +23,10 @@ libNDBT_a_SOURCES = \
 	HugoAsynchTransactions.cpp UtilTransactions.cpp \
 	NdbRestarter.cpp NdbRestarts.cpp NDBT_Output.cpp \
 	NdbBackup.cpp  NdbConfig.cpp NdbGrep.cpp NDBT_Table.cpp \
-	NdbSchemaCon.cpp NdbSchemaOp.cpp getarg.c \
-	CpcClient.cpp NdbMixRestarter.cpp NDBT_Thread.cpp dbutil.cpp
+	NdbSchemaCon.cpp NdbSchemaOp.cpp getarg.c AtrtClient.cpp \
+	CpcClient.cpp NdbMixRestarter.cpp NDBT_Thread.cpp DbUtil.cpp
 
-INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/common/mgmcommon -I$(top_srcdir)/storage/ndb/include/mgmcommon -I$(top_srcdir)/storage/ndb/include/kernel -I$(top_srcdir)/storage/ndb/src/mgmapi
+INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/common/mgmcommon -I$(top_srcdir)/storage/ndb/include/mgmcommon -I$(top_srcdir)/storage/ndb/include/kernel -I$(top_srcdir)/storage/ndb/src/mgmapi -I$(top_srcdir)/include
 
 include $(top_srcdir)/storage/ndb/config/common.mk.am
 include $(top_srcdir)/storage/ndb/config/type_ndbapitest.mk.am
diff --git a/storage/ndb/test/src/NdbBackup.cpp b/storage/ndb/test/src/NdbBackup.cpp
index 42b15885089..3fb4de461f0 100644
--- a/storage/ndb/test/src/NdbBackup.cpp
+++ b/storage/ndb/test/src/NdbBackup.cpp
@@ -350,7 +350,8 @@ FailS_codes[] = {
   10025,
   10027,
   10033,
-  10035
+  10035,
+  10036
 };
 
 int
diff --git a/storage/ndb/test/src/dbutil.cpp b/storage/ndb/test/src/dbutil.cpp
deleted file mode 100755
index 0c936f53182..00000000000
--- a/storage/ndb/test/src/dbutil.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-// dbutil.cpp: implementation of the database utilities class.
-//
-//////////////////////////////////////////////////////////////////////
-
-#include "dbutil.hpp"
-
-//////////////////////////////////////////////////////////////////////
-// Construction/Destruction
-//////////////////////////////////////////////////////////////////////
-dbutil::dbutil(const char * dbname)
-{
-  memset(host,' ',sizeof(host));
-  memset(user,' ',sizeof(pass));
-  memset(dbs,' ',sizeof(dbs));
-  port = 0;
-  memset(socket,' ',sizeof(socket));
-  this->SetDbName(dbname);
-}
-
-dbutil::~dbutil()
-{
-  this->DatabaseLogout();
-}
-
-//////////////////////////////////////////////////////////////////////
-// Database Login
-//////////////////////////////////////////////////////////////////////
-void dbutil::DatabaseLogin(const char* system,
-                           const char* usr,
-                           const char* password,
-                           unsigned int portIn,
-                           const char* sockIn,
-                           bool transactional
-                           ){
-  if (!(myDbHandel = mysql_init(NULL))){
-    myerror("mysql_init() failed");
-    exit(1);
-  }
-  this->SetUser(usr);
-  this->SetHost(system);
-  this->SetPassword(password);
-  this->SetPort(portIn);
-  this->SetSocket(sockIn);
-
-  if (!(mysql_real_connect(myDbHandel, host, user, pass, "test", port, socket, 0))){
-    myerror("connection failed");
-    mysql_close(myDbHandel);
-    fprintf(stdout, "\n Check the connection options using --help or -?\n");
-    exit(1);
-  }
-
-  myDbHandel->reconnect= 1;
-
-  /* set AUTOCOMMIT */
-  if(!transactional){
-    mysql_autocommit(myDbHandel, TRUE);
-  }
-  else{
-    mysql_autocommit(myDbHandel, FALSE);
-  }
-
-  fprintf(stdout, "\n\tConnected to MySQL server version: %s (%lu)\n\n", 
-          mysql_get_server_info(myDbHandel),
-    (unsigned long) mysql_get_server_version(myDbHandel));
-}
-
-//////////////////////////////////////////////////////////////////////
-// Database Logout
-//////////////////////////////////////////////////////////////////////
-void dbutil::DatabaseLogout(){
-  if (myDbHandel){
-    fprintf(stdout, "\n\tClosing the MySQL database connection ...\n\n");
-    mysql_close(myDbHandel);
-  }
-}
-
-//////////////////////////////////////////////////////////////////////
-// Prepare MySQL Statements Cont
-//////////////////////////////////////////////////////////////////////
-MYSQL_STMT *STDCALL dbutil::MysqlSimplePrepare(const char *query){
-#ifdef DEBUG
-printf("Inside dbutil::MysqlSimplePrepare\n");
-#endif
-int result = 0;
-  MYSQL_STMT *my_stmt= mysql_stmt_init(this->GetDbHandel());
-  if (my_stmt && (result = mysql_stmt_prepare(my_stmt, query, strlen(query)))){
-    printf("res = %s\n",mysql_stmt_error(my_stmt));
-    mysql_stmt_close(my_stmt);
-    return 0;
-  }
-  return my_stmt;
-}
-//////////////////////////////////////////////////////////////////////
-// Error Printing
-//////////////////////////////////////////////////////////////////////
-void dbutil::PrintError(const char *msg){
-  if (this->GetDbHandel()
-      && mysql_errno(this->GetDbHandel())){
-      if (this->GetDbHandel()->server_version){
-        fprintf(stdout, "\n [MySQL-%s]",
-                this->GetDbHandel()->server_version);
-      }
-      else
-        fprintf(stdout, "\n [MySQL]");
-      fprintf(stdout, "[%d] %s\n",
-              mysql_errno(this->GetDbHandel()),
-              mysql_error(this->GetDbHandel()));
-  }
-  else if (msg)
-    fprintf(stderr, " [MySQL] %s\n", msg);
-}
-
-void dbutil::PrintStError(MYSQL_STMT *stmt, const char *msg)
-{
-  if (stmt && mysql_stmt_errno(stmt))
-  {
-    if (this->GetDbHandel()
-        && this->GetDbHandel()->server_version)
-      fprintf(stdout, "\n [MySQL-%s]",
-              this->GetDbHandel()->server_version);
-    else
-      fprintf(stdout, "\n [MySQL]");
-
-    fprintf(stdout, "[%d] %s\n", mysql_stmt_errno(stmt),
-    mysql_stmt_error(stmt));
-  }
-  else if (msg)
-   fprintf(stderr, " [MySQL] %s\n", msg);
-}
-/////////////////////////////////////////////////////
-int dbutil::Select_DB()
-{
-  return mysql_select_db(this->GetDbHandel(),
-                         this->GetDbName());
-}
-////////////////////////////////////////////////////
-int dbutil::Do_Query(char * stm)
-{
-  return mysql_query(this->GetDbHandel(), stm);
-}
-////////////////////////////////////////////////////
-const char * dbutil::GetError()
-{
-  return mysql_error(this->GetDbHandel());
-}
-////////////////////////////////////////////////////
-int dbutil::GetErrorNumber()
-{
-  return mysql_errno(this->GetDbHandel());
-}
-////////////////////////////////////////////////////
-unsigned long dbutil::SelectCountTable(const char * table)
-{
-	unsigned long count = 0;
-    MYSQL_RES *result;
-    char query[1024];
-    MYSQL_ROW row;
-        
-    sprintf(query,"select count(*) from `%s`", table);
-    if (mysql_query(this->GetDbHandel(),query) || !(result=mysql_store_result(this->GetDbHandel())))
-    {
-      printf("error\n");
-      return 1;
-    }
-    row= mysql_fetch_row(result);
-    count= (ulong) strtoull(row[0], (char**) 0, 10);
-    mysql_free_result(result);
-    
-    return count;
-}
-void dbutil::Die(const char *file, int line, const char *expr){
-  fprintf(stderr, "%s:%d: check failed: '%s'\n", file, line, expr);
-  abort();
-}
-
-
diff --git a/storage/ndb/test/tools/hugoPkUpdate.cpp b/storage/ndb/test/tools/hugoPkUpdate.cpp
index b920a4f396a..3fa87da3145 100644
--- a/storage/ndb/test/tools/hugoPkUpdate.cpp
+++ b/storage/ndb/test/tools/hugoPkUpdate.cpp
@@ -106,7 +106,7 @@ int main(int argc, const char** argv){
   NDBT_ThreadSet ths(_threads);
 
   // create Ndb object for each thread
-  if (ths.connect(&con, "TEST_DB") == -1) {
+  if (ths.connect(&con, db ? db : "TEST_DB") == -1) {
     ndbout << "connect failed: err=" << ths.get_err() << endl;
     return NDBT_ProgramExit(NDBT_FAILED);
   }
diff --git a/storage/ndb/tools/waiter.cpp b/storage/ndb/tools/waiter.cpp
index a292ab9140a..fc2a4b368b1 100644
--- a/storage/ndb/tools/waiter.cpp
+++ b/storage/ndb/tools/waiter.cpp
@@ -21,13 +21,11 @@
 #include <NdbMain.h>
 #include <NdbOut.hpp>
 #include <NdbSleep.h>
-#include <kernel/ndb_limits.h>
 
 #include <NDBT.hpp>
 
-int 
-waitClusterStatus(const char* _addr, ndb_mgm_node_status _status,
-		  unsigned int _timeout);
+static int
+waitClusterStatus(const char* _addr, ndb_mgm_node_status _status);
 
 enum ndb_waiter_options {
   OPT_WAIT_STATUS_NOT_STARTED = NDB_STD_OPTIONS_LAST,
@@ -55,12 +53,13 @@ static struct my_option my_long_options[] =
     "Wait for cluster to enter single user mode",
     (uchar**) &_single_user, (uchar**) &_single_user, 0,
     GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 }, 
-  { "timeout", 't', "Timeout to wait",
+  { "timeout", 't', "Timeout to wait in seconds",
     (uchar**) &_timeout, (uchar**) &_timeout, 0,
     GET_INT, REQUIRED_ARG, 120, 0, 0, 0, 0, 0 }, 
   { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
 
+
 static void usage()
 {
   ndb_std_print_version();
@@ -70,16 +69,18 @@ static void usage()
   my_print_variables(my_long_options);
 }
 
+
 int main(int argc, char** argv){
   NDB_INIT(argv[0]);
   load_defaults("my",load_default_groups,&argc,&argv);
   const char* _hostName = NULL;
-  int ho_error;
+
 #ifndef DBUG_OFF
   opt_debug= "d:t:O,/tmp/ndb_waiter.trace";
 #endif
-  if ((ho_error=handle_options(&argc, &argv, my_long_options,
-			       ndb_std_get_one_option)))
+
+  if (handle_options(&argc, &argv, my_long_options,
+                     ndb_std_get_one_option))
     return NDBT_ProgramExit(NDBT_WRONGARGS);
 
   _hostName = argv[0];
@@ -105,7 +106,7 @@ int main(int argc, char** argv){
     wait_status= NDB_MGM_NODE_STATUS_STARTED;
   }
 
-  if (waitClusterStatus(_hostName, wait_status, _timeout*10) != 0)
+  if (waitClusterStatus(_hostName, wait_status) != 0)
     return NDBT_ProgramExit(NDBT_FAILED);
   return NDBT_ProgramExit(NDBT_OK);
 }
@@ -118,8 +119,6 @@ int main(int argc, char** argv){
 NdbMgmHandle handle= NULL;
 
 Vector<ndb_mgm_node_state> ndbNodes;
-Vector<ndb_mgm_node_state> mgmNodes;
-Vector<ndb_mgm_node_state> apiNodes;
 
 int 
 getStatus(){
@@ -128,8 +127,6 @@ getStatus(){
   struct ndb_mgm_node_state * node;
   
   ndbNodes.clear();
-  mgmNodes.clear();
-  apiNodes.clear();
 
   while(retries < 10){
     status = ndb_mgm_get_status(handle);
@@ -153,18 +150,16 @@ getStatus(){
 	ndbNodes.push_back(*node);
 	break;
       case NDB_MGM_NODE_TYPE_MGM:
-	mgmNodes.push_back(*node);
+        /* Don't care about MGM nodes */
 	break;
       case NDB_MGM_NODE_TYPE_API:
-	apiNodes.push_back(*node);
+        /* Don't care about API nodes */
 	break;
       default:
 	if(node->node_status == NDB_MGM_NODE_STATUS_UNKNOWN ||
 	   node->node_status == NDB_MGM_NODE_STATUS_NO_CONTACT){
 	  retries++;
 	  ndbNodes.clear();
-	  mgmNodes.clear();
-	  apiNodes.clear();
 	  free(status); 
 	  status = NULL;
           count = 0;
@@ -183,24 +178,22 @@ getStatus(){
     free(status);
     return 0;
   }
-   
-  g_err  << "getStatus failed" << endl;
+
   return -1;
 }
 
-int 
+static int
 waitClusterStatus(const char* _addr,
-		  ndb_mgm_node_status _status,
-		  unsigned int _timeout)
+		  ndb_mgm_node_status _status)
 {
   int _startphase = -1;
 
-  int _nodes[MAX_NDB_NODES];
-  int _num_nodes = 0;
+  /* Ignore SIGPIPE */
+  signal(SIGPIPE, SIG_IGN);
 
   handle = ndb_mgm_create_handle();
   if (handle == NULL){
-    g_err << "handle == NULL" << endl;
+    g_err << "Could not create ndb_mgm handle" << endl;
     return -1;
   }
   g_info << "Connecting to mgmsrv at " << _addr << endl;
@@ -216,19 +209,11 @@ waitClusterStatus(const char* _addr,
     return -1;
   }
 
-  if (getStatus() != 0)
-    return -1;
-  
-  // Collect all nodes into nodes
-  for (size_t i = 0; i < ndbNodes.size(); i++){
-    _nodes[i] = ndbNodes[i].node_id;
-    _num_nodes++;
-  }
-
-  unsigned int attempts = 0;
-  unsigned int resetAttempts = 0;
-  const unsigned int MAX_RESET_ATTEMPTS = 10;
-  bool allInState = false;    
+  int attempts = 0;
+  int resetAttempts = 0;
+  const int MAX_RESET_ATTEMPTS = 10;
+  bool allInState = false;
+  int timeout_ms= _timeout * 10; /* In number of 100 milliseconds */
   while (allInState == false){
     if (_timeout > 0 && attempts > _timeout){
       /**
@@ -236,8 +221,8 @@ waitClusterStatus(const char* _addr,
        * the state we want
        */
       bool waitMore = false;
-      /** 
-       * Make special check if we are waiting for 
+      /**
+       * Make special check if we are waiting for
        * cluster to become started
        */
       if(_status == NDB_MGM_NODE_STATUS_STARTED){
@@ -252,7 +237,7 @@ waitClusterStatus(const char* _addr,
 	    waitMore = false;
 
 	}
-      } 
+      }
 
       if (!waitMore || resetAttempts > MAX_RESET_ATTEMPTS){
 	g_err << "waitNodeState("
@@ -260,7 +245,7 @@ waitClusterStatus(const char* _addr,
 	      <<", "<<_startphase<<")"
 	      << " timeout after " << attempts <<" attemps" << endl;
 	return -1;
-      } 
+      }
 
       g_err << "waitNodeState("
 	    << ndb_mgm_get_node_status_string(_status)
@@ -269,62 +254,34 @@ waitClusterStatus(const char* _addr,
 	    << resetAttempts << endl;
       attempts = 0;
       resetAttempts++;
-      
     }
 
-    allInState = true;
     if (getStatus() != 0){
-      g_err << "getStatus != 0" << endl;
       return -1;
     }
 
-    // ndbout << "waitNodeState; _num_nodes = " << _num_nodes << endl;
-    // for (int i = 0; i < _num_nodes; i++)
-    //   ndbout << " node["<<i<<"] =" <<_nodes[i] << endl;
+    /* Assume all nodes are in state(if there is any) */
+    allInState = (ndbNodes.size() > 0);
 
-    for (int i = 0; i < _num_nodes; i++){
-      ndb_mgm_node_state* ndbNode = NULL;
-      for (size_t n = 0; n < ndbNodes.size(); n++){
-	if (ndbNodes[n].node_id == _nodes[i])
-	  ndbNode = &ndbNodes[n];
-      }
+    /* Loop through all nodes and check their state */
+    for (size_t n = 0; n < ndbNodes.size(); n++) {
+      ndb_mgm_node_state* ndbNode = &ndbNodes[n];
 
-      if(ndbNode == NULL){
-	allInState = false;
-	continue;
-      }
+      assert(ndbNode != NULL);
 
-      g_info << "State node " << ndbNode->node_id << " "
+      g_info << "Node " << ndbNode->node_id << ": "
 	     << ndb_mgm_get_node_status_string(ndbNode->node_status)<< endl;
 
-      assert(ndbNode != NULL);
-
-      if(_status == NDB_MGM_NODE_STATUS_STARTING && 
-	 ((ndbNode->node_status == NDB_MGM_NODE_STATUS_STARTING && 
-	   ndbNode->start_phase >= _startphase) ||
-	  (ndbNode->node_status == NDB_MGM_NODE_STATUS_STARTED)))
-	continue;
-
-      if (_status == NDB_MGM_NODE_STATUS_STARTING){
-	g_info << "status = "  
-	       << ndb_mgm_get_node_status_string(ndbNode->node_status)
-	       <<", start_phase="<<ndbNode->start_phase<<endl;
-	if (ndbNode->node_status !=  _status) {
-	  if (ndbNode->node_status < _status)
-	    allInState = false;
-	  else 
-	    g_info << "node_status(" << (unsigned)ndbNode->node_status
-		   << ") != _status("<< (unsigned)_status << ")" <<endl;
-	} else if (ndbNode->start_phase < _startphase)
-	  allInState = false;
-      } else {
-	if (ndbNode->node_status !=  _status) 
+      if (ndbNode->node_status !=  _status)
 	  allInState = false;
-      }
     }
-    g_info << "Waiting for cluster enter state " 
-	    << ndb_mgm_get_node_status_string(_status)<< endl;
-    NdbSleep_MilliSleep(100);
+
+    if (!allInState) {
+      g_info << "Waiting for cluster enter state "
+             << ndb_mgm_get_node_status_string(_status)<< endl;
+      NdbSleep_MilliSleep(100);
+    }
+
     attempts++;
   }
   return 0;
diff --git a/support-files/Makefile.am b/support-files/Makefile.am
index 056a61f2e2a..a6001e635e6 100644
--- a/support-files/Makefile.am
+++ b/support-files/Makefile.am
@@ -26,6 +26,9 @@ EXTRA_DIST =		mysql.spec.sh \
 			mysql-log-rotate.sh \
 			mysql.server.sh \
 			mysqld_multi.server.sh \
+                        config.huge.ini.sh \
+                        config.medium.ini.sh \
+                        config.small.ini.sh \
 			binary-configure.sh \
 			magic mysql.m4 \
 			MySQL-shared-compat.spec.sh \
@@ -41,6 +44,9 @@ pkgsupp_DATA =		my-small.cnf \
 			my-medium.cnf \
 			my-large.cnf \
 			my-huge.cnf \
+                        config.huge.ini \
+                        config.medium.ini \
+                        config.small.ini \
 			my-innodb-heavy-4G.cnf \
 			mysql-log-rotate \
 			binary-configure \
@@ -59,6 +65,9 @@ CLEANFILES =		my-small.cnf \
 			my-medium.cnf \
 			my-large.cnf \
 			my-huge.cnf \
+                        config.huge.ini \
+                        config.medium.ini \
+                        config.small.ini \
 			my-innodb-heavy-4G.cnf \
 			mysql.spec \
 			mysql-@VERSION@.spec \
diff --git a/support-files/config.huge.ini.sh b/support-files/config.huge.ini.sh
new file mode 100755
index 00000000000..938dd3209b8
--- /dev/null
+++ b/support-files/config.huge.ini.sh
@@ -0,0 +1,212 @@
+######################################################
+# MySQL NDB Cluster Huge Sample Configuration File   #
+######################################################
+# This files assumes that you are using at least 9   #
+# hosts for running the cluster. Hostnames and paths #
+# listed below should be changed to match your setup #
+######################################################
+
+[NDBD DEFAULT]
+NoOfReplicas: 2
+DataDir: /add/path/here
+FileSystemPath: /add/path/here
+
+# Data Memory, Index Memory, and String Memory #
+DataMemory: 6000M
+IndexMemory: 1500M
+StringMemory: 5
+
+# Transaction Parameters #
+MaxNoOfConcurrentTransactions: 4096
+MaxNoOfConcurrentOperations: 100000
+MaxNoOfLocalOperations: 100000
+
+# Transaction Temporary Storage #
+MaxNoOfConcurrentIndexOperations: 8192
+MaxNoOfFiredTriggers: 4000
+TransactionBufferMemory: 1M
+
+# Scans and buffering #
+MaxNoOfConcurrentScans: 300
+MaxNoOfLocalScans: 32
+BatchSizePerLocalScan: 64
+LongMessageBuffer: 1M
+
+# Logging and Checkpointing #
+NoOfFragmentLogFiles: 300
+FragmentLogFileSize: 16M
+MaxNoOfOpenFiles: 40
+InitialNoOfOpenFiles: 27
+MaxNoOfSavedMessages: 25
+
+# Metadata Objects #
+MaxNoOfAttributes: 1500
+MaxNoOfTables: 400
+MaxNoOfOrderedIndexes: 200
+MaxNoOfUniqueHashIndexes: 200
+MaxNoOfTriggers: 770
+
+# Boolean Parameters #
+LockPagesInMainMemory: 0
+StopOnError: 1
+Diskless: 0
+ODirect: 0
+
+# Controlling Timeouts, Intervals, and Disk Paging #
+TimeBetweenWatchDogCheck: 6000
+TimeBetweenWatchDogCheckInitial: 6000
+StartPartialTimeout: 30000
+StartPartitionedTimeout: 60000
+StartFailureTimeout: 1000000
+HeartbeatIntervalDbDb: 2000
+HeartbeatIntervalDbApi: 3000
+TimeBetweenLocalCheckpoints: 20
+TimeBetweenGlobalCheckpoints: 2000
+TransactionInactiveTimeout: 0
+TransactionDeadlockDetectionTimeout: 1200
+DiskSyncSize: 4M
+DiskCheckpointSpeed: 10M
+DiskCheckpointSpeedInRestart: 100M
+ArbitrationTimeout: 10
+
+# Buffering and Logging #
+UndoIndexBuffer: 2M
+UndoDataBuffer: 1M
+RedoBuffer: 32M
+LogLevelStartup: 15
+LogLevelShutdown: 3
+LogLevelStatistic: 0
+LogLevelCheckpoint: 0
+LogLevelNodeRestart: 0
+LogLevelConnection: 0
+LogLevelError: 15
+LogLevelCongestion: 0
+LogLevelInfo: 3
+MemReportFrequency: 0
+
+# Backup Parameters #
+BackupDataBufferSize: 2M
+BackupLogBufferSize: 2M
+BackupMemory: 64M
+BackupWriteSize: 32K
+BackupMaxWriteSize: 256K
+
+[MGM DEFAULT]
+PortNumber: 1186
+DataDir: /add/path/here
+
+[TCP DEFAULT]
+SendBufferMemory: 2M
+
+#######################################
+# Change HOST1 to the name of the NDB_MGMD host
+# Change HOST2 to the name of the NDB_MGMD host
+# Change HOST3 to the name of the NDB_MGMD host
+# Change HOST4 to the name of the NDBD host
+# Change HOST5 to the name of the NDBD host
+# Change HOST6 to the name of the NDBD host
+# Change HOST7 to the name of the NDBD host
+# Change HOST8 to the name of the NDBD host
+# Change HOST9 to the name of the NDBD host
+#######################################
+
+[NDB_MGMD]
+Id: 1
+HostName: HOST1
+ArbitrationRank: 1
+
+[NDB_MGMD]
+Id: 2
+HostName: HOST2
+ArbitrationRank: 1
+
+[NDB_MGMD]
+Id: 3
+HostName: HOST3
+ArbitrationRank: 1
+
+[NDBD]
+Id: 4
+HostName: HOST4
+
+[NDBD]
+Id: 5
+HostName: HOST5
+
+[NDBD]
+Id: 6
+HostName: HOST6
+
+[NDBD]
+Id: 7
+HostName: HOST7
+
+[NDBD]
+Id: 8
+HostName: HOST8
+
+[NDBD]
+Id: 9
+HostName: HOST9
+
+######################################################
+# Note: The following can be MySQLD connections or   #
+#      NDB API application connecting to the cluster #
+######################################################
+
+[API]
+Id: 10
+HostName: HOST1
+ArbitrationRank: 2
+
+[API]
+Id: 11
+HostName: HOST2
+ArbitrationRank: 2
+
+[API]
+Id: 12
+HostName: HOST3
+
+[API]
+Id: 13
+HostName: HOST4
+
+[API]
+Id: 14
+HostName: HOST5
+
+[API]
+Id: 15
+HostName: HOST6
+
+[API]
+Id: 16
+HostName: HOST7
+
+[API]
+Id: 17
+HostName: HOST8
+
+[API]
+Id: 19
+HostName: HOST9
+
+[API]
+Id: 20
+
+[API]
+Id: 21
+
+[API]
+Id: 22
+
+[API]
+Id: 23
+
+[API]
+Id: 24
+
+[API]
+Id: 25
+
diff --git a/support-files/config.medium.ini.sh b/support-files/config.medium.ini.sh
new file mode 100755
index 00000000000..e35dd35e455
--- /dev/null
+++ b/support-files/config.medium.ini.sh
@@ -0,0 +1,124 @@
+#
+# MySQL NDB Cluster Medium Sample Configuration File
+#
+# This files assumes that you are using at least 6
+# hosts for running the cluster. Hostnames and paths
+# listed below should be changed to match your setup
+#
+
+[NDBD DEFAULT]
+NoOfReplicas: 2
+DataDir: /add/path/here
+FileSystemPath: /add/path/here
+
+
+# Data Memory, Index Memory, and String Memory
+
+DataMemory: 3000M
+IndexMemory: 800M
+BackupMemory: 64M
+
+# Transaction Parameters
+
+MaxNoOfConcurrentOperations: 100000
+MaxNoOfLocalOperations: 100000
+
+# Buffering and Logging
+
+RedoBuffer: 16M
+
+# Logging and Checkpointing
+
+NoOfFragmentLogFiles: 200
+
+# Metadata Objects
+
+MaxNoOfAttributes: 500
+MaxNoOfTables: 100
+
+# Scans and Buffering
+
+MaxNoOfConcurrentScans: 100
+
+
+[MGM DEFAULT]
+PortNumber: 1186
+DataDir: /add/path/here
+
+#
+# Change HOST1 to the name of the NDB_MGMD host
+# Change HOST2 to the name of the NDB_MGMD host
+# Change HOST3 to the name of the NDBD host
+# Change HOST4 to the name of the NDBD host
+# Change HOST5 to the name of the NDBD host
+# Change HOST6 to the name of the NDBD host
+#
+
+[NDB_MGMD]
+Id: 1
+HostName: HOST1
+ArbitrationRank: 1
+
+[NDB_MGMD]
+Id: 2
+HostName: HOST2
+ArbitrationRank: 1
+
+[NDBD]
+Id: 3
+HostName: HOST3
+
+[NDBD]
+Id: 4
+HostName: HOST4
+
+[NDBD]
+Id: 5
+HostName: HOST5
+
+[NDBD]
+Id: 6
+HostName: HOST6
+
+#
+# Note: The following can be MySQLD connections or
+#      NDB API application connecting to the cluster
+#
+
+[API]
+Id: 7
+HostName: HOST1
+ArbitrationRank: 2
+
+[API]
+Id: 8
+HostName: HOST2
+ArbitrationRank: 2
+
+[API]
+Id: 9
+HostName: HOST3
+ArbitrationRank: 2
+
+[API]
+Id: 10
+HostName: HOST4
+
+[API]
+Id: 11
+HostName: HOST5
+
+[API]
+Id: 12
+HostName: HOST6
+
+[API]
+Id: 13
+
+[API]
+Id: 14
+
+[API]
+Id: 15
+
+
diff --git a/support-files/config.small.ini.sh b/support-files/config.small.ini.sh
new file mode 100755
index 00000000000..129e2521e17
--- /dev/null
+++ b/support-files/config.small.ini.sh
@@ -0,0 +1,65 @@
+#
+# MySQL NDB Cluster Small Sample Configuration File
+#
+# This files assumes that you are using 1 to 3 hosts
+# for running the cluster. Hostnames and paths listed
+# below should be changed to match your setup.
+#
+# Note: You can change localhost for a different host
+#
+
+[NDBD DEFAULT]
+NoOfReplicas: 2
+DataDir: /add/path/here
+FileSystemPath: /add/path/here
+
+# Data Memory, Index Memory, and String Memory
+
+DataMemory: 600M
+IndexMemory: 100M
+BackupMemory: 64M
+
+[MGM DEFAULT]
+PortNumber: 1186
+DataDir: /add/path/here
+
+[NDB_MGMD]
+Id: 1
+HostName: localhost
+ArbitrationRank: 1
+
+[NDBD]
+Id: 2
+HostName: localhost
+
+[NDBD]
+Id: 3
+HostName: localhost
+
+#
+# Note: The following can be MySQLD connections or
+#      NDB API application connecting to the cluster
+#
+
+[API]
+Id: 4
+HostName: localhost
+ArbitrationRank: 2
+
+[API]
+Id: 5
+HostName: localhost
+
+[API]
+Id: 6
+HostName: localhost
+
+[API]
+Id: 7
+
+[API]
+Id: 8
+
+[API]
+Id: 9
+
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index afd23f4a5a3..bd01dc86e31 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -15,6 +15,7 @@
 # MA  02110-1301  USA.
 
 %define mysql_version		@VERSION@
+%define mysql_vendor    MySQL AB
 
 # use "rpmbuild --with static" or "rpm --define '_with_static 1'" (for RPM 3.x)
 # to enable static linking (off by default)
@@ -69,7 +70,7 @@ License:	%{license}
 Source:		http://www.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/mysql-%{mysql_version}.tar.gz
 URL:		http://www.mysql.com/
 Packager:	MySQL Production Engineering Team <build@mysql.com>
-Vendor:		MySQL AB
+Vendor:		%{mysql_vendor}
 Provides:	msqlormysql MySQL-server mysql
 BuildRequires: ncurses-devel
 Obsoletes:	mysql
@@ -429,6 +430,72 @@ touch $RBR%{_sysconfdir}/my.cnf
 touch $RBR%{_sysconfdir}/mysqlmanager.passwd
 
 %pre server
+# Check if we can safely upgrade.  An upgrade is only safe if it's from one
+# of our RPMs in the same version family.
+
+installed=`rpm -q --whatprovides mysql-server 2> /dev/null`
+if [ $? -eq 0 -a -n "$installed" ]; then
+  vendor=`rpm -q --queryformat='%{VENDOR}' "$installed" 2>&1`
+  version=`rpm -q --queryformat='%{VERSION}' "$installed" 2>&1`
+  myvendor='%{mysql_vendor}'
+  myversion='%{mysql_version}'
+
+  old_family=`echo $version   | sed -n -e 's,^\([1-9][0-9]*\.[0-9][0-9]*\)\..*$,\1,p'`
+  new_family=`echo $myversion | sed -n -e 's,^\([1-9][0-9]*\.[0-9][0-9]*\)\..*$,\1,p'`
+
+  [ -z "$vendor" ] && vendor='<unknown>'
+  [ -z "$old_family" ] && old_family="<unrecognized version $version>"
+  [ -z "$new_family" ] && new_family="<bad package specification: version $myversion>"
+
+  error_text=
+  if [ "$vendor" != "$myvendor" ]; then
+    error_text="$error_text
+The current MySQL server package is provided by a different
+vendor ($vendor) than $myvendor.  Some files may be installed
+to different locations, including log files and the service
+startup script in %{_sysconfdir}/init.d/.
+"
+  fi
+
+  if [ "$old_family" != "$new_family" ]; then
+    error_text="$error_text
+Upgrading directly from MySQL $old_family to MySQL $new_family may not
+be safe in all cases.  A manual dump and restore using mysqldump is
+recommended.  It is important to review the MySQL manual's Upgrading
+section for version-specific incompatibilities.
+"
+  fi
+
+  if [ -n "$error_text" ]; then
+    cat <<HERE >&2
+
+******************************************************************
+A MySQL server package ($installed) is installed.
+$error_text
+A manual upgrade is required.
+
+- Ensure that you have a complete, working backup of your data and my.cnf
+  files
+- Shut down the MySQL server cleanly
+- Remove the existing MySQL packages.  Usually this command will
+  list the packages you should remove:
+  rpm -qa | grep -i '^mysql-'
+
+  You may choose to use 'rpm --nodeps -ev <package-name>' to remove
+  the package which contains the mysqlclient shared library.  The
+  library will be reinstalled by the MySQL-shared-compat package.
+- Install the new MySQL packages supplied by $myvendor
+- Ensure that the MySQL server is started
+- Run the 'mysql_upgrade' program
+
+This is a brief description of the upgrade process.  Important details
+can be found in the MySQL manual, in the Upgrading section.
+******************************************************************
+HERE
+    exit 1
+  fi
+fi
+
 # Shut down a previously installed server first
 if test -x %{_sysconfdir}/init.d/mysql
 then
@@ -730,6 +797,11 @@ fi
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog
+* Mon Feb 18 2008 Timothy Smith <tim@mysql.com>
+
+- Require a manual upgrade if the alread-installed mysql-server is
+  from another vendor, or is of a different major version.
+
 * Wed May 02 2007 Joerg Bruehe <joerg@mysql.com>
 
 - "ndb_size.tmpl" is not needed any more, 
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c
index 24bccee708a..188a051f874 100644
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -16955,16 +16955,16 @@ static void bug20023_change_user(MYSQL *con)
                            opt_db ? opt_db : "test"));
 }
 
-static bool query_int_variable(MYSQL *con,
-                               const char *var_name,
-                               int *var_value)
+static my_bool query_int_variable(MYSQL *con,
+                                  const char *var_name,
+                                  int *var_value)
 {
   MYSQL_RES *rs;
   MYSQL_ROW row;
 
   char query_buffer[MAX_TEST_QUERY_LENGTH];
 
-  bool is_null;
+  my_bool is_null;
 
   my_snprintf(query_buffer,
           sizeof (query_buffer),
@@ -17143,7 +17143,7 @@ static void bug31418_impl()
 {
   MYSQL con;
 
-  bool is_null;
+  my_bool is_null;
   int rc;
 
   /* Create a new connection. */
diff --git a/unittest/mysys/bitmap-t.c b/unittest/mysys/bitmap-t.c
index 069a14ff553..0bd21b63430 100644
--- a/unittest/mysys/bitmap-t.c
+++ b/unittest/mysys/bitmap-t.c
@@ -29,7 +29,7 @@ uint get_rand_bit(uint bitsize)
   return (rand() % bitsize);
 }
 
-bool test_set_get_clear_bit(MY_BITMAP *map, uint bitsize)
+my_bool test_set_get_clear_bit(MY_BITMAP *map, uint bitsize)
 {
   uint i, test_bit;
   uint no_loops= bitsize > 128 ? 128 : bitsize;
@@ -52,7 +52,7 @@ error2:
   return TRUE;
 }
 
-bool test_flip_bit(MY_BITMAP *map, uint bitsize)
+my_bool test_flip_bit(MY_BITMAP *map, uint bitsize)
 {
   uint i, test_bit;
   uint no_loops= bitsize > 128 ? 128 : bitsize;
@@ -75,13 +75,13 @@ error2:
   return TRUE;
 }
 
-bool test_operators(MY_BITMAP *map __attribute__((unused)),
-                    uint bitsize __attribute__((unused)))
+my_bool test_operators(MY_BITMAP *map __attribute__((unused)),
+                       uint bitsize __attribute__((unused)))
 {
   return FALSE;
 }
 
-bool test_get_all_bits(MY_BITMAP *map, uint bitsize)
+my_bool test_get_all_bits(MY_BITMAP *map, uint bitsize)
 {
   uint i;
   bitmap_set_all(map);
@@ -123,7 +123,7 @@ error6:
   return TRUE;
 }
 
-bool test_compare_operators(MY_BITMAP *map, uint bitsize)
+my_bool test_compare_operators(MY_BITMAP *map, uint bitsize)
 {
   uint i, j, test_bit1, test_bit2, test_bit3,test_bit4;
   uint no_loops= bitsize > 128 ? 128 : bitsize;
@@ -229,7 +229,7 @@ error5:
   return TRUE;
 }
 
-bool test_count_bits_set(MY_BITMAP *map, uint bitsize)
+my_bool test_count_bits_set(MY_BITMAP *map, uint bitsize)
 {
   uint i, bit_count=0, test_bit;
   uint no_loops= bitsize > 128 ? 128 : bitsize;
@@ -255,7 +255,7 @@ error2:
   return TRUE;
 }
 
-bool test_get_first_bit(MY_BITMAP *map, uint bitsize)
+my_bool test_get_first_bit(MY_BITMAP *map, uint bitsize)
 {
   uint i, test_bit;
   uint no_loops= bitsize > 128 ? 128 : bitsize;
@@ -280,7 +280,7 @@ error2:
   return TRUE;
 }
 
-bool test_get_next_bit(MY_BITMAP *map, uint bitsize)
+my_bool test_get_next_bit(MY_BITMAP *map, uint bitsize)
 {
   uint i, j, test_bit;
   uint no_loops= bitsize > 128 ? 128 : bitsize;
@@ -299,7 +299,7 @@ error1:
   return TRUE;
 }
 
-bool test_prefix(MY_BITMAP *map, uint bitsize)
+my_bool test_prefix(MY_BITMAP *map, uint bitsize)
 {
   uint i, j, test_bit;
   uint no_loops= bitsize > 128 ? 128 : bitsize;
@@ -334,7 +334,7 @@ error3:
 }
 
 
-bool do_test(uint bitsize)
+my_bool do_test(uint bitsize)
 {
   MY_BITMAP map;
   uint32 buf[1024];
diff --git a/vio/CMakeLists.txt b/vio/CMakeLists.txt
index 83cd6f65e6d..164bcde7c4b 100755
--- a/vio/CMakeLists.txt
+++ b/vio/CMakeLists.txt
@@ -23,5 +23,6 @@ SET(VIO_SOURCES  vio.c viosocket.c viossl.c viosslfactories.c)
 
 IF(NOT SOURCE_SUBLIBS)
   ADD_LIBRARY(vio ${VIO_SOURCES})
+  ADD_DEPENDENCIES(vio GenError)
 ENDIF(NOT SOURCE_SUBLIBS)
 
diff --git a/vio/viossl.c b/vio/viossl.c
index 24bb18b9c68..0651fd8b7a3 100644
--- a/vio/viossl.c
+++ b/vio/viossl.c
@@ -172,20 +172,15 @@ void vio_ssl_delete(Vio *vio)
   vio_delete(vio);
 }
 
-int sslaccept(struct st_VioSSLFd *ptr, Vio *vio, long timeout)
-{
-  DBUG_ENTER("sslaccept");
-  DBUG_RETURN(sslconnect(ptr, vio, timeout));
-}
-
 
-int sslconnect(struct st_VioSSLFd *ptr, Vio *vio, long timeout)
+static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout,
+                  int (*connect_accept_func)(SSL*))
 {
   SSL *ssl;
   my_bool unused;
   my_bool was_blocking;
 
-  DBUG_ENTER("sslconnect");
+  DBUG_ENTER("ssl_do");
   DBUG_PRINT("enter", ("ptr: 0x%lx, sd: %d  ctx: 0x%lx",
                        (long) ptr, vio->sd, (long) ptr->ssl_context));
 
@@ -204,13 +199,9 @@ int sslconnect(struct st_VioSSLFd *ptr, Vio *vio, long timeout)
   SSL_SESSION_set_timeout(SSL_get_session(ssl), timeout);
   SSL_set_fd(ssl, vio->sd);
 
-  /*
-    SSL_do_handshake will select between SSL_connect
-    or SSL_accept depending on server or client side
-  */
-  if (SSL_do_handshake(ssl) < 1)
+  if (connect_accept_func(ssl) < 1)
   {
-    DBUG_PRINT("error", ("SSL_do_handshake failure"));
+    DBUG_PRINT("error", ("SSL_connect/accept failure"));
     report_errors(ssl);
     SSL_free(ssl);
     vio_blocking(vio, was_blocking, &unused);
@@ -259,6 +250,20 @@ int sslconnect(struct st_VioSSLFd *ptr, Vio *vio, long timeout)
 }
 
 
+int sslaccept(struct st_VioSSLFd *ptr, Vio *vio, long timeout)
+{
+  DBUG_ENTER("sslaccept");
+  DBUG_RETURN(ssl_do(ptr, vio, timeout, SSL_accept));
+}
+
+
+int sslconnect(struct st_VioSSLFd *ptr, Vio *vio, long timeout)
+{
+  DBUG_ENTER("sslconnect");
+  DBUG_RETURN(ssl_do(ptr, vio, timeout, SSL_connect));
+}
+
+
 int vio_ssl_blocking(Vio *vio __attribute__((unused)),
 		     my_bool set_blocking_mode,
 		     my_bool *old_mode)
@@ -269,4 +274,6 @@ int vio_ssl_blocking(Vio *vio __attribute__((unused)),
   return (set_blocking_mode ? 0 : 1);
 }
 
+
+
 #endif /* HAVE_OPENSSL */
diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c
index d7e4f380bc1..9ffe600beb8 100644
--- a/vio/viosslfactories.c
+++ b/vio/viosslfactories.c
@@ -17,8 +17,8 @@
 
 #ifdef HAVE_OPENSSL
 
-static bool     ssl_algorithms_added    = FALSE;
-static bool     ssl_error_strings_loaded= FALSE;
+static my_bool     ssl_algorithms_added    = FALSE;
+static my_bool     ssl_error_strings_loaded= FALSE;
 static int      verify_depth = 0;
 
 static unsigned char dh512_p[]=