Merge chilla.local:/home/mydev/mysql-5.0-amain

into chilla.local:/home/mydev/mysql-5.0-axmrg sql/sql_insert.cc: Auto merged
2025-08-08 11:22:35 +03:00 · 2007-08-03 06:56:04 +02:00
parent 1ed5de8edb 9687988e83
commit 09d74da734
221 changed files with 3306 additions and 6705 deletions
--- a/.bzrignore
+++ b/.bzrignore
@@ -6,6 +6,7 @@
 *.bin
 *.vcproj.cmake
 cmake_install.cmake
+*.cdf
 *.core
 *.d
 *.da
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -139,21 +139,47 @@ ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR
 ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D _CRT_SECURE_NO_DEPRECATE")

 IF(EMBED_MANIFESTS)
-    # Search for the Manifest tool.  CMake will first search it's defaults
-    # (CMAKE_FRAMEWORK_PATH, CMAKE_APPBUNDLE_PATH, CMAKE_PROGRAM_PATH and
-    # the system PATH) followed by the listed paths which are the current
-    # possible defaults and should be updated when necessary.  The custom
-    # manifests are designed to be compatible with all mt versions.
+    # Search for the tools (mt, makecat, signtool) necessary for embedding
+    # manifests and signing executables with the MySQL AB authenticode cert.
+    #
+    # CMake will first search it's defaults (CMAKE_FRAMEWORK_PATH, 
+    # CMAKE_APPBUNDLE_PATH, CMAKE_PROGRAM_PATH and the system PATH) followed 
+    # by the listed paths which are the current possible defaults and should be
+    # updated when necessary.  
+    # 
+    # The custom manifests are designed to be compatible with all mt versions.
+    # The MySQL AB Authenticode certificate is available only internally.  
+    # Others should store a single signing certificate in a local cryptographic
+    # service provider and alter the signtool command as necessary.
    FIND_PROGRAM(HAVE_MANIFEST_TOOL NAMES mt
                 PATHS
                 "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/VC/bin"
                 "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/Common7/Tools/Bin"
                 "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/SDK/v2.0/Bin")
+    FIND_PROGRAM(HAVE_CATALOG_TOOL NAMES makecat
+                 PATHS
+                 "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/Common7/Tools/Bin")
+    FIND_PROGRAM(HAVE_SIGN_TOOL NAMES signtool
+                 PATHS
+                 "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/Common7/Tools/Bin"
+                 "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/SDK/v2.0/Bin")
+
    IF(HAVE_MANIFEST_TOOL)
-        MESSAGE(STATUS "Found Mainfest Tool. Embedding custom manifests.")
+        MESSAGE(STATUS "Found Mainfest Tool.")
    ELSE(HAVE_MANIFEST_TOOL)
        MESSAGE(FATAL_ERROR "Manifest tool, mt.exe, can't be found.")
    ENDIF(HAVE_MANIFEST_TOOL)
+    IF(HAVE_CATALOG_TOOL)
+        MESSAGE(STATUS "Found Catalog Tool.")
+    ELSE(HAVE_CATALOG_TOOL)
+        MESSAGE(FATAL_ERROR "Catalog tool, makecat.exe, can't be found.")
+    ENDIF(HAVE_CATALOG_TOOL)
+    IF(HAVE_SIGN_TOOL)
+        MESSAGE(STATUS "Found Sign Tool. Embedding custom manifests and signing executables.")
+    ELSE(HAVE_SIGN_TOOL)
+        MESSAGE(FATAL_ERROR "Sign tool, signtool.exe, can't be found.")
+    ENDIF(HAVE_SIGN_TOOL)
+
    # Disable automatic manifest generation.
    STRING(REPLACE "/MANIFEST" "/MANIFEST:NO" CMAKE_EXE_LINKER_FLAGS 
    	   ${CMAKE_EXE_LINKER_FLAGS})
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,6 +20,7 @@ AUTOMAKE_OPTIONS =	foreign
 # These are built from source in the Docs directory
 EXTRA_DIST =		INSTALL-SOURCE INSTALL-WIN-SOURCE \
 			README COPYING EXCEPTIONS-CLIENT CMakeLists.txt
+
 SUBDIRS =		. include @docs_dirs@ @zlib_dir@ @yassl_dir@ \
 			@readline_topdir@ sql-common scripts \
 			@thread_dirs@ pstack \
@@ -157,8 +158,6 @@ test-bt:
 	@PERL@ ./mysql-test-run.pl --force --comment=funcs1_ps --ps-protocol --suite=funcs_1
 	-cd mysql-test ; MTR_BUILD_THREAD=auto \
 	@PERL@ ./mysql-test-run.pl --force --comment=funcs2 --suite=funcs_2
-	-cd mysql-test ; MTR_BUILD_THREAD=auto \
-	@PERL@ ./mysql-test-run.pl --force --comment=rowlock --suite=row_lock
 	-if [ -d mysql-test/suite/nist ] ; then \
 	  cd mysql-test ; MTR_BUILD_THREAD=auto \
 	  @PERL@ ./mysql-test-run.pl --comment=NIST+normal --force --suite=nist ; \
--- a/SSL/Makefile.am
+++ b/SSL/Makefile.am
@@ -15,9 +15,7 @@

 ## Process this file with automake to create Makefile.in

-EXTRA_DIST=	NOTES cacert.pem client-cert.pem client-key.pem \
-		run-client run-server server-cert.pem \
-		server-key.pem
+EXTRA_DIST= NOTES run-client run-server

 # Don't update the files from bitkeeper
 %::SCCS/s.%
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -992,6 +992,21 @@ static int mysql_query_with_error_report(MYSQL *mysql_con, MYSQL_RES **res,
  return 0;
 }

+
+static int switch_character_set_results(MYSQL *mysql, const char *cs_name)
+{
+  char query_buffer[QUERY_LENGTH];
+  size_t query_length;
+
+  query_length= my_snprintf(query_buffer,
+                            sizeof (query_buffer),
+                            "SET SESSION character_set_results = '%s'",
+                            (const char *) cs_name);
+
+  return mysql_real_query(mysql, query_buffer, query_length);
+}
+
+
 /*
  Open a new .sql file to dump the table or view into

@@ -1671,7 +1686,10 @@ static uint get_table_structure(char *table, char *db, char *table_type,
      MYSQL_FIELD *field;

      my_snprintf(buff, sizeof(buff), "show create table %s", result_table);
-      if (mysql_query_with_error_report(mysql, 0, buff))
+
+      if (switch_character_set_results(mysql, "binary") ||
+          mysql_query_with_error_report(mysql, &result, buff) ||
+          switch_character_set_results(mysql, default_charset))
        DBUG_RETURN(0);

      if (path)
@@ -1702,7 +1720,6 @@ static uint get_table_structure(char *table, char *db, char *table_type,
        check_io(sql_file);
      }

-      result= mysql_store_result(mysql);
      field= mysql_fetch_field_direct(result, 0);
      if (strcmp(field->name, "View") == 0)
      {
@@ -1794,7 +1811,14 @@ static uint get_table_structure(char *table, char *db, char *table_type,
      }

      row= mysql_fetch_row(result);
-      fprintf(sql_file, "%s;\n", row[1]);
+
+      fprintf(sql_file,
+              "SET @saved_cs_client     = @@character_set_client;\n"
+              "SET character_set_client = utf8;\n"
+              "%s;\n"
+              "SET character_set_client = @saved_cs_client;\n",
+              row[1]);
+
      check_io(sql_file);
      mysql_free_result(result);
    }
--- a/cmd-line-utils/libedit/Makefile.am
+++ b/cmd-line-utils/libedit/Makefile.am
@@ -5,8 +5,8 @@
 ASRC =			$(srcdir)/vi.c $(srcdir)/emacs.c $(srcdir)/common.c
 AHDR =			vi.h emacs.h common.h

-INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include \
-			-I$(srcdir)/../.. -I..
+# Make sure to include stuff from this directory first, to get right "config.h"
+INCLUDES =		-I. -I$(top_builddir)/include -I$(top_srcdir)/include

 noinst_LIBRARIES =	libedit.a

--- a/config/ac-macros/large_file.m4
+++ b/config/ac-macros/large_file.m4
@@ -127,14 +127,9 @@ AC_DEFUN([MYSQL_SYS_LARGEFILE],
 	hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*)
 	  ac_cv_sys_largefile_source=1 ;;
 	esac])
-     AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES,
-       ac_cv_sys_large_files,
-       [Large files support on AIX-style hosts.],
-       [case "$host_os" in
-	# AIX 4.2 and later
-	aix4.[2-9]* | aix4.1[0-9]* | aix[5-9].* | aix[1-9][0-9]*)
-	  ac_cv_sys_large_files=1 ;;
-	esac])
+
+     # AIX 4.2 and later -- do nothing, include standards.h instead.
+     # this goes for both GNU and IBM C and C++ compilers.
   fi
  ])

--- a/config/ac-macros/misc.m4
+++ b/config/ac-macros/misc.m4
@@ -763,7 +763,6 @@ AC_SUBST(CXX_VERSION)
 ])

 AC_DEFUN([MYSQL_PROG_AR], [
-AC_REQUIRE([MYSQL_CHECK_CXX_VERSION])
 case $CXX_VERSION in
  MIPSpro*)
    AR=$CXX
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # remember to also change ndb version below and update version.c in ndb
 AM_INIT_AUTOMAKE(mysql, 5.0.48)
-AM_CONFIG_HEADER(config.h)
+AM_CONFIG_HEADER([include/config.h:config.h.in])

 PROTOCOL_VERSION=10
 DOT_FRM_VERSION=6
@@ -2898,6 +2898,12 @@ then
  ndb_opt_subdirs="$ndb_opt_subdirs docs"
  ndb_bin_am_ldflags=""
 fi
+# building dynamic breaks on AIX. (If you want to try it and get unresolved
+# __vec__delete2 and some such, try linking against libhC.)
+case "$host_os" in
+  aix3.* | aix4.0.* | aix4.1.*) ;;
+  *) ndb_bin_am_ldflags="-static";;
+esac
 AC_SUBST([ndb_bin_am_ldflags])
 AC_SUBST([ndb_opt_subdirs])

--- a/extra/yassl/taocrypt/src/coding.cpp
+++ b/extra/yassl/taocrypt/src/coding.cpp
@@ -184,7 +184,7 @@ void Base64Decoder::Decode()
 {
    word32 bytes = coded_.size();
    word32 plainSz = bytes - ((bytes + (pemLineSz - 1)) / pemLineSz); 
-    plainSz = (plainSz * 3 + 3) / 4;
+    plainSz = ((plainSz * 3) / 4) + 3;
    decoded_.New(plainSz);

    word32 i = 0;
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -49,8 +49,11 @@ link_sources:
 	@readline_h_ln_cmd@
 	@yassl_h_ln_cmd@

-my_config.h: ../config.h
-	$(CP) ../config.h my_config.h
+# We want both "my_config.h" and "config.h" that are identical, as
+# MySQL sources assumes the name "my_config.h", and 3rd party sources
+# assumes the name "config.h".
+my_config.h: config.h
+	$(CP) config.h my_config.h

 # These files should not be included in distributions since they are
 # generated by configure from the .h.in files
--- a/include/mysql.h
+++ b/include/mysql.h
@@ -27,6 +27,10 @@
 #ifndef _mysql_h
 #define _mysql_h

+#ifdef _AIX           /* large-file support will break without this */
+#include <standards.h>
+#endif
+
 #ifdef __CYGWIN__     /* CYGWIN implements a UNIX API */
 #undef WIN
 #undef _WIN
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@@ -37,12 +37,7 @@ EXTRA_DIST = 		$(EXTRA_SCRIPTS) suite
 GENSCRIPTS =		mysql-test-run-shell mysql-test-run install_test_db mtr
 PRESCRIPTS =		mysql-test-run.pl mysql-stress-test.pl
 test_SCRIPTS = 		$(GENSCRIPTS) $(PRESCRIPTS)
-test_DATA = 		std_data/client-key.pem \
-			std_data/client-cert.pem \
-			std_data/cacert.pem \
-			std_data/server-cert.pem \
-			std_data/server-key.pem
-CLEANFILES = 		$(GENSCRIPTS) $(test_DATA)
+CLEANFILES = 		$(GENSCRIPTS)

 INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include -I..

@@ -111,17 +106,6 @@ install-data-local:
 uninstall-local:
 	@RM@ -f -r $(DESTDIR)$(testdir)

-std_data/client-key.pem: $(top_srcdir)/SSL/$(@F)
-	@RM@ -f $@; @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data
-std_data/client-cert.pem: $(top_srcdir)/SSL/$(@F)
-	@RM@ -f $@; @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data
-std_data/cacert.pem: $(top_srcdir)/SSL/$(@F)
-	@RM@ -f $@; @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data
-std_data/server-cert.pem: $(top_srcdir)/SSL/$(@F)
-	@RM@ -f $@; @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data
-std_data/server-key.pem: $(top_srcdir)/SSL/$(@F)
-	@RM@ -f $@; @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data
-
 # mtr - a shortcut for executing mysql-test-run.pl
 mtr:
 	$(RM) -f mtr
--- a/mysql-test/r/bdb.result
+++ b/mysql-test/r/bdb.result
@@ -136,8 +136,8 @@ update ignore t1 set id=1023 where id=1010;
 select * from t1 where parent_id=102 order by parent_id,id;
 id	parent_id	level
 1008	102	2
-1010	102	2
 1015	102	2
+1010	102	2
 explain select level from t1 where level=1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ref	level	level	1	const	X	Using index
--- a/mysql-test/r/federated.result
+++ b/mysql-test/r/federated.result
@@ -1844,6 +1844,43 @@ C3A4C3B6C3BCC39F
 D18DD184D184D0B5D0BAD182D0B8D0B2D0BDD183D18E
 drop table federated.t1;
 drop table federated.t1;
+CREATE TABLE federated.t1 (
+categoryId int(11) NOT NULL AUTO_INCREMENT,
+domainId varchar(745) NOT NULL DEFAULT '',
+categoryName varchar(255) NOT NULL DEFAULT '',
+PRIMARY KEY (categoryId),
+UNIQUE KEY idx_unique_category_categoryName (domainId, categoryName),
+KEY idx_category_domainId (domainId)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+CREATE TABLE federated.t1 (
+categoryId int(11) NOT NULL AUTO_INCREMENT,
+domainId varchar(745) NOT NULL DEFAULT '',
+categoryName varchar(255) NOT NULL DEFAULT '',
+PRIMARY KEY (categoryId),
+UNIQUE KEY idx_unique_category_categoryName (domainId, categoryName),
+KEY idx_category_domainId (domainId)
+) ENGINE=FEDERATED DEFAULT CHARSET=latin1
+CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1';
+insert into federated.t1 (domainId, categoryName) values ( '1231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231231  300', '1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345  250');
+insert into federated.t1 (domainId, categoryName) values ( '12312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312312  301', '12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456  250');
+insert into federated.t1 (domainId, categoryName) values ('a', 'b');
+select categoryId from federated.t1 order by domainId, categoryName;
+categoryId
+1
+2
+3
+select categoryId from federated.t1 where domainId='a' and categoryName='b' order by categoryId;
+categoryId
+3
+select categoryId from federated.t1 where domainId='a' and categoryName='b' order by categoryId;
+categoryId
+3
+select categoryId from federated.t1 where domainId<>'a' and categoryName<>'b' order by categoryId;
+categoryId
+1
+2
+drop table federated.t1;
+drop table federated.t1;
 create table federated.t1 (a int primary key, b varchar(64))
 DEFAULT CHARSET=utf8;
 create table federated.t1 (a int primary key, b varchar(64))
--- a/mysql-test/r/func_time.result
+++ b/mysql-test/r/func_time.result
@@ -840,11 +840,11 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 Warnings:
 Note	1003	select period_add(_latin1'9602',-(12)) AS `period_add("9602",-12)`,period_diff(199505,_latin1'9404') AS `period_diff(199505,"9404")`,from_days(to_days(_latin1'960101')) AS `from_days(to_days("960101"))`,dayofmonth(_latin1'1997-01-02') AS `dayofmonth("1997-01-02")`,month(_latin1'1997-01-02') AS `month("1997-01-02")`,monthname(_latin1'1972-03-04') AS `monthname("1972-03-04")`,dayofyear(_latin1'0000-00-00') AS `dayofyear("0000-00-00")`,hour(_latin1'1997-03-03 23:03:22') AS `HOUR("1997-03-03 23:03:22")`,minute(_latin1'23:03:22') AS `MINUTE("23:03:22")`,second(230322) AS `SECOND(230322)`,quarter(980303) AS `QUARTER(980303)`,week(_latin1'1998-03-03',0) AS `WEEK("1998-03-03")`,yearweek(_latin1'2000-01-01',1) AS `yearweek("2000-01-01",1)`,week(19950101,1) AS `week(19950101,1)`,year(_latin1'98-02-03') AS `year("98-02-03")`,(weekday(curdate()) - weekday(now())) AS `weekday(curdate())-weekday(now())`,dayname(_latin1'1962-03-03') AS `dayname("1962-03-03")`,unix_timestamp() AS `unix_timestamp()`,sec_to_time((time_to_sec(_latin1'0:30:47') / 6.21)) AS `sec_to_time(time_to_sec("0:30:47")/6.21)`,curtime() AS `curtime()`,utc_time() AS `utc_time()`,curdate() AS `curdate()`,utc_date() AS `utc_date()`,utc_timestamp() AS `utc_timestamp()`,date_format(_latin1'1997-01-02 03:04:05',_latin1'%M %W %D %Y %y %m %d %h %i %s %w') AS `date_format("1997-01-02 03:04:05", "%M %W %D %Y %y %m %d %h %i %s %w")`,from_unixtime(unix_timestamp(_latin1'1994-03-02 10:11:12')) AS `from_unixtime(unix_timestamp("1994-03-02 10:11:12"))`,(_latin1'1997-12-31 23:59:59' + interval 1 second) AS `"1997-12-31 23:59:59" + INTERVAL 1 SECOND`,(_latin1'1998-01-01 00:00:00' - interval 1 second) AS `"1998-01-01 00:00:00" - INTERVAL 1 SECOND`,(_latin1'1997-12-31' + interval 1 day) AS `INTERVAL 1 DAY + "1997-12-31"`,extract(year from _latin1'1999-01-02 10:11:12') AS `extract(YEAR FROM "1999-01-02 10:11:12")`,(_latin1'1997-12-31 23:59:59' + interval 1 second) AS `date_add("1997-12-31 23:59:59",INTERVAL 1 SECOND)`
-SET @TMP=NOW();
+SET @TMP='2007-08-01 12:22:49';
 CREATE TABLE t1 (d DATETIME);
-INSERT INTO t1 VALUES (NOW());
-INSERT INTO t1 VALUES (NOW());
-INSERT INTO t1 VALUES (NOW());
+INSERT INTO t1 VALUES ('2007-08-01 12:22:59');
+INSERT INTO t1 VALUES ('2007-08-01 12:23:01');
+INSERT INTO t1 VALUES ('2007-08-01 12:23:20');
 SELECT count(*) FROM t1 WHERE d>FROM_DAYS(TO_DAYS(@TMP)) AND d<=FROM_DAYS(TO_DAYS(@TMP)+1);
 count(*)
 3
--- a/mysql-test/r/group_by.result
+++ b/mysql-test/r/group_by.result
@@ -824,6 +824,23 @@ a
 2
 1
 DROP TABLE t1;
+CREATE TABLE t1 (
+f1 int(10) unsigned NOT NULL auto_increment primary key,
+f2 varchar(100) NOT NULL default ''
+);
+CREATE TABLE t2 (
+f1 varchar(10) NOT NULL default '',
+f2 char(3) NOT NULL default '',
+PRIMARY KEY  (`f1`),
+KEY `k1` (`f2`,`f1`)
+);
+INSERT INTO t1 values(NULL, '');
+INSERT INTO `t2` VALUES ('486878','WDT'),('486910','WDT');
+SELECT SQL_BUFFER_RESULT avg(t2.f1) FROM t1, t2 where t2.f2 = 'SIR' GROUP BY t1.f1;
+avg(t2.f1)
+SELECT avg(t2.f1) FROM t1, t2 where t2.f2 = 'SIR' GROUP BY t1.f1;
+avg(t2.f1)
+DROP TABLE t1, t2;
 create table t1 (c1 char(3), c2 char(3));
 create table t2 (c3 char(3), c4 char(3));
 insert into t1 values ('aaa', 'bb1'), ('aaa', 'bb2');
--- a/mysql-test/r/innodb-big.result
+++ b/mysql-test/r/innodb-big.result
@@ -32,3 +32,69 @@ select sum(id) from t3;
 sum(id)
 2199024304128
 drop table t1,t2,t3,t4;
+CREATE TABLE t1 (f1 int NOT NULL) ENGINE=InnoDB;
+CREATE TABLE t2 (f2 int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT) ENGINE=InnoDB;
+CREATE TRIGGER t1_bi before INSERT
+ON t1 FOR EACH ROW
+BEGIN
+DECLARE CONTINUE HANDLER FOR SQLSTATE '40001' SET @a:= 'deadlock';
+DECLARE CONTINUE HANDLER FOR SQLEXCEPTION SET @a:= 'exception';
+INSERT INTO t2 (f2) VALUES (1);
+DELETE FROM t2 WHERE f2 = 1;
+END;|
+CREATE PROCEDURE proc24989()
+BEGIN
+DECLARE CONTINUE HANDLER FOR SQLSTATE '40001' SET @b:= 'deadlock';
+DECLARE CONTINUE HANDLER FOR SQLEXCEPTION SET @a:= 'exception';
+INSERT INTO t2 (f2) VALUES (1);
+DELETE FROM t2 WHERE f2 = 1;
+END;|
+create procedure proc24989_2()
+deterministic
+begin
+declare continue handler for sqlexception
+select 'Outer handler' as 'exception';
+insert into t1 values(1);
+select "continued";
+end|
+start transaction;
+insert into t1 values(1);
+start transaction;
+insert into t2 values(123);
+insert into t1 values(1);
+insert into t1 values(1);
+ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
+select @a;
+@a
+NULL
+select * from t2;
+f2
+commit;
+start transaction;
+insert into t1 values(1);
+start transaction;
+insert into t2 values(123);
+call proc24989();
+insert into t1 values(1);
+select @a,@b;
+@a	@b
+exception	deadlock
+select * from t2;
+f2
+commit;
+start transaction;
+insert into t1 values(1);
+start transaction;
+insert into t2 values(123);
+call proc24989_2();
+insert into t1 values(1);
+commit;
+exception
+Outer handler
+continued
+continued
+select * from t2;
+f2
+drop procedure proc24989;
+drop procedure proc24989_2;
+drop table t1,t2;
--- a/mysql-test/r/innodb_mysql.result
+++ b/mysql-test/r/innodb_mysql.result
@@ -418,7 +418,7 @@ DROP TABLE t1,t2;
 create table t1(f1 varchar(800) binary not null, key(f1)) engine = innodb 
 character set utf8 collate utf8_general_ci;
 Warnings:
-Warning	1071	Specified key was too long; max key length is 765 bytes
+Warning	1071	Specified key was too long; max key length is 767 bytes
 insert into t1 values('aaa');
 drop table t1;
 CREATE TABLE t1 (a INT PRIMARY KEY, b INT, c FLOAT, KEY b(b)) ENGINE = INNODB;
@@ -739,6 +739,34 @@ drop table if exists t1;
 create table t1 (a int) engine=innodb;
 alter table t1 alter a set default 1;
 drop table t1;
+
+Bug#24918 drop table and lock / inconsistent between 
+perm and temp tables
+
+Check transactional tables under LOCK TABLES
+
+drop table if exists t24918, t24918_tmp, t24918_trans, t24918_trans_tmp, 
+t24918_access;
+create table t24918_access (id int);
+create table t24918 (id int) engine=myisam;
+create temporary table t24918_tmp (id int) engine=myisam;
+create table t24918_trans (id int) engine=innodb;
+create temporary table t24918_trans_tmp (id int) engine=innodb;
+lock table t24918 write, t24918_tmp write, t24918_trans write, t24918_trans_tmp write;
+drop table t24918;
+select * from t24918_access;
+ERROR HY000: Table 't24918_access' was not locked with LOCK TABLES
+drop table t24918_trans;
+select * from t24918_access;
+ERROR HY000: Table 't24918_access' was not locked with LOCK TABLES
+drop table t24918_trans_tmp;
+select * from t24918_access;
+ERROR HY000: Table 't24918_access' was not locked with LOCK TABLES
+drop table t24918_tmp;
+select * from t24918_access;
+ERROR HY000: Table 't24918_access' was not locked with LOCK TABLES
+unlock tables;
+drop table t24918_access;
 CREATE TABLE t1 (a int, b int, PRIMARY KEY (a), KEY bkey (b)) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1,2),(3,2),(2,2),(4,2),(5,2),(6,2),(7,2),(8,2);
 INSERT INTO t1 SELECT a + 8, 2 FROM t1;
@@ -1007,4 +1035,16 @@ CALL p1();
 CALL p1();
 DROP PROCEDURE p1;
 DROP TABLE t1;
+create table t1(a text) engine=innodb default charset=utf8;
+insert into t1 values('aaa');
+alter table t1 add index(a(1024));
+Warnings:
+Warning	1071	Specified key was too long; max key length is 767 bytes
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` text,
+  KEY `a` (`a`(255))
+) ENGINE=InnoDB DEFAULT CHARSET=utf8
+drop table t1;
 End of 5.0 tests
--- a/mysql-test/r/insert_select.result
+++ b/mysql-test/r/insert_select.result
@@ -699,6 +699,32 @@ Handler_read_prev	0
 Handler_read_rnd	0
 Handler_read_rnd_next	1
 DROP TABLE t1;
+CREATE TABLE t1 (
+f1 int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
+f2 varchar(100) NOT NULL default ''
+);
+CREATE TABLE t2 (
+f1 varchar(10) NOT NULL default '',
+f2 char(3) NOT NULL default '',
+PRIMARY KEY  (`f1`),
+KEY `k1` (`f2`, `f1`)
+);
+INSERT INTO t1 values(NULL, '');
+INSERT INTO `t2` VALUES ('486878','WDT'),('486910','WDT');
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+1
+SELECT min(t2.f1) FROM t1, t2 where t2.f2 = 'SIR' GROUP BY t1.f1;
+min(t2.f1)
+INSERT INTO t1 (f2)
+SELECT min(t2.f1) FROM t1, t2 where t2.f2 = 'SIR' GROUP BY t1.f1;
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+1
+SELECT * FROM t1;
+f1	f2
+1	
+DROP TABLE t1, t2;
 CREATE TABLE t1 (x int, y int);
 CREATE TABLE t2 (z int, y int);
 CREATE TABLE t3 (a int, b int);
--- a/mysql-test/r/mix_innodb_myisam_binlog.result
+++ b/mysql-test/r/mix_innodb_myisam_binlog.result
@@ -280,3 +280,116 @@ select
@a like "%#%error_code=0%ROLLBACK/*!*/;%ROLLBACK /* added by mysqlbinlog */;%"	@a not like "%#%error_code=%error_code=%"
 1	1
 drop table t1, t2;
+create temporary table tt (a int unique);
+create table ti (a int) engine=innodb;
+reset master;
+show master status;
+File	Position	Binlog_Do_DB	Binlog_Ignore_DB
+master-bin.000001	98		
+begin;
+insert into ti values (1);
+insert into ti values (2) ;
+insert into tt select * from ti;
+rollback;
+Warnings:
+Warning	1196	Some non-transactional changed tables couldn't be rolled back
+select count(*) from tt /* 2 */;
+count(*)
+2
+show master status;
+File	Position	Binlog_Do_DB	Binlog_Ignore_DB
+master-bin.000001	507		
+show binlog events from 98;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	1	#	use `test`; BEGIN
+master-bin.000001	#	Query	1	#	use `test`; insert into ti values (1)
+master-bin.000001	#	Query	1	#	use `test`; insert into ti values (2)
+master-bin.000001	#	Query	1	#	use `test`; insert into tt select * from ti
+master-bin.000001	#	Query	1	#	use `test`; ROLLBACK
+select count(*) from ti /* zero */;
+count(*)
+0
+insert into ti select * from tt;
+select * from ti /* that is what slave would miss - a bug */;
+a
+1
+2
+delete from ti;
+delete from tt where a=1;
+reset master;
+show master status;
+File	Position	Binlog_Do_DB	Binlog_Ignore_DB
+master-bin.000001	98		
+begin;
+insert into ti values (1);
+insert into ti values (2) /* to make the dup error in the following */;
+insert into tt select * from ti /* one affected and error */;
+ERROR 23000: Duplicate entry '2' for key 1
+rollback;
+Warnings:
+Warning	1196	Some non-transactional changed tables couldn't be rolled back
+show master status;
+File	Position	Binlog_Do_DB	Binlog_Ignore_DB
+master-bin.000001	581		
+show binlog events from 98;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	1	#	use `test`; BEGIN
+master-bin.000001	#	Query	1	#	use `test`; insert into ti values (1)
+master-bin.000001	#	Query	1	#	use `test`; insert into ti values (2) /* to make the dup error in the following */
+master-bin.000001	#	Query	1	#	use `test`; insert into tt select * from ti /* one affected and error */
+master-bin.000001	#	Query	1	#	use `test`; ROLLBACK
+select count(*) from ti /* zero */;
+count(*)
+0
+insert into ti select * from tt;
+select * from tt /* that is what otherwise slave missed - the bug */;
+a
+1
+2
+drop table ti;
+drop function if exists bug27417;
+drop table if exists t1,t2;
+CREATE TABLE t1 (a int NOT NULL auto_increment primary key) ENGINE=MyISAM;
+CREATE TABLE t2 (a int NOT NULL auto_increment, PRIMARY KEY (a));
+create function bug27417(n int) 
+RETURNS int(11)
+begin
+insert into t1 values (null);
+return n;
+end|
+reset master;
+insert into t2 values (bug27417(1));
+insert into t2 select bug27417(2);
+reset master;
+insert into t2 values (bug27417(2));
+ERROR 23000: Duplicate entry '2' for key 1
+show master status;
+File	Position	Binlog_Do_DB	Binlog_Ignore_DB
+master-bin.000001	98		
+/* only (!) with fixes for #23333 will show there is the query */;
+select count(*) from t1 /* must be 3 */;
+count(*)
+3
+reset master;
+select count(*) from t2;
+count(*)
+2
+delete from t2 where a=bug27417(3);
+select count(*) from t2 /* nothing got deleted */;
+count(*)
+2
+show master status;
+File	Position	Binlog_Do_DB	Binlog_Ignore_DB
+master-bin.000001	195		
+/* the query must be in regardless of #23333 */;
+select count(*) from t1 /* must be 5 */;
+count(*)
+5
+delete t2 from t2 where t2.a=bug27417(100) /* must not affect t2 */;
+affected rows: 0
+select count(*) from t1 /* must be 7 */;
+count(*)
+7
+drop function bug27417;
+drop table t1,t2;
+end of tests
--- a/mysql-test/r/mysqlbinlog.result
+++ b/mysql-test/r/mysqlbinlog.result
@@ -318,4 +318,11 @@ INSERT INTO t1 VALUES ('0123456789');
 flush logs;
 DROP TABLE t1;
 # 	Query	thread_id=REMOVED	exec_time=REMOVED	error_code=REMOVED
+flush logs;
+create table t1(a int);
+insert into t1 values(connection_id());
+flush logs;
+drop table t1;
+1
+drop table t1;
 End of 5.0 tests
--- a/mysql-test/r/mysqldump-max.result
+++ b/mysql-test/r/mysqldump-max.result
@@ -93,55 +93,73 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l

 USE `test`;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `id` int(8) default NULL,
  `name` varchar(32) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
 INSERT  DELAYED IGNORE INTO `t1` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t2`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t2` (
  `id` int(8) default NULL,
  `name` varchar(32) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
 INSERT  DELAYED IGNORE INTO `t2` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
 /*!40000 ALTER TABLE `t2` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t3`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t3` (
  `id` int(8) default NULL,
  `name` varchar(32) default NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 /*!40000 ALTER TABLE `t3` DISABLE KEYS */;
 INSERT  DELAYED IGNORE INTO `t3` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
 /*!40000 ALTER TABLE `t3` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t4`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t4` (
  `id` int(8) default NULL,
  `name` varchar(32) default NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 /*!40000 ALTER TABLE `t4` DISABLE KEYS */;
 INSERT  DELAYED IGNORE INTO `t4` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
 /*!40000 ALTER TABLE `t4` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t5`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t5` (
  `id` int(8) default NULL,
  `name` varchar(32) default NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 /*!40000 ALTER TABLE `t5` DISABLE KEYS */;
 INSERT  DELAYED IGNORE INTO `t5` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
 /*!40000 ALTER TABLE `t5` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t6`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t6` (
  `id` int(8) default NULL,
  `name` varchar(32) default NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 /*!40000 ALTER TABLE `t6` DISABLE KEYS */;
 INSERT  IGNORE INTO `t6` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
@@ -172,55 +190,73 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l

 USE `test`;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `id` int(8) default NULL,
  `name` varchar(32) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
 INSERT  DELAYED INTO `t1` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t2`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t2` (
  `id` int(8) default NULL,
  `name` varchar(32) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
 INSERT  DELAYED INTO `t2` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
 /*!40000 ALTER TABLE `t2` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t3`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t3` (
  `id` int(8) default NULL,
  `name` varchar(32) default NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 /*!40000 ALTER TABLE `t3` DISABLE KEYS */;
 INSERT  DELAYED INTO `t3` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
 /*!40000 ALTER TABLE `t3` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t4`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t4` (
  `id` int(8) default NULL,
  `name` varchar(32) default NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 /*!40000 ALTER TABLE `t4` DISABLE KEYS */;
 INSERT  DELAYED INTO `t4` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
 /*!40000 ALTER TABLE `t4` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t5`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t5` (
  `id` int(8) default NULL,
  `name` varchar(32) default NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 /*!40000 ALTER TABLE `t5` DISABLE KEYS */;
 INSERT  DELAYED INTO `t5` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
 /*!40000 ALTER TABLE `t5` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t6`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t6` (
  `id` int(8) default NULL,
  `name` varchar(32) default NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 /*!40000 ALTER TABLE `t6` DISABLE KEYS */;
 INSERT INTO `t6` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
--- a/mysql-test/r/mysqldump.result
+++ b/mysql-test/r/mysqldump.result
@@ -28,9 +28,12 @@ DROP TABLE t1;
 CREATE TABLE t1 (a decimal(64, 20));
 INSERT INTO t1 VALUES ("1234567890123456789012345678901234567890"),
 ("0987654321098765432109876543210987654321");
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` decimal(64,20) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 INSERT INTO `t1` VALUES ('1234567890123456789012345678901234567890.00000000000000000000'),('987654321098765432109876543210987654321.00000000000000000000');
 DROP TABLE t1;
 #
@@ -40,9 +43,12 @@ CREATE TABLE t1 (a double);
 INSERT INTO t1 VALUES ('-9e999999');
 Warnings:
 Warning	1264	Out of range value adjusted for column 'a' at row 1
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` double default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 INSERT INTO `t1` VALUES (RES);
 DROP TABLE t1;
 #
@@ -58,15 +64,21 @@ INSERT INTO t1 VALUES ('1.2345', 2.3456);
 INSERT INTO t1 VALUES ("1.2345", 2.3456);
 ERROR 42S22: Unknown column '1.2345' in 'field list'
 SET SQL_MODE=@OLD_SQL_MODE;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` decimal(10,5) default NULL,
  `b` float default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 INSERT INTO `t1` VALUES ('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456);
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` decimal(10,5) default NULL,
  `b` float default NULL
 );
+SET character_set_client = @saved_cs_client;
 INSERT INTO `t1` VALUES ('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456);

 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
@@ -80,10 +92,13 @@ INSERT INTO `t1` VALUES ('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456)
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` decimal(10,5) default NULL,
  `b` float default NULL
 );
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -106,10 +121,13 @@ UNLOCK TABLES;
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` decimal(10,5) default NULL,
  `b` float default NULL
 );
+SET character_set_client = @saved_cs_client;

 INSERT INTO `t1` VALUES ('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456);
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -185,9 +203,12 @@ INSERT INTO t1  VALUES (_koi8r x'C1C2C3C4C5'), (NULL);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` varchar(255) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=koi8r;
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -218,9 +239,12 @@ INSERT INTO t1 VALUES (1), (2);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL40' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` int(11) default NULL
 ) TYPE=MyISAM;
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -241,9 +265,12 @@ UNLOCK TABLES;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` int(11) default NULL
 ) TYPE=MyISAM;
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -262,9 +289,12 @@ DROP TABLE t1;
 # Bug #2592 'mysqldump doesn't quote "tricky" names correctly'
 #
 create table ```a` (i int);
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE ```a` (
  `i` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 drop table ```a`;
 #
 # Bug #2591 "mysqldump quotes names inconsistently"
@@ -282,9 +312,12 @@ create table t1(a int);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -307,9 +340,12 @@ UNLOCK TABLES;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,ANSI' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS "t1";
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE "t1" (
  "a" int(11) default NULL
 );
+SET character_set_client = @saved_cs_client;

 LOCK TABLES "t1" WRITE;
 /*!40000 ALTER TABLE "t1" DISABLE KEYS */;
@@ -335,9 +371,12 @@ set global sql_mode='ANSI_QUOTES';
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -360,9 +399,12 @@ UNLOCK TABLES;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,ANSI' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS "t1";
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE "t1" (
  "a" int(11) default NULL
 );
+SET character_set_client = @saved_cs_client;

 LOCK TABLES "t1" WRITE;
 /*!40000 ALTER TABLE "t1" DISABLE KEYS */;
@@ -392,9 +434,12 @@ insert into t1 values (1),(2),(3);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;

@@ -483,9 +528,12 @@ INSERT INTO t1  VALUES (_latin1 '
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` char(10) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -516,9 +564,12 @@ UNLOCK TABLES;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` char(10) default NULL
 ) TYPE=MyISAM;
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -539,9 +590,12 @@ UNLOCK TABLES;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` char(10) default NULL
 ) TYPE=MyISAM;
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -562,9 +616,12 @@ UNLOCK TABLES;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` char(10) default NULL
 ) TYPE=MyISAM;
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -598,9 +655,12 @@ INSERT INTO t2 VALUES (4),(5),(6);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t2`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t2` (
  `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t2` WRITE;
 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
@@ -636,9 +696,12 @@ INSERT INTO `t1` VALUES (0x602010000280100005E71A);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `b` blob
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -674,9 +737,12 @@ INSERT INTO t1 VALUES (4),(5),(6);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -705,9 +771,12 @@ UNLOCK TABLES;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
 INSERT  DELAYED IGNORE INTO `t1` VALUES (1),(2),(3),(4),(5),(6);
@@ -1071,6 +1140,8 @@ insert into t1 (F_8d3bba7425e7c98c50f52ca1b52d3735) values (1);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `F_c4ca4238a0b923820dcc509a6f75849b` int(11) default NULL,
  `F_c81e728d9d4c2f636f067f89cc14862c` int(11) default NULL,
@@ -1403,6 +1474,7 @@ CREATE TABLE `t1` (
  `F_6faa8040da20ef399b63a72d0e4ab575` int(11) default NULL,
  `F_fe73f687e5bc5280214e0486b273a5f9` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -1443,9 +1515,12 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l

 USE `test`;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -1484,13 +1559,19 @@ INSERT INTO t2 VALUES (1), (2);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 DROP TABLE IF EXISTS `t2`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t2` (
  `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;

 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
@@ -1513,13 +1594,19 @@ CREATE TABLE `t2` (
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 DROP TABLE IF EXISTS `t2`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t2` (
  `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;

 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
@@ -1719,17 +1806,26 @@ create table t3(a int);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t3`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t3` (
  `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 DROP TABLE IF EXISTS `t2`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t2` (
  `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;

 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
@@ -1759,9 +1855,12 @@ mysqldump: Got error: 1064: You have an error in your SQL syntax; check the manu
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;

@@ -1792,12 +1891,15 @@ insert into t1 values (0815, 4711, 2006);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,ANSI' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS "t1";
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE "t1" (
  "a b" int(11) NOT NULL default '0',
  "c""d" int(11) NOT NULL default '0',
  "e`f" int(11) NOT NULL default '0',
  PRIMARY KEY  ("a b","c""d","e`f")
 );
+SET character_set_client = @saved_cs_client;

 LOCK TABLES "t1" WRITE;
 /*!40000 ALTER TABLE "t1" DISABLE KEYS */;
@@ -1823,12 +1925,15 @@ UNLOCK TABLES;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a b` int(11) NOT NULL default '0',
  `c"d` int(11) NOT NULL default '0',
  `e``f` int(11) NOT NULL default '0',
  PRIMARY KEY  (`a b`,`c"d`,`e``f`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -1874,10 +1979,13 @@ create view v2 as select * from t2 where a like 'a%' with check option;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t2`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t2` (
  `a` varchar(30) default NULL,
  KEY `a` (`a`(5))
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t2` WRITE;
 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
@@ -1955,9 +2063,12 @@ create view v1 as select * from t1;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -2012,10 +2123,13 @@ create view v2 as select * from t2 where a like 'a%' with check option;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t2`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t2` (
  `a` varchar(30) default NULL,
  KEY `a` (`a`(5))
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t2` WRITE;
 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
@@ -2064,9 +2178,12 @@ INSERT INTO t1 VALUES ('\'');
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` char(10) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -2107,11 +2224,14 @@ select v3.a from v3, v1 where v1.a=v3.a and v3.b=3 limit 1;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` int(11) default NULL,
  `b` int(11) default NULL,
  `c` varchar(30) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -2227,10 +2347,13 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l

 USE `test`;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` int(11) default NULL,
  `b` bigint(20) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -2264,9 +2387,12 @@ end */;;
 DELIMITER ;
 /*!50003 SET SESSION SQL_MODE=@SAVE_SQL_MODE*/;
 DROP TABLE IF EXISTS `t2`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t2` (
  `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t2` WRITE;
 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
@@ -2311,10 +2437,13 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l

 USE `test`;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` int(11) default NULL,
  `b` bigint(20) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -2322,9 +2451,12 @@ INSERT INTO `t1` VALUES (1,NULL),(2,NULL),(4,NULL),(11,NULL);
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
 UNLOCK TABLES;
 DROP TABLE IF EXISTS `t2`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t2` (
  `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t2` WRITE;
 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
@@ -2448,9 +2580,12 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l

 USE `test`;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `id` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -2538,10 +2673,13 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l

 USE `test`;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `d` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
  UNIQUE KEY `d` (`d`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -2572,10 +2710,13 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l

 USE `test`;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `d` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
  UNIQUE KEY `d` (`d`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -2622,9 +2763,12 @@ a2
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,ANSI' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS "t1 test";
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE "t1 test" (
  "a1" int(11) default NULL
 );
+SET character_set_client = @saved_cs_client;

 LOCK TABLES "t1 test" WRITE;
 /*!40000 ALTER TABLE "t1 test" DISABLE KEYS */;
@@ -2642,9 +2786,12 @@ INSERT INTO `t2 test` SET a2 = NEW.a1; END */;;
 DELIMITER ;
 /*!50003 SET SESSION SQL_MODE=@SAVE_SQL_MODE*/;
 DROP TABLE IF EXISTS "t2 test";
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE "t2 test" (
  "a2" int(11) default NULL
 );
+SET character_set_client = @saved_cs_client;

 LOCK TABLES "t2 test" WRITE;
 /*!40000 ALTER TABLE "t2 test" DISABLE KEYS */;
@@ -2693,11 +2840,14 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l

 USE `test`;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` int(11) default NULL,
  `b` varchar(32) default NULL,
  `c` varchar(32) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -2785,9 +2935,12 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l

 USE `test`;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -2833,10 +2986,13 @@ insert into t1 values ('','');
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` binary(1) default NULL,
  `b` blob
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -2865,10 +3021,13 @@ UNLOCK TABLES;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` binary(1) default NULL,
  `b` blob
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -3023,9 +3182,12 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqldump_test_db` /*!40100 DEFAULT CH

 USE `mysqldump_test_db`;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `id` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -3070,11 +3232,14 @@ create view nasishnasifu as select mysqldump_tables.basetable.id from mysqldump_
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqldump_tables` /*!40100 DEFAULT CHARACTER SET latin1 */;

 USE `mysqldump_tables`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `basetable` (
  `id` bigint(20) unsigned NOT NULL auto_increment,
  `tag` varchar(64) default NULL,
  UNIQUE KEY `id` (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqldump_views` /*!40100 DEFAULT CHARACTER SET latin1 */;

@@ -3142,10 +3307,13 @@ mysqldump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need the SU
 mysqldump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need the SUPER,REPLICATION CLIENT privilege for this operation (1227)
 grant REPLICATION CLIENT on *.* to mysqltest_1@localhost;
 CHANGE MASTER TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=537;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` int(11) default NULL,
  `b` varchar(34) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
 drop table t1;
 drop user mysqltest_1@localhost;
 #
@@ -3234,22 +3402,31 @@ CREATE TABLE t1 (a int) ENGINE=merge UNION=(t2, t3);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` int(11) default NULL
 ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=(`t2`,`t3`);
+SET character_set_client = @saved_cs_client;
 DROP TABLE IF EXISTS `t2`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t2` (
  `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t2` WRITE;
 /*!40000 ALTER TABLE `t2` DISABLE KEYS */;
 /*!40000 ALTER TABLE `t2` ENABLE KEYS */;
 UNLOCK TABLES;
 DROP TABLE IF EXISTS `t3`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t3` (
  `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t3` WRITE;
 /*!40000 ALTER TABLE `t3` DISABLE KEYS */;
@@ -3325,10 +3502,13 @@ drop database mysqldump_test_db;
 #
 CREATE TABLE t1 (c1 INT, c2 LONGBLOB);
 INSERT INTO t1 SET c1=11, c2=REPEAT('q',509);
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `c1` int(11) default NULL,
  `c2` longblob
 );
+SET character_set_client = @saved_cs_client;
 INSERT INTO `t1` VALUES (11,0x7171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171);
 DROP TABLE t1;
 #
--- a/mysql-test/r/openssl_1.result
+++ b/mysql-test/r/openssl_1.result
@@ -77,9 +77,12 @@ INSERT INTO t1 VALUES (1), (2);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` int(11) default NULL
 );
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -108,9 +111,12 @@ UNLOCK TABLES;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` int(11) default NULL
 );
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
@@ -139,9 +145,12 @@ UNLOCK TABLES;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 DROP TABLE IF EXISTS `t1`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE `t1` (
  `a` int(11) default NULL
 );
+SET character_set_client = @saved_cs_client;

 LOCK TABLES `t1` WRITE;
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
--- a/mysql-test/r/query_cache.result
+++ b/mysql-test/r/query_cache.result
@@ -1467,6 +1467,125 @@ insert into t1 values ('c');
 a
 drop table t1;
 set GLOBAL query_cache_size= default;
+SET GLOBAL query_cache_size=64*1024*1024;
+CREATE TABLE t1 (id INT);
+CREATE PROCEDURE proc29856(IN theUPC TEXT)
+BEGIN
+SET @stmtStr := '';
+SELECT CONCAT("SELECT id FROM t1 WHERE id IN (",theUPC,")") INTO @stmtStr;
+PREPARE stmt FROM @stmtStr;
+EXECUTE stmt;
+END |
+CALL proc29856('1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,
+25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,
+51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,
+77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,
+102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,
+121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,
+140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,
+159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,
+178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,
+197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,
+216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,
+235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,
+254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,
+273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,
+292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,
+311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,
+330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,
+349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,
+368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385,386,
+387,388,389,390,391,392,393,394,395,396,397,398,399,400,401,402,403,404,405,
+406,407,408,409,410,411,412,413,414,415,416,417,418,419,420,421,422,423,424,
+425,426,427,428,429,430,431,432,433,434,435,436,437,438,439,440,441,442,443,
+444,445,446,447,448,449,450,451,452,453,454,455,456,457,458,459,460,461,462,
+463,464,465,466,467,468,469,470,471,472,473,474,475,476,477,478,479,480,481,
+482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,
+501,502,503,504,505,506,507,508,509,510,511,512,513,514,515,516,517,518,519,
+520,521,522,523,524,525,526,527,528,529,530,531,532,533,534,535,536,537,538,
+539,540,541,542,543,544,545,546,547,548,549,550,551,552,553,554,555,556,557,
+558,559,560,561,562,563,564,565,566,567,568,569,570,571,572,573,574,575,576,
+577,578,579,580,581,582,583,584,585,586,587,588,589,590,591,592,593,594,595,
+596,597,598,599,600,601,602,603,604,605,606,607,608,609,610,611,612,613,614,
+615,616,617,618,619,620,621,622,623,624,625,626,627,628,629,630,631,632,633,
+634,635,636,637,638,639,640,641,642,643,644,645,646,647,648,649,650,651,652,
+653,654,655,656,657,658,659,660,661,662,663,664,665,666,667,668,669,670,671,
+672,673,674,675,676,677,678,679,680,681,682,683,684,685,686,687,688,689,690,
+691,692,693,694,695,696,697,698,699,700,701,702,703,704,705,706,707,708,709,
+710,711,712,713,714,715,716,717,718,719,720,721,722,723,724,725,726,727,728,
+729,730,731,732,733,734,735,736,737,738,739,740,741,742,743,744,745,746,747,
+748,749,750,751,752,753,754,755,756,757,758,759,760,761,762,763,764,765,766,
+767,768,769,770,771,772,773,774,775,776,777,778,779,780,781,782,783,784,785,
+786,787,788,789,790,791,792,793,794,795,796,797,798,799,800,801,802,803,804,
+805,806,807,808,809,810,811,812,813,814,815,816,817,818,819,820,821,822,823,
+824,825,826,827,828,829,830,831,832,833,834,835,836,837,838,839,840,841,842,
+843,844,845,846,847,848,849,850,851,852,853,854,855,856,857,858,859,860,861,
+862,863,864,865,866,867,868,869,870,871,872,873,874,875,876,877,878,879,880,
+881,882,883,884,885,886,887,888,889,890,891,892,893,894,895,896,897,898,899,
+900,901,902,903,904,905,906,907,908,909,910,911,912,913,914,915,916,917,918,
+919,920,921,922,923,924,925,926,927,928,929,930,931,932,933,934,935,936,937,
+938,939,940,941,942,943,944,945,946,947,948,949,950,951,952,953,954,955,956,
+957,958,959,960,961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,
+976,977,978,979,980,981,982,983,984,985,986,987,988,989,990,991,992,993,994,
+995,996,997,998,999,1000,1001,1002,1003,1004,1005,1006,1007,1008,1009,1010,
+1011,1012,1013,1014,1015,1016,1017,1018,1019,1020,1021,1022,1023,1024,1025,
+1026,1027,1028,1029,1030,1031,1032,1033,1034,1035,1036,1037,1038,1039,1040,
+1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,
+1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,
+1071,1072,1073,1074,1075,1076,1077,1078,1079,1080,1081,1082,1083,1084,1085,
+1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,
+1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1111,1112,1113,1114,1115,
+1116,1117,1118,1119,1120,1121,1122,1123,1124,1125,1126,1127,1128,1129,1130,
+1131,1132,1133,1134,1135,1136,1137,1138,1139,1140,1141,1142,1143,1144,1145,
+1146,1147,1148,1149,1150,1151,1152,1153,1154,1155,1156,1157,1158,1159,1160,
+1161,1162,1163,1164,1165,1166,1167,1168,1169,1170,1171,1172,1173,1174,1175,
+1176,1177,1178,1179,1180,1181,1182,1183,1184,1185,1186,1187,1188,1189,1190,
+1191,1192,1193,1194,1195,1196,1197,1198,1199,1200,1201,1202,1203,1204,1205,
+1206,1207,1208,1209,1210,1211,1212,1213,1214,1215,1216,1217,1218,1219,1220,
+1221,1222,1223,1224,1225,1226,1227,1228,1229,1230,1231,1232,1233,1234,1235,
+1236,1237,1238,1239,1240,1241,1242,1243,1244,1245,1246,1247,1248,1249,1250,
+1251,1252,1253,1254,1255,1256,1257,1258,1259,1260,1261,1262,1263,1264,1265,
+1266,1267,1268,1269,1270,1271,1272,1273,1274,1275,1276,1277,1278,1279,1280,
+1281,1282,1283,1284,1285,1286,1287,1288,1289,1290,1291,1292,1293,1294,1295,
+1296,1297,1298,1299,1300,1301,1302,1303,1304,1305,1306,1307,1308,1309,1310,
+1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,
+1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,
+1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,
+1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,
+1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,
+1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,
+1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,
+1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,
+1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,
+1446,1447,1448,1449,1450,1451,1452,1453,1454,1455,1456,1457,1458,1459,1460,
+1461,1462,1463,1464,1465,1466,1467,1468,1469,1470,1471,1472,1473,1474,1475,
+1476,1477,1478,1479,1480,1481,1482,1483,1484,1485,1486,1487,1488,1489,1490,
+1491,1492,1493,1494,1495,1496,1497,1498,1499,1500,1501,1502,1503,1504,1505,
+1506,1507,1508,1509,1510,1511,1512,1513,1514,1515,1516,1517,1518,1519,1520,
+1521,1522,1523,1524,1525,1526,1527,1528,1529,1530,1531,1532,1533,1534,1535,
+1536,1537,1538,1539,1540,1541,1542,1543,1544,1545,1546,1547,1548,1549,1550,
+1551,1552,1553,1554,1555,1556,1557,1558,1559,1560,1561,1562,1563,1564,1565,
+1566,1567,1568,1569,1570,1571,1572,1573,1574,1575,1576,1577,1578,1579,1580,
+1581,1582,1583,1584,1585,1586,1587,1588,1589,1590,1591,1592,1593,1594,1595,
+1596,1597,1598,1599,1600,1601,1602,1603,1604,1605,1606,1607,1608,1609,1610,
+1611,1612,1613,1614,1615,1616,1617,1618,1619,1620,1621,1622,1623,1624,1625,
+1626,1627,1628,1629,1630,1631,1632,1633,1634,1635,1636,1637,1638,1639,1640,
+1641,1642,1643,1644,1645,1646,1647,1648,1649,1650,1651,1652,1653,1654,1655,
+1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,
+1671,1672,1673,1674,1675,1676,1677,1678,1679,1680,1681,1682,1683,1684,1685,
+1686,1687,1688,1689,1690,1691,1692,1693,1694,1695,1696,1697,1698,1699,1700,
+1701,1702,1703,1704,1705,1706,1707,1708,1709,1710,1711,1712,1713,1714,1715,
+1716,1717,1718,1719,1720,1721,1722,1723,1724,1725,1726,1727,1728,1729,1730,
+1731,1732,1733,1734,1735,1736,1737,1738,1739,1740,1741,1742,1743,1744,1745,
+1746,1747,1748,1749,1750,1751,1752,1753,1754,1755,1756,1757,1758,1759,1760,
+1761,1762,1763,1764,1765,1766,1767,1768,1769,1770,1771,1772,1773,1774,1775,
+1776,1777,1778,1779,1780,1781,1782,1783,1784,1785,1786,1787,1788,1789,1790,
+1791,1792,1793,1794,1795,1796,1797,1798,1799,1800,1801,1802,1803,1804,1805,
+1806,1807,1808,1809,1810,1811');
+id
+DROP PROCEDURE proc29856;
+DROP TABLE t1;
+SET GLOBAL query_cache_size= default;
 Bug#28249 Query Cache returns wrong result with concurrent insert/ certain lock
 set GLOBAL query_cache_type=1;
 set GLOBAL query_cache_limit=10000;
--- a/mysql-test/r/rpl_insert_delayed.result
+++ b/mysql-test/r/rpl_insert_delayed.result
@@ -29,3 +29,26 @@ id	name
 10	my name
 20	is Bond
 drop table t1;
+CREATE TABLE t1(a int, UNIQUE(a));
+INSERT DELAYED IGNORE INTO t1 VALUES(1);
+INSERT DELAYED IGNORE INTO t1 VALUES(1);
+flush table t1;
+show binlog events limit 11,100;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+x	x	x	x	x	use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
+x	x	x	x	x	use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
+x	x	x	x	x	use `test`; flush table t1
+select * from t1;
+a
+1
+On slave
+show binlog events limit 12,100;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+x	x	x	x	x	use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
+x	x	x	x	x	use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
+x	x	x	x	x	use `test`; flush table t1
+select * from t1;
+a
+1
+drop table t1;
+End of 5.0 tests
--- a/mysql-test/r/rpl_session_var.result
+++ b/mysql-test/r/rpl_session_var.result
@@ -41,3 +41,13 @@ select * from t2 order by b;
 b	a
 1	1
 drop table t1,t2;
+CREATE TABLE t1 (
+`id` int(11) NOT NULL auto_increment,
+`data` varchar(100),
+PRIMARY KEY  (`id`)
+) ENGINE=MyISAM;
+INSERT INTO t1(data) VALUES(SESSION_USER());
+SELECT * FROM t1;
+id	data
+1	
+drop table t1;
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -1088,6 +1088,26 @@ DROP TABLE t1;
 DROP VIEW v1;
 DROP PROCEDURE p1;
 DROP FUNCTION f1;
+set names koi8r;
+DROP DATABASE IF EXISTS mysqltest1;
+CREATE DATABASE mysqltest1;
+use mysqltest1;
+CREATE TABLE t1(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>1 INT);
+
+---> Dumping mysqltest1 to show_check.mysqltest1.sql
+
+
+DROP DATABASE mysqltest1;
+
+
+---> Restoring mysqltest1...
+SHOW CREATE TABLE mysqltest1.t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>1` int(11) default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+DROP DATABASE mysqltest1;
+use test;
 flush status;
 show variables like "log_queries_not_using_indexes";
 Variable_name	Value
@@ -1118,4 +1138,7 @@ select 1 from information_schema.tables limit 1;
 show status like 'slow_queries';
 Variable_name	Value
 Slow_queries	2
+show variables like 'myisam_recover_options';
+Variable_name	Value
+myisam_recover_options	OFF
 End of 5.0 tests
--- a/mysql-test/r/sp-prelocking.result
+++ b/mysql-test/r/sp-prelocking.result
@@ -289,4 +289,34 @@ create table t1 select f_bug22427() as i;
 ERROR 42S01: Table 't1' already exists
 drop table t1;
 drop function f_bug22427;
+#
+# Bug #29929 LOCK TABLES does not pre-lock tables used in triggers of the locked tables
+#
+DROP table IF EXISTS t1,t2;
+CREATE TABLE t1 (c1 INT);
+CREATE TABLE t2 (c2 INT);
+INSERT INTO t1 VALUES (1);
+INSERT INTO t2 VALUES (2);
+CREATE TRIGGER t1_ai AFTER INSERT ON t1 FOR EACH ROW
+BEGIN
+UPDATE t2 SET c2= c2 + 1;
+END//
+# Take a table lock on t1.
+# This should pre-lock t2 through the trigger.
+LOCK TABLE t1 WRITE;
+INSERT INTO t1 VALUES (3);
+UNLOCK TABLES;
+LOCK TABLE t1 READ;
+INSERT INTO t2 values(4);
+ERROR HY000: Table 't2' was not locked with LOCK TABLES
+UNLOCK TABLES;
+SELECT * FROM t1;
+c1
+1
+3
+SELECT * FROM t2;
+c2
+3
+DROP TRIGGER t1_ai;
+DROP TABLE t1, t2;
 End of 5.0 tests
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
@@ -1,5 +1,8 @@
 use test;
 drop table if exists t1,t2,t3,t4;
+drop view if exists v1;
+drop procedure if exists p1;
+drop procedure if exists p2;
 drop function if exists f1;
 drop function if exists f2;
 create table t1 (
@@ -6178,6 +6181,73 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 DROP VIEW v1;
 DROP FUNCTION metered;
 DROP TABLE t1;
+SET @p1_p2_cnt= 2;
+CREATE TABLE t1 (c1 INT);
+CREATE VIEW v1 AS SELECT * FROM t1;
+PREPARE s1 FROM 'SELECT c1 FROM v1';
+EXECUTE s1;
+c1
+EXECUTE s1;
+c1
+CREATE PROCEDURE p1(IN loops BIGINT(19) UNSIGNED)
+BEGIN
+WHILE loops > 0 DO
+SELECT c1 FROM v1;
+SET loops = loops - 1;
+END WHILE;
+END|
+CREATE PROCEDURE p2(IN loops BIGINT(19) UNSIGNED)
+BEGIN
+WHILE loops > 0 DO
+SELECT c1 FROM v1;
+CALL p1(@p1_p2_cnt);
+SET loops = loops - 1;
+END WHILE;
+END|
+CREATE FUNCTION f1(loops INT UNSIGNED)
+RETURNS INT
+BEGIN
+DECLARE tmp INT;
+WHILE loops > 0 DO
+SELECT c1 INTO tmp FROM v1;
+SET loops = loops - 1;
+END WHILE;
+RETURN loops;
+END|
+CALL p1(2);
+c1
+c1
+CALL p2(2);
+c1
+c1
+c1
+c1
+c1
+c1
+SELECT f1(2);
+f1(2)
+0
+Warnings:
+Warning	1329	No data - zero rows fetched, selected, or processed
+Warning	1329	No data - zero rows fetched, selected, or processed
+PREPARE s1 FROM 'SELECT f1(2)';
+EXECUTE s1;
+f1(2)
+0
+Warnings:
+Warning	1329	No data - zero rows fetched, selected, or processed
+Warning	1329	No data - zero rows fetched, selected, or processed
+EXECUTE s1;
+f1(2)
+0
+Warnings:
+Warning	1329	No data - zero rows fetched, selected, or processed
+Warning	1329	No data - zero rows fetched, selected, or processed
+DROP PROCEDURE p1;
+DROP PROCEDURE p2;
+DROP FUNCTION f1;
+DROP VIEW v1;
+DROP TABLE t1;
 drop database if exists mysqltest_db1;
 create database mysqltest_db1;
 create procedure mysqltest_db1.sp_bug28551() begin end;
@@ -6233,4 +6303,15 @@ DROP VIEW v1;
 DROP FUNCTION f1;
 DROP FUNCTION f2;
 DROP TABLE t1;
+SET NAMES latin1;
+CREATE PROCEDURE p1()
+BEGIN
+DECLARE <20><><EFBFBD> INT;
+SELECT <20><><EFBFBD>;
+END|
+CALL p1();
+<EFBFBD><EFBFBD><EFBFBD>
+NULL
+SET NAMES default;
+DROP PROCEDURE p1;
 End of 5.0 tests
--- a/mysql-test/r/ssl_8k_key.result
+++ b/mysql-test/r/ssl_8k_key.result
@@ -0,0 +1,2 @@
+Variable_name	Value
+Ssl_cipher	DHE-RSA-AES256-SHA
--- a/mysql-test/r/view.result
+++ b/mysql-test/r/view.result
@@ -3547,4 +3547,19 @@ a	b
 6	6
 DROP VIEW v1;
 DROP TABLE t1,t2,t3;
+create table t1 (i int);
+insert into t1 values (1), (2), (1), (3), (2), (4);
+create view v1 as select distinct i from t1;
+select * from v1;
+i
+1
+2
+3
+4
+select table_name, is_updatable from information_schema.views 
+where table_name = 'v1';
+table_name	is_updatable
+v1	NO
+drop view v1;
+drop table t1;
 End of 5.0 tests.
--- a/mysql-test/std_data/cacert.pem
+++ b/mysql-test/std_data/cacert.pem
--- a/mysql-test/std_data/client-cert.pem
+++ b/mysql-test/std_data/client-cert.pem
--- a/mysql-test/std_data/client-key.pem
+++ b/mysql-test/std_data/client-key.pem
--- a/mysql-test/std_data/server-cert.pem
+++ b/mysql-test/std_data/server-cert.pem
--- a/mysql-test/std_data/server-key.pem
+++ b/mysql-test/std_data/server-key.pem
--- a/mysql-test/std_data/server8k-cert.pem
+++ b/mysql-test/std_data/server8k-cert.pem
@@ -0,0 +1,51 @@
+-----BEGIN CERTIFICATE-----
+MIIJHDCCBQQCAQEwDQYJKoZIhvcNAQEEBQAwTjELMAkGA1UEBhMCU0UxEDAOBgNV
+BAgTB1VwcHNhbGExETAPBgNVBAoTCE15U1FMIEFCMQ0wCwYDVQQLEwRUZXN0MQsw
+CQYDVQQDEwJDQTAeFw0wNzA3MTMwNzU2MjVaFw0xMDA0MDgwNzU2MjVaMFoxCzAJ
+BgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRkwFwYDVQQKFBBNeVNRTCAgIAog
+ICAgIEFCMQ0wCwYDVQQLEwRUZXN0MQ8wDQYDVQQDEwZzZXJ2ZXIwggQiMA0GCSqG
+SIb3DQEBAQUAA4IEDwAwggQKAoIEAQDUFlh/3mwov5YaICFXOdJXgHV/uDkTjXB6
+9oxlipshQaYPX8LDT5vhI3gPciS1Z1sRE2dTcC4Mk2K4LDUIjp3WkeTfFAHZPV3E
+Y+3OH/ftH4N6SEIBTKE4EY6ah0nJtU98M0JhxOh5zHje6zQp1SkBnhEOQYexYRqj
+OtGloZ9RyF0iFAXcyu2Ap14u37l5Yla0cyPzvZqP4mFYlcXwaRfAacJmqMM1vuQv
+Fx1JITUTBugMF3VGZ1F0tw63EIUH/FW/WWncPqvG18na40qlv9ZkBw0FhZeKS8cK
+JIY5y4J30jn/eV8p1lTO7K+ASTuGZWmdRDgjUG0Y9OGuKsPPoaE6ml0HTnMBsBSQ
+fXUq9XkwGt8DTgPioAKHBHjLbILEy4FMYWrlTZlPTzNqyhayec/2T15oDladNSt7
+JpDLpX70UECXFhdEGxsGxtXdKbIBvNm2yT4X2nxW9ItsECjSSgD+94TgGoa8QKDw
+rpmgq+Wqpm54CZ1vN1oqyMUw1sjNEX/iLByHAjSALby2Kffk5cl5mnsR6d/k4jsi
+c3Qsciwkd+rQt/8VMhS2ns3nkez/BK3FvQA2Ms8xJhFLfszVrBhnjcFRTNT2+/KM
+lr1oT5Q1XZKL7qVXTpabPL51JlVBL5CSHl1QRkffsqfqcgJkcHBq+kKjUiFs4lad
+hTrvNBCXYa5+NkA2QqIfdOpNwl62/gdE7/7zU1uh40vkVKyzL+APkLPywPEXBOpQ
+yIDNkgoXmS10+JMD44K7uZyUmxZL7W7Xbi30NuEFrVOzoUmVXhapPbpQnkQHxn8n
+tqKPYXdBcvXcCKyJ6i79H2Vk9fM6rBYiwNcE7QyWqfd2QMjzr76veF04sXkPR+tG
+5Y1lrF9Zp3vabFXQg2RJuGA3rV6MR2GFNXuChIYu410vhIhPNtmdKEVoIVZsFsug
+dtn0PDCFrR8VEd/sshp0naNa9Ad1lY+marJkOJOVpPgCs2yJDPAUB/YdvSJ4avW
+6ZdvNTwhBL8fEJMS2DSqkaa6A3+i/SqITpU8ToJxsMGagBsLieXgvJALFysSRfR/
+2dmEu9/J0PPc28inHXwjiLb99VKlkuEz8wX9UkuoqFl0pLa8jrlM8hzdPQ9QHb3k
+9c5knfgPCYkOIWwGXH+NwANHdQRK7CmGAFV24k9+P3q0g5ikabVHr+4ZQ3WPd+1H
+K0+Msbb/vv53vFJWa+pYeNeFcwNCyW2kJBTMiI6qmlL4IWCcX+QDzpRLalbAWWHj
+l5Zk39QEaCL024DYK948IDXCqDg6utEs7YnMdaIF0meYMKjehZFp0fVQ8e8Od+rp
+bbjdj/w60wMgBpSOeYxVrs3QKNZd/if4Az3LggoVHB09SjXKiWpvAgMBAAEwDQYJ
+KoZIhvcNAQEEBQADggQBABncOBW0wQwJdEB6W3d9CrhFp40q1OM54GPfX0/0aUfP
+aOQPxS1uCKcFhxAmR4OT9RiJx+0bhDctekkuMkj5yy3u0a/4PxHIhnVxXTyB0/Hj
+N1gLz6cQricunl6Q4Ldi54gR5/KUehKLBWnqsfxhgzWBHosvhlJC0xh/uio7JTqz
+ns60djyL7R4wGbSqiGdhT9L2HfpJo3dmmWLDxe02jaHkbL1Z6NQMxrRgs3+gctp/
+Wd5UxNl4BHbNsSbzaK9V9gXUcj4TjZGGSqVki0+pEZ3dmksGZdoW9cSKtzKvgUQ6
+vhhqO4dcopxkY2zYeVOpspgTm0XLZSbNPXv5rSFwa4cpWSfD7u8o8KhHvkkSMahw
+cMuH17W4voHHFDtWP8Oq9rA7uE/4/LKCl0JmJl2RWM+G6PMH8w4X4auHPssgRvb/
+Ge1AvgqQJrvi7zWx3XYKKJ0ISBy7fi5Jo/wYgLagRYcG3mwdm1+gAdw+77C/ZGmG
+FbWFIPB1+Mc6azhhk9m/vqP7o/Wuncc99mp2zPMzdAEzuzp/IJ9UJNat0edA7jiC
+bQ7JSRJ1DSzdJZSWWHdardLNKipPfrEHVm7f5QvL5DQLnGpt+rCWL361KsGtvETC
+o+Ph7+kDJsJLokUYfs/BEZopzspNPy/NQ2ECwQp7T4Yq/PBE6Ce/dFaoZysMUOrG
+TcALtJW6It98dRmTJPiqjlrlHNTrfoV3Aiy+tK4rpyGuApSHc+1Y+t7YvWotRlQ4
+GEboBqR8evjDPJ1xAaUZqwLkebf3mlpl4MzHM9uNWBkQdJilkQs/IrAaApG3Ayt0
+nIymNHmDslBEdrRGmT4aNWAWYvVYzyKDy3H0fzYdWwuA9goJUL4tj3eMJa8pgEU/
+rG3HfflVi+xuwm1UnLXPSIE8hixgV8ebnwcCnEjlUBvwpl7f5Ub40jKcdycdGvVu
+gcTUzuRl1+Ikfk/MXKPbdi4A5Pjtz6AG4Ez9q5j7X77JqskTI5Z/f1RPiKwFBJHg
+cN4+BPnEuSWGcjiNDOfQxhk5exlWRf/gpEhnQpGHe3a7tZgfxHUb/pWU9BYpf8OH
+vtV3WSDXlUqsEEH6/bmvj8lmFWJLmeZv+qLy1wHxcXR9/GJ6TwCF8niQIl3MrBAL
+sKPLft1drmpqdIQpZQIJxtN/AQuD9mxEdW7XA6rkvFySKcswJpS1QjkSWpafCBWE
+wu+SPxZL8oFrnNMTU3JloUjcRp70FkNXLLm/Dy+MjW2qFBtIoBgNptVGp94L1uZS
+amd2XJMcOQ+X9fcH3wAdM3IHGn3NiLf6eTW92JNNA0IN6aNtyVaJKmFJ1JfXOl9r
+ujr4SorRSesaerjIcuzW1u1YE5RlgeI4kizV2/D5kYc=
+-----END CERTIFICATE-----
--- a/mysql-test/std_data/server8k-key.pem
+++ b/mysql-test/std_data/server8k-key.pem
@@ -0,0 +1,99 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIISKQIBAAKCBAEA1BZYf95sKL+WGiAhVznSV4B1f7g5E41wevaMZYqbIUGmD1/C
+w0+b4SN4D3IktWdbERNnU3AuDJNiuCw1CI6d1pHk3xQB2T1dxGPtzh/37R+DekhC
+AUyhOBGOmodJybVPfDNCYcToecx43us0KdUpAZ4RDkGHsWEaozrRpaGfUchdIhQF
+3MrtgKdeLt+5eWJWtHMj872aj+JhWJXF8GkXwGnCZqjDNb7kLxcdSSE1EwboDBd1
+RmdRdLcOtxCFB/xVv1lp3D6rxtfJ2uNKpb/WZAcNBYWXikvHCiSGOcuCd9I5/3lf
+KdZUzuyvgEk7hmVpnUQ4I1BtGPThrirDz6GhOppdB05zAbAUkH11KvV5MBrfA04D
+4qAChwR4y2yCxMuBTGFq5U2ZT08zasoWsnnP9k9eaA5WnTUreyaQy6V+9FBAlxYX
+RBsbBsbV3SmyAbzZtsk+F9p8VvSLbBAo0koA/veE4BqGvECg8K6ZoKvlqqZueAmd
+bzdaKsjFMNbIzRF/4iwchwI0gC28tin35OXJeZp7Eenf5OI7InN0LHIsJHfq0Lf/
+FTIUtp7N55Hs/wStxb0ANjLPMSYRS37M1awYZ43BUUzU9vvyjJa9aE+UNV2Si+6l
+V06Wmzy+dSZVQS+Qkh5dUEZH37Kn6nICZHBwavpCo1IhbOJWnYU67zQQl2GufjZA
+NkKiH3TqTcJetv4HRO/+81NboeNL5FSssy/gD5Cz8sDxFwTqUMiAzZIKF5ktdPiT
+A+OCu7mclJsWS+1u124t9DbhBa1Ts6FJlV4WqT26UJ5EB8Z/J7aij2F3QXL13Ais
+ieou/R9lZPXzOqwWIsDXBO0Mlqn3dkDI86++r3hdOLF5D0frRuWNZaxfWad72mxV
+0INkSbhgN61ejEdhhTV7goSGLuNdL4SITzbZnShFaCFWbBbLoPnbZ9Dwwha0fFRH
+f7LIadJ2jWvQHdZWPpmqyZDiTlaT4ArNsiQzwFAf2Hb0ieGr1umXbzU8IQS/HxCT
+Etg0qpGmugN/ov0qiE6VPE6CcbDBmoAbC4nl4LyQCxcrEkX0f9nZhLvfydDz3NvI
+px18I4i2/fVSpZLhM/MF/VJLqKhZdKS2vI65TPIc3T0PUB295PXOZJ34DwmJDiFs
+Blx/jcADR3UESuwphgBVduJPfj96tIOYpGm1R6/uGUN1j3ftRytPjLG2/77+d7xS
+VmvqWHjXhXMDQsltpCQUzIiOqppS+CFgnF/kA86US2pWwFlh45eWZN/UBGgi9NuA
+2CvePCA1wqg4OrrRLO2JzHWiBdJnmDCo3oWRadH1UPHvDnfq6W243Y/8OtMDIAaU
+jnmMVa7N0CjWXf4n+AM9y4IKFRwdPUo1yolqbwIDAQABAoIEAQDI3u0tFoWMRoCs
+99d8HLiaxYED2YC9gw2QeKjal198LQhRsVnu0ByMLKLOxkX8RgrbbmxDe5Exufob
+A0urciAOFJoXqoRhs5x2oEqgGmkf/ePx0jQptOFREFfnBdGeKIpC0O3DWdLxYPbt
+8wixwkEXVhVDUk9pcdXf2ZqsbBpQRBvpZdtzlgNCAcLTVHP/gmMqf48CkIauVjPq
+ydfybibfx4sm3hodclH+Q78p/zicb8MhiKo7ZymgCKz4N743pQe1tsLrpbPeHY0C
+MpoFyF8O2Bq+KxwvELxQX+19GcHVKJhj3hmCr4wde9BxCWtGTBCusekVkVvy8iQ5
+aCmTIrtonMEVZXjJlXK0sw5hBKOmKx0jrSVC5FfgdxzNVlW4fCJXLEEpMsjMc+/3
+6bV7jqGn4N5CYaopNS2ccxdaucE3NjcmofahO6bqUTJHSPFecfYmCA42W2m+ldjj
+HZ78JLkyw03nT1hjPjbwHf5FTem1KfKg4EJrDprowMT7D8KZb0SW+z59pFoDOM5u
+Heu6sOSUtvpvKfozdw2ZAI58dhpW4/jTfCEtewRhPqE3/V7g3haTnQFxU8gm/a4N
+uefZTCjFE16QWNuvnUrJWw/DlvOBY8GjpQCWY0mDeBHPNOI0Xg9oRTgOCrKSLUya
+YSbg6BmhSKwKsYQU834jrQb3fXFlXZVIxlcNePOWMhHFFNAHucHF822Nr7u/3FOT
+twcbBIOXCGfDT6ed8d4dNum1L7k9Blju16CWkfuciL8PGXY4mGAmF4nZMXGZgK8B
+Cz9cxhtvFLe8gz5615DtBAsuVm7Q4AAHiULAMg6t6auyxCb8pXbAL0Ec5X4zS3+f
+I2riODYiyHCh/qTtjawOzUZZEtjZRMSDi+jk8wjjDdkFU8McOaYoPyqT3TDy2v6m
+NiPJs8GWQ2NCNo9CNoGbEIIFFP5iSz18XLFAOF+2dN/KHHl9nKyi7kOhYbbzoNku
+2wQV40yVsrS4E/hd/7+2IB2Muduxiu7NxCUSUXsw6p0hZTYMpIoduEfRSk1al0lS
+862GD8JgJ4RhJ0uIOTDJS52MQmO8zFIL86emdjjV1CzVvadYSQLTX7ZgR0i8g46A
+y0muCFAC8EJpnEtHzqtQ/z22zB8TCJShFuUK9KF6K8nOlbc6ShcUXU2J6r1sc8aT
+Dx0yzRXfCL15fpCJBP49EYaKhArTNmFRa2GaLiJP0OYkTrrwVOGuS6x2+kRVoP/8
+BcNMZ5x8mXP1LgotHCztgMKX30Hn5CLxbH8QfcWKemGva1jBmhCWxS17Gh3Ld9T3
+/WKkBa6JDq83rlO84x/iF3mB3tYkZPfcYtYURn5wwm/BmVV/9G1VwAatJdxmfCSy
+5JwC9WDBAoICAQD7xStPk3lq+qYHAtLZidujmzSNv7XG+E8UC9yvMRFuBwSM5ZE4
+YGD2LDev2nghB+7OSR8KJIkxeaNjP91Zf3s8wjCuxLg/cLGI6mf6uWy9+zypFg3i
+J+ylDKa6NBuqYyY75W7Pj63xvGQlw5kX5+mB3ulQbActT4cUiVdEkyDytzubqLzY
+s15QGFrL9gqLow+C+7LKQKdeXq8OavFV1PWkMDAJUki6cIir9m+f5Mqr2cQCLKgx
+38aX8c9UWJv6pI5zQQuBjpaBOwz07WnyTXiFpc71x/8i85uLGDM0e3VO5ZPGeRBj
+jZ0ucHatOHJ3i/nPRG16rsPR+q97QiDHoLF0quHEG+ND+rwTBzNGIwzYRE16p1o3
+UdzFk1RzlDCfOX7QgszCwK6mf8TbCK9f/FxJ5e6TCkt3iHXSrlLS4op6k9nEpKFH
+KHf4nPtCy9GriP+A8+dA6K1s+DgejoIojBMBTsnl4TEf+m8BaenTXGuU7KYyc8dR
+JqmpmDggDRT/ImHRhXirY7lIIYXnI7tRjN5gmnKpEiHScT1r848zpQ4gWH1Dx/ks
+mKT6NZ8nF45saQCYbKEYc0RH9Kw0O7vr1kVtNPc2dEZtVgt4bC5fnl7xX1/YTk3m
+h1qfzbku/+MX5rRjHLR2l8a71UltlnnnpP5NKBBgtxll6aCIkk6CdH8YQKCAgEA
+16aBaVa0cOZmiOQwPQkpuXIbV7msz1ttWEAHElCy6waniOCON89PYFCb7F0NjV3Q
+i+pGaRgG1iZGbjjHwyqTrHhMloFm+IsSWZqOZzrHgSJgA4bgTJFgp+5b31sQXGfJ
+14QQSqMJLC61/M+CnrNtiuI3IVHx6BFRxI42uE7PfTyUMaFhL9F0/SLl0Mw0oMPj
+S5kmarduuKpRn1tN9WO+ywEvYwopvH3e9PBssZzPpttlLiE/Wulb0iEtlVXYB9DS
+Vzc94N2dzFMIvWUDF9BQ+IBMRzXRm15Psy6LfzoK+9S6w38Dx3BVV8ykSMKeW1UR
+ZwTajjdnIBLdE3onD5XMmrSOPw/WtV5zXEYY4DObhIPoN2iD8GJP0IubPb6fonH5
+VHmuVZoXrroFEe7rdt2wgmBdPPl6fqvBKVhjJOpYQctrFLgWh63bXZKaBWqbQM9W
+fECq8We1VN3fzqwfwJQit3z5R/DjQNk8eQx7SnnkOzAY6ZgpysHCwaoPOnPVuiYF
+ZU0+X3iwfsdeefWmGEDIzoZk6nYaljs61lOhhEoWHngZHDkMOp5kg0n9f8BUP02+
+WJ4QhwzZ73hr4FPBuPHHXECw9TCAgCBHBFrnrXg5QalDhRXz4F+3tCY7UUpD/ikZ
+L6Daxm5zGJ5u3rXs6WwKy2EHVVS9zfqs4Q259pQdWM8CggIAcIKpGzOVM+h033c0
+kIBZxeAq+Rlt+0+lzxiJ80RjPJ8oOmqwndf8HKaf8BcaTfCEmGz20QqIwLJSAJ1e
+posgoINLTB6fE8Kho8TU2KeaX7/xWMKBS8p5pzxjGZ0Fq/wI7wVVoq3blsaQnout
+U5CQujfKXeUYw/fhLp09gWiadbzKh4I9ej2V7QclNDZsegBRg0BForqH0NVRN4k0
+9h1n9IqQPOonlCGMAgTr1zFgHLIBNNOOClOtJOOruk6qzbRR8FFl+eyld3TTEnUy
+PlS+gkMZnJ5WduEUZnFXGKH/R1Wy1yPs3gA/+KvLbRdnl+LWrPgwUH3fBmwXlWZ0
+zaETDEb9Ay1PP2bCO2KhWDt7lv3W/fPhjg0oMqbnO4tCuzTvZfC93l5K7h708skL
+zkIxX9i/57fXB8DUnmTGoHUaWzLNQ2IqrGj6TACjDDOXLCfZvl/AvTH9pk+6jHU0
+1zfZmmECOpeK43Z/ussA8jI/5Vpn3u38aVh0w1RB6JjQBD/yJLaXuUekWgaZFzTR
+ldz014jNqp5uvONcBmzeVr7w9CV3PR4VTQed2i6yQ770J6A44uTQjOOd5OYDOohj
+Lz4e4nGj9BK8Eko8cAEwLAzS8tyjMT+08n5dPOVCu68DwVBMGE7CVONYUuoXS/YU
+cTxddiU9ZGk9Yq0FfOwjeys+SqECggIAdn3M2b6Egwx2Bn2ra74fKQBjub4SEBWi
+bT0xJYUl6jHL2E/alRvZ94gTRLqUebq0nkxpx9El4IFDbcjRKpG4dqnbG0+a7rIr
+sQRVfq8zc+cZbparpCa1P1CfNojo4n080KiF8xzGK3q3EGRM1zqr1AYcWLiX/PWX
+QjMKKhdTtvKUUvjjV8z1RSnpsOKjgDpiJ+XM0BJeSiV7l94pZc4axZyvFvI8oI9g
+9KEueCE7j+k5HTGziBZ1F26Xh1iVzSWWjcmSvH3I+L4fLUHVgz45X3HPd8lAlOgr
+Tr8icxPHeTwYKtcdknZMzmNpWXlmXbTOTRbDqCUVCvCSfOM/lzauJ8tR5aCkTx/I
+r0js3jQ9HYEFFXzeEjVSubob4L9fI3kQkLQTcIGsxZr8si/fPX7uP5UHZjuGbRee
+mUMxptUFDZHiEo5cAs0qna2x54v+JoxGbxtxUhez8R/Am+TDxaMfuEZ5Cmh31egH
+bFPJYtC68TKqXZ/4RqpUgukYWPvQ0emWSWU6AmdkQyT06nppeyYNsDz0MkgWr7l3
+yNBHDVNP+Anxcip+Z68kd2cuXQWmxOnIzxR67FnJXeWDEM20whRHgI8jLHYsBTq3
+CtOQPSaz/zosGXJIgF7Xp6riKPZvibW3Ww49Z47EuyBCtyirNk7hV4LG7sITUJyO
+ZVKPfcdAoM0CggIBANz3EBZGyt3af2UjFFKbazV01KcHF8OxqdQzsLqHCXWb98V6
+PggQnrF76U7DvqOWho9djDBPrbQU55HG5nXq+eZKPwhsOdwQ8bxOhaVxQcATZOI7
+FtJYnjM1/+zMzzS0iPR5DA2pbB3AKH2Z+wODmF23CK2XTwoJyPKxvlyGKrIqq3gN
+kOmocNu2Qm5bJf+D/hYPm5Ust2wzD52NnvJU536bZ0ZMo1/kaK2idqSAzqo4TkR1
+j9U0fdW2rIBDo/qFmBBdJhYVjYLj4qR8CEEoIjshD4Nztf1xRM5C8irE/gJcT5+r
+4bPJJ5TjAtHxPiQqZruSprSEUbMsPqBap64ow0SmbNNWSgyaz2ha1rG0p52NBzH4
+XM52LBqS9QHPHvB0ooYfBTfPpDM3CePuuNyzjPAw86ncUo38FKXuc2oViJJ6C5I7
+v2sKhLK5gu3uPBB2ludDEXSpWBqiraynolOT/o52r+taYp9YY2WU3GrhOiV/A1FV
+Nl118xiF6FOFpEeTbhHvy27A8kZEKXgeSs+f4aC0XG9kLVD1CiCbQiqHTDcDS4nV
+O1N1eQxhP81X+YKE4Lgufh07REqYVwtCj2lQcMp73WDyfBLKTEFlmHusoqmT5JCH
+X0BWNjk5Dn1g5h63/lQb+EjNRILBhDFYhrDRDQtw5p0/7IY3AcNKDUHv+XGn
+-----END RSA PRIVATE KEY-----
--- a/mysql-test/suite/funcs_1/datadict/datadict_master.inc
+++ b/mysql-test/suite/funcs_1/datadict/datadict_master.inc
@@ -437,19 +437,23 @@ eval SELECT *
 # check also with a 'simple' user
 CREATE USER user_3212@localhost;
 GRANT ALL ON db_datadict.* TO user_3212@localhost;
+# OBN: The following line was added following the fix to bug 28181  
+#      where queries to information_schema will fail if exporting to 
+#      a file without having the FILE attribute
+GRANT FILE ON *.* TO user_3212@localhost;
+

 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 connect (u3212,localhost,user_3212,,db_datadict);
 --source suite/funcs_1/include/show_connection.inc

 # no db given --> db_datadict.schema does not exist
--error 1045
+--error 1146
 eval SELECT *
  INTO OUTFILE '../tmp/out.$ENGINE_TYPE.user.file'
  FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"'
  LINES TERMINATED BY '\n'
  FROM schemata LIMIT 0, 5;
-# FIXME 3.2.1.2: why do we get different error numbers with and without OUTFILE ?
 --error 1146
 eval SELECT *
  FROM schemata LIMIT 0, 5;
@@ -460,8 +464,6 @@ eval SELECT *
  LINES TERMINATED BY '\n'
  FROM information_schema.schemata
  WHERE schema_name LIKE 'db_%';
-# The above will fail with access error as long as 
-# BUBG#28181 - a regression introduced in 5.0.42 is not fixed

 eval SELECT *
  FROM information_schema.schemata
@@ -469,14 +471,11 @@ eval SELECT *

 USE information_schema;

-# no db given --> db_datadict.schema does not exist
 eval SELECT *
  INTO OUTFILE '../tmp/out.$ENGINE_TYPE.user_2.file'
  FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"'
  LINES TERMINATED BY '\n'
  FROM schemata LIMIT 0, 5;
-# The above will fail with access error as long as 
-# BUBG#28181 - a regression introduced in 5.0.42 is not fixed

 eval SELECT *
  FROM schemata LIMIT 0, 5;
@@ -487,8 +486,6 @@ eval SELECT *
  LINES TERMINATED BY '\n'
  FROM information_schema.schemata
  WHERE schema_name LIKE 'db_%';
-# The above will fail with access error as long as 
-# BUBG#28181 - a regression introduced in 5.0.42 is not fixed

 eval SELECT *
  FROM information_schema.schemata
--- a/mysql-test/suite/funcs_1/r/innodb__datadict.result
+++ b/mysql-test/suite/funcs_1/r/innodb__datadict.result
@@ -4859,6 +4859,7 @@ INTO OUTFILE '../tmp/out.innodb.db.file'
 WHERE schema_name LIKE 'db_%';
 CREATE USER user_3212@localhost;
 GRANT ALL ON db_datadict.* TO user_3212@localhost;
+GRANT FILE ON *.* TO user_3212@localhost;
 connect(localhost,user_3212,,db_datadict,MYSQL_PORT,MYSQL_SOCK);
 	
 user_3212@localhost	db_datadict
@@ -4867,7 +4868,7 @@ INTO OUTFILE '../tmp/out.innodb.user.file'
  FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"'
  LINES TERMINATED BY '\n'
  FROM schemata LIMIT 0, 5;
-ERROR 28000: Access denied for user 'user_3212'@'localhost' (using password: NO)
+ERROR 42S02: Table 'db_datadict.schemata' doesn't exist
 SELECT *
 FROM schemata LIMIT 0, 5;
 ERROR 42S02: Table 'db_datadict.schemata' doesn't exist
--- a/mysql-test/suite/funcs_1/r/innodb_func_view.result
+++ b/mysql-test/suite/funcs_1/r/innodb_func_view.result
@@ -2400,16 +2400,10 @@ my_time, id FROM t1_values
 WHERE select_id = 89 OR select_id IS NULL;
 CAST(my_time AS UNSIGNED INTEGER)	my_time	id
 NULL	NULL	1
-18446744073709550778	-838:59:59	2
-838	838:59:59	3
-13	13:00:00	4
-10	10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-838:59:59'
-Warning	1105	Cast to unsigned converted negative integer to it's positive complement
-Warning	1292	Truncated incorrect INTEGER value: '838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '13:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '10:00:00'
+18446744073701165657	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_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`
@@ -2418,16 +2412,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 89 OR select_id IS NULL);
 CAST(my_time AS UNSIGNED INTEGER)	my_time	id
 NULL	NULL	1
-18446744073709550778	-838:59:59	2
-838	838:59:59	3
-13	13:00:00	4
-10	10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-838:59:59'
-Warning	1105	Cast to unsigned converted negative integer to it's positive complement
-Warning	1292	Truncated incorrect INTEGER value: '838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '13:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '10:00:00'
+18446744073701165657	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 DROP VIEW v1;


@@ -2438,16 +2426,10 @@ my_timestamp, id FROM t1_values
 WHERE select_id = 88 OR select_id IS NULL;
 CAST(my_timestamp AS UNSIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
-1970	1970-01-01 03:00:01	2
-2038	2038-01-01 02:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0000-00-00 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '1970-01-01 03:00:01'
-Warning	1292	Truncated incorrect INTEGER value: '2038-01-01 02:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+19700101030001	1970-01-01 03:00:01	2
+20380101025959	2038-01-01 02:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_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`
@@ -2456,16 +2438,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 88 OR select_id IS NULL);
 CAST(my_timestamp AS UNSIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
-1970	1970-01-01 03:00:01	2
-2038	2038-01-01 02:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0000-00-00 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '1970-01-01 03:00:01'
-Warning	1292	Truncated incorrect INTEGER value: '2038-01-01 02:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+19700101030001	1970-01-01 03:00:01	2
+20380101025959	2038-01-01 02:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 DROP VIEW v1;


@@ -2476,15 +2452,10 @@ my_date, id FROM t1_values
 WHERE select_id = 87 OR select_id IS NULL;
 CAST(my_date AS UNSIGNED INTEGER)	my_date	id
 NULL	NULL	1
-1	0001-01-01	2
-9999	9999-12-31	3
-2004	2004-02-29	4
-2005	2005-06-28	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28'
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_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`
@@ -2493,15 +2464,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 87 OR select_id IS NULL);
 CAST(my_date AS UNSIGNED INTEGER)	my_date	id
 NULL	NULL	1
-1	0001-01-01	2
-9999	9999-12-31	3
-2004	2004-02-29	4
-2005	2005-06-28	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28'
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 DROP VIEW v1;


@@ -2512,15 +2478,10 @@ my_datetime, id FROM t1_values
 WHERE select_id = 86 OR select_id IS NULL;
 CAST(my_datetime AS UNSIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
-1	0001-01-01 00:00:00	2
-9999	9999-12-31 23:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+10101000000	0001-01-01 00:00:00	2
+99991231235959	9999-12-31 23:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_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`
@@ -2529,15 +2490,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 86 OR select_id IS NULL);
 CAST(my_datetime AS UNSIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
-1	0001-01-01 00:00:00	2
-9999	9999-12-31 23:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+10101000000	0001-01-01 00:00:00	2
+99991231235959	9999-12-31 23:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 DROP VIEW v1;


@@ -2780,15 +2736,10 @@ my_time, id FROM t1_values
 WHERE select_id = 78 OR select_id IS NULL;
 CAST(my_time AS SIGNED INTEGER)	my_time	id
 NULL	NULL	1
-838	-838:59:59	2
-838	838:59:59	3
-13	13:00:00	4
-10	10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '13:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '10:00:00'
+-8385959	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as signed) AS `CAST(my_time AS SIGNED INTEGER)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2797,15 +2748,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 78 OR select_id IS NULL);
 CAST(my_time AS SIGNED INTEGER)	my_time	id
 NULL	NULL	1
-838	-838:59:59	2
-838	838:59:59	3
-13	13:00:00	4
-10	10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '13:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '10:00:00'
+-8385959	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 DROP VIEW v1;


@@ -2816,16 +2762,10 @@ my_timestamp, id FROM t1_values
 WHERE select_id = 77 OR select_id IS NULL;
 CAST(my_timestamp AS SIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
-1970	1970-01-01 03:00:01	2
-2038	2038-01-01 02:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0000-00-00 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '1970-01-01 03:00:01'
-Warning	1292	Truncated incorrect INTEGER value: '2038-01-01 02:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+19700101030001	1970-01-01 03:00:01	2
+20380101025959	2038-01-01 02:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as signed) AS `CAST(my_timestamp AS SIGNED INTEGER)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2834,16 +2774,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 77 OR select_id IS NULL);
 CAST(my_timestamp AS SIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
-1970	1970-01-01 03:00:01	2
-2038	2038-01-01 02:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0000-00-00 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '1970-01-01 03:00:01'
-Warning	1292	Truncated incorrect INTEGER value: '2038-01-01 02:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+19700101030001	1970-01-01 03:00:01	2
+20380101025959	2038-01-01 02:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 DROP VIEW v1;


@@ -2854,15 +2788,10 @@ my_date, id FROM t1_values
 WHERE select_id = 76 OR select_id IS NULL;
 CAST(my_date AS SIGNED INTEGER)	my_date	id
 NULL	NULL	1
-1	0001-01-01	2
-9999	9999-12-31	3
-2004	2004-02-29	4
-2005	2005-06-28	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28'
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as signed) AS `CAST(my_date AS SIGNED INTEGER)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2871,15 +2800,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 76 OR select_id IS NULL);
 CAST(my_date AS SIGNED INTEGER)	my_date	id
 NULL	NULL	1
-1	0001-01-01	2
-9999	9999-12-31	3
-2004	2004-02-29	4
-2005	2005-06-28	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28'
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 DROP VIEW v1;


@@ -2890,15 +2814,10 @@ my_datetime, id FROM t1_values
 WHERE select_id = 75 OR select_id IS NULL;
 CAST(my_datetime AS SIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
-1	0001-01-01 00:00:00	2
-9999	9999-12-31 23:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+10101000000	0001-01-01 00:00:00	2
+99991231235959	9999-12-31 23:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as signed) AS `CAST(my_datetime AS SIGNED INTEGER)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2907,15 +2826,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 75 OR select_id IS NULL);
 CAST(my_datetime AS SIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
-1	0001-01-01 00:00:00	2
-9999	9999-12-31 23:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+10101000000	0001-01-01 00:00:00	2
+99991231235959	9999-12-31 23:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 DROP VIEW v1;


@@ -2926,8 +2840,8 @@ my_decimal, id FROM t1_values
 WHERE select_id = 74 OR select_id IS NULL;
 CAST(my_decimal AS SIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
-10000000000000000	-9999999999999999999999999999999999.999999999999999999999999999999	2
-10000000000000000	9999999999999999999999999999999999.999999999999999999999999999999	3
+-9223372036854775808	-9999999999999999999999999999999999.999999999999999999999999999999	2
+9223372036854775807	9999999999999999999999999999999999.999999999999999999999999999999	3
 0	0.000000000000000000000000000000	4
 -1	-1.000000000000000000000000000000	5
 Warnings:
@@ -2941,8 +2855,8 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 74 OR select_id IS NULL);
 CAST(my_decimal AS SIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
-10000000000000000	-9999999999999999999999999999999999.999999999999999999999999999999	2
-10000000000000000	9999999999999999999999999999999999.999999999999999999999999999999	3
+-9223372036854775808	-9999999999999999999999999999999999.999999999999999999999999999999	2
+9223372036854775807	9999999999999999999999999999999999.999999999999999999999999999999	3
 0	0.000000000000000000000000000000	4
 -1	-1.000000000000000000000000000000	5
 Warnings:
@@ -3115,12 +3029,12 @@ Warning	1292	Truncated incorrect INTEGER value: ' ---
 DROP VIEW v1;


-CREATE VIEW v1 AS SELECT CAST(my_year AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_year AS DECIMAL(37,2)),
 my_year, id FROM t1_values;
-SELECT CAST(my_year AS DECIMAL),
+SELECT CAST(my_year AS DECIMAL(37,2)),
 my_year, id FROM t1_values
 WHERE select_id = 68 OR select_id IS NULL;
-CAST(my_year AS DECIMAL)	my_year	id
+CAST(my_year AS DECIMAL(37,2))	my_year	id
 NULL	NULL	1
 1901.00	1901	2
 2155.00	2155	3
@@ -3128,11 +3042,11 @@ NULL	NULL	1
 2005.00	2005	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as decimal) AS `CAST(my_year AS DECIMAL)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as decimal(37,2)) AS `CAST(my_year AS DECIMAL(37,2))`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 68 OR select_id IS NULL);
-CAST(my_year AS DECIMAL)	my_year	id
+CAST(my_year AS DECIMAL(37,2))	my_year	id
 NULL	NULL	1
 1901.00	1901	2
 2155.00	2155	3
@@ -3141,12 +3055,12 @@ NULL	NULL	1
 DROP VIEW v1;


-CREATE VIEW v1 AS SELECT CAST(my_time AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_time AS DECIMAL(37,2)),
 my_time, id FROM t1_values;
-SELECT CAST(my_time AS DECIMAL),
+SELECT CAST(my_time AS DECIMAL(37,2)),
 my_time, id FROM t1_values
 WHERE select_id = 67 OR select_id IS NULL;
-CAST(my_time AS DECIMAL)	my_time	id
+CAST(my_time AS DECIMAL(37,2))	my_time	id
 NULL	NULL	1
 -8385959.00	-838:59:59	2
 8385959.00	838:59:59	3
@@ -3154,11 +3068,11 @@ NULL	NULL	1
 100000.00	10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as decimal) AS `CAST(my_time AS DECIMAL)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as decimal(37,2)) AS `CAST(my_time AS DECIMAL(37,2))`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 67 OR select_id IS NULL);
-CAST(my_time AS DECIMAL)	my_time	id
+CAST(my_time AS DECIMAL(37,2))	my_time	id
 NULL	NULL	1
 -8385959.00	-838:59:59	2
 8385959.00	838:59:59	3
@@ -3167,12 +3081,12 @@ NULL	NULL	1
 DROP VIEW v1;


-CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DECIMAL(37,2)),
 my_timestamp, id FROM t1_values;
-SELECT CAST(my_timestamp AS DECIMAL),
+SELECT CAST(my_timestamp AS DECIMAL(37,2)),
 my_timestamp, id FROM t1_values
 WHERE select_id = 66 OR select_id IS NULL;
-CAST(my_timestamp AS DECIMAL)	my_timestamp	id
+CAST(my_timestamp AS DECIMAL(37,2))	my_timestamp	id
 0.00	0000-00-00 00:00:00	1
 19700101030001.00	1970-01-01 03:00:01	2
 20380101025959.00	2038-01-01 02:59:59	3
@@ -3180,11 +3094,11 @@ CAST(my_timestamp AS DECIMAL)	my_timestamp	id
 20050628100000.00	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as decimal) AS `CAST(my_timestamp AS DECIMAL)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as decimal(37,2)) AS `CAST(my_timestamp AS DECIMAL(37,2))`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 66 OR select_id IS NULL);
-CAST(my_timestamp AS DECIMAL)	my_timestamp	id
+CAST(my_timestamp AS DECIMAL(37,2))	my_timestamp	id
 0.00	0000-00-00 00:00:00	1
 19700101030001.00	1970-01-01 03:00:01	2
 20380101025959.00	2038-01-01 02:59:59	3
@@ -3193,12 +3107,12 @@ CAST(my_timestamp AS DECIMAL)	my_timestamp	id
 DROP VIEW v1;


-CREATE VIEW v1 AS SELECT CAST(my_date AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_date AS DECIMAL(37,2)),
 my_date, id FROM t1_values;
-SELECT CAST(my_date AS DECIMAL),
+SELECT CAST(my_date AS DECIMAL(37,2)),
 my_date, id FROM t1_values
 WHERE select_id = 65 OR select_id IS NULL;
-CAST(my_date AS DECIMAL)	my_date	id
+CAST(my_date AS DECIMAL(37,2))	my_date	id
 NULL	NULL	1
 10101.00	0001-01-01	2
 99991231.00	9999-12-31	3
@@ -3206,11 +3120,11 @@ NULL	NULL	1
 20050628.00	2005-06-28	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as decimal) AS `CAST(my_date AS DECIMAL)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as decimal(37,2)) AS `CAST(my_date AS DECIMAL(37,2))`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 65 OR select_id IS NULL);
-CAST(my_date AS DECIMAL)	my_date	id
+CAST(my_date AS DECIMAL(37,2))	my_date	id
 NULL	NULL	1
 10101.00	0001-01-01	2
 99991231.00	9999-12-31	3
@@ -3219,12 +3133,12 @@ NULL	NULL	1
 DROP VIEW v1;


-CREATE VIEW v1 AS SELECT CAST(my_datetime AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_datetime AS DECIMAL(37,2)),
 my_datetime, id FROM t1_values;
-SELECT CAST(my_datetime AS DECIMAL),
+SELECT CAST(my_datetime AS DECIMAL(37,2)),
 my_datetime, id FROM t1_values
 WHERE select_id = 64 OR select_id IS NULL;
-CAST(my_datetime AS DECIMAL)	my_datetime	id
+CAST(my_datetime AS DECIMAL(37,2))	my_datetime	id
 NULL	NULL	1
 10101000000.00	0001-01-01 00:00:00	2
 99991231235959.00	9999-12-31 23:59:59	3
@@ -3232,11 +3146,11 @@ NULL	NULL	1
 20050628100000.00	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as decimal) AS `CAST(my_datetime AS DECIMAL)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as decimal(37,2)) AS `CAST(my_datetime AS DECIMAL(37,2))`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 64 OR select_id IS NULL);
-CAST(my_datetime AS DECIMAL)	my_datetime	id
+CAST(my_datetime AS DECIMAL(37,2))	my_datetime	id
 NULL	NULL	1
 10101000000.00	0001-01-01 00:00:00	2
 99991231235959.00	9999-12-31 23:59:59	3
@@ -3245,12 +3159,12 @@ NULL	NULL	1
 DROP VIEW v1;


-CREATE VIEW v1 AS SELECT CAST(my_decimal AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_decimal AS DECIMAL(37,2)),
 my_decimal, id FROM t1_values;
-SELECT CAST(my_decimal AS DECIMAL),
+SELECT CAST(my_decimal AS DECIMAL(37,2)),
 my_decimal, id FROM t1_values
 WHERE select_id = 63 OR select_id IS NULL;
-CAST(my_decimal AS DECIMAL)	my_decimal	id
+CAST(my_decimal AS DECIMAL(37,2))	my_decimal	id
 NULL	NULL	1
 -10000000000000000000000000000000000.00	-9999999999999999999999999999999999.999999999999999999999999999999	2
 10000000000000000000000000000000000.00	9999999999999999999999999999999999.999999999999999999999999999999	3
@@ -3258,11 +3172,11 @@ NULL	NULL	1
 -1.00	-1.000000000000000000000000000000	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as decimal) AS `CAST(my_decimal AS DECIMAL)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as decimal(37,2)) AS `CAST(my_decimal AS DECIMAL(37,2))`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 63 OR select_id IS NULL);
-CAST(my_decimal AS DECIMAL)	my_decimal	id
+CAST(my_decimal AS DECIMAL(37,2))	my_decimal	id
 NULL	NULL	1
 -10000000000000000000000000000000000.00	-9999999999999999999999999999999999.999999999999999999999999999999	2
 10000000000000000000000000000000000.00	9999999999999999999999999999999999.999999999999999999999999999999	3
@@ -3271,12 +3185,12 @@ NULL	NULL	1
 DROP VIEW v1;


-CREATE VIEW v1 AS SELECT CAST(my_bigint AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_bigint AS DECIMAL(37,2)),
 my_bigint, id FROM t1_values;
-SELECT CAST(my_bigint AS DECIMAL),
+SELECT CAST(my_bigint AS DECIMAL(37,2)),
 my_bigint, id FROM t1_values
 WHERE select_id = 62 OR select_id IS NULL;
-CAST(my_bigint AS DECIMAL)	my_bigint	id
+CAST(my_bigint AS DECIMAL(37,2))	my_bigint	id
 NULL	NULL	1
 -9223372036854775808.00	-9223372036854775808	2
 9223372036854775807.00	9223372036854775807	3
@@ -3284,11 +3198,11 @@ NULL	NULL	1
 -1.00	-1	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as decimal) AS `CAST(my_bigint AS DECIMAL)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as decimal(37,2)) AS `CAST(my_bigint AS DECIMAL(37,2))`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 62 OR select_id IS NULL);
-CAST(my_bigint AS DECIMAL)	my_bigint	id
+CAST(my_bigint AS DECIMAL(37,2))	my_bigint	id
 NULL	NULL	1
 -9223372036854775808.00	-9223372036854775808	2
 9223372036854775807.00	9223372036854775807	3
@@ -3297,12 +3211,12 @@ NULL	NULL	1
 DROP VIEW v1;


-CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DECIMAL(37,2)),
 my_varbinary_1000, id FROM t1_values;
-SELECT CAST(my_varbinary_1000 AS DECIMAL),
+SELECT CAST(my_varbinary_1000 AS DECIMAL(37,2)),
 my_varbinary_1000, id FROM t1_values
 WHERE select_id = 61 OR select_id IS NULL;
-CAST(my_varbinary_1000 AS DECIMAL)	my_varbinary_1000	id
+CAST(my_varbinary_1000 AS DECIMAL(37,2))	my_varbinary_1000	id
 NULL	NULL	1
 0.00		2
 0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
@@ -3315,11 +3229,11 @@ Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as decimal) AS `CAST(my_varbinary_1000 AS DECIMAL)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as decimal(37,2)) AS `CAST(my_varbinary_1000 AS DECIMAL(37,2))`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 61 OR select_id IS NULL);
-CAST(my_varbinary_1000 AS DECIMAL)	my_varbinary_1000	id
+CAST(my_varbinary_1000 AS DECIMAL(37,2))	my_varbinary_1000	id
 NULL	NULL	1
 0.00		2
 0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
@@ -3333,12 +3247,12 @@ Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP VIEW v1;


-CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DECIMAL(37,2)),
 my_binary_30, id FROM t1_values;
-SELECT CAST(my_binary_30 AS DECIMAL),
+SELECT CAST(my_binary_30 AS DECIMAL(37,2)),
 my_binary_30, id FROM t1_values
 WHERE select_id = 60 OR select_id IS NULL;
-CAST(my_binary_30 AS DECIMAL)	my_binary_30	id
+CAST(my_binary_30 AS DECIMAL(37,2))	my_binary_30	id
 NULL	NULL	1
 0.00		2
 0.00	<--------30 characters------->	3
@@ -3356,11 +3270,11 @@ Warning	1292	Truncated incorrect DECIMAL value: '-1'
 Warning	1292	Truncated incorrect DECIMAL value: '-3333.3333'
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as decimal) AS `CAST(my_binary_30 AS DECIMAL)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as decimal(37,2)) AS `CAST(my_binary_30 AS DECIMAL(37,2))`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 60 OR select_id IS NULL);
-CAST(my_binary_30 AS DECIMAL)	my_binary_30	id
+CAST(my_binary_30 AS DECIMAL(37,2))	my_binary_30	id
 NULL	NULL	1
 0.00		2
 0.00	<--------30 characters------->	3
@@ -3379,12 +3293,12 @@ Warning	1292	Truncated incorrect DECIMAL value: '-3333.3333'
 DROP VIEW v1;


-CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DECIMAL(37,2)),
 my_varchar_1000, id FROM t1_values;
-SELECT CAST(my_varchar_1000 AS DECIMAL),
+SELECT CAST(my_varchar_1000 AS DECIMAL(37,2)),
 my_varchar_1000, id FROM t1_values
 WHERE select_id = 59 OR select_id IS NULL;
-CAST(my_varchar_1000 AS DECIMAL)	my_varchar_1000	id
+CAST(my_varchar_1000 AS DECIMAL(37,2))	my_varchar_1000	id
 NULL	NULL	1
 0.00		2
 0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
@@ -3397,11 +3311,11 @@ Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as decimal) AS `CAST(my_varchar_1000 AS DECIMAL)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as decimal(37,2)) AS `CAST(my_varchar_1000 AS DECIMAL(37,2))`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 59 OR select_id IS NULL);
-CAST(my_varchar_1000 AS DECIMAL)	my_varchar_1000	id
+CAST(my_varchar_1000 AS DECIMAL(37,2))	my_varchar_1000	id
 NULL	NULL	1
 0.00		2
 0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
@@ -3415,12 +3329,12 @@ Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP VIEW v1;


-CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DECIMAL(37,2)),
 my_char_30, id FROM t1_values;
-SELECT CAST(my_char_30 AS DECIMAL),
+SELECT CAST(my_char_30 AS DECIMAL(37,2)),
 my_char_30, id FROM t1_values
 WHERE select_id = 58 OR select_id IS NULL;
-CAST(my_char_30 AS DECIMAL)	my_char_30	id
+CAST(my_char_30 AS DECIMAL(37,2))	my_char_30	id
 NULL	NULL	1
 0.00		2
 0.00	<--------30 characters------->	3
@@ -3436,11 +3350,11 @@ Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: ' ---<2D><><EFBFBD><EFBFBD>@<40>*$--           '
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as decimal) AS `CAST(my_char_30 AS DECIMAL)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as decimal(37,2)) AS `CAST(my_char_30 AS DECIMAL(37,2))`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 58 OR select_id IS NULL);
-CAST(my_char_30 AS DECIMAL)	my_char_30	id
+CAST(my_char_30 AS DECIMAL(37,2))	my_char_30	id
 NULL	NULL	1
 0.00		2
 0.00	<--------30 characters------->	3
--- a/mysql-test/suite/funcs_1/r/innodb_trig_0102.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_0102.result
@@ -237,7 +237,7 @@ create table t1 (f1 integer) engine = innodb;
 use test;
 CREATE TRIGGER trig_db.trg6_2 AFTER INSERT on tb3 
 for each row set @ret_trg6_2 = 5;
-ERROR HY000: Trigger in wrong schema
+ERROR 42S02: Table 'trig_db.tb3' doesn't exist
 use trig_db;
 CREATE TRIGGER trg6_3 AFTER INSERT on test.tb3 
 for each row set @ret_trg6_3 = 18;
--- a/mysql-test/suite/funcs_1/r/innodb_trig_08.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_08.result
@@ -484,9 +484,8 @@ BEGIN
 WHILE @counter1 < new.f136 
 SET @counter1 = @counter1 + 1; 
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'WHILE @counter1 < new.f136 
-SET @counter1 = @counter1 + 1; 
-END' at line 3
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SET @counter1 = @counter1 + 1; 
+END' at line 4
 delete from tb3 where f122='Test 3.5.8.5-while';
 drop trigger trg7;

--- a/mysql-test/suite/funcs_1/r/innodb_trig_09.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_09.result
@@ -194,7 +194,7 @@ a	NULL	Test 3.5.9.4	7	999	995.240000000000000000000000000000
 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	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'f136' at row 11
+Warning	1048	Column 'f136' cannot be null
 select f118, f121, f122, f136, f151, f163 from tb3 
 where f122 like 'Test 3.5.9.4-trig';
 f118	f121	f122	f136	f151	f163
--- a/mysql-test/suite/funcs_1/r/innodb_views.result
+++ b/mysql-test/suite/funcs_1/r/innodb_views.result
@@ -10202,7 +10202,8 @@ SHOW FIELDS  FROM v1;
 ERROR 42S02: Table 'test.v1' doesn't exist
 CHECK TABLE v1;
 Table	Op	Msg_type	Msg_text
-test.v1	check	error	Table 'test.v1' doesn't exist
+test.v1	check	Error	Table 'test.v1' doesn't exist
+test.v1	check	error	Corrupt
 DESCRIBE v1;
 ERROR 42S02: Table 'test.v1' doesn't exist
 EXPLAIN SELECT * FROM v1;
--- a/mysql-test/suite/funcs_1/r/memory__datadict.result
+++ b/mysql-test/suite/funcs_1/r/memory__datadict.result
@@ -4842,6 +4842,7 @@ INTO OUTFILE '../tmp/out.memory.db.file'
 WHERE schema_name LIKE 'db_%';
 CREATE USER user_3212@localhost;
 GRANT ALL ON db_datadict.* TO user_3212@localhost;
+GRANT FILE ON *.* TO user_3212@localhost;
 connect(localhost,user_3212,,db_datadict,MYSQL_PORT,MYSQL_SOCK);
 	
 user_3212@localhost	db_datadict
@@ -4850,7 +4851,7 @@ INTO OUTFILE '../tmp/out.memory.user.file'
  FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"'
  LINES TERMINATED BY '\n'
  FROM schemata LIMIT 0, 5;
-ERROR 28000: Access denied for user 'user_3212'@'localhost' (using password: NO)
+ERROR 42S02: Table 'db_datadict.schemata' doesn't exist
 SELECT *
 FROM schemata LIMIT 0, 5;
 ERROR 42S02: Table 'db_datadict.schemata' doesn't exist
--- a/mysql-test/suite/funcs_1/r/memory_func_view.result
+++ b/mysql-test/suite/funcs_1/r/memory_func_view.result
@@ -2400,16 +2400,10 @@ my_time, id FROM t1_values
 WHERE select_id = 89 OR select_id IS NULL;
 CAST(my_time AS UNSIGNED INTEGER)	my_time	id
 NULL	NULL	1
-18446744073709550778	-838:59:59	2
-838	838:59:59	3
-13	13:00:00	4
-10	10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-838:59:59'
-Warning	1105	Cast to unsigned converted negative integer to it's positive complement
-Warning	1292	Truncated incorrect INTEGER value: '838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '13:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '10:00:00'
+18446744073701165657	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_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`
@@ -2418,16 +2412,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 89 OR select_id IS NULL);
 CAST(my_time AS UNSIGNED INTEGER)	my_time	id
 NULL	NULL	1
-18446744073709550778	-838:59:59	2
-838	838:59:59	3
-13	13:00:00	4
-10	10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-838:59:59'
-Warning	1105	Cast to unsigned converted negative integer to it's positive complement
-Warning	1292	Truncated incorrect INTEGER value: '838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '13:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '10:00:00'
+18446744073701165657	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 DROP VIEW v1;


@@ -2438,16 +2426,10 @@ my_timestamp, id FROM t1_values
 WHERE select_id = 88 OR select_id IS NULL;
 CAST(my_timestamp AS UNSIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
-1970	1970-01-01 03:00:01	2
-2038	2038-01-01 02:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0000-00-00 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '1970-01-01 03:00:01'
-Warning	1292	Truncated incorrect INTEGER value: '2038-01-01 02:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+19700101030001	1970-01-01 03:00:01	2
+20380101025959	2038-01-01 02:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_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`
@@ -2456,16 +2438,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 88 OR select_id IS NULL);
 CAST(my_timestamp AS UNSIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
-1970	1970-01-01 03:00:01	2
-2038	2038-01-01 02:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0000-00-00 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '1970-01-01 03:00:01'
-Warning	1292	Truncated incorrect INTEGER value: '2038-01-01 02:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+19700101030001	1970-01-01 03:00:01	2
+20380101025959	2038-01-01 02:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 DROP VIEW v1;


@@ -2476,15 +2452,10 @@ my_date, id FROM t1_values
 WHERE select_id = 87 OR select_id IS NULL;
 CAST(my_date AS UNSIGNED INTEGER)	my_date	id
 NULL	NULL	1
-1	0001-01-01	2
-9999	9999-12-31	3
-2004	2004-02-29	4
-2005	2005-06-28	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28'
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_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`
@@ -2493,15 +2464,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 87 OR select_id IS NULL);
 CAST(my_date AS UNSIGNED INTEGER)	my_date	id
 NULL	NULL	1
-1	0001-01-01	2
-9999	9999-12-31	3
-2004	2004-02-29	4
-2005	2005-06-28	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28'
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 DROP VIEW v1;


@@ -2512,15 +2478,10 @@ my_datetime, id FROM t1_values
 WHERE select_id = 86 OR select_id IS NULL;
 CAST(my_datetime AS UNSIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
-1	0001-01-01 00:00:00	2
-9999	9999-12-31 23:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+10101000000	0001-01-01 00:00:00	2
+99991231235959	9999-12-31 23:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_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`
@@ -2529,15 +2490,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 86 OR select_id IS NULL);
 CAST(my_datetime AS UNSIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
-1	0001-01-01 00:00:00	2
-9999	9999-12-31 23:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+10101000000	0001-01-01 00:00:00	2
+99991231235959	9999-12-31 23:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 DROP VIEW v1;


@@ -2780,15 +2736,10 @@ my_time, id FROM t1_values
 WHERE select_id = 78 OR select_id IS NULL;
 CAST(my_time AS SIGNED INTEGER)	my_time	id
 NULL	NULL	1
-838	-838:59:59	2
-838	838:59:59	3
-13	13:00:00	4
-10	10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '13:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '10:00:00'
+-8385959	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as signed) AS `CAST(my_time AS SIGNED INTEGER)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2797,15 +2748,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 78 OR select_id IS NULL);
 CAST(my_time AS SIGNED INTEGER)	my_time	id
 NULL	NULL	1
-838	-838:59:59	2
-838	838:59:59	3
-13	13:00:00	4
-10	10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '13:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '10:00:00'
+-8385959	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 DROP VIEW v1;


@@ -2816,16 +2762,10 @@ my_timestamp, id FROM t1_values
 WHERE select_id = 77 OR select_id IS NULL;
 CAST(my_timestamp AS SIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
-1970	1970-01-01 03:00:01	2
-2038	2038-01-01 02:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0000-00-00 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '1970-01-01 03:00:01'
-Warning	1292	Truncated incorrect INTEGER value: '2038-01-01 02:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+19700101030001	1970-01-01 03:00:01	2
+20380101025959	2038-01-01 02:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as signed) AS `CAST(my_timestamp AS SIGNED INTEGER)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2834,16 +2774,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 77 OR select_id IS NULL);
 CAST(my_timestamp AS SIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
-1970	1970-01-01 03:00:01	2
-2038	2038-01-01 02:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0000-00-00 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '1970-01-01 03:00:01'
-Warning	1292	Truncated incorrect INTEGER value: '2038-01-01 02:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+19700101030001	1970-01-01 03:00:01	2
+20380101025959	2038-01-01 02:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 DROP VIEW v1;


@@ -2854,15 +2788,10 @@ my_date, id FROM t1_values
 WHERE select_id = 76 OR select_id IS NULL;
 CAST(my_date AS SIGNED INTEGER)	my_date	id
 NULL	NULL	1
-1	0001-01-01	2
-9999	9999-12-31	3
-2004	2004-02-29	4
-2005	2005-06-28	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28'
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as signed) AS `CAST(my_date AS SIGNED INTEGER)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2871,15 +2800,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 76 OR select_id IS NULL);
 CAST(my_date AS SIGNED INTEGER)	my_date	id
 NULL	NULL	1
-1	0001-01-01	2
-9999	9999-12-31	3
-2004	2004-02-29	4
-2005	2005-06-28	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28'
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 DROP VIEW v1;


@@ -2890,15 +2814,10 @@ my_datetime, id FROM t1_values
 WHERE select_id = 75 OR select_id IS NULL;
 CAST(my_datetime AS SIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
-1	0001-01-01 00:00:00	2
-9999	9999-12-31 23:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+10101000000	0001-01-01 00:00:00	2
+99991231235959	9999-12-31 23:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as signed) AS `CAST(my_datetime AS SIGNED INTEGER)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2907,15 +2826,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 75 OR select_id IS NULL);
 CAST(my_datetime AS SIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
-1	0001-01-01 00:00:00	2
-9999	9999-12-31 23:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+10101000000	0001-01-01 00:00:00	2
+99991231235959	9999-12-31 23:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 DROP VIEW v1;


@@ -2926,8 +2840,8 @@ my_decimal, id FROM t1_values
 WHERE select_id = 74 OR select_id IS NULL;
 CAST(my_decimal AS SIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
-10000000000000000	-9999999999999999999999999999999999.999999999999999999999999999999	2
-10000000000000000	9999999999999999999999999999999999.999999999999999999999999999999	3
+-9223372036854775808	-9999999999999999999999999999999999.999999999999999999999999999999	2
+9223372036854775807	9999999999999999999999999999999999.999999999999999999999999999999	3
 0	0.000000000000000000000000000000	4
 -1	-1.000000000000000000000000000000	5
 Warnings:
@@ -2941,8 +2855,8 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 74 OR select_id IS NULL);
 CAST(my_decimal AS SIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
-10000000000000000	-9999999999999999999999999999999999.999999999999999999999999999999	2
-10000000000000000	9999999999999999999999999999999999.999999999999999999999999999999	3
+-9223372036854775808	-9999999999999999999999999999999999.999999999999999999999999999999	2
+9223372036854775807	9999999999999999999999999999999999.999999999999999999999999999999	3
 0	0.000000000000000000000000000000	4
 -1	-1.000000000000000000000000000000	5
 Warnings:
@@ -3115,12 +3029,12 @@ Warning	1292	Truncated incorrect INTEGER value: ' ---
 DROP VIEW v1;


-CREATE VIEW v1 AS SELECT CAST(my_year AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_year AS DECIMAL(37,2)),
 my_year, id FROM t1_values;
-SELECT CAST(my_year AS DECIMAL),
+SELECT CAST(my_year AS DECIMAL(37,2)),
 my_year, id FROM t1_values
 WHERE select_id = 68 OR select_id IS NULL;
-CAST(my_year AS DECIMAL)	my_year	id
+CAST(my_year AS DECIMAL(37,2))	my_year	id
 NULL	NULL	1
 1901.00	1901	2
 2155.00	2155	3
@@ -3128,11 +3042,11 @@ NULL	NULL	1
 2005.00	2005	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as decimal) AS `CAST(my_year AS DECIMAL)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as decimal(37,2)) AS `CAST(my_year AS DECIMAL(37,2))`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 68 OR select_id IS NULL);
-CAST(my_year AS DECIMAL)	my_year	id
+CAST(my_year AS DECIMAL(37,2))	my_year	id
 NULL	NULL	1
 1901.00	1901	2
 2155.00	2155	3
@@ -3141,12 +3055,12 @@ NULL	NULL	1
 DROP VIEW v1;


-CREATE VIEW v1 AS SELECT CAST(my_time AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_time AS DECIMAL(37,2)),
 my_time, id FROM t1_values;
-SELECT CAST(my_time AS DECIMAL),
+SELECT CAST(my_time AS DECIMAL(37,2)),
 my_time, id FROM t1_values
 WHERE select_id = 67 OR select_id IS NULL;
-CAST(my_time AS DECIMAL)	my_time	id
+CAST(my_time AS DECIMAL(37,2))	my_time	id
 NULL	NULL	1
 -8385959.00	-838:59:59	2
 8385959.00	838:59:59	3
@@ -3154,11 +3068,11 @@ NULL	NULL	1
 100000.00	10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as decimal) AS `CAST(my_time AS DECIMAL)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as decimal(37,2)) AS `CAST(my_time AS DECIMAL(37,2))`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 67 OR select_id IS NULL);
-CAST(my_time AS DECIMAL)	my_time	id
+CAST(my_time AS DECIMAL(37,2))	my_time	id
 NULL	NULL	1
 -8385959.00	-838:59:59	2
 8385959.00	838:59:59	3
@@ -3167,12 +3081,12 @@ NULL	NULL	1
 DROP VIEW v1;


-CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DECIMAL(37,2)),
 my_timestamp, id FROM t1_values;
-SELECT CAST(my_timestamp AS DECIMAL),
+SELECT CAST(my_timestamp AS DECIMAL(37,2)),
 my_timestamp, id FROM t1_values
 WHERE select_id = 66 OR select_id IS NULL;
-CAST(my_timestamp AS DECIMAL)	my_timestamp	id
+CAST(my_timestamp AS DECIMAL(37,2))	my_timestamp	id
 0.00	0000-00-00 00:00:00	1
 19700101030001.00	1970-01-01 03:00:01	2
 20380101025959.00	2038-01-01 02:59:59	3
@@ -3180,11 +3094,11 @@ CAST(my_timestamp AS DECIMAL)	my_timestamp	id
 20050628100000.00	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as decimal) AS `CAST(my_timestamp AS DECIMAL)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as decimal(37,2)) AS `CAST(my_timestamp AS DECIMAL(37,2))`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 66 OR select_id IS NULL);
-CAST(my_timestamp AS DECIMAL)	my_timestamp	id
+CAST(my_timestamp AS DECIMAL(37,2))	my_timestamp	id
 0.00	0000-00-00 00:00:00	1
 19700101030001.00	1970-01-01 03:00:01	2
 20380101025959.00	2038-01-01 02:59:59	3
@@ -3193,12 +3107,12 @@ CAST(my_timestamp AS DECIMAL)	my_timestamp	id
 DROP VIEW v1;


-CREATE VIEW v1 AS SELECT CAST(my_date AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_date AS DECIMAL(37,2)),
 my_date, id FROM t1_values;
-SELECT CAST(my_date AS DECIMAL),
+SELECT CAST(my_date AS DECIMAL(37,2)),
 my_date, id FROM t1_values
 WHERE select_id = 65 OR select_id IS NULL;
-CAST(my_date AS DECIMAL)	my_date	id
+CAST(my_date AS DECIMAL(37,2))	my_date	id
 NULL	NULL	1
 10101.00	0001-01-01	2
 99991231.00	9999-12-31	3
@@ -3206,11 +3120,11 @@ NULL	NULL	1
 20050628.00	2005-06-28	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as decimal) AS `CAST(my_date AS DECIMAL)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as decimal(37,2)) AS `CAST(my_date AS DECIMAL(37,2))`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 65 OR select_id IS NULL);
-CAST(my_date AS DECIMAL)	my_date	id
+CAST(my_date AS DECIMAL(37,2))	my_date	id
 NULL	NULL	1
 10101.00	0001-01-01	2
 99991231.00	9999-12-31	3
@@ -3219,12 +3133,12 @@ NULL	NULL	1
 DROP VIEW v1;


-CREATE VIEW v1 AS SELECT CAST(my_datetime AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_datetime AS DECIMAL(37,2)),
 my_datetime, id FROM t1_values;
-SELECT CAST(my_datetime AS DECIMAL),
+SELECT CAST(my_datetime AS DECIMAL(37,2)),
 my_datetime, id FROM t1_values
 WHERE select_id = 64 OR select_id IS NULL;
-CAST(my_datetime AS DECIMAL)	my_datetime	id
+CAST(my_datetime AS DECIMAL(37,2))	my_datetime	id
 NULL	NULL	1
 10101000000.00	0001-01-01 00:00:00	2
 99991231235959.00	9999-12-31 23:59:59	3
@@ -3232,11 +3146,11 @@ NULL	NULL	1
 20050628100000.00	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as decimal) AS `CAST(my_datetime AS DECIMAL)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as decimal(37,2)) AS `CAST(my_datetime AS DECIMAL(37,2))`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 64 OR select_id IS NULL);
-CAST(my_datetime AS DECIMAL)	my_datetime	id
+CAST(my_datetime AS DECIMAL(37,2))	my_datetime	id
 NULL	NULL	1
 10101000000.00	0001-01-01 00:00:00	2
 99991231235959.00	9999-12-31 23:59:59	3
@@ -3245,12 +3159,12 @@ NULL	NULL	1
 DROP VIEW v1;


-CREATE VIEW v1 AS SELECT CAST(my_decimal AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_decimal AS DECIMAL(37,2)),
 my_decimal, id FROM t1_values;
-SELECT CAST(my_decimal AS DECIMAL),
+SELECT CAST(my_decimal AS DECIMAL(37,2)),
 my_decimal, id FROM t1_values
 WHERE select_id = 63 OR select_id IS NULL;
-CAST(my_decimal AS DECIMAL)	my_decimal	id
+CAST(my_decimal AS DECIMAL(37,2))	my_decimal	id
 NULL	NULL	1
 -10000000000000000000000000000000000.00	-9999999999999999999999999999999999.999999999999999999999999999999	2
 10000000000000000000000000000000000.00	9999999999999999999999999999999999.999999999999999999999999999999	3
@@ -3258,11 +3172,11 @@ NULL	NULL	1
 -1.00	-1.000000000000000000000000000000	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as decimal) AS `CAST(my_decimal AS DECIMAL)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as decimal(37,2)) AS `CAST(my_decimal AS DECIMAL(37,2))`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 63 OR select_id IS NULL);
-CAST(my_decimal AS DECIMAL)	my_decimal	id
+CAST(my_decimal AS DECIMAL(37,2))	my_decimal	id
 NULL	NULL	1
 -10000000000000000000000000000000000.00	-9999999999999999999999999999999999.999999999999999999999999999999	2
 10000000000000000000000000000000000.00	9999999999999999999999999999999999.999999999999999999999999999999	3
@@ -3271,12 +3185,12 @@ NULL	NULL	1
 DROP VIEW v1;


-CREATE VIEW v1 AS SELECT CAST(my_bigint AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_bigint AS DECIMAL(37,2)),
 my_bigint, id FROM t1_values;
-SELECT CAST(my_bigint AS DECIMAL),
+SELECT CAST(my_bigint AS DECIMAL(37,2)),
 my_bigint, id FROM t1_values
 WHERE select_id = 62 OR select_id IS NULL;
-CAST(my_bigint AS DECIMAL)	my_bigint	id
+CAST(my_bigint AS DECIMAL(37,2))	my_bigint	id
 NULL	NULL	1
 -9223372036854775808.00	-9223372036854775808	2
 9223372036854775807.00	9223372036854775807	3
@@ -3284,11 +3198,11 @@ NULL	NULL	1
 -1.00	-1	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as decimal) AS `CAST(my_bigint AS DECIMAL)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as decimal(37,2)) AS `CAST(my_bigint AS DECIMAL(37,2))`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 62 OR select_id IS NULL);
-CAST(my_bigint AS DECIMAL)	my_bigint	id
+CAST(my_bigint AS DECIMAL(37,2))	my_bigint	id
 NULL	NULL	1
 -9223372036854775808.00	-9223372036854775808	2
 9223372036854775807.00	9223372036854775807	3
@@ -3297,12 +3211,12 @@ NULL	NULL	1
 DROP VIEW v1;


-CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DECIMAL(37,2)),
 my_varbinary_1000, id FROM t1_values;
-SELECT CAST(my_varbinary_1000 AS DECIMAL),
+SELECT CAST(my_varbinary_1000 AS DECIMAL(37,2)),
 my_varbinary_1000, id FROM t1_values
 WHERE select_id = 61 OR select_id IS NULL;
-CAST(my_varbinary_1000 AS DECIMAL)	my_varbinary_1000	id
+CAST(my_varbinary_1000 AS DECIMAL(37,2))	my_varbinary_1000	id
 NULL	NULL	1
 0.00		2
 0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
@@ -3315,11 +3229,11 @@ Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as decimal) AS `CAST(my_varbinary_1000 AS DECIMAL)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as decimal(37,2)) AS `CAST(my_varbinary_1000 AS DECIMAL(37,2))`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 61 OR select_id IS NULL);
-CAST(my_varbinary_1000 AS DECIMAL)	my_varbinary_1000	id
+CAST(my_varbinary_1000 AS DECIMAL(37,2))	my_varbinary_1000	id
 NULL	NULL	1
 0.00		2
 0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
@@ -3333,12 +3247,12 @@ Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP VIEW v1;


-CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DECIMAL(37,2)),
 my_binary_30, id FROM t1_values;
-SELECT CAST(my_binary_30 AS DECIMAL),
+SELECT CAST(my_binary_30 AS DECIMAL(37,2)),
 my_binary_30, id FROM t1_values
 WHERE select_id = 60 OR select_id IS NULL;
-CAST(my_binary_30 AS DECIMAL)	my_binary_30	id
+CAST(my_binary_30 AS DECIMAL(37,2))	my_binary_30	id
 NULL	NULL	1
 0.00		2
 0.00	<--------30 characters------->	3
@@ -3356,11 +3270,11 @@ Warning	1292	Truncated incorrect DECIMAL value: '-1'
 Warning	1292	Truncated incorrect DECIMAL value: '-3333.3333'
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as decimal) AS `CAST(my_binary_30 AS DECIMAL)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as decimal(37,2)) AS `CAST(my_binary_30 AS DECIMAL(37,2))`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 60 OR select_id IS NULL);
-CAST(my_binary_30 AS DECIMAL)	my_binary_30	id
+CAST(my_binary_30 AS DECIMAL(37,2))	my_binary_30	id
 NULL	NULL	1
 0.00		2
 0.00	<--------30 characters------->	3
@@ -3379,12 +3293,12 @@ Warning	1292	Truncated incorrect DECIMAL value: '-3333.3333'
 DROP VIEW v1;


-CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DECIMAL(37,2)),
 my_varchar_1000, id FROM t1_values;
-SELECT CAST(my_varchar_1000 AS DECIMAL),
+SELECT CAST(my_varchar_1000 AS DECIMAL(37,2)),
 my_varchar_1000, id FROM t1_values
 WHERE select_id = 59 OR select_id IS NULL;
-CAST(my_varchar_1000 AS DECIMAL)	my_varchar_1000	id
+CAST(my_varchar_1000 AS DECIMAL(37,2))	my_varchar_1000	id
 NULL	NULL	1
 0.00		2
 0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
@@ -3397,11 +3311,11 @@ Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as decimal) AS `CAST(my_varchar_1000 AS DECIMAL)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as decimal(37,2)) AS `CAST(my_varchar_1000 AS DECIMAL(37,2))`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 59 OR select_id IS NULL);
-CAST(my_varchar_1000 AS DECIMAL)	my_varchar_1000	id
+CAST(my_varchar_1000 AS DECIMAL(37,2))	my_varchar_1000	id
 NULL	NULL	1
 0.00		2
 0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
@@ -3415,12 +3329,12 @@ Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP VIEW v1;


-CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DECIMAL(37,2)),
 my_char_30, id FROM t1_values;
-SELECT CAST(my_char_30 AS DECIMAL),
+SELECT CAST(my_char_30 AS DECIMAL(37,2)),
 my_char_30, id FROM t1_values
 WHERE select_id = 58 OR select_id IS NULL;
-CAST(my_char_30 AS DECIMAL)	my_char_30	id
+CAST(my_char_30 AS DECIMAL(37,2))	my_char_30	id
 NULL	NULL	1
 0.00		2
 0.00	<--------30 characters------->	3
@@ -3436,11 +3350,11 @@ Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: ' ---<2D><><EFBFBD><EFBFBD>@<40>*$--           '
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as decimal) AS `CAST(my_char_30 AS DECIMAL)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as decimal(37,2)) AS `CAST(my_char_30 AS DECIMAL(37,2))`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 58 OR select_id IS NULL);
-CAST(my_char_30 AS DECIMAL)	my_char_30	id
+CAST(my_char_30 AS DECIMAL(37,2))	my_char_30	id
 NULL	NULL	1
 0.00		2
 0.00	<--------30 characters------->	3
--- a/mysql-test/suite/funcs_1/r/memory_trig_0102.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_0102.result
@@ -233,7 +233,7 @@ create table t1 (f1 integer) engine = memory;
 use test;
 CREATE TRIGGER trig_db.trg6_2 AFTER INSERT on tb3 
 for each row set @ret_trg6_2 = 5;
-ERROR HY000: Trigger in wrong schema
+ERROR 42S02: Table 'trig_db.tb3' doesn't exist
 use trig_db;
 CREATE TRIGGER trg6_3 AFTER INSERT on test.tb3 
 for each row set @ret_trg6_3 = 18;
--- a/mysql-test/suite/funcs_1/r/memory_trig_08.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_08.result
@@ -480,9 +480,8 @@ BEGIN
 WHILE @counter1 < new.f136 
 SET @counter1 = @counter1 + 1; 
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'WHILE @counter1 < new.f136 
-SET @counter1 = @counter1 + 1; 
-END' at line 3
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SET @counter1 = @counter1 + 1; 
+END' at line 4
 delete from tb3 where f122='Test 3.5.8.5-while';
 drop trigger trg7;

--- a/mysql-test/suite/funcs_1/r/memory_trig_09.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_09.result
@@ -190,7 +190,7 @@ a	NULL	Test 3.5.9.4	7	999	995.240000000000000000000000000000
 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	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'f136' at row 11
+Warning	1048	Column 'f136' cannot be null
 select f118, f121, f122, f136, f151, f163 from tb3 
 where f122 like 'Test 3.5.9.4-trig';
 f118	f121	f122	f136	f151	f163
--- a/mysql-test/suite/funcs_1/r/memory_views.result
+++ b/mysql-test/suite/funcs_1/r/memory_views.result
@@ -10207,7 +10207,8 @@ SHOW FIELDS  FROM v1;
 ERROR 42S02: Table 'test.v1' doesn't exist
 CHECK TABLE v1;
 Table	Op	Msg_type	Msg_text
-test.v1	check	error	Table 'test.v1' doesn't exist
+test.v1	check	Error	Table 'test.v1' doesn't exist
+test.v1	check	error	Corrupt
 DESCRIBE v1;
 ERROR 42S02: Table 'test.v1' doesn't exist
 EXPLAIN SELECT * FROM v1;
--- a/mysql-test/suite/funcs_1/r/myisam__datadict.result
+++ b/mysql-test/suite/funcs_1/r/myisam__datadict.result
@@ -4912,6 +4912,7 @@ INTO OUTFILE '../tmp/out.myisam.db.file'
 WHERE schema_name LIKE 'db_%';
 CREATE USER user_3212@localhost;
 GRANT ALL ON db_datadict.* TO user_3212@localhost;
+GRANT FILE ON *.* TO user_3212@localhost;
 connect(localhost,user_3212,,db_datadict,MYSQL_PORT,MYSQL_SOCK);
 	
 user_3212@localhost	db_datadict
@@ -4920,7 +4921,7 @@ INTO OUTFILE '../tmp/out.myisam.user.file'
  FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"'
  LINES TERMINATED BY '\n'
  FROM schemata LIMIT 0, 5;
-ERROR 28000: Access denied for user 'user_3212'@'localhost' (using password: NO)
+ERROR 42S02: Table 'db_datadict.schemata' doesn't exist
 SELECT *
 FROM schemata LIMIT 0, 5;
 ERROR 42S02: Table 'db_datadict.schemata' doesn't exist
--- a/mysql-test/suite/funcs_1/r/myisam_func_view.result
+++ b/mysql-test/suite/funcs_1/r/myisam_func_view.result
@@ -2400,16 +2400,10 @@ my_time, id FROM t1_values
 WHERE select_id = 89 OR select_id IS NULL;
 CAST(my_time AS UNSIGNED INTEGER)	my_time	id
 NULL	NULL	1
-18446744073709550778	-838:59:59	2
-838	838:59:59	3
-13	13:00:00	4
-10	10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-838:59:59'
-Warning	1105	Cast to unsigned converted negative integer to it's positive complement
-Warning	1292	Truncated incorrect INTEGER value: '838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '13:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '10:00:00'
+18446744073701165657	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_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`
@@ -2418,16 +2412,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 89 OR select_id IS NULL);
 CAST(my_time AS UNSIGNED INTEGER)	my_time	id
 NULL	NULL	1
-18446744073709550778	-838:59:59	2
-838	838:59:59	3
-13	13:00:00	4
-10	10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-838:59:59'
-Warning	1105	Cast to unsigned converted negative integer to it's positive complement
-Warning	1292	Truncated incorrect INTEGER value: '838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '13:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '10:00:00'
+18446744073701165657	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 DROP VIEW v1;


@@ -2438,16 +2426,10 @@ my_timestamp, id FROM t1_values
 WHERE select_id = 88 OR select_id IS NULL;
 CAST(my_timestamp AS UNSIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
-1970	1970-01-01 03:00:01	2
-2038	2038-01-01 02:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0000-00-00 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '1970-01-01 03:00:01'
-Warning	1292	Truncated incorrect INTEGER value: '2038-01-01 02:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+19700101030001	1970-01-01 03:00:01	2
+20380101025959	2038-01-01 02:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_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`
@@ -2456,16 +2438,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 88 OR select_id IS NULL);
 CAST(my_timestamp AS UNSIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
-1970	1970-01-01 03:00:01	2
-2038	2038-01-01 02:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0000-00-00 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '1970-01-01 03:00:01'
-Warning	1292	Truncated incorrect INTEGER value: '2038-01-01 02:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+19700101030001	1970-01-01 03:00:01	2
+20380101025959	2038-01-01 02:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 DROP VIEW v1;


@@ -2476,15 +2452,10 @@ my_date, id FROM t1_values
 WHERE select_id = 87 OR select_id IS NULL;
 CAST(my_date AS UNSIGNED INTEGER)	my_date	id
 NULL	NULL	1
-1	0001-01-01	2
-9999	9999-12-31	3
-2004	2004-02-29	4
-2005	2005-06-28	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28'
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_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`
@@ -2493,15 +2464,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 87 OR select_id IS NULL);
 CAST(my_date AS UNSIGNED INTEGER)	my_date	id
 NULL	NULL	1
-1	0001-01-01	2
-9999	9999-12-31	3
-2004	2004-02-29	4
-2005	2005-06-28	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28'
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 DROP VIEW v1;


@@ -2512,15 +2478,10 @@ my_datetime, id FROM t1_values
 WHERE select_id = 86 OR select_id IS NULL;
 CAST(my_datetime AS UNSIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
-1	0001-01-01 00:00:00	2
-9999	9999-12-31 23:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+10101000000	0001-01-01 00:00:00	2
+99991231235959	9999-12-31 23:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_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`
@@ -2529,15 +2490,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 86 OR select_id IS NULL);
 CAST(my_datetime AS UNSIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
-1	0001-01-01 00:00:00	2
-9999	9999-12-31 23:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+10101000000	0001-01-01 00:00:00	2
+99991231235959	9999-12-31 23:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 DROP VIEW v1;


@@ -2780,15 +2736,10 @@ my_time, id FROM t1_values
 WHERE select_id = 78 OR select_id IS NULL;
 CAST(my_time AS SIGNED INTEGER)	my_time	id
 NULL	NULL	1
-838	-838:59:59	2
-838	838:59:59	3
-13	13:00:00	4
-10	10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '13:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '10:00:00'
+-8385959	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as signed) AS `CAST(my_time AS SIGNED INTEGER)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2797,15 +2748,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 78 OR select_id IS NULL);
 CAST(my_time AS SIGNED INTEGER)	my_time	id
 NULL	NULL	1
-838	-838:59:59	2
-838	838:59:59	3
-13	13:00:00	4
-10	10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '838:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '13:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '10:00:00'
+-8385959	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 DROP VIEW v1;


@@ -2816,16 +2762,10 @@ my_timestamp, id FROM t1_values
 WHERE select_id = 77 OR select_id IS NULL;
 CAST(my_timestamp AS SIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
-1970	1970-01-01 03:00:01	2
-2038	2038-01-01 02:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0000-00-00 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '1970-01-01 03:00:01'
-Warning	1292	Truncated incorrect INTEGER value: '2038-01-01 02:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+19700101030001	1970-01-01 03:00:01	2
+20380101025959	2038-01-01 02:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as signed) AS `CAST(my_timestamp AS SIGNED INTEGER)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2834,16 +2774,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 77 OR select_id IS NULL);
 CAST(my_timestamp AS SIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
-1970	1970-01-01 03:00:01	2
-2038	2038-01-01 02:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0000-00-00 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '1970-01-01 03:00:01'
-Warning	1292	Truncated incorrect INTEGER value: '2038-01-01 02:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+19700101030001	1970-01-01 03:00:01	2
+20380101025959	2038-01-01 02:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 DROP VIEW v1;


@@ -2854,15 +2788,10 @@ my_date, id FROM t1_values
 WHERE select_id = 76 OR select_id IS NULL;
 CAST(my_date AS SIGNED INTEGER)	my_date	id
 NULL	NULL	1
-1	0001-01-01	2
-9999	9999-12-31	3
-2004	2004-02-29	4
-2005	2005-06-28	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28'
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as signed) AS `CAST(my_date AS SIGNED INTEGER)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2871,15 +2800,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 76 OR select_id IS NULL);
 CAST(my_date AS SIGNED INTEGER)	my_date	id
 NULL	NULL	1
-1	0001-01-01	2
-9999	9999-12-31	3
-2004	2004-02-29	4
-2005	2005-06-28	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28'
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 DROP VIEW v1;


@@ -2890,15 +2814,10 @@ my_datetime, id FROM t1_values
 WHERE select_id = 75 OR select_id IS NULL;
 CAST(my_datetime AS SIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
-1	0001-01-01 00:00:00	2
-9999	9999-12-31 23:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+10101000000	0001-01-01 00:00:00	2
+99991231235959	9999-12-31 23:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as signed) AS `CAST(my_datetime AS SIGNED INTEGER)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
@@ -2907,15 +2826,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 75 OR select_id IS NULL);
 CAST(my_datetime AS SIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
-1	0001-01-01 00:00:00	2
-9999	9999-12-31 23:59:59	3
-2004	2004-02-29 23:59:59	4
-2005	2005-06-28 10:00:00	5
-Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '0001-01-01 00:00:00'
-Warning	1292	Truncated incorrect INTEGER value: '9999-12-31 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2004-02-29 23:59:59'
-Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
+10101000000	0001-01-01 00:00:00	2
+99991231235959	9999-12-31 23:59:59	3
+20040229235959	2004-02-29 23:59:59	4
+20050628100000	2005-06-28 10:00:00	5
 DROP VIEW v1;


@@ -2926,8 +2840,8 @@ my_decimal, id FROM t1_values
 WHERE select_id = 74 OR select_id IS NULL;
 CAST(my_decimal AS SIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
-10000000000000000	-9999999999999999999999999999999999.999999999999999999999999999999	2
-10000000000000000	9999999999999999999999999999999999.999999999999999999999999999999	3
+-9223372036854775808	-9999999999999999999999999999999999.999999999999999999999999999999	2
+9223372036854775807	9999999999999999999999999999999999.999999999999999999999999999999	3
 0	0.000000000000000000000000000000	4
 -1	-1.000000000000000000000000000000	5
 Warnings:
@@ -2941,8 +2855,8 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 74 OR select_id IS NULL);
 CAST(my_decimal AS SIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
-10000000000000000	-9999999999999999999999999999999999.999999999999999999999999999999	2
-10000000000000000	9999999999999999999999999999999999.999999999999999999999999999999	3
+-9223372036854775808	-9999999999999999999999999999999999.999999999999999999999999999999	2
+9223372036854775807	9999999999999999999999999999999999.999999999999999999999999999999	3
 0	0.000000000000000000000000000000	4
 -1	-1.000000000000000000000000000000	5
 Warnings:
@@ -3115,12 +3029,12 @@ Warning	1292	Truncated incorrect INTEGER value: ' ---
 DROP VIEW v1;


-CREATE VIEW v1 AS SELECT CAST(my_year AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_year AS DECIMAL(37,2)),
 my_year, id FROM t1_values;
-SELECT CAST(my_year AS DECIMAL),
+SELECT CAST(my_year AS DECIMAL(37,2)),
 my_year, id FROM t1_values
 WHERE select_id = 68 OR select_id IS NULL;
-CAST(my_year AS DECIMAL)	my_year	id
+CAST(my_year AS DECIMAL(37,2))	my_year	id
 NULL	NULL	1
 1901.00	1901	2
 2155.00	2155	3
@@ -3128,11 +3042,11 @@ NULL	NULL	1
 2005.00	2005	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as decimal) AS `CAST(my_year AS DECIMAL)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as decimal(37,2)) AS `CAST(my_year AS DECIMAL(37,2))`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 68 OR select_id IS NULL);
-CAST(my_year AS DECIMAL)	my_year	id
+CAST(my_year AS DECIMAL(37,2))	my_year	id
 NULL	NULL	1
 1901.00	1901	2
 2155.00	2155	3
@@ -3141,12 +3055,12 @@ NULL	NULL	1
 DROP VIEW v1;


-CREATE VIEW v1 AS SELECT CAST(my_time AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_time AS DECIMAL(37,2)),
 my_time, id FROM t1_values;
-SELECT CAST(my_time AS DECIMAL),
+SELECT CAST(my_time AS DECIMAL(37,2)),
 my_time, id FROM t1_values
 WHERE select_id = 67 OR select_id IS NULL;
-CAST(my_time AS DECIMAL)	my_time	id
+CAST(my_time AS DECIMAL(37,2))	my_time	id
 NULL	NULL	1
 -8385959.00	-838:59:59	2
 8385959.00	838:59:59	3
@@ -3154,11 +3068,11 @@ NULL	NULL	1
 100000.00	10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as decimal) AS `CAST(my_time AS DECIMAL)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as decimal(37,2)) AS `CAST(my_time AS DECIMAL(37,2))`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 67 OR select_id IS NULL);
-CAST(my_time AS DECIMAL)	my_time	id
+CAST(my_time AS DECIMAL(37,2))	my_time	id
 NULL	NULL	1
 -8385959.00	-838:59:59	2
 8385959.00	838:59:59	3
@@ -3167,12 +3081,12 @@ NULL	NULL	1
 DROP VIEW v1;


-CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DECIMAL(37,2)),
 my_timestamp, id FROM t1_values;
-SELECT CAST(my_timestamp AS DECIMAL),
+SELECT CAST(my_timestamp AS DECIMAL(37,2)),
 my_timestamp, id FROM t1_values
 WHERE select_id = 66 OR select_id IS NULL;
-CAST(my_timestamp AS DECIMAL)	my_timestamp	id
+CAST(my_timestamp AS DECIMAL(37,2))	my_timestamp	id
 0.00	0000-00-00 00:00:00	1
 19700101030001.00	1970-01-01 03:00:01	2
 20380101025959.00	2038-01-01 02:59:59	3
@@ -3180,11 +3094,11 @@ CAST(my_timestamp AS DECIMAL)	my_timestamp	id
 20050628100000.00	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as decimal) AS `CAST(my_timestamp AS DECIMAL)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as decimal(37,2)) AS `CAST(my_timestamp AS DECIMAL(37,2))`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 66 OR select_id IS NULL);
-CAST(my_timestamp AS DECIMAL)	my_timestamp	id
+CAST(my_timestamp AS DECIMAL(37,2))	my_timestamp	id
 0.00	0000-00-00 00:00:00	1
 19700101030001.00	1970-01-01 03:00:01	2
 20380101025959.00	2038-01-01 02:59:59	3
@@ -3193,12 +3107,12 @@ CAST(my_timestamp AS DECIMAL)	my_timestamp	id
 DROP VIEW v1;


-CREATE VIEW v1 AS SELECT CAST(my_date AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_date AS DECIMAL(37,2)),
 my_date, id FROM t1_values;
-SELECT CAST(my_date AS DECIMAL),
+SELECT CAST(my_date AS DECIMAL(37,2)),
 my_date, id FROM t1_values
 WHERE select_id = 65 OR select_id IS NULL;
-CAST(my_date AS DECIMAL)	my_date	id
+CAST(my_date AS DECIMAL(37,2))	my_date	id
 NULL	NULL	1
 10101.00	0001-01-01	2
 99991231.00	9999-12-31	3
@@ -3206,11 +3120,11 @@ NULL	NULL	1
 20050628.00	2005-06-28	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as decimal) AS `CAST(my_date AS DECIMAL)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as decimal(37,2)) AS `CAST(my_date AS DECIMAL(37,2))`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 65 OR select_id IS NULL);
-CAST(my_date AS DECIMAL)	my_date	id
+CAST(my_date AS DECIMAL(37,2))	my_date	id
 NULL	NULL	1
 10101.00	0001-01-01	2
 99991231.00	9999-12-31	3
@@ -3219,12 +3133,12 @@ NULL	NULL	1
 DROP VIEW v1;


-CREATE VIEW v1 AS SELECT CAST(my_datetime AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_datetime AS DECIMAL(37,2)),
 my_datetime, id FROM t1_values;
-SELECT CAST(my_datetime AS DECIMAL),
+SELECT CAST(my_datetime AS DECIMAL(37,2)),
 my_datetime, id FROM t1_values
 WHERE select_id = 64 OR select_id IS NULL;
-CAST(my_datetime AS DECIMAL)	my_datetime	id
+CAST(my_datetime AS DECIMAL(37,2))	my_datetime	id
 NULL	NULL	1
 10101000000.00	0001-01-01 00:00:00	2
 99991231235959.00	9999-12-31 23:59:59	3
@@ -3232,11 +3146,11 @@ NULL	NULL	1
 20050628100000.00	2005-06-28 10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as decimal) AS `CAST(my_datetime AS DECIMAL)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as decimal(37,2)) AS `CAST(my_datetime AS DECIMAL(37,2))`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 64 OR select_id IS NULL);
-CAST(my_datetime AS DECIMAL)	my_datetime	id
+CAST(my_datetime AS DECIMAL(37,2))	my_datetime	id
 NULL	NULL	1
 10101000000.00	0001-01-01 00:00:00	2
 99991231235959.00	9999-12-31 23:59:59	3
@@ -3245,12 +3159,12 @@ NULL	NULL	1
 DROP VIEW v1;


-CREATE VIEW v1 AS SELECT CAST(my_decimal AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_decimal AS DECIMAL(37,2)),
 my_decimal, id FROM t1_values;
-SELECT CAST(my_decimal AS DECIMAL),
+SELECT CAST(my_decimal AS DECIMAL(37,2)),
 my_decimal, id FROM t1_values
 WHERE select_id = 63 OR select_id IS NULL;
-CAST(my_decimal AS DECIMAL)	my_decimal	id
+CAST(my_decimal AS DECIMAL(37,2))	my_decimal	id
 NULL	NULL	1
 -10000000000000000000000000000000000.00	-9999999999999999999999999999999999.999999999999999999999999999999	2
 10000000000000000000000000000000000.00	9999999999999999999999999999999999.999999999999999999999999999999	3
@@ -3258,11 +3172,11 @@ NULL	NULL	1
 -1.00	-1.000000000000000000000000000000	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as decimal) AS `CAST(my_decimal AS DECIMAL)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as decimal(37,2)) AS `CAST(my_decimal AS DECIMAL(37,2))`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 63 OR select_id IS NULL);
-CAST(my_decimal AS DECIMAL)	my_decimal	id
+CAST(my_decimal AS DECIMAL(37,2))	my_decimal	id
 NULL	NULL	1
 -10000000000000000000000000000000000.00	-9999999999999999999999999999999999.999999999999999999999999999999	2
 10000000000000000000000000000000000.00	9999999999999999999999999999999999.999999999999999999999999999999	3
@@ -3271,12 +3185,12 @@ NULL	NULL	1
 DROP VIEW v1;


-CREATE VIEW v1 AS SELECT CAST(my_bigint AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_bigint AS DECIMAL(37,2)),
 my_bigint, id FROM t1_values;
-SELECT CAST(my_bigint AS DECIMAL),
+SELECT CAST(my_bigint AS DECIMAL(37,2)),
 my_bigint, id FROM t1_values
 WHERE select_id = 62 OR select_id IS NULL;
-CAST(my_bigint AS DECIMAL)	my_bigint	id
+CAST(my_bigint AS DECIMAL(37,2))	my_bigint	id
 NULL	NULL	1
 -9223372036854775808.00	-9223372036854775808	2
 9223372036854775807.00	9223372036854775807	3
@@ -3284,11 +3198,11 @@ NULL	NULL	1
 -1.00	-1	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as decimal) AS `CAST(my_bigint AS DECIMAL)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as decimal(37,2)) AS `CAST(my_bigint AS DECIMAL(37,2))`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 62 OR select_id IS NULL);
-CAST(my_bigint AS DECIMAL)	my_bigint	id
+CAST(my_bigint AS DECIMAL(37,2))	my_bigint	id
 NULL	NULL	1
 -9223372036854775808.00	-9223372036854775808	2
 9223372036854775807.00	9223372036854775807	3
@@ -3297,12 +3211,12 @@ NULL	NULL	1
 DROP VIEW v1;


-CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DECIMAL(37,2)),
 my_varbinary_1000, id FROM t1_values;
-SELECT CAST(my_varbinary_1000 AS DECIMAL),
+SELECT CAST(my_varbinary_1000 AS DECIMAL(37,2)),
 my_varbinary_1000, id FROM t1_values
 WHERE select_id = 61 OR select_id IS NULL;
-CAST(my_varbinary_1000 AS DECIMAL)	my_varbinary_1000	id
+CAST(my_varbinary_1000 AS DECIMAL(37,2))	my_varbinary_1000	id
 NULL	NULL	1
 0.00		2
 0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
@@ -3315,11 +3229,11 @@ Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as decimal) AS `CAST(my_varbinary_1000 AS DECIMAL)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as decimal(37,2)) AS `CAST(my_varbinary_1000 AS DECIMAL(37,2))`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 61 OR select_id IS NULL);
-CAST(my_varbinary_1000 AS DECIMAL)	my_varbinary_1000	id
+CAST(my_varbinary_1000 AS DECIMAL(37,2))	my_varbinary_1000	id
 NULL	NULL	1
 0.00		2
 0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
@@ -3333,12 +3247,12 @@ Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP VIEW v1;


-CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DECIMAL(37,2)),
 my_binary_30, id FROM t1_values;
-SELECT CAST(my_binary_30 AS DECIMAL),
+SELECT CAST(my_binary_30 AS DECIMAL(37,2)),
 my_binary_30, id FROM t1_values
 WHERE select_id = 60 OR select_id IS NULL;
-CAST(my_binary_30 AS DECIMAL)	my_binary_30	id
+CAST(my_binary_30 AS DECIMAL(37,2))	my_binary_30	id
 NULL	NULL	1
 0.00		2
 0.00	<--------30 characters------->	3
@@ -3356,11 +3270,11 @@ Warning	1292	Truncated incorrect DECIMAL value: '-1'
 Warning	1292	Truncated incorrect DECIMAL value: '-3333.3333'
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as decimal) AS `CAST(my_binary_30 AS DECIMAL)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as decimal(37,2)) AS `CAST(my_binary_30 AS DECIMAL(37,2))`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 60 OR select_id IS NULL);
-CAST(my_binary_30 AS DECIMAL)	my_binary_30	id
+CAST(my_binary_30 AS DECIMAL(37,2))	my_binary_30	id
 NULL	NULL	1
 0.00		2
 0.00	<--------30 characters------->	3
@@ -3379,12 +3293,12 @@ Warning	1292	Truncated incorrect DECIMAL value: '-3333.3333'
 DROP VIEW v1;


-CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DECIMAL(37,2)),
 my_varchar_1000, id FROM t1_values;
-SELECT CAST(my_varchar_1000 AS DECIMAL),
+SELECT CAST(my_varchar_1000 AS DECIMAL(37,2)),
 my_varchar_1000, id FROM t1_values
 WHERE select_id = 59 OR select_id IS NULL;
-CAST(my_varchar_1000 AS DECIMAL)	my_varchar_1000	id
+CAST(my_varchar_1000 AS DECIMAL(37,2))	my_varchar_1000	id
 NULL	NULL	1
 0.00		2
 0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
@@ -3397,11 +3311,11 @@ Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as decimal) AS `CAST(my_varchar_1000 AS DECIMAL)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as decimal(37,2)) AS `CAST(my_varchar_1000 AS DECIMAL(37,2))`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 59 OR select_id IS NULL);
-CAST(my_varchar_1000 AS DECIMAL)	my_varchar_1000	id
+CAST(my_varchar_1000 AS DECIMAL(37,2))	my_varchar_1000	id
 NULL	NULL	1
 0.00		2
 0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
@@ -3415,12 +3329,12 @@ Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP VIEW v1;


-CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DECIMAL),
+CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DECIMAL(37,2)),
 my_char_30, id FROM t1_values;
-SELECT CAST(my_char_30 AS DECIMAL),
+SELECT CAST(my_char_30 AS DECIMAL(37,2)),
 my_char_30, id FROM t1_values
 WHERE select_id = 58 OR select_id IS NULL;
-CAST(my_char_30 AS DECIMAL)	my_char_30	id
+CAST(my_char_30 AS DECIMAL(37,2))	my_char_30	id
 NULL	NULL	1
 0.00		2
 0.00	<--------30 characters------->	3
@@ -3436,11 +3350,11 @@ Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: ' ---<2D><><EFBFBD><EFBFBD>@<40>*$--           '
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as decimal) AS `CAST(my_char_30 AS DECIMAL)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as decimal(37,2)) AS `CAST(my_char_30 AS DECIMAL(37,2))`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 58 OR select_id IS NULL);
-CAST(my_char_30 AS DECIMAL)	my_char_30	id
+CAST(my_char_30 AS DECIMAL(37,2))	my_char_30	id
 NULL	NULL	1
 0.00		2
 0.00	<--------30 characters------->	3
--- a/mysql-test/suite/funcs_1/r/myisam_trig_0102.result
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_0102.result
@@ -237,7 +237,7 @@ create table t1 (f1 integer) engine = myisam;
 use test;
 CREATE TRIGGER trig_db.trg6_2 AFTER INSERT on tb3 
 for each row set @ret_trg6_2 = 5;
-ERROR HY000: Trigger in wrong schema
+ERROR 42S02: Table 'trig_db.tb3' doesn't exist
 use trig_db;
 CREATE TRIGGER trg6_3 AFTER INSERT on test.tb3 
 for each row set @ret_trg6_3 = 18;
--- a/mysql-test/suite/funcs_1/r/myisam_trig_08.result
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_08.result
@@ -484,9 +484,8 @@ BEGIN
 WHILE @counter1 < new.f136 
 SET @counter1 = @counter1 + 1; 
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'WHILE @counter1 < new.f136 
-SET @counter1 = @counter1 + 1; 
-END' at line 3
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SET @counter1 = @counter1 + 1; 
+END' at line 4
 delete from tb3 where f122='Test 3.5.8.5-while';
 drop trigger trg7;

--- a/mysql-test/suite/funcs_1/r/myisam_trig_09.result
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_09.result
@@ -194,7 +194,7 @@ a	NULL	Test 3.5.9.4	7	999	995.240000000000000000000000000000
 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	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'f136' at row 11
+Warning	1048	Column 'f136' cannot be null
 select f118, f121, f122, f136, f151, f163 from tb3 
 where f122 like 'Test 3.5.9.4-trig';
 f118	f121	f122	f136	f151	f163
--- a/mysql-test/suite/funcs_1/r/myisam_views.result
+++ b/mysql-test/suite/funcs_1/r/myisam_views.result
@@ -10224,7 +10224,8 @@ SHOW FIELDS  FROM v1;
 ERROR 42S02: Table 'test.v1' doesn't exist
 CHECK TABLE v1;
 Table	Op	Msg_type	Msg_text
-test.v1	check	error	Table 'test.v1' doesn't exist
+test.v1	check	Error	Table 'test.v1' doesn't exist
+test.v1	check	error	Corrupt
 DESCRIBE v1;
 ERROR 42S02: Table 'test.v1' doesn't exist
 EXPLAIN SELECT * FROM v1;
--- a/mysql-test/suite/funcs_1/triggers/triggers_0102.inc
+++ b/mysql-test/suite/funcs_1/triggers/triggers_0102.inc
@@ -265,7 +265,7 @@ let $message= Testcase 3.5.1.8:;

 	# Can't create a trigger in a different database
 	use test;
-	--error 1435
+	--error 1146
 	CREATE TRIGGER trig_db.trg6_2 AFTER INSERT on tb3 
 		for each row set @ret_trg6_2 = 5;

--- a/mysql-test/suite/funcs_1/views/func_view.inc
+++ b/mysql-test/suite/funcs_1/views/func_view.inc
@@ -609,7 +609,8 @@ let $col_type= my_year;


 # 1.1.6. CAST --> DECIMAL
-let $target_type= DECIMAL;
+# Set the following to (37,2) since the default was changed to (10,0) - OBN
+let $target_type= DECIMAL(37,2);
 #
 let $col_type= my_char_30;
 --source suite/funcs_1/views/fv_cast.inc
--- a/mysql-test/suite/row_lock/include/row_lock.inc
+++ b/mysql-test/suite/row_lock/include/row_lock.inc
@@ -1,83 +0,0 @@
--disable_warnings
-DROP TABLE IF EXISTS t1, t2;
--enable_warnings
-SET autocommit=0;
-# Create additional connections used through test
-CONNECT (root1, localhost, root,,);
-SET autocommit=0;
--echo connection default;
-CONNECTION default;
-eval CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-eval $indext1;
-eval CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-eval $indext2;
-COMMIT;
-SELECT @@global.tx_isolation;
-
-# Both transaction are able to update the tables
-eval EXPLAIN $select;
-eval $select;
-
--echo connection root1;
-CONNECTION root1;
-UPDATE t1,t2 SET t1.i=225,t2.i=225 WHERE t1.i=125 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
--echo connection default;
-CONNECTION default;
-UPDATE t1,t2 SET t1.i=223,t2.i=223 WHERE t1.i=123 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
--echo connection root1;
-CONNECTION root1;
-UPDATE t1,t2 SET t1.i=226,t2.i=226 WHERE t1.i=126 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
--echo connection default;
-CONNECTION default;
-UPDATE t1,t2 SET t1.i=224,t2.i=224 WHERE t1.i=124 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
--echo connection root1;
-CONNECTION root1;
-DELETE FROM t1 WHERE t1.i=226;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
--echo connection default;
-CONNECTION default;
-DELETE FROM t1 WHERE t1.i=224;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-COMMIT;
-
--echo connection root1;
-CONNECTION root1;
-ROLLBACK;
-
--echo connection default;
-CONNECTION default;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
--echo connection root1;
-CONNECTION root1;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-DISCONNECT root1;
--echo connection default;
-CONNECTION default;
-DROP TABLE t1, t2;
-
--- a/mysql-test/suite/row_lock/include/row_lock_big_tab.inc
+++ b/mysql-test/suite/row_lock/include/row_lock_big_tab.inc
@@ -1,94 +0,0 @@
--disable_warnings
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
--enable_warnings
-SET autocommit=0;
-# Create additional connections used through test
-CONNECT (root1, localhost, root,,);
-SET autocommit=0;
--echo connection default;
-CONNECTION default;
-eval CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-eval $indext1;
-eval CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-eval $indext2;
-DELIMITER |;
-CREATE PROCEDURE fill_t1 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-      INSERT INTO t1 VALUES (cnt, cnt+100, cnt, cnt+100);
-      SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t1() RETURNS int
-BEGIN
-    DECLARE res int DEFAULT 0;
-    SELECT count(*)/2 INTO res FROM t1;
-    RETURN  res;
-END;
-|
-CREATE PROCEDURE fill_t2 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-      INSERT INTO t2 VALUES (cnt, cnt+100, cnt, cnt+100);
-      SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t2() RETURNS int
-BEGIN
-    DECLARE res int DEFAULT 0;
-    SELECT count(*)/2 INTO res FROM t2;
-    RETURN  res;
-END;
-|
-DELIMITER ;|
-CALL fill_t1 (10);
-CALL fill_t2 (10);
-COMMIT;
-SELECT @@global.tx_isolation;
-# With the two separate selects (without join) the differs from
-# that select with join.
-
-# Both transaction are able to update the tables
-eval EXPLAIN $select;
-eval $select;
-
--echo connection root1;
-CONNECTION root1;
-SELECT k from t1 WHERE k < half_t1();
-SELECT k from t1 WHERE k >= half_t1();
-UPDATE t1,t2 SET t1.i=1111,t2.i=2222 WHERE t1.k < half_t1() AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
--echo connection default;
-CONNECTION default;
-UPDATE t1,t2 SET t1.i=3333,t2.i=4444 WHERE t1.k >= half_t1() AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-COMMIT;
-
--echo connection root1;
-CONNECTION root1;
-ROLLBACK;
-
--echo connection default;
-CONNECTION default;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
--echo connection root1;
-CONNECTION root1;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-DISCONNECT root1;
--echo connection default;
-CONNECTION default;
-DROP VIEW IF EXISTS v1;
-DROP TABLE t1, t2;
-#DROP VIEW v1;
-
--- a/mysql-test/suite/row_lock/include/row_lock_big_tab_1.inc
+++ b/mysql-test/suite/row_lock/include/row_lock_big_tab_1.inc
@@ -1,93 +0,0 @@
--disable_warnings
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
--enable_warnings
-SET autocommit=0;
-# Create additional connections used through test
-CONNECT (root1, localhost, root,,);
-SET autocommit=0;
--echo connection default;
-CONNECTION default;
-eval CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-eval $indext1;
-eval CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-eval $indext2;
-DELIMITER |;
-CREATE PROCEDURE fill_t1 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-      INSERT INTO t1 VALUES (cnt, cnt+100, cnt, cnt+100);
-      SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t1() RETURNS int
-BEGIN
-    DECLARE res int DEFAULT 0;
-    SELECT MOD(k,2) INTO res FROM t1;
-    RETURN  res;
-END;
-|
-CREATE PROCEDURE fill_t2 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-      INSERT INTO t2 VALUES (cnt, cnt+100, cnt, cnt+100);
-      SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t2() RETURNS int
-BEGIN
-    DECLARE res int DEFAULT 0;
-    SELECT MOD(k,2) INTO res FROM t2;
-    RETURN  res;
-END;
-|
-DELIMITER ;|
-eval CALL fill_t1 ($nbrows);
-eval CALL fill_t2 ($nbrows);
-COMMIT;
-SELECT @@global.tx_isolation;
-# With the two separate selects (without join) the differs from
-# that select with join.
-
-# Both transaction are able to update the tables
-eval EXPLAIN $select;
-eval $select;
-
--echo connection root1;
-CONNECTION root1;
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.k % 2= 1 AND t1.k = t2.k LOCK IN SHARE MODE;
-UPDATE t1,t2 SET t1.i=1111,t2.i=2222 WHERE t1.k % 2 = 1 AND t1.k = t2.k;
-SELECT * FROM t1 WHERE k < 20 ORDER BY t1.k;
-SELECT * FROM t2 WHERE k < 20 ORDER BY t2.k;
-
--echo connection default;
-CONNECTION default;
-UPDATE t1,t2 SET t1.i=3333,t2.i=4444 WHERE t1.k % 2 = 0 AND t1.k = t2.k;
-SELECT * FROM t1 WHERE k < 20 ORDER BY t1.k;
-SELECT * FROM t2 WHERE k < 20 ORDER BY t2.k;
-
-COMMIT;
-
--echo connection root1;
-CONNECTION root1;
-ROLLBACK;
-
--echo connection default;
-CONNECTION default;
-SELECT * FROM t1 WHERE k < 40 ORDER BY t1.k;
-SELECT * FROM t2 WHERE k < 40 ORDER BY t2.k;
-
--echo connection root1;
-CONNECTION root1;
-SELECT * FROM t1 WHERE k < 40 ORDER BY t1.k;
-SELECT * FROM t2 WHERE k < 40 ORDER BY t2.k;
-DISCONNECT root1;
--echo connection default;
-CONNECTION default;
-DROP TABLE t1, t2;
-
-
--- a/mysql-test/suite/row_lock/include/row_lock_big_tab_2.inc
+++ b/mysql-test/suite/row_lock/include/row_lock_big_tab_2.inc
@@ -1,93 +0,0 @@
--disable_warnings
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
--enable_warnings
-SET autocommit=0;
-# Create additional connections used through test
-CONNECT (root1, localhost, root,,);
-SET autocommit=0;
--echo connection default;
-CONNECTION default;
-eval CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-eval $indext1;
-eval CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-eval $indext2;
-DELIMITER |;
-CREATE PROCEDURE fill_t1 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-      INSERT INTO t1 VALUES (cnt, cnt+100, cnt, cnt+100);
-      SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t1() RETURNS int
-BEGIN
-    DECLARE res int DEFAULT 0;
-    SELECT MOD(k,2) INTO res FROM t1;
-    RETURN  res;
-END;
-|
-CREATE PROCEDURE fill_t2 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-      INSERT INTO t2 VALUES (cnt, cnt+100, cnt, cnt+100);
-      SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t2() RETURNS int
-BEGIN
-    DECLARE res int DEFAULT 0;
-    SELECT MOD(k,2) INTO res FROM t2;
-    RETURN  res;
-END;
-|
-DELIMITER ;|
-eval CALL fill_t1 ($nbrows);
-eval CALL fill_t2 ($nbrows);
-COMMIT;
-SELECT @@global.tx_isolation;
-# With the two separate selects (without join) the differs from
-# that select with join.
-
-# Both transaction are able to update the tables
-eval EXPLAIN $select;
-eval $select;
-
--echo connection root1;
-CONNECTION root1;
-#SELECT t1.i,t2.i FROM t1,t2 WHERE t1.k % 2= 1 AND t1.k = t2.k FOR UPDATE;
-DELETE FROM t1 WHERE t1.k % 2 = 1;
-SELECT * FROM t1 WHERE k < 20 ORDER BY t1.k;
-SELECT * FROM t2 WHERE k < 20 ORDER BY t2.k;
-
--echo connection default;
-CONNECTION default;
-UPDATE t1,t2 SET t1.i=3333,t2.i=4444 WHERE t1.k % 2 = 0 AND t1.k = t2.k;
-SELECT * FROM t1 WHERE k < 20 ORDER BY t1.k;
-SELECT * FROM t2 WHERE k < 20 ORDER BY t2.k;
-
-COMMIT;
-
--echo connection root1;
-CONNECTION root1;
-ROLLBACK;
-
--echo connection default;
-CONNECTION default;
-SELECT * FROM t1 WHERE k < 40 ORDER BY t1.k;
-SELECT * FROM t2 WHERE k < 40 ORDER BY t2.k;
-
--echo connection root1;
-CONNECTION root1;
-SELECT * FROM t1 WHERE k < 40 ORDER BY t1.k;
-SELECT * FROM t2 WHERE k < 40 ORDER BY t2.k;
-DISCONNECT root1;
--echo connection default;
-CONNECTION default;
-DROP TABLE t1, t2;
-
-
--- a/mysql-test/suite/row_lock/include/row_lock_trig.inc
+++ b/mysql-test/suite/row_lock/include/row_lock_trig.inc
@@ -1,96 +0,0 @@
--disable_warnings
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
--enable_warnings
-SET autocommit=0;
-# Create additional connections used through test
-CONNECT (root1, localhost, root,,);
-SET autocommit=0;
--echo connection default;
-CONNECTION default;
-eval CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-eval $indext1;
-eval CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-eval $indext2;
-DELIMITER |;
-
-CREATE TRIGGER trig_t2 AFTER UPDATE ON t2
-  FOR EACH ROW BEGIN
-    UPDATE t1 SET l = NEW.i WHERE i = OLD.i;
-  END;
-|
-
-DELIMITER ;|
-
-COMMIT;
-SELECT @@global.tx_isolation;
-# With the two separate selects (without join) the differs from
-# that select with join.
-
-# Both transaction are able to update the tables
-eval EXPLAIN $select;
-eval $select;
--echo connection root1;
-CONNECTION root1;
-UPDATE t2 SET t2.i=225 WHERE t2.i=125;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
--echo connection default;
-CONNECTION default;
-UPDATE t2 SET t2.i=223 WHERE t2.i=123;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
--echo connection root1;
-CONNECTION root1;
-UPDATE t2 SET t2.i=226 WHERE t2.i=126;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
--echo connection default;
-CONNECTION default;
-UPDATE t2 SET t2.i=224 WHERE t2.i=124;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
--echo connection root1;
-CONNECTION root1;
-DELETE FROM t1 WHERE t1.i=226;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
--echo connection default;
-CONNECTION default;
-DELETE FROM t1 WHERE t1.i=224;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-COMMIT;
-
--echo connection root1;
-CONNECTION root1;
-ROLLBACK;
-
--echo connection default;
-CONNECTION default;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
--echo connection root1;
-CONNECTION root1;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-DISCONNECT root1;
--echo connection default;
-CONNECTION default;
-DROP TABLE t1, t2;
-#DROP VIEW v1;
-
--- a/mysql-test/suite/row_lock/include/row_lock_view.inc
+++ b/mysql-test/suite/row_lock/include/row_lock_view.inc
@@ -1,89 +0,0 @@
--disable_warnings
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
--enable_warnings
-SET autocommit=0;
-# Create additional connections used through test
-CONNECT (root1, localhost, root,,);
-SET autocommit=0;
--echo connection default;
-CONNECTION default;
-eval CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-eval $indext1;
-eval CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-eval $indext2;
-CREATE VIEW v1 AS SELECT t1.i, t2.l from t1,t2;
-COMMIT;
-SELECT @@global.tx_isolation;
-# With the two separate selects (without join) the differs from
-# that select with join.
-
-# Both transaction are able to update the tables
-eval EXPLAIN $select;
-eval $select;
-
--echo connection root1;
-CONNECTION root1;
-UPDATE v1 SET i=325 where i=125;
-SELECT * FROM v1 ORDER BY i,l;
-SELECT * FROM t1 ORDER BY t1.k;
-
--echo connection default;
-CONNECTION default;
-UPDATE v1 SET i=323 where i=123;
-SELECT * FROM v1 ORDER BY i,l;
-SELECT * FROM t1 ORDER BY t1.k;
-
--echo connection root1;
-CONNECTION root1;
-UPDATE v1 SET i=326 where i=126;
-SELECT * FROM v1 ORDER BY i,l;
-SELECT * FROM t1 ORDER BY t1.k;
-
--echo connection default;
-CONNECTION default;
-UPDATE v1 SET i=324 where i=124;
-SELECT * FROM v1 ORDER BY i,l;
-SELECT * FROM t1 ORDER BY t1.k;
-
--echo connection root1;
-CONNECTION root1;
-DELETE FROM t1 WHERE t1.i=226;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
--echo connection default;
-CONNECTION default;
-DELETE FROM t1 WHERE t1.i=224;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-COMMIT;
-
--echo connection root1;
-CONNECTION root1;
-ROLLBACK;
-
--echo connection default;
-CONNECTION default;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
--echo connection root1;
-CONNECTION root1;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-DISCONNECT root1;
--echo connection default;
-CONNECTION default;
-DROP VIEW IF EXISTS v1;
-DROP TABLE t1, t2;
-#DROP VIEW v1;
-
--- a/mysql-test/suite/row_lock/include/row_lock_view_mix.inc
+++ b/mysql-test/suite/row_lock/include/row_lock_view_mix.inc
@@ -1,92 +0,0 @@
--disable_warnings
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
--enable_warnings
-SET autocommit=0;
-# Create additional connections used through test
-CONNECT (root1, localhost, root,,);
-SET autocommit=0;
--echo connection default;
-CONNECTION default;
-eval CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-eval $indext1;
-eval CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-eval $indext2;
-CREATE VIEW v1 AS SELECT t1.i, t2.l from t1,t2;
-COMMIT;
-SELECT @@global.tx_isolation;
-# With the two separate selects (without join) the differs from
-# that select with join.
-
-# Both transaction are able to update the tables
-eval EXPLAIN $select;
-eval $select;
-
--echo connection root1;
-CONNECTION root1;
-UPDATE t1,t2 SET t1.i=225,t2.i=225 WHERE t1.i=125 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-#UPDATE v1 SET i=325 where i=125;
-#SELECT * FROM v1 ORDER BY i,l;
-#SELECT * FROM t1 ORDER BY t1.k;
-
--echo connection default;
-CONNECTION default;
-UPDATE v1 SET i=323 where i=123;
-SELECT * FROM v1 ORDER BY i,l;
-SELECT * FROM t1 ORDER BY t1.k;
-
--echo connection root1;
-CONNECTION root1;
-UPDATE t1,t2 SET t1.i=226,t2.i=226 WHERE t1.i=126 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
--echo connection default;
-CONNECTION default;
-UPDATE v1 SET i=324 where i=124;
-SELECT * FROM v1 ORDER BY i,l;
-SELECT * FROM t1 ORDER BY t1.k;
-
--echo connection root1;
-CONNECTION root1;
-DELETE FROM t1 WHERE t1.i=226;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
--echo connection default;
-CONNECTION default;
-DELETE FROM t1 WHERE t1.i=224;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-COMMIT;
-
--echo connection root1;
-CONNECTION root1;
-ROLLBACK;
-
--echo connection default;
-CONNECTION default;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
--echo connection root1;
-CONNECTION root1;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-DISCONNECT root1;
--echo connection default;
-CONNECTION default;
-DROP VIEW IF EXISTS v1;
-DROP TABLE t1, t2;
-#DROP VIEW v1;
-
--- a/mysql-test/suite/row_lock/include/row_lock_view_storedp.inc
+++ b/mysql-test/suite/row_lock/include/row_lock_view_storedp.inc
@@ -1,126 +0,0 @@
--disable_warnings
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-DROP PROCEDURE IF EXISTS stp_t;
--enable_warnings
-SET autocommit=0;
-# Create additional connections used through test
-CONNECT (root1, localhost, root,,);
-SET autocommit=0;
-CONNECT (root2, localhost, root,,);
-SET autocommit=0;
--echo connection default;
-CONNECTION default;
-eval CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-INSERT INTO t1 VALUES (5,127,5,127);
-INSERT INTO t1 VALUES (6,128,6,128);
-eval $indext1;
-eval CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-INSERT INTO t2 VALUES (5,127,5,127);
-INSERT INTO t2 VALUES (6,128,6,128);
-eval $indext2;
-CREATE VIEW v1 AS SELECT t1.i from t1;
-DELIMITER |;
-
-CREATE PROCEDURE stp_t (IN p1 int, IN p2 int) MODIFIES SQL DATA
-  BEGIN
-    UPDATE t2 SET i = p2 WHERE i = p1;
-    UPDATE v1 SET i = p2 WHERE i = p1;
-    SELECT * FROM v1 ORDER BY i;
-    SELECT * FROM t1 ORDER BY t1.k;
-    SELECT * FROM t2 ORDER BY t2.k;
-  END;
-|
-
-DELIMITER ;|
-
-COMMIT;
-SELECT @@global.tx_isolation;
-eval EXPLAIN $select;
-eval $select;
--echo connection root1;
-CONNECTION root1;
-CALL stp_t (125, 225);
-
--echo connection root2;
-CONNECTION root2;
-CALL stp_t (127, 227);
-
--echo connection default;
-CONNECTION default;
-CALL stp_t (123, 223);
-
--echo connection root1;
-CONNECTION root1;
-CALL stp_t (126, 226);
-
--echo connection root2;
-CONNECTION root2;
-CALL stp_t (128, 228);
-
--echo connection default;
-CONNECTION default;
-CALL stp_t (124, 224);
-
--echo connection root1;
-CONNECTION root1;
-DELETE FROM t1 WHERE t1.i=226;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
--echo connection root2;
-CONNECTION root2;
-DELETE FROM t1 WHERE t1.i=228;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
--echo connection default;
-CONNECTION default;
-DELETE FROM t1 WHERE t1.i=224;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-COMMIT;
-
--echo connection root1;
-CONNECTION root1;
-ROLLBACK;
-
--echo connection root1;
-CONNECTION root1;
-COMMIT;
-
--echo connection default;
-CONNECTION default;
-SELECT * FROM v1 ORDER BY i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
--echo connection root1;
-CONNECTION root1;
-SELECT * FROM v1 ORDER BY i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-DISCONNECT root1;
-
--echo connection root2;
-CONNECTION root2;
-SELECT * FROM v1 ORDER BY i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-DISCONNECT root2;
-
--echo connection default;
-CONNECTION default;
--disable_warnings
-DROP VIEW v1;
-DROP PROCEDURE stp_t;
-DROP TABLE t1, t2;
--enable_warnings
--- a/mysql-test/suite/row_lock/include/row_lock_view_trig.inc
+++ b/mysql-test/suite/row_lock/include/row_lock_view_trig.inc
@@ -1,99 +0,0 @@
--disable_warnings
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
--enable_warnings
-SET autocommit=0;
-# Create additional connections used through test
-CONNECT (root1, localhost, root,,);
-SET autocommit=0;
--echo connection default;
-CONNECTION default;
-eval CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-eval $indext1;
-eval CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=$engine;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-eval $indext2;
-CREATE VIEW v1 AS SELECT t1.i from t1;
-DELIMITER |;
-
-CREATE TRIGGER trig_t2 AFTER UPDATE ON t2
-  FOR EACH ROW BEGIN
-    UPDATE v1 SET i = NEW.i WHERE i = OLD.i;
-  END;
-|
-
-DELIMITER ;|
-
-COMMIT;
-SELECT @@global.tx_isolation;
-eval EXPLAIN $select;
-eval $select;
--echo connection root1;
-CONNECTION root1;
-UPDATE t2 SET t2.i=225 WHERE t2.i=125;
-SELECT * FROM v1 ORDER BY i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
--echo connection default;
-CONNECTION default;
-UPDATE t2 SET t2.i=223 WHERE t2.i=123;
-SELECT * FROM v1 ORDER BY i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
--echo connection root1;
-CONNECTION root1;
-UPDATE t2 SET t2.i=226 WHERE t2.i=126;
-SELECT * FROM v1 ORDER BY i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
--echo connection default;
-CONNECTION default;
-UPDATE t2 SET t2.i=224 WHERE t2.i=124;
-SELECT * FROM v1 ORDER BY i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
--echo connection root1;
-CONNECTION root1;
-DELETE FROM t1 WHERE t1.i=226;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
--echo connection default;
-CONNECTION default;
-DELETE FROM t1 WHERE t1.i=224;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-COMMIT;
-
--echo connection root1;
-CONNECTION root1;
-ROLLBACK;
-
--echo connection default;
-CONNECTION default;
-SELECT * FROM v1 ORDER BY i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-
--echo connection root1;
-CONNECTION root1;
-SELECT * FROM v1 ORDER BY i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-DISCONNECT root1;
--echo connection default;
-CONNECTION default;
-DROP TABLE t1, t2;
-DROP VIEW v1;
-
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_1.result
+++ b/mysql-test/suite/row_lock/r/innodb_row_lock_1.result
@@ -1,142 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t2 (i);
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	ixi	ixi	5	NULL	4	Using where; Using index
-1	SIMPLE	t2	ref	ixi	ixi	5	test.t1.i	2	Using where; Using index
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-i	i
-123	123
-124	124
-connection root1;
-UPDATE t1,t2 SET t1.i=225,t2.i=225 WHERE t1.i=125 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-connection default;
-UPDATE t1,t2 SET t1.i=223,t2.i=223 WHERE t1.i=123 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-UPDATE t1,t2 SET t1.i=226,t2.i=226 WHERE t1.i=126 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-connection default;
-UPDATE t1,t2 SET t1.i=224,t2.i=224 WHERE t1.i=124 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-DELETE FROM t1 WHERE t1.i=226;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-connection default;
-DELETE FROM t1 WHERE t1.i=224;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-COMMIT;
-connection root1;
-ROLLBACK;
-connection default;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection default;
-DROP TABLE t1, t2;
-SET @@global.innodb_table_locks= @table_locks;
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_2.result
+++ b/mysql-test/suite/row_lock/r/innodb_row_lock_2.result
@@ -1,32 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-#CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-#CREATE INDEX ixi ON t2 (i);
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	Using where
-1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	4	Using where
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-i	i
-123	123
-124	124
-connection root1;
-UPDATE t1,t2 SET t1.i=225,t2.i=225 WHERE t1.i=125 AND t2.i=t1.i;
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_3.result
+++ b/mysql-test/suite/row_lock/r/innodb_row_lock_3.result
@@ -1,32 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-#CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-#CREATE INDEX ixi ON t2 (i);
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i LOCK IN SHARE MODE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	Using where
-1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	4	Using where
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i LOCK IN SHARE MODE;
-i	i
-123	123
-124	124
-connection root1;
-UPDATE t1,t2 SET t1.i=225,t2.i=225 WHERE t1.i=125 AND t2.i=t1.i;
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_4.result
+++ b/mysql-test/suite/row_lock/r/innodb_row_lock_4.result
@@ -1,142 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t2 (i);
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i LOCK IN SHARE MODE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	ixi	ixi	5	NULL	4	Using where; Using index
-1	SIMPLE	t2	ref	ixi	ixi	5	test.t1.i	2	Using where; Using index
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i LOCK IN SHARE MODE;
-i	i
-123	123
-124	124
-connection root1;
-UPDATE t1,t2 SET t1.i=225,t2.i=225 WHERE t1.i=125 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-connection default;
-UPDATE t1,t2 SET t1.i=223,t2.i=223 WHERE t1.i=123 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-UPDATE t1,t2 SET t1.i=226,t2.i=226 WHERE t1.i=126 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-connection default;
-UPDATE t1,t2 SET t1.i=224,t2.i=224 WHERE t1.i=124 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-DELETE FROM t1 WHERE t1.i=226;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-connection default;
-DELETE FROM t1 WHERE t1.i=224;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-COMMIT;
-connection root1;
-ROLLBACK;
-connection default;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection default;
-DROP TABLE t1, t2;
-SET @@global.innodb_table_locks= @table_locks;
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_5.result
+++ b/mysql-test/suite/row_lock/r/innodb_row_lock_5.result
@@ -1,32 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t2 (i);
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1 ignore index (ixi),t2 IGNORE INDEX (ixi) WHERE t1.i<125 AND t2.i=t1.i LOCK IN SHARE MODE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	Using where
-1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	4	Using where
-SELECT t1.i,t2.i FROM t1 ignore index (ixi),t2 IGNORE INDEX (ixi) WHERE t1.i<125 AND t2.i=t1.i LOCK IN SHARE MODE;
-i	i
-123	123
-124	124
-connection root1;
-UPDATE t1,t2 SET t1.i=225,t2.i=225 WHERE t1.i=125 AND t2.i=t1.i;
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_big_tab.result
+++ b/mysql-test/suite/row_lock/r/innodb_row_lock_big_tab.result
@@ -1,97 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-CREATE INDEX ixi ON t2 (i);
-CREATE PROCEDURE fill_t1 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-INSERT INTO t1 VALUES (cnt, cnt+100, cnt, cnt+100);
-SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t1() RETURNS int
-BEGIN
-DECLARE res int DEFAULT 0;
-SELECT count(*)/2 INTO res FROM t1;
-RETURN  res;
-END;
-|
-CREATE PROCEDURE fill_t2 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-INSERT INTO t2 VALUES (cnt, cnt+100, cnt, cnt+100);
-SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t2() RETURNS int
-BEGIN
-DECLARE res int DEFAULT 0;
-SELECT count(*)/2 INTO res FROM t2;
-RETURN  res;
-END;
-|
-CALL fill_t1 (10);
-CALL fill_t2 (10);
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i < half_t1() AND t2.i=t1.i LOCK IN SHARE MODE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	ixi	ixi	5	NULL	10	Using where; Using index
-1	SIMPLE	t2	ref	ixi	ixi	5	test.t1.i	1	Using where; Using index
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i < half_t1() AND t2.i=t1.i LOCK IN SHARE MODE;
-i	i
-connection root1;
-SELECT k from t1 WHERE k < half_t1();
-k
-0
-1
-2
-3
-4
-SELECT k from t1 WHERE k >= half_t1();
-k
-5
-6
-7
-8
-9
-UPDATE t1,t2 SET t1.i=1111,t2.i=2222 WHERE t1.k < half_t1() AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-0	1111	0	100
-1	1111	1	101
-2	1111	2	102
-3	1111	3	103
-4	1111	4	104
-5	105	5	105
-6	106	6	106
-7	107	7	107
-8	108	8	108
-9	109	9	109
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-0	2222	0	100
-1	2222	1	101
-2	2222	2	102
-3	2222	3	103
-4	2222	4	104
-5	105	5	105
-6	106	6	106
-7	107	7	107
-8	108	8	108
-9	109	9	109
-connection default;
-UPDATE t1,t2 SET t1.i=3333,t2.i=4444 WHERE t1.k >= half_t1() AND t2.i=t1.i;
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_big_tab_1.result
+++ b/mysql-test/suite/row_lock/r/innodb_row_lock_big_tab_1.result
@@ -1,145 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-CREATE INDEX ixi ON t2 (i);
-CREATE PROCEDURE fill_t1 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-INSERT INTO t1 VALUES (cnt, cnt+100, cnt, cnt+100);
-SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t1() RETURNS int
-BEGIN
-DECLARE res int DEFAULT 0;
-SELECT MOD(k,2) INTO res FROM t1;
-RETURN  res;
-END;
-|
-CREATE PROCEDURE fill_t2 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-INSERT INTO t2 VALUES (cnt, cnt+100, cnt, cnt+100);
-SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t2() RETURNS int
-BEGIN
-DECLARE res int DEFAULT 0;
-SELECT MOD(k,2) INTO res FROM t2;
-RETURN  res;
-END;
-|
-CALL fill_t1 (40);
-CALL fill_t2 (40);
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1,t2 WHERE t1.k % 2= 0 AND t1.k = t2.k LOCK IN SHARE MODE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	PRIMARY	ixi	5	NULL	40	Using where; Using index
-1	SIMPLE	t2	eq_ref	PRIMARY	PRIMARY	4	test.t1.k	1	
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.k % 2= 0 AND t1.k = t2.k LOCK IN SHARE MODE;
-i	i
-100	100
-102	102
-104	104
-106	106
-108	108
-110	110
-112	112
-114	114
-116	116
-118	118
-120	120
-122	122
-124	124
-126	126
-128	128
-130	130
-132	132
-134	134
-136	136
-138	138
-connection root1;
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.k % 2= 1 AND t1.k = t2.k LOCK IN SHARE MODE;
-i	i
-101	101
-103	103
-105	105
-107	107
-109	109
-111	111
-113	113
-115	115
-117	117
-119	119
-121	121
-123	123
-125	125
-127	127
-129	129
-131	131
-133	133
-135	135
-137	137
-139	139
-UPDATE t1,t2 SET t1.i=1111,t2.i=2222 WHERE t1.k % 2 = 1 AND t1.k = t2.k;
-SELECT * FROM t1 WHERE k < 20 ORDER BY t1.k;
-k	i	j	l
-0	100	0	100
-1	1111	1	101
-2	102	2	102
-3	1111	3	103
-4	104	4	104
-5	1111	5	105
-6	106	6	106
-7	1111	7	107
-8	108	8	108
-9	1111	9	109
-10	110	10	110
-11	1111	11	111
-12	112	12	112
-13	1111	13	113
-14	114	14	114
-15	1111	15	115
-16	116	16	116
-17	1111	17	117
-18	118	18	118
-19	1111	19	119
-SELECT * FROM t2 WHERE k < 20 ORDER BY t2.k;
-k	i	j	l
-0	100	0	100
-1	2222	1	101
-2	102	2	102
-3	2222	3	103
-4	104	4	104
-5	2222	5	105
-6	106	6	106
-7	2222	7	107
-8	108	8	108
-9	2222	9	109
-10	110	10	110
-11	2222	11	111
-12	112	12	112
-13	2222	13	113
-14	114	14	114
-15	2222	15	115
-16	116	16	116
-17	2222	17	117
-18	118	18	118
-19	2222	19	119
-connection default;
-UPDATE t1,t2 SET t1.i=3333,t2.i=4444 WHERE t1.k % 2 = 0 AND t1.k = t2.k;
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_big_tab_2.result
+++ b/mysql-test/suite/row_lock/r/innodb_row_lock_big_tab_2.result
@@ -1,113 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-CREATE INDEX ixi ON t2 (i);
-CREATE PROCEDURE fill_t1 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-INSERT INTO t1 VALUES (cnt, cnt+100, cnt, cnt+100);
-SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t1() RETURNS int
-BEGIN
-DECLARE res int DEFAULT 0;
-SELECT MOD(k,2) INTO res FROM t1;
-RETURN  res;
-END;
-|
-CREATE PROCEDURE fill_t2 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-INSERT INTO t2 VALUES (cnt, cnt+100, cnt, cnt+100);
-SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t2() RETURNS int
-BEGIN
-DECLARE res int DEFAULT 0;
-SELECT MOD(k,2) INTO res FROM t2;
-RETURN  res;
-END;
-|
-CALL fill_t1 (40);
-CALL fill_t2 (40);
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1,t2 WHERE t1.k % 2= 0 AND t1.k = t2.k LOCK IN SHARE MODE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	PRIMARY	ixi	5	NULL	40	Using where; Using index
-1	SIMPLE	t2	eq_ref	PRIMARY	PRIMARY	4	test.t1.k	1	
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.k % 2= 0 AND t1.k = t2.k LOCK IN SHARE MODE;
-i	i
-100	100
-102	102
-104	104
-106	106
-108	108
-110	110
-112	112
-114	114
-116	116
-118	118
-120	120
-122	122
-124	124
-126	126
-128	128
-130	130
-132	132
-134	134
-136	136
-138	138
-connection root1;
-DELETE FROM t1 WHERE t1.k % 2 = 1;
-SELECT * FROM t1 WHERE k < 20 ORDER BY t1.k;
-k	i	j	l
-0	100	0	100
-2	102	2	102
-4	104	4	104
-6	106	6	106
-8	108	8	108
-10	110	10	110
-12	112	12	112
-14	114	14	114
-16	116	16	116
-18	118	18	118
-SELECT * FROM t2 WHERE k < 20 ORDER BY t2.k;
-k	i	j	l
-0	100	0	100
-1	101	1	101
-2	102	2	102
-3	103	3	103
-4	104	4	104
-5	105	5	105
-6	106	6	106
-7	107	7	107
-8	108	8	108
-9	109	9	109
-10	110	10	110
-11	111	11	111
-12	112	12	112
-13	113	13	113
-14	114	14	114
-15	115	15	115
-16	116	16	116
-17	117	17	117
-18	118	18	118
-19	119	19	119
-connection default;
-UPDATE t1,t2 SET t1.i=3333,t2.i=4444 WHERE t1.k % 2 = 0 AND t1.k = t2.k;
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_trig_1.result
+++ b/mysql-test/suite/row_lock/r/innodb_row_lock_trig_1.result
@@ -1,151 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t2 (i);
-CREATE TRIGGER trig_t2 AFTER UPDATE ON t2
-FOR EACH ROW BEGIN
-UPDATE t1 SET l = NEW.i WHERE i = OLD.i;
-END;
-|
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	ixi	ixi	5	NULL	4	Using where; Using index
-SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-i
-123
-124
-connection root1;
-UPDATE t2 SET t2.i=225 WHERE t2.i=125;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	225
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-connection default;
-UPDATE t2 SET t2.i=223 WHERE t2.i=123;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	223
-2	124	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-UPDATE t2 SET t2.i=226 WHERE t2.i=126;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	225
-4	126	4	226
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-connection default;
-UPDATE t2 SET t2.i=224 WHERE t2.i=124;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	223
-2	124	2	224
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-DELETE FROM t1 WHERE t1.i=226;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	225
-4	126	4	226
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-connection default;
-DELETE FROM t1 WHERE t1.i=224;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	223
-2	124	2	224
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-COMMIT;
-connection root1;
-ROLLBACK;
-connection default;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	223
-2	124	2	224
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	223
-2	124	2	224
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection default;
-DROP TABLE t1, t2;
-SET @@global.innodb_table_locks= @table_locks;
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_trig_2.result
+++ b/mysql-test/suite/row_lock/r/innodb_row_lock_trig_2.result
@@ -1,37 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-#CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-#CREATE INDEX ixi ON t2 (i);
-CREATE TRIGGER trig_t2 AFTER UPDATE ON t2
-FOR EACH ROW BEGIN
-UPDATE t1 SET l = NEW.i WHERE i = OLD.i;
-END;
-|
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	Using where
-SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-i
-123
-124
-connection root1;
-UPDATE t2 SET t2.i=225 WHERE t2.i=125;
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_view_1.result
+++ b/mysql-test/suite/row_lock/r/innodb_row_lock_view_1.result
@@ -1,34 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t2 (i);
-CREATE VIEW v1 AS SELECT t1.i, t2.l from t1,t2;
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	ixi	ixi	5	NULL	4	Using where; Using index
-1	SIMPLE	t2	ref	ixi	ixi	5	test.t1.i	2	Using where; Using index
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-i	i
-123	123
-124	124
-connection root1;
-UPDATE v1 SET i=325 where i=125;
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_view_2.result
+++ b/mysql-test/suite/row_lock/r/innodb_row_lock_view_2.result
@@ -1,40 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t2 (i);
-CREATE VIEW v1 AS SELECT t1.i, t2.l from t1,t2;
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT v1.i FROM v1 WHERE v1.i<125 FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	ixi	ixi	5	NULL	4	Using where; Using index
-1	SIMPLE	t2	index	NULL	PRIMARY	4	NULL	4	Using index
-SELECT v1.i FROM v1 WHERE v1.i<125 FOR UPDATE;
-i
-123
-124
-123
-124
-123
-124
-123
-124
-connection root1;
-UPDATE v1 SET i=325 where i=125;
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_view_mix_1.result
+++ b/mysql-test/suite/row_lock/r/innodb_row_lock_view_mix_1.result
@@ -1,48 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t2 (i);
-CREATE VIEW v1 AS SELECT t1.i, t2.l from t1,t2;
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	ixi	ixi	5	NULL	4	Using where; Using index
-1	SIMPLE	t2	ref	ixi	ixi	5	test.t1.i	2	Using where; Using index
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-i	i
-123	123
-124	124
-connection root1;
-UPDATE t1,t2 SET t1.i=225,t2.i=225 WHERE t1.i=125 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-connection default;
-UPDATE v1 SET i=323 where i=123;
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_view_mix_2.result
+++ b/mysql-test/suite/row_lock/r/innodb_row_lock_view_mix_2.result
@@ -1,40 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t2 (i);
-CREATE VIEW v1 AS SELECT t1.i, t2.l from t1,t2;
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT v1.i FROM v1 WHERE v1.i<125 FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	ixi	ixi	5	NULL	4	Using where; Using index
-1	SIMPLE	t2	index	NULL	PRIMARY	4	NULL	4	Using index
-SELECT v1.i FROM v1 WHERE v1.i<125 FOR UPDATE;
-i
-123
-124
-123
-124
-123
-124
-123
-124
-connection root1;
-UPDATE t1,t2 SET t1.i=225,t2.i=225 WHERE t1.i=125 AND t2.i=t1.i;
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_view_storedp_1.result
+++ b/mysql-test/suite/row_lock/r/innodb_row_lock_view_storedp_1.result
@@ -1,312 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-INSERT INTO t1 VALUES (5,127,5,127);
-INSERT INTO t1 VALUES (6,128,6,128);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-INSERT INTO t2 VALUES (5,127,5,127);
-INSERT INTO t2 VALUES (6,128,6,128);
-CREATE INDEX ixi ON t2 (i);
-CREATE VIEW v1 AS SELECT t1.i from t1;
-CREATE PROCEDURE stp_t (IN p1 int, IN p2 int) MODIFIES SQL DATA
-BEGIN
-UPDATE t2 SET i = p2 WHERE i = p1;
-UPDATE v1 SET i = p2 WHERE i = p1;
-SELECT * FROM v1 ORDER BY i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-END;
-|
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	ixi	ixi	5	NULL	6	Using where; Using index
-SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-i
-123
-124
-connection root1;
-CALL stp_t (125, 225);
-i
-123
-124
-126
-127
-128
-225
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-connection root2;
-CALL stp_t (127, 227);
-i
-123
-124
-125
-126
-128
-227
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-5	227	5	127
-6	128	6	128
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-5	227	5	127
-6	128	6	128
-connection default;
-CALL stp_t (123, 223);
-i
-124
-125
-126
-127
-128
-223
-k	i	j	l
-1	223	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-k	i	j	l
-1	223	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-connection root1;
-CALL stp_t (126, 226);
-i
-123
-124
-127
-128
-225
-226
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-5	127	5	127
-6	128	6	128
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-5	127	5	127
-6	128	6	128
-connection root2;
-CALL stp_t (128, 228);
-i
-123
-124
-125
-126
-227
-228
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-5	227	5	127
-6	228	6	128
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-5	227	5	127
-6	228	6	128
-connection default;
-CALL stp_t (124, 224);
-i
-125
-126
-127
-128
-223
-224
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-connection root1;
-DELETE FROM t1 WHERE t1.i=226;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-5	127	5	127
-6	128	6	128
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-5	127	5	127
-6	128	6	128
-connection root2;
-DELETE FROM t1 WHERE t1.i=228;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-5	227	5	127
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-5	227	5	127
-6	228	6	128
-connection default;
-DELETE FROM t1 WHERE t1.i=224;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-COMMIT;
-connection root1;
-ROLLBACK;
-connection root1;
-COMMIT;
-connection default;
-SELECT * FROM v1 ORDER BY i;
-i
-125
-126
-127
-128
-223
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-connection root1;
-SELECT * FROM v1 ORDER BY i;
-i
-125
-126
-127
-128
-223
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-5	127	5	127
-6	128	6	128
-connection root2;
-SELECT * FROM v1 ORDER BY i;
-i
-123
-124
-125
-126
-227
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-5	227	5	127
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-5	227	5	127
-6	228	6	128
-connection default;
-DROP TABLE t1, t2;
-DROP VIEW v1;
-SET @@global.innodb_table_locks= @table_locks;
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_view_storedp_2.result
+++ b/mysql-test/suite/row_lock/r/innodb_row_lock_view_storedp_2.result
@@ -1,47 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-INSERT INTO t1 VALUES (5,127,5,127);
-INSERT INTO t1 VALUES (6,128,6,128);
-#CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-INSERT INTO t2 VALUES (5,127,5,127);
-INSERT INTO t2 VALUES (6,128,6,128);
-#CREATE INDEX ixi ON t2 (i);
-CREATE VIEW v1 AS SELECT t1.i from t1;
-CREATE PROCEDURE stp_t (IN p1 int, IN p2 int) MODIFIES SQL DATA
-BEGIN
-UPDATE t2 SET i = p2 WHERE i = p1;
-UPDATE v1 SET i = p2 WHERE i = p1;
-SELECT * FROM v1 ORDER BY i;
-SELECT * FROM t1 ORDER BY t1.k;
-SELECT * FROM t2 ORDER BY t2.k;
-END;
-|
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	6	Using where
-SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-i
-123
-124
-connection root1;
-CALL stp_t (125, 225);
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_view_trig_1.result
+++ b/mysql-test/suite/row_lock/r/innodb_row_lock_view_trig_1.result
@@ -1,183 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t2 (i);
-CREATE VIEW v1 AS SELECT t1.i from t1;
-CREATE TRIGGER trig_t2 AFTER UPDATE ON t2
-FOR EACH ROW BEGIN
-UPDATE v1 SET i = NEW.i WHERE i = OLD.i;
-END;
-|
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	ixi	ixi	5	NULL	4	Using where; Using index
-SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-i
-123
-124
-connection root1;
-UPDATE t2 SET t2.i=225 WHERE t2.i=125;
-SELECT * FROM v1 ORDER BY i;
-i
-123
-124
-126
-225
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-connection default;
-UPDATE t2 SET t2.i=223 WHERE t2.i=123;
-SELECT * FROM v1 ORDER BY i;
-i
-124
-125
-126
-223
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-UPDATE t2 SET t2.i=226 WHERE t2.i=126;
-SELECT * FROM v1 ORDER BY i;
-i
-123
-124
-225
-226
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-connection default;
-UPDATE t2 SET t2.i=224 WHERE t2.i=124;
-SELECT * FROM v1 ORDER BY i;
-i
-125
-126
-223
-224
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-DELETE FROM t1 WHERE t1.i=226;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-connection default;
-DELETE FROM t1 WHERE t1.i=224;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-COMMIT;
-connection root1;
-ROLLBACK;
-connection default;
-SELECT * FROM v1 ORDER BY i;
-i
-125
-126
-223
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-SELECT * FROM v1 ORDER BY i;
-i
-125
-126
-223
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection default;
-DROP TABLE t1, t2;
-DROP VIEW v1;
-SET @@global.innodb_table_locks= @table_locks;
--- a/mysql-test/suite/row_lock/r/innodb_row_lock_view_trig_2.result
+++ b/mysql-test/suite/row_lock/r/innodb_row_lock_view_trig_2.result
@@ -1,38 +0,0 @@
-SELECT @@global.innodb_table_locks into @table_locks;
-SET @@global.innodb_table_locks= OFF;
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-#CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=InnoDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-#CREATE INDEX ixi ON t2 (i);
-CREATE VIEW v1 AS SELECT t1.i from t1;
-CREATE TRIGGER trig_t2 AFTER UPDATE ON t2
-FOR EACH ROW BEGIN
-UPDATE v1 SET i = NEW.i WHERE i = OLD.i;
-END;
-|
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	Using where
-SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-i
-123
-124
-connection root1;
-UPDATE t2 SET t2.i=225 WHERE t2.i=125;
--- a/mysql-test/suite/row_lock/r/ndb_row_lock_1.result
+++ b/mysql-test/suite/row_lock/r/ndb_row_lock_1.result
@@ -1,139 +0,0 @@
-DROP TABLE IF EXISTS t1, t2;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t2 (i);
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	ixi	ixi	5	NULL	10	Using where
-1	SIMPLE	t2	ref	ixi	ixi	5	test.t1.i	1	Using where
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-i	i
-123	123
-124	124
-connection root1;
-UPDATE t1,t2 SET t1.i=225,t2.i=225 WHERE t1.i=125 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-connection default;
-UPDATE t1,t2 SET t1.i=223,t2.i=223 WHERE t1.i=123 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-UPDATE t1,t2 SET t1.i=226,t2.i=226 WHERE t1.i=126 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-connection default;
-UPDATE t1,t2 SET t1.i=224,t2.i=224 WHERE t1.i=124 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-DELETE FROM t1 WHERE t1.i=226;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-connection default;
-DELETE FROM t1 WHERE t1.i=224;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-COMMIT;
-connection root1;
-ROLLBACK;
-connection default;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection default;
-DROP TABLE t1, t2;
--- a/mysql-test/suite/row_lock/r/ndb_row_lock_2.result
+++ b/mysql-test/suite/row_lock/r/ndb_row_lock_2.result
@@ -1,31 +0,0 @@
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-#CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-#CREATE INDEX ixi ON t2 (i);
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	Using where
-1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	4	Using where
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-i	i
-123	123
-124	124
-connection root1;
-UPDATE t1,t2 SET t1.i=225,t2.i=225 WHERE t1.i=125 AND t2.i=t1.i;
--- a/mysql-test/suite/row_lock/r/ndb_row_lock_3.result
+++ b/mysql-test/suite/row_lock/r/ndb_row_lock_3.result
@@ -1,30 +0,0 @@
-DROP TABLE IF EXISTS t1, t2;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-#CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-#CREATE INDEX ixi ON t2 (i);
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i LOCK IN SHARE MODE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	Using where
-1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	4	Using where
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i LOCK IN SHARE MODE;
-i	i
-123	123
-124	124
-connection root1;
-UPDATE t1,t2 SET t1.i=225,t2.i=225 WHERE t1.i=125 AND t2.i=t1.i;
--- a/mysql-test/suite/row_lock/r/ndb_row_lock_4.result
+++ b/mysql-test/suite/row_lock/r/ndb_row_lock_4.result
@@ -1,139 +0,0 @@
-DROP TABLE IF EXISTS t1, t2;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t2 (i);
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i LOCK IN SHARE MODE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	ixi	ixi	5	NULL	10	Using where
-1	SIMPLE	t2	ref	ixi	ixi	5	test.t1.i	1	Using where
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i LOCK IN SHARE MODE;
-i	i
-123	123
-124	124
-connection root1;
-UPDATE t1,t2 SET t1.i=225,t2.i=225 WHERE t1.i=125 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-connection default;
-UPDATE t1,t2 SET t1.i=223,t2.i=223 WHERE t1.i=123 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-UPDATE t1,t2 SET t1.i=226,t2.i=226 WHERE t1.i=126 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-connection default;
-UPDATE t1,t2 SET t1.i=224,t2.i=224 WHERE t1.i=124 AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-DELETE FROM t1 WHERE t1.i=226;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-connection default;
-DELETE FROM t1 WHERE t1.i=224;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-COMMIT;
-connection root1;
-ROLLBACK;
-connection default;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	223	1	123
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection default;
-DROP TABLE t1, t2;
--- a/mysql-test/suite/row_lock/r/ndb_row_lock_5.result
+++ b/mysql-test/suite/row_lock/r/ndb_row_lock_5.result
@@ -1,30 +0,0 @@
-DROP TABLE IF EXISTS t1, t2;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t2 (i);
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1 ignore index (ixi),t2 IGNORE INDEX (ixi) WHERE t1.i<125 AND t2.i=t1.i LOCK IN SHARE MODE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	Using where
-1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	4	Using where
-SELECT t1.i,t2.i FROM t1 ignore index (ixi),t2 IGNORE INDEX (ixi) WHERE t1.i<125 AND t2.i=t1.i LOCK IN SHARE MODE;
-i	i
-123	123
-124	124
-connection root1;
-UPDATE t1,t2 SET t1.i=225,t2.i=225 WHERE t1.i=125 AND t2.i=t1.i;
--- a/mysql-test/suite/row_lock/r/ndb_row_lock_big_tab.result
+++ b/mysql-test/suite/row_lock/r/ndb_row_lock_big_tab.result
@@ -1,177 +0,0 @@
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-CREATE INDEX ixi ON t2 (i);
-CREATE PROCEDURE fill_t1 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-INSERT INTO t1 VALUES (cnt, cnt+100, cnt, cnt+100);
-SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t1() RETURNS int
-BEGIN
-DECLARE res int DEFAULT 0;
-SELECT count(*)/2 INTO res FROM t1;
-RETURN  res;
-END;
-|
-CREATE PROCEDURE fill_t2 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-INSERT INTO t2 VALUES (cnt, cnt+100, cnt, cnt+100);
-SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t2() RETURNS int
-BEGIN
-DECLARE res int DEFAULT 0;
-SELECT count(*)/2 INTO res FROM t2;
-RETURN  res;
-END;
-|
-CALL fill_t1 (10);
-CALL fill_t2 (10);
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i < half_t1() AND t2.i=t1.i LOCK IN SHARE MODE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	ixi	ixi	5	NULL	10	Using where
-1	SIMPLE	t2	ref	ixi	ixi	5	test.t1.i	1	Using where
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i < half_t1() AND t2.i=t1.i LOCK IN SHARE MODE;
-i	i
-connection root1;
-SELECT k from t1 WHERE k < half_t1();
-k
-0
-3
-1
-2
-4
-SELECT k from t1 WHERE k >= half_t1();
-k
-6
-7
-9
-5
-8
-UPDATE t1,t2 SET t1.i=1111,t2.i=2222 WHERE t1.k < half_t1() AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-0	1111	0	100
-1	1111	1	101
-2	1111	2	102
-3	1111	3	103
-4	1111	4	104
-5	105	5	105
-6	106	6	106
-7	107	7	107
-8	108	8	108
-9	109	9	109
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-0	2222	0	100
-1	2222	1	101
-2	2222	2	102
-3	2222	3	103
-4	2222	4	104
-5	105	5	105
-6	106	6	106
-7	107	7	107
-8	108	8	108
-9	109	9	109
-connection default;
-UPDATE t1,t2 SET t1.i=3333,t2.i=4444 WHERE t1.k >= half_t1() AND t2.i=t1.i;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-0	100	0	100
-1	101	1	101
-2	102	2	102
-3	103	3	103
-4	104	4	104
-5	3333	5	105
-6	3333	6	106
-7	3333	7	107
-8	3333	8	108
-9	3333	9	109
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-0	100	0	100
-1	101	1	101
-2	102	2	102
-3	103	3	103
-4	104	4	104
-5	4444	5	105
-6	4444	6	106
-7	4444	7	107
-8	4444	8	108
-9	4444	9	109
-COMMIT;
-connection root1;
-ROLLBACK;
-connection default;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-0	100	0	100
-1	101	1	101
-2	102	2	102
-3	103	3	103
-4	104	4	104
-5	3333	5	105
-6	3333	6	106
-7	3333	7	107
-8	3333	8	108
-9	3333	9	109
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-0	100	0	100
-1	101	1	101
-2	102	2	102
-3	103	3	103
-4	104	4	104
-5	4444	5	105
-6	4444	6	106
-7	4444	7	107
-8	4444	8	108
-9	4444	9	109
-connection root1;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-0	100	0	100
-1	101	1	101
-2	102	2	102
-3	103	3	103
-4	104	4	104
-5	3333	5	105
-6	3333	6	106
-7	3333	7	107
-8	3333	8	108
-9	3333	9	109
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-0	100	0	100
-1	101	1	101
-2	102	2	102
-3	103	3	103
-4	104	4	104
-5	4444	5	105
-6	4444	6	106
-7	4444	7	107
-8	4444	8	108
-9	4444	9	109
-connection default;
-DROP VIEW IF EXISTS v1;
-Warnings:
-Note	1051	Unknown table 'test.v1'
-DROP TABLE t1, t2;
--- a/mysql-test/suite/row_lock/r/ndb_row_lock_big_tab_1.result
+++ b/mysql-test/suite/row_lock/r/ndb_row_lock_big_tab_1.result
@@ -1,357 +0,0 @@
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-CREATE INDEX ixi ON t2 (i);
-CREATE PROCEDURE fill_t1 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-INSERT INTO t1 VALUES (cnt, cnt+100, cnt, cnt+100);
-SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t1() RETURNS int
-BEGIN
-DECLARE res int DEFAULT 0;
-SELECT MOD(k,2) INTO res FROM t1;
-RETURN  res;
-END;
-|
-CREATE PROCEDURE fill_t2 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-INSERT INTO t2 VALUES (cnt, cnt+100, cnt, cnt+100);
-SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t2() RETURNS int
-BEGIN
-DECLARE res int DEFAULT 0;
-SELECT MOD(k,2) INTO res FROM t2;
-RETURN  res;
-END;
-|
-CALL fill_t1 (200);
-CALL fill_t2 (200);
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i < t1.k % 2 = 0 AND t2.k=t1.k LOCK IN SHARE MODE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	PRIMARY	NULL	NULL	NULL	200	Using where
-1	SIMPLE	t2	eq_ref	PRIMARY	PRIMARY	4	test.t1.k	1	
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i < t1.k % 2 = 0 AND t2.k=t1.k LOCK IN SHARE MODE;
-i	i
-135	135
-119	119
-211	211
-184	184
-232	232
-105	105
-188	188
-216	216
-255	255
-154	154
-197	197
-279	279
-218	218
-127	127
-203	203
-281	281
-194	194
-161	161
-276	276
-122	122
-139	139
-183	183
-114	114
-247	247
-144	144
-148	148
-174	174
-267	267
-142	142
-168	168
-226	226
-258	258
-231	231
-146	146
-253	253
-189	189
-230	230
-290	290
-178	178
-158	158
-130	130
-214	214
-133	133
-229	229
-294	294
-295	295
-108	108
-112	112
-297	297
-151	151
-251	251
-270	270
-291	291
-159	159
-132	132
-121	121
-244	244
-272	272
-293	293
-186	186
-111	111
-166	166
-201	201
-175	175
-180	180
-209	209
-192	192
-246	246
-195	195
-107	107
-233	233
-239	239
-103	103
-109	109
-128	128
-266	266
-143	143
-160	160
-187	187
-243	243
-273	273
-259	259
-110	110
-176	176
-141	141
-170	170
-215	215
-191	191
-200	200
-271	271
-162	162
-260	260
-106	106
-150	150
-126	126
-147	147
-155	155
-193	193
-207	207
-287	287
-235	235
-252	252
-129	129
-205	205
-268	268
-278	278
-116	116
-137	137
-199	199
-217	217
-234	234
-190	190
-236	236
-257	257
-100	100
-210	210
-212	212
-264	264
-221	221
-241	241
-256	256
-262	262
-265	265
-269	269
-277	277
-173	173
-177	177
-208	208
-219	219
-285	285
-101	101
-164	164
-113	113
-125	125
-202	202
-140	140
-156	156
-282	282
-181	181
-206	206
-299	299
-102	102
-145	145
-227	227
-196	196
-138	138
-198	198
-204	204
-237	237
-171	171
-284	284
-263	263
-292	292
-104	104
-149	149
-250	250
-296	296
-228	228
-280	280
-242	242
-248	248
-185	185
-220	220
-245	245
-275	275
-118	118
-120	120
-152	152
-153	153
-157	157
-182	182
-179	179
-254	254
-288	288
-172	172
-283	283
-286	286
-115	115
-238	238
-289	289
-131	131
-223	223
-134	134
-136	136
-222	222
-225	225
-261	261
-274	274
-123	123
-163	163
-224	224
-117	117
-298	298
-169	169
-124	124
-167	167
-240	240
-249	249
-165	165
-213	213
-connection root1;
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.k % 2= 1 AND t1.k = t2.k LOCK IN SHARE MODE;
-i	i
-209	209
-195	195
-107	107
-233	233
-239	239
-103	103
-109	109
-143	143
-187	187
-243	243
-273	273
-259	259
-141	141
-215	215
-191	191
-271	271
-147	147
-155	155
-193	193
-207	207
-287	287
-235	235
-129	129
-205	205
-137	137
-199	199
-217	217
-257	257
-221	221
-241	241
-265	265
-269	269
-277	277
-173	173
-177	177
-135	135
-119	119
-211	211
-105	105
-255	255
-197	197
-279	279
-127	127
-203	203
-281	281
-161	161
-139	139
-183	183
-247	247
-267	267
-231	231
-253	253
-189	189
-133	133
-229	229
-295	295
-297	297
-151	151
-251	251
-291	291
-159	159
-121	121
-293	293
-111	111
-201	201
-175	175
-185	185
-245	245
-275	275
-153	153
-157	157
-179	179
-283	283
-115	115
-289	289
-131	131
-223	223
-225	225
-261	261
-123	123
-163	163
-117	117
-169	169
-167	167
-249	249
-165	165
-213	213
-219	219
-285	285
-101	101
-113	113
-125	125
-181	181
-299	299
-145	145
-227	227
-237	237
-171	171
-263	263
-149	149
-UPDATE t1,t2 SET t1.i=1111,t2.i=2222 WHERE t1.k % 2 = 1 AND t1.k = t2.k;
--- a/mysql-test/suite/row_lock/r/ndb_row_lock_big_tab_2.result
+++ b/mysql-test/suite/row_lock/r/ndb_row_lock_big_tab_2.result
@@ -1,255 +0,0 @@
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-CREATE INDEX ixi ON t2 (i);
-CREATE PROCEDURE fill_t1 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-INSERT INTO t1 VALUES (cnt, cnt+100, cnt, cnt+100);
-SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t1() RETURNS int
-BEGIN
-DECLARE res int DEFAULT 0;
-SELECT MOD(k,2) INTO res FROM t1;
-RETURN  res;
-END;
-|
-CREATE PROCEDURE fill_t2 (IN upb int)
-BEGIN
-DECLARE cnt int DEFAULT 0;
-WHILE cnt < upb DO
-INSERT INTO t2 VALUES (cnt, cnt+100, cnt, cnt+100);
-SET cnt= cnt+1;
-END WHILE; 
-END;
-|
-CREATE FUNCTION half_t2() RETURNS int
-BEGIN
-DECLARE res int DEFAULT 0;
-SELECT MOD(k,2) INTO res FROM t2;
-RETURN  res;
-END;
-|
-CALL fill_t1 (200);
-CALL fill_t2 (200);
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i < t1.k % 2 = 0 AND t2.k=t1.k LOCK IN SHARE MODE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	PRIMARY	NULL	NULL	NULL	200	Using where
-1	SIMPLE	t2	eq_ref	PRIMARY	PRIMARY	4	test.t1.k	1	
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i < t1.k % 2 = 0 AND t2.k=t1.k LOCK IN SHARE MODE;
-i	i
-135	135
-119	119
-211	211
-184	184
-232	232
-105	105
-188	188
-216	216
-255	255
-154	154
-197	197
-279	279
-218	218
-127	127
-203	203
-281	281
-194	194
-161	161
-276	276
-122	122
-139	139
-183	183
-114	114
-247	247
-144	144
-148	148
-174	174
-267	267
-142	142
-168	168
-226	226
-258	258
-231	231
-146	146
-253	253
-189	189
-230	230
-290	290
-178	178
-158	158
-130	130
-214	214
-133	133
-229	229
-294	294
-295	295
-108	108
-112	112
-297	297
-151	151
-251	251
-270	270
-291	291
-159	159
-132	132
-121	121
-244	244
-272	272
-293	293
-186	186
-111	111
-166	166
-201	201
-175	175
-180	180
-209	209
-192	192
-246	246
-195	195
-107	107
-233	233
-239	239
-103	103
-109	109
-128	128
-266	266
-143	143
-160	160
-187	187
-243	243
-273	273
-259	259
-110	110
-176	176
-141	141
-170	170
-215	215
-191	191
-200	200
-271	271
-162	162
-260	260
-106	106
-150	150
-126	126
-147	147
-155	155
-193	193
-207	207
-287	287
-235	235
-252	252
-129	129
-205	205
-268	268
-278	278
-116	116
-137	137
-199	199
-217	217
-234	234
-190	190
-236	236
-257	257
-100	100
-210	210
-212	212
-264	264
-221	221
-241	241
-256	256
-262	262
-265	265
-269	269
-277	277
-173	173
-177	177
-208	208
-219	219
-285	285
-101	101
-164	164
-113	113
-125	125
-202	202
-140	140
-156	156
-282	282
-181	181
-206	206
-299	299
-102	102
-145	145
-227	227
-196	196
-138	138
-198	198
-204	204
-237	237
-171	171
-284	284
-263	263
-292	292
-104	104
-149	149
-250	250
-296	296
-228	228
-280	280
-242	242
-248	248
-185	185
-220	220
-245	245
-275	275
-118	118
-120	120
-152	152
-153	153
-157	157
-182	182
-179	179
-254	254
-288	288
-172	172
-283	283
-286	286
-115	115
-238	238
-289	289
-131	131
-223	223
-134	134
-136	136
-222	222
-225	225
-261	261
-274	274
-123	123
-163	163
-224	224
-117	117
-298	298
-169	169
-124	124
-167	167
-240	240
-249	249
-165	165
-213	213
-connection root1;
-DELETE FROM t1 WHERE t1.k % 2 = 1;
--- a/mysql-test/suite/row_lock/r/ndb_row_lock_trig_1.result
+++ b/mysql-test/suite/row_lock/r/ndb_row_lock_trig_1.result
@@ -1,148 +0,0 @@
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t2 (i);
-CREATE TRIGGER trig_t2 AFTER UPDATE ON t2
-FOR EACH ROW BEGIN
-UPDATE t1 SET l = NEW.i WHERE i = OLD.i;
-END;
-|
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	ixi	ixi	5	NULL	10	Using where
-SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-i
-123
-124
-connection root1;
-UPDATE t2 SET t2.i=225 WHERE t2.i=125;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	225
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	126	4	126
-connection default;
-UPDATE t2 SET t2.i=223 WHERE t2.i=123;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	223
-2	124	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-UPDATE t2 SET t2.i=226 WHERE t2.i=126;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	225
-4	126	4	226
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-connection default;
-UPDATE t2 SET t2.i=224 WHERE t2.i=124;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	223
-2	124	2	224
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-DELETE FROM t1 WHERE t1.i=226;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	225
-4	126	4	226
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	225	3	125
-4	226	4	126
-connection default;
-DELETE FROM t1 WHERE t1.i=224;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	223
-2	124	2	224
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-COMMIT;
-connection root1;
-ROLLBACK;
-connection default;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	223
-2	124	2	224
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	223
-2	124	2	224
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	223	1	123
-2	224	2	124
-3	125	3	125
-4	126	4	126
-connection default;
-DROP TABLE t1, t2;
--- a/mysql-test/suite/row_lock/r/ndb_row_lock_trig_2.result
+++ b/mysql-test/suite/row_lock/r/ndb_row_lock_trig_2.result
@@ -1,35 +0,0 @@
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-#CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-#CREATE INDEX ixi ON t2 (i);
-CREATE TRIGGER trig_t2 AFTER UPDATE ON t2
-FOR EACH ROW BEGIN
-UPDATE t1 SET l = NEW.i WHERE i = OLD.i;
-END;
-|
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	Using where
-SELECT t1.i FROM t1 WHERE t1.i< 125 FOR UPDATE;
-i
-123
-124
-connection root1;
-UPDATE t2 SET t2.i=225 WHERE t2.i=125;
--- a/mysql-test/suite/row_lock/r/ndb_row_lock_view_1.result
+++ b/mysql-test/suite/row_lock/r/ndb_row_lock_view_1.result
@@ -1,194 +0,0 @@
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t2 (i);
-CREATE VIEW v1 AS SELECT t1.i, t2.l from t1,t2;
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	ixi	ixi	5	NULL	10	Using where
-1	SIMPLE	t2	ref	ixi	ixi	5	test.t1.i	1	Using where
-SELECT t1.i,t2.i FROM t1,t2 WHERE t1.i<125 AND t2.i=t1.i FOR UPDATE;
-i	i
-123	123
-124	124
-connection root1;
-UPDATE v1 SET i=325 where i=125;
-SELECT * FROM v1 ORDER BY i,l;
-i	l
-123	123
-123	124
-123	125
-123	126
-124	123
-124	124
-124	125
-124	126
-126	123
-126	124
-126	125
-126	126
-325	123
-325	124
-325	125
-325	126
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	325	3	125
-4	126	4	126
-connection default;
-UPDATE v1 SET i=323 where i=123;
-SELECT * FROM v1 ORDER BY i,l;
-i	l
-124	123
-124	124
-124	125
-124	126
-125	123
-125	124
-125	125
-125	126
-126	123
-126	124
-126	125
-126	126
-323	123
-323	124
-323	125
-323	126
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	323	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-UPDATE v1 SET i=326 where i=126;
-SELECT * FROM v1 ORDER BY i,l;
-i	l
-123	123
-123	124
-123	125
-123	126
-124	123
-124	124
-124	125
-124	126
-325	123
-325	124
-325	125
-325	126
-326	123
-326	124
-326	125
-326	126
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	325	3	125
-4	326	4	126
-connection default;
-UPDATE v1 SET i=324 where i=124;
-SELECT * FROM v1 ORDER BY i,l;
-i	l
-125	123
-125	124
-125	125
-125	126
-126	123
-126	124
-126	125
-126	126
-323	123
-323	124
-323	125
-323	126
-324	123
-324	124
-324	125
-324	126
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	323	1	123
-2	324	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-DELETE FROM t1 WHERE t1.i=226;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	325	3	125
-4	326	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-connection default;
-DELETE FROM t1 WHERE t1.i=224;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	323	1	123
-2	324	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-COMMIT;
-connection root1;
-ROLLBACK;
-connection default;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	323	1	123
-2	324	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	323	1	123
-2	324	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-connection default;
-DROP VIEW IF EXISTS v1;
-DROP TABLE t1, t2;
--- a/mysql-test/suite/row_lock/r/ndb_row_lock_view_2.result
+++ b/mysql-test/suite/row_lock/r/ndb_row_lock_view_2.result
@@ -1,200 +0,0 @@
-DROP TABLE IF EXISTS t1, t2;
-DROP VIEW IF EXISTS v1;
-SET autocommit=0;
-SET autocommit=0;
-connection default;
-CREATE TABLE t1 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t1 VALUES (1,123,1,123);
-INSERT INTO t1 VALUES (2,124,2,124);
-INSERT INTO t1 VALUES (3,125,3,125);
-INSERT INTO t1 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t1 (i);
-CREATE TABLE t2 (k INT NOT NULL PRIMARY KEY, i INT, j INT, l INT) ENGINE=NDB;
-INSERT INTO t2 VALUES (1,123,1,123);
-INSERT INTO t2 VALUES (2,124,2,124);
-INSERT INTO t2 VALUES (3,125,3,125);
-INSERT INTO t2 VALUES (4,126,4,126);
-CREATE INDEX ixi ON t2 (i);
-CREATE VIEW v1 AS SELECT t1.i, t2.l from t1,t2;
-COMMIT;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
-REPEATABLE-READ
-EXPLAIN SELECT v1.i FROM v1 WHERE v1.i<125 FOR UPDATE;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	ixi	ixi	5	NULL	10	Using where
-1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	4	
-SELECT v1.i FROM v1 WHERE v1.i<125 FOR UPDATE;
-i
-123
-124
-123
-124
-123
-124
-123
-124
-connection root1;
-UPDATE v1 SET i=325 where i=125;
-SELECT * FROM v1 ORDER BY i,l;
-i	l
-123	123
-123	124
-123	125
-123	126
-124	123
-124	124
-124	125
-124	126
-126	123
-126	124
-126	125
-126	126
-325	123
-325	124
-325	125
-325	126
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	325	3	125
-4	126	4	126
-connection default;
-UPDATE v1 SET i=323 where i=123;
-SELECT * FROM v1 ORDER BY i,l;
-i	l
-124	123
-124	124
-124	125
-124	126
-125	123
-125	124
-125	125
-125	126
-126	123
-126	124
-126	125
-126	126
-323	123
-323	124
-323	125
-323	126
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	323	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-UPDATE v1 SET i=326 where i=126;
-SELECT * FROM v1 ORDER BY i,l;
-i	l
-123	123
-123	124
-123	125
-123	126
-124	123
-124	124
-124	125
-124	126
-325	123
-325	124
-325	125
-325	126
-326	123
-326	124
-326	125
-326	126
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	325	3	125
-4	326	4	126
-connection default;
-UPDATE v1 SET i=324 where i=124;
-SELECT * FROM v1 ORDER BY i,l;
-i	l
-125	123
-125	124
-125	125
-125	126
-126	123
-126	124
-126	125
-126	126
-323	123
-323	124
-323	125
-323	126
-324	123
-324	124
-324	125
-324	126
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	323	1	123
-2	324	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-DELETE FROM t1 WHERE t1.i=226;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	325	3	125
-4	326	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-connection default;
-DELETE FROM t1 WHERE t1.i=224;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	323	1	123
-2	324	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-COMMIT;
-connection root1;
-ROLLBACK;
-connection default;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	323	1	123
-2	324	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-connection root1;
-SELECT * FROM t1 ORDER BY t1.k;
-k	i	j	l
-1	323	1	123
-2	324	2	124
-3	125	3	125
-4	126	4	126
-SELECT * FROM t2 ORDER BY t2.k;
-k	i	j	l
-1	123	1	123
-2	124	2	124
-3	125	3	125
-4	126	4	126
-connection default;
-DROP VIEW IF EXISTS v1;
-DROP TABLE t1, t2;
--- a/Show More
+++ b/Show More