merged 5.1-5.1.29-rc -> 5.1-bugteam

author: Georgi Kodinov <kgeorge@mysql.com> 2008-10-01 12:47:25 +0300
committer: Georgi Kodinov <kgeorge@mysql.com> 2008-10-01 12:47:25 +0300
commit: 63a3ce6ef0f75440dd21ec13925c16d475ca37e6 (patch)
tree: 60bbb287461767b7a9cafa225bf108abe6eb1f65 /mysql-test
parent: 6db425ab4cd2fbd069977336144e99651211ef64 (diff)
parent: 6816cf6a6518bb5108fe7907f71e58be994db6e5 (diff)
download: mariadb-git-63a3ce6ef0f75440dd21ec13925c16d475ca37e6.tar.gz
15 files changed, 1622 insertions, 34 deletions
diff --git a/mysql-test/r/compare.result b/mysql-test/r/compare.result
index 44c258d7611..f9563b89b76 100644
--- a/mysql-test/r/compare.result
+++ b/mysql-test/r/compare.result
@@ -90,4 +90,9 @@ Note	1276	Field or reference 'test.t2.a' of SELECT #2 was resolved in SELECT #1
 Note	1276	Field or reference 'test.t2.a' of SELECT #2 was resolved in SELECT #1
 Note	1003	select `test`.`t2`.`a` AS `a`,(select count(0) AS `COUNT(*)` from `test`.`t1` where ((`test`.`t1`.`b` = `test`.`t2`.`a`) and (concat(`test`.`t1`.`b`,`test`.`t1`.`c`) = concat('0',`test`.`t2`.`a`,'01')))) AS `x` from `test`.`t2` order by `test`.`t2`.`a`
 DROP TABLE t1,t2;
+CREATE TABLE t1 (a TIMESTAMP);
+INSERT INTO t1 VALUES (NOW()),(NOW()),(NOW());
+SELECT * FROM t1 WHERE a > '2008-01-01' AND a = '0000-00-00';
+a
+DROP TABLE t1;
 End of 5.0 tests
diff --git a/mysql-test/r/events_2.result b/mysql-test/r/events_2.result
index 64d643505c5..db503f7aa6d 100644
--- a/mysql-test/r/events_2.result
+++ b/mysql-test/r/events_2.result
@@ -328,4 +328,81 @@ create event
 очень_очень_очень_очень_очень_очень_очень_очень_длинная_строка_66
 on schedule every 2 year do select 1;
 ERROR 42000: Identifier name 'очень_очень_очень_очень_очень_очень_очень_очень_длинна' is too long
+create event event_35981 on schedule every 6 month on completion preserve
+disable
+do
+select 1;
+The following SELECTs should all give 1
+select  count(*) from information_schema.events
+where   event_schema = database() and event_name = 'event_35981' and
+on_completion = 'PRESERVE';
+count(*)
+1
+alter   event event_35981 enable;
+select  count(*) from information_schema.events
+where   event_schema = database() and event_name = 'event_35981' and
+on_completion = 'PRESERVE';
+count(*)
+1
+alter   event event_35981 on completion not preserve;
+select  count(*) from information_schema.events
+where   event_schema = database() and event_name = 'event_35981' and
+on_completion = 'NOT PRESERVE';
+count(*)
+1
+alter   event event_35981 disable;
+select  count(*) from information_schema.events
+where   event_schema = database() and event_name = 'event_35981' and
+on_completion = 'NOT PRESERVE';
+count(*)
+1
+alter   event event_35981 on completion preserve;
+select  count(*) from information_schema.events
+where   event_schema = database() and event_name = 'event_35981' and
+on_completion = 'PRESERVE';
+count(*)
+1
+drop event event_35981;
+create event event_35981 on schedule every 6 month disable
+do
+select 1;
+select  count(*) from information_schema.events
+where   event_schema = database() and event_name = 'event_35981' and
+on_completion = 'NOT PRESERVE';
+count(*)
+1
+drop event event_35981;
+create event event_35981 on schedule every 1 hour starts current_timestamp
+on completion not preserve
+do
+select 1;
+alter event event_35981 on schedule every 1 hour starts '1999-01-01 00:00:00'
+  ends '1999-01-02 00:00:00';
+ERROR HY000: Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation.
+drop event event_35981;
+create event event_35981 on schedule every 1 hour starts current_timestamp
+on completion not preserve
+do
+select 1;
+alter event event_35981 on schedule every 1 hour starts '1999-01-01 00:00:00'
+  ends '1999-01-02 00:00:00' on completion preserve;
+Warnings:
+Note	1544	Event execution time is in the past. Event has been disabled
+drop event event_35981;
+create event event_35981 on schedule every 1 hour starts current_timestamp
+on completion preserve
+do
+select 1;
+alter event event_35981 on schedule every 1 hour starts '1999-01-01 00:00:00'
+  ends '1999-01-02 00:00:00';
+Warnings:
+Note	1544	Event execution time is in the past. Event has been disabled
+alter event event_35981 on schedule every 1 hour starts '1999-01-01 00:00:00'
+  ends '1999-01-02 00:00:00' on completion not preserve;
+ERROR HY000: Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation.
+alter event event_35981 on schedule every 1 hour starts '1999-01-01 00:00:00'
+  ends '1999-01-02 00:00:00' on completion preserve;
+Warnings:
+Note	1544	Event execution time is in the past. Event has been disabled
+drop event event_35981;
 drop database events_test;
diff --git a/mysql-test/r/log_tables.result b/mysql-test/r/log_tables.result
index 2a4cee9fbbc..c5228538788 100644
--- a/mysql-test/r/log_tables.result
+++ b/mysql-test/r/log_tables.result
@@ -832,6 +832,35 @@ Execute	select '000 001 002 003 004 005 006 007 008 009010 011 012 013 014 015 0
 Query	set global general_log = off
 deallocate prepare long_query;
 set global general_log = @old_general_log_state;
+DROP TABLE IF EXISTS log_count;
+DROP TABLE IF EXISTS slow_log_copy;
+DROP TABLE IF EXISTS general_log_copy;
+CREATE TABLE log_count (count BIGINT(21));
+SET @old_general_log_state = @@global.general_log;
+SET @old_slow_log_state = @@global.slow_query_log;
+SET GLOBAL general_log = ON;
+SET GLOBAL slow_query_log = ON;
+CREATE TABLE slow_log_copy SELECT * FROM mysql.slow_log;
+INSERT INTO slow_log_copy SELECT * FROM mysql.slow_log;
+INSERT INTO log_count (count) VALUES ((SELECT count(*) FROM mysql.slow_log));
+DROP TABLE slow_log_copy;
+CREATE TABLE general_log_copy SELECT * FROM mysql.general_log;
+INSERT INTO general_log_copy SELECT * FROM mysql.general_log;
+INSERT INTO log_count (count) VALUES ((SELECT count(*) FROM mysql.general_log));
+DROP TABLE general_log_copy;
+SET GLOBAL general_log = OFF;
+SET GLOBAL slow_query_log = OFF;
+CREATE TABLE slow_log_copy SELECT * FROM mysql.slow_log;
+INSERT INTO slow_log_copy SELECT * FROM mysql.slow_log;
+INSERT INTO log_count (count) VALUES ((SELECT count(*) FROM mysql.slow_log));
+DROP TABLE slow_log_copy;
+CREATE TABLE general_log_copy SELECT * FROM mysql.general_log;
+INSERT INTO general_log_copy SELECT * FROM mysql.general_log;
+INSERT INTO log_count (count) VALUES ((SELECT count(*) FROM mysql.general_log));
+DROP TABLE general_log_copy;
+SET GLOBAL general_log = @old_general_log_state;
+SET GLOBAL slow_query_log = @old_slow_log_state;
+DROP TABLE log_count;
 SET @old_slow_log_state = @@global.slow_query_log;
 SET SESSION long_query_time = 0;
 SET GLOBAL slow_query_log = ON;
diff --git a/mysql-test/r/mysqldump-max.result b/mysql-test/r/mysqldump-max.result
index 2d118092a2c..c1c61cd7fe8 100644
--- a/mysql-test/r/mysqldump-max.result
+++ b/mysql-test/r/mysqldump-max.result
@@ -277,3 +277,16 @@ drop table t3;
 drop table t4;
 drop table t5;
 drop table t6;
+SELECT @@global.storage_engine INTO @old_engine;
+SET GLOBAL storage_engine=InnoDB;
+CREATE VIEW v1 AS SELECT * FROM t1;
+INSERT INTO t1 VALUES();
+SELECT COUNT(*) FROM v1;
+COUNT(*)
+1
+SELECT COUNT(*) FROM v1;
+COUNT(*)
+1
+DROP VIEW  v1;
+DROP TABLE t1;
+SET GLOBAL storage_engine=@old_engine;
diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
index 1e76e85ce64..ec397d8fb89 100644
--- a/mysql-test/r/mysqldump.result
+++ b/mysql-test/r/mysqldump.result
@@ -2004,7 +2004,7 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 /*!50001 CREATE TABLE `v2` (
   `a` varchar(30)
-) */;
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 /*!50001 DROP TABLE `v2`*/;
 /*!50001 DROP VIEW IF EXISTS `v2`*/;
@@ -2101,7 +2101,7 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 /*!50001 CREATE TABLE `v1` (
   `a` int(11)
-) */;
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 /*!50001 DROP TABLE `v1`*/;
 /*!50001 DROP VIEW IF EXISTS `v1`*/;
@@ -2175,7 +2175,7 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 /*!50001 CREATE TABLE `v2` (
   `a` varchar(30)
-) */;
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 /*!50001 DROP TABLE `v2`*/;
 /*!50001 DROP VIEW IF EXISTS `v2`*/;
@@ -2291,7 +2291,7 @@ SET character_set_client = utf8;
   `a` int(11),
   `b` int(11),
   `c` varchar(30)
-) */;
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 DROP TABLE IF EXISTS `v2`;
 /*!50001 DROP VIEW IF EXISTS `v2`*/;
@@ -2299,7 +2299,7 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 /*!50001 CREATE TABLE `v2` (
   `a` int(11)
-) */;
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 DROP TABLE IF EXISTS `v3`;
 /*!50001 DROP VIEW IF EXISTS `v3`*/;
@@ -2309,7 +2309,7 @@ SET character_set_client = utf8;
   `a` int(11),
   `b` int(11),
   `c` varchar(30)
-) */;
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 /*!50001 DROP TABLE `v1`*/;
 /*!50001 DROP VIEW IF EXISTS `v1`*/;
@@ -3046,7 +3046,7 @@ SET character_set_client = utf8;
   `a` int(11),
   `b` varchar(32),
   `c` varchar(32)
-) */;
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 DROP TABLE IF EXISTS `v1`;
 /*!50001 DROP VIEW IF EXISTS `v1`*/;
@@ -3056,7 +3056,7 @@ SET character_set_client = utf8;
   `a` int(11),
   `b` varchar(32),
   `c` varchar(32)
-) */;
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 DROP TABLE IF EXISTS `v2`;
 /*!50001 DROP VIEW IF EXISTS `v2`*/;
@@ -3066,7 +3066,7 @@ SET character_set_client = utf8;
   `a` int(11),
   `b` varchar(32),
   `c` varchar(32)
-) */;
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 USE `test`;
@@ -3446,7 +3446,7 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 /*!50001 CREATE TABLE `v1` (
   `id` int(11)
-) */;
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 USE `mysqldump_test_db`;
@@ -3506,7 +3506,7 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 /*!50001 CREATE TABLE `nasishnasifu` (
   `id` bigint(20) unsigned
-) */;
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 USE `mysqldump_tables`;
@@ -3964,7 +3964,7 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 /*!50001 CREATE TABLE `v1` (
   `id` int(11)
-) */;
+) ENGINE=MyISAM */;
 SET character_set_client = @saved_cs_client;
 
 USE `mysqldump_test_db`;
diff --git a/mysql-test/r/partition_range.result b/mysql-test/r/partition_range.result
index e4e5a748b0d..23a38ff3885 100644
--- a/mysql-test/r/partition_range.result
+++ b/mysql-test/r/partition_range.result
@@ -742,3 +742,23 @@ WHERE (a >= '2004-07-01' AND a <= '2004-09-30') OR
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p407,p408,p409,p507,p508,p509	ALL	NULL	NULL	NULL	NULL	18	Using where
 DROP TABLE t1;
+create table t1 (a int);
+insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
+CREATE TABLE t2 (
+defid int(10) unsigned NOT NULL,
+day int(10) unsigned NOT NULL,
+count int(10) unsigned NOT NULL,
+filler char(200),
+KEY (defid,day)
+) 
+PARTITION BY RANGE (day) (
+PARTITION p7 VALUES LESS THAN (20070401) , 
+PARTITION p8 VALUES LESS THAN (20070501));
+insert into t2 select 20, 20070311, 1, 'filler' from t1 A, t1 B;
+insert into t2 select 20, 20070411, 1, 'filler' from t1 A, t1 B;
+insert into t2 values(52, 20070321, 123, 'filler') ;
+insert into t2 values(52, 20070322, 456, 'filler') ;
+select sum(count) from t2 ch where ch.defid in (50,52) and ch.day between 20070320 and 20070401 group by defid;
+sum(count)
+579
+drop table t1, t2;
diff --git a/mysql-test/r/user_var.result b/mysql-test/r/user_var.result
index 2cd132ce03c..2d91835d723 100644
--- a/mysql-test/r/user_var.result
+++ b/mysql-test/r/user_var.result
@@ -121,8 +121,8 @@ select @a:=0;
 select @a+0, @a:=@a+0+count(*), count(*), @a+0 from t1 group by i;
 @a+0	@a:=@a+0+count(*)	count(*)	@a+0
 0	1	1	0
-1	3	2	0
-3	6	3	0
+0	2	2	0
+0	3	3	0
 set @a=0;
 select @a,@a:="hello",@a,@a:=3,@a,@a:="hello again" from t1 group by i;
 @a	@a:="hello"	@a	@a:=3	@a	@a:="hello again"
@@ -370,4 +370,33 @@ select @rownum := @rownum + 1 as row,
 @prev_score := a as score
 from t1 order by score desc;
 drop table t1;
+create table t1(b bigint);
+insert into t1 (b) values (10), (30), (10);
+set @var := 0;
+select if(b=@var, 999, b) , @var := b from t1  order by b;
+if(b=@var, 999, b)	@var := b
+10	10
+999	10
+30	30
+drop table t1;
+create temporary table t1 (id int);
+insert into t1 values (2), (3), (3), (4);
+set @lastid=-1;
+select @lastid != id, @lastid, @lastid := id from t1;
+@lastid != id	@lastid	@lastid := id
+1	-1	2
+1	2	3
+0	3	3
+1	3	4
+drop table t1;
+create temporary table t1 (id bigint);
+insert into t1 values (2), (3), (3), (4);
+set @lastid=-1;
+select @lastid != id, @lastid, @lastid := id from t1;
+@lastid != id	@lastid	@lastid := id
+1	-1	2
+1	2	3
+0	3	3
+1	3	4
+drop table t1;
 End of 5.1 tests
diff --git a/mysql-test/suite/binlog/r/binlog_stm_row.result b/mysql-test/suite/binlog/r/binlog_stm_row.result
new file mode 100644
index 00000000000..97ec38cfb3e
--- /dev/null
+++ b/mysql-test/suite/binlog/r/binlog_stm_row.result
@@ -0,0 +1,71 @@
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+SET GLOBAL BINLOG_FORMAT = STATEMENT;
+SET SESSION BINLOG_FORMAT = STATEMENT;
+CREATE TABLE t1 (a INT);
+CREATE TABLE t2 LIKE t1;
+select @@SESSION.BINLOG_FORMAT;
+@@SESSION.BINLOG_FORMAT
+STATEMENT
+INSERT INTO t1 VALUES(1);
+INSERT INTO t2 VALUES(2);
+#
+# Ensure that INSERT INTO .. SELECT FROM under SBR takes a read
+# lock that will prevent the source table from being modified.
+#
+# con1
+SELECT GET_LOCK('Bug#34306', 120);
+GET_LOCK('Bug#34306', 120)
+1
+# con2
+PREPARE stmt FROM "INSERT INTO t1 SELECT * FROM t2 WHERE GET_LOCK('Bug#34306', 120)";
+EXECUTE stmt;;
+# default
+INSERT INTO t2 VALUES (3);;
+# con1
+SELECT RELEASE_LOCK('Bug#34306');
+RELEASE_LOCK('Bug#34306')
+1
+# con2
+SELECT RELEASE_LOCK('Bug#34306');
+RELEASE_LOCK('Bug#34306')
+1
+# default
+#
+# Ensure that INSERT INTO .. SELECT FROM prepared under SBR does
+# not prevent the source table from being modified if under RBR.
+#
+# con2
+SET SESSION BINLOG_FORMAT = ROW;
+# con1
+SELECT GET_LOCK('Bug#34306', 120);
+GET_LOCK('Bug#34306', 120)
+1
+# con2
+EXECUTE stmt;;
+# default
+# con1
+INSERT INTO t2 VALUES (4);
+SELECT RELEASE_LOCK('Bug#34306');
+RELEASE_LOCK('Bug#34306')
+1
+# con2
+# default
+# Show binlog events
+show binlog events from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS t1
+master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS t2
+master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
+master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t2 LIKE t1
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES(1)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t2 VALUES(2)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 SELECT * FROM t2 WHERE GET_LOCK('Bug#34306', 120)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t2 VALUES (3)
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t2 VALUES (4)
+master-bin.000001	#	Query	#	#	use `test`; BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	use `test`; COMMIT
+DROP TABLE t1;
+DROP TABLE t2;
diff --git a/mysql-test/suite/binlog/t/binlog_stm_row.test b/mysql-test/suite/binlog/t/binlog_stm_row.test
new file mode 100644
index 00000000000..4944e65c9f3
--- /dev/null
+++ b/mysql-test/suite/binlog/t/binlog_stm_row.test
@@ -0,0 +1,107 @@
+--source include/have_log_bin.inc
+--source include/have_binlog_format_row_or_statement.inc
+
+# Get rid of previous tests binlog
+--disable_query_log
+reset master;
+--enable_query_log
+
+#
+# Bug#34306: Can't make copy of log tables when server binary log is enabled
+#
+# This is an additional test for Bug#34306 in order to ensure that INSERT INTO
+# .. SELECT FROM is properly replicated under SBR and RBR and that the proper
+# read lock type are acquired.
+#
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+--enable_warnings
+
+SET GLOBAL BINLOG_FORMAT = STATEMENT;
+SET SESSION BINLOG_FORMAT = STATEMENT;
+
+CREATE TABLE t1 (a INT);
+CREATE TABLE t2 LIKE t1;
+select @@SESSION.BINLOG_FORMAT;
+INSERT INTO t1 VALUES(1);
+INSERT INTO t2 VALUES(2);
+
+--connect(con1,localhost,root,,)
+--connect(con2,localhost,root,,)
+
+--echo #
+--echo # Ensure that INSERT INTO .. SELECT FROM under SBR takes a read
+--echo # lock that will prevent the source table from being modified.
+--echo #
+
+--connection con1
+--echo # con1
+SELECT GET_LOCK('Bug#34306', 120);
+--connection con2
+--echo # con2
+PREPARE stmt FROM "INSERT INTO t1 SELECT * FROM t2 WHERE GET_LOCK('Bug#34306', 120)";
+--send EXECUTE stmt;
+--connection default
+--echo # default
+let $wait_condition=
+  SELECT COUNT(*) = 1 FROM information_schema.processlist WHERE
+  state = "User lock" AND
+  info = "INSERT INTO t1 SELECT * FROM t2 WHERE GET_LOCK('Bug#34306', 120)";
+--source include/wait_condition.inc
+--send INSERT INTO t2 VALUES (3);
+--connection con1
+--echo # con1
+let $wait_condition=
+  SELECT COUNT(*) = 1 FROM information_schema.processlist WHERE
+  state = "Locked" and info = "INSERT INTO t2 VALUES (3)";
+--source include/wait_condition.inc
+SELECT RELEASE_LOCK('Bug#34306');
+--connection con2
+--echo # con2
+--reap
+SELECT RELEASE_LOCK('Bug#34306');
+--connection default
+--echo # default
+--reap
+
+--echo #
+--echo # Ensure that INSERT INTO .. SELECT FROM prepared under SBR does
+--echo # not prevent the source table from being modified if under RBR.
+--echo #
+
+--connection con2
+--echo # con2
+SET SESSION BINLOG_FORMAT = ROW;
+--connection con1
+--echo # con1
+SELECT GET_LOCK('Bug#34306', 120);
+--connection con2
+--echo # con2
+--send EXECUTE stmt;
+--connection default
+--echo # default
+let $wait_condition=
+  SELECT COUNT(*) = 1 FROM information_schema.processlist WHERE
+  state = "User lock" AND
+  info = "INSERT INTO t1 SELECT * FROM t2 WHERE GET_LOCK('Bug#34306', 120)";
+--source include/wait_condition.inc
+--connection con1
+--echo # con1
+INSERT INTO t2 VALUES (4);
+SELECT RELEASE_LOCK('Bug#34306');
+--connection con2
+--echo # con2
+--reap
+
+--disconnect con1
+--disconnect con2
+--connection default
+--echo # default
+
+--echo # Show binlog events
+source include/show_binlog_events.inc;
+
+DROP TABLE t1;
+DROP TABLE t2;
diff --git a/mysql-test/t/compare.test b/mysql-test/t/compare.test
index 8863ed825c2..103244eb2f7 100644
--- a/mysql-test/t/compare.test
+++ b/mysql-test/t/compare.test
@@ -76,4 +76,13 @@ FROM t2 ORDER BY a;
 
 DROP TABLE t1,t2;
 
+#
+# Bug #39353: Multiple conditions on timestamp column crashes server
+#
+
+CREATE TABLE t1 (a TIMESTAMP); 
+INSERT INTO t1 VALUES (NOW()),(NOW()),(NOW());
+SELECT * FROM t1 WHERE a > '2008-01-01' AND a = '0000-00-00';
+DROP TABLE t1;
+
 --echo End of 5.0 tests
diff --git a/mysql-test/t/events_2.test b/mysql-test/t/events_2.test
index 58a6fffe6f5..a50255e9f8b 100644
--- a/mysql-test/t/events_2.test
+++ b/mysql-test/t/events_2.test
@@ -411,6 +411,108 @@ create event
 очень_очень_очень_очень_очень_очень_очень_очень_длинная_строка_66
 on schedule every 2 year do select 1;
 
+#
+# Bug#35981: ALTER EVENT causes the server to change the PRESERVE option.
+#
+
+create event event_35981 on schedule every 6 month on completion preserve
+disable
+do
+  select 1;
+
+echo The following SELECTs should all give 1;
+
+# show current ON_COMPLETION
+select  count(*) from information_schema.events
+where   event_schema = database() and event_name = 'event_35981' and
+        on_completion = 'PRESERVE';
+
+# show ON_COMPLETION remains "PRESERVE" when not given in ALTER EVENT
+alter   event event_35981 enable;
+select  count(*) from information_schema.events
+where   event_schema = database() and event_name = 'event_35981' and
+        on_completion = 'PRESERVE';
+
+# show we can change ON_COMPLETION
+alter   event event_35981 on completion not preserve;
+select  count(*) from information_schema.events
+where   event_schema = database() and event_name = 'event_35981' and
+        on_completion = 'NOT PRESERVE';
+
+# show ON_COMPLETION remains "NOT PRESERVE" when not given in ALTER EVENT
+alter   event event_35981 disable;
+select  count(*) from information_schema.events
+where   event_schema = database() and event_name = 'event_35981' and
+        on_completion = 'NOT PRESERVE';
+
+# show we can change ON_COMPLETION
+alter   event event_35981 on completion preserve;
+select  count(*) from information_schema.events
+where   event_schema = database() and event_name = 'event_35981' and
+        on_completion = 'PRESERVE';
+
+
+drop event event_35981;
+
+create event event_35981 on schedule every 6 month disable
+do
+  select 1;
+
+# show that the defaults for CREATE EVENT are still correct (NOT PRESERVE)
+select  count(*) from information_schema.events
+where   event_schema = database() and event_name = 'event_35981' and
+        on_completion = 'NOT PRESERVE';
+
+drop event event_35981;
+
+
+# show that backdating doesn't break
+
+create event event_35981 on schedule every 1 hour starts current_timestamp
+  on completion not preserve
+do
+  select 1;
+
+# should fail thanks to above's NOT PRESERVE
+--error ER_EVENT_CANNOT_ALTER_IN_THE_PAST
+alter event event_35981 on schedule every 1 hour starts '1999-01-01 00:00:00'
+  ends '1999-01-02 00:00:00';
+
+drop event event_35981;
+
+create event event_35981 on schedule every 1 hour starts current_timestamp
+  on completion not preserve
+do
+  select 1;
+
+# succeed with warning
+alter event event_35981 on schedule every 1 hour starts '1999-01-01 00:00:00'
+  ends '1999-01-02 00:00:00' on completion preserve;
+
+drop event event_35981;
+
+
+
+create event event_35981 on schedule every 1 hour starts current_timestamp
+  on completion preserve
+do
+  select 1;
+
+# this should succeed thanks to above PRESERVE! give a warning though.
+alter event event_35981 on schedule every 1 hour starts '1999-01-01 00:00:00'
+  ends '1999-01-02 00:00:00';
+
+# this should fail, as the event would have passed already
+--error ER_EVENT_CANNOT_ALTER_IN_THE_PAST
+alter event event_35981 on schedule every 1 hour starts '1999-01-01 00:00:00'
+  ends '1999-01-02 00:00:00' on completion not preserve;
+
+# should succeed giving a warning
+alter event event_35981 on schedule every 1 hour starts '1999-01-01 00:00:00'
+  ends '1999-01-02 00:00:00' on completion preserve;
+
+drop event event_35981;
+
 # 
 # End of tests
 #
diff --git a/mysql-test/t/log_tables.test b/mysql-test/t/log_tables.test
index 3047d16d3b6..34086336fa8 100644
--- a/mysql-test/t/log_tables.test
+++ b/mysql-test/t/log_tables.test
@@ -937,6 +937,52 @@ deallocate prepare long_query;
 set global general_log = @old_general_log_state;
 
 #
+# Bug#34306: Can't make copy of log tables when server binary log is enabled
+#
+
+--disable_warnings
+DROP TABLE IF EXISTS log_count;
+DROP TABLE IF EXISTS slow_log_copy;
+DROP TABLE IF EXISTS general_log_copy;
+--enable_warnings
+
+CREATE TABLE log_count (count BIGINT(21));
+
+SET @old_general_log_state = @@global.general_log;
+SET @old_slow_log_state = @@global.slow_query_log;
+
+SET GLOBAL general_log = ON;
+SET GLOBAL slow_query_log = ON;
+
+CREATE TABLE slow_log_copy SELECT * FROM mysql.slow_log;
+INSERT INTO slow_log_copy SELECT * FROM mysql.slow_log;
+INSERT INTO log_count (count) VALUES ((SELECT count(*) FROM mysql.slow_log));
+DROP TABLE slow_log_copy;
+
+CREATE TABLE general_log_copy SELECT * FROM mysql.general_log;
+INSERT INTO general_log_copy SELECT * FROM mysql.general_log;
+INSERT INTO log_count (count) VALUES ((SELECT count(*) FROM mysql.general_log));
+DROP TABLE general_log_copy;
+
+SET GLOBAL general_log = OFF;
+SET GLOBAL slow_query_log = OFF;
+
+CREATE TABLE slow_log_copy SELECT * FROM mysql.slow_log;
+INSERT INTO slow_log_copy SELECT * FROM mysql.slow_log;
+INSERT INTO log_count (count) VALUES ((SELECT count(*) FROM mysql.slow_log));
+DROP TABLE slow_log_copy;
+
+CREATE TABLE general_log_copy SELECT * FROM mysql.general_log;
+INSERT INTO general_log_copy SELECT * FROM mysql.general_log;
+INSERT INTO log_count (count) VALUES ((SELECT count(*) FROM mysql.general_log));
+DROP TABLE general_log_copy;
+
+SET GLOBAL general_log = @old_general_log_state;
+SET GLOBAL slow_query_log = @old_slow_log_state;
+
+DROP TABLE log_count;
+
+#
 # Bug #31700: thd->examined_row_count not incremented for 'const' type queries
 #
 SET @old_slow_log_state = @@global.slow_query_log;
diff --git a/mysql-test/t/mysqldump-max.test b/mysql-test/t/mysqldump-max.test
index 359c4ea5793..1e8b9647503 100644
--- a/mysql-test/t/mysqldump-max.test
+++ b/mysql-test/t/mysqldump-max.test
@@ -66,3 +66,1061 @@ drop table t3;
 drop table t4; 
 drop table t5; 
 drop table t6; 
+
+
+#
+# Bug#31434 - mysqldump dumps view as table
+#
+
+# Show that mysqldump's stand-in tables for views are always of MyISAM
+# type to avoid Inno's column-number limits (~1000 columns) etc.
+# Here because it needs Inno-engine.
+
+SELECT @@global.storage_engine INTO @old_engine;
+SET GLOBAL storage_engine=InnoDB;
+
+--disable_query_log
+CREATE TABLE `t1` (
+  `col_0` tinyint(1) default NULL,
+  `col_1` tinyint(1) default NULL,
+  `col_2` tinyint(1) default NULL,
+  `col_3` tinyint(1) default NULL,
+  `col_4` tinyint(1) default NULL,
+  `col_5` tinyint(1) default NULL,
+  `col_6` tinyint(1) default NULL,
+  `col_7` tinyint(1) default NULL,
+  `col_8` tinyint(1) default NULL,
+  `col_9` tinyint(1) default NULL,
+  `col_10` tinyint(1) default NULL,
+  `col_11` tinyint(1) default NULL,
+  `col_12` tinyint(1) default NULL,
+  `col_13` tinyint(1) default NULL,
+  `col_14` tinyint(1) default NULL,
+  `col_15` tinyint(1) default NULL,
+  `col_16` tinyint(1) default NULL,
+  `col_17` tinyint(1) default NULL,
+  `col_18` tinyint(1) default NULL,
+  `col_19` tinyint(1) default NULL,
+  `col_20` tinyint(1) default NULL,
+  `col_21` tinyint(1) default NULL,
+  `col_22` tinyint(1) default NULL,
+  `col_23` tinyint(1) default NULL,
+  `col_24` tinyint(1) default NULL,
+  `col_25` tinyint(1) default NULL,
+  `col_26` tinyint(1) default NULL,
+  `col_27` tinyint(1) default NULL,
+  `col_28` tinyint(1) default NULL,
+  `col_29` tinyint(1) default NULL,
+  `col_30` tinyint(1) default NULL,
+  `col_31` tinyint(1) default NULL,
+  `col_32` tinyint(1) default NULL,
+  `col_33` tinyint(1) default NULL,
+  `col_34` tinyint(1) default NULL,
+  `col_35` tinyint(1) default NULL,
+  `col_36` tinyint(1) default NULL,
+  `col_37` tinyint(1) default NULL,
+  `col_38` tinyint(1) default NULL,
+  `col_39` tinyint(1) default NULL,
+  `col_40` tinyint(1) default NULL,
+  `col_41` tinyint(1) default NULL,
+  `col_42` tinyint(1) default NULL,
+  `col_43` tinyint(1) default NULL,
+  `col_44` tinyint(1) default NULL,
+  `col_45` tinyint(1) default NULL,
+  `col_46` tinyint(1) default NULL,
+  `col_47` tinyint(1) default NULL,
+  `col_48` tinyint(1) default NULL,
+  `col_49` tinyint(1) default NULL,
+  `col_50` tinyint(1) default NULL,
+  `col_51` tinyint(1) default NULL,
+  `col_52` tinyint(1) default NULL,
+  `col_53` tinyint(1) default NULL,
+  `col_54` tinyint(1) default NULL,
+  `col_55` tinyint(1) default NULL,
+  `col_56` tinyint(1) default NULL,
+  `col_57` tinyint(1) default NULL,
+  `col_58` tinyint(1) default NULL,
+  `col_59` tinyint(1) default NULL,
+  `col_60` tinyint(1) default NULL,
+  `col_61` tinyint(1) default NULL,
+  `col_62` tinyint(1) default NULL,
+  `col_63` tinyint(1) default NULL,
+  `col_64` tinyint(1) default NULL,
+  `col_65` tinyint(1) default NULL,
+  `col_66` tinyint(1) default NULL,
+  `col_67` tinyint(1) default NULL,
+  `col_68` tinyint(1) default NULL,
+  `col_69` tinyint(1) default NULL,
+  `col_70` tinyint(1) default NULL,
+  `col_71` tinyint(1) default NULL,
+  `col_72` tinyint(1) default NULL,
+  `col_73` tinyint(1) default NULL,
+  `col_74` tinyint(1) default NULL,
+  `col_75` tinyint(1) default NULL,
+  `col_76` tinyint(1) default NULL,
+  `col_77` tinyint(1) default NULL,
+  `col_78` tinyint(1) default NULL,
+  `col_79` tinyint(1) default NULL,
+  `col_80` tinyint(1) default NULL,
+  `col_81` tinyint(1) default NULL,
+  `col_82` tinyint(1) default NULL,
+  `col_83` tinyint(1) default NULL,
+  `col_84` tinyint(1) default NULL,
+  `col_85` tinyint(1) default NULL,
+  `col_86` tinyint(1) default NULL,
+  `col_87` tinyint(1) default NULL,
+  `col_88` tinyint(1) default NULL,
+  `col_89` tinyint(1) default NULL,
+  `col_90` tinyint(1) default NULL,
+  `col_91` tinyint(1) default NULL,
+  `col_92` tinyint(1) default NULL,
+  `col_93` tinyint(1) default NULL,
+  `col_94` tinyint(1) default NULL,
+  `col_95` tinyint(1) default NULL,
+  `col_96` tinyint(1) default NULL,
+  `col_97` tinyint(1) default NULL,
+  `col_98` tinyint(1) default NULL,
+  `col_99` tinyint(1) default NULL,
+  `col_100` tinyint(1) default NULL,
+  `col_101` tinyint(1) default NULL,
+  `col_102` tinyint(1) default NULL,
+  `col_103` tinyint(1) default NULL,
+  `col_104` tinyint(1) default NULL,
+  `col_105` tinyint(1) default NULL,
+  `col_106` tinyint(1) default NULL,
+  `col_107` tinyint(1) default NULL,
+  `col_108` tinyint(1) default NULL,
+  `col_109` tinyint(1) default NULL,
+  `col_110` tinyint(1) default NULL,
+  `col_111` tinyint(1) default NULL,
+  `col_112` tinyint(1) default NULL,
+  `col_113` tinyint(1) default NULL,
+  `col_114` tinyint(1) default NULL,
+  `col_115` tinyint(1) default NULL,
+  `col_116` tinyint(1) default NULL,
+  `col_117` tinyint(1) default NULL,
+  `col_118` tinyint(1) default NULL,
+  `col_119` tinyint(1) default NULL,
+  `col_120` tinyint(1) default NULL,
+  `col_121` tinyint(1) default NULL,
+  `col_122` tinyint(1) default NULL,
+  `col_123` tinyint(1) default NULL,
+  `col_124` tinyint(1) default NULL,
+  `col_125` tinyint(1) default NULL,
+  `col_126` tinyint(1) default NULL,
+  `col_127` tinyint(1) default NULL,
+  `col_128` tinyint(1) default NULL,
+  `col_129` tinyint(1) default NULL,
+  `col_130` tinyint(1) default NULL,
+  `col_131` tinyint(1) default NULL,
+  `col_132` tinyint(1) default NULL,
+  `col_133` tinyint(1) default NULL,
+  `col_134` tinyint(1) default NULL,
+  `col_135` tinyint(1) default NULL,
+  `col_136` tinyint(1) default NULL,
+  `col_137` tinyint(1) default NULL,
+  `col_138` tinyint(1) default NULL,
+  `col_139` tinyint(1) default NULL,
+  `col_140` tinyint(1) default NULL,
+  `col_141` tinyint(1) default NULL,
+  `col_142` tinyint(1) default NULL,
+  `col_143` tinyint(1) default NULL,
+  `col_144` tinyint(1) default NULL,
+  `col_145` tinyint(1) default NULL,
+  `col_146` tinyint(1) default NULL,
+  `col_147` tinyint(1) default NULL,
+  `col_148` tinyint(1) default NULL,
+  `col_149` tinyint(1) default NULL,
+  `col_150` tinyint(1) default NULL,
+  `col_151` tinyint(1) default NULL,
+  `col_152` tinyint(1) default NULL,
+  `col_153` tinyint(1) default NULL,
+  `col_154` tinyint(1) default NULL,
+  `col_155` tinyint(1) default NULL,
+  `col_156` tinyint(1) default NULL,
+  `col_157` tinyint(1) default NULL,
+  `col_158` tinyint(1) default NULL,
+  `col_159` tinyint(1) default NULL,
+  `col_160` tinyint(1) default NULL,
+  `col_161` tinyint(1) default NULL,
+  `col_162` tinyint(1) default NULL,
+  `col_163` tinyint(1) default NULL,
+  `col_164` tinyint(1) default NULL,
+  `col_165` tinyint(1) default NULL,
+  `col_166` tinyint(1) default NULL,
+  `col_167` tinyint(1) default NULL,
+  `col_168` tinyint(1) default NULL,
+  `col_169` tinyint(1) default NULL,
+  `col_170` tinyint(1) default NULL,
+  `col_171` tinyint(1) default NULL,
+  `col_172` tinyint(1) default NULL,
+  `col_173` tinyint(1) default NULL,
+  `col_174` tinyint(1) default NULL,
+  `col_175` tinyint(1) default NULL,
+  `col_176` tinyint(1) default NULL,
+  `col_177` tinyint(1) default NULL,
+  `col_178` tinyint(1) default NULL,
+  `col_179` tinyint(1) default NULL,
+  `col_180` tinyint(1) default NULL,
+  `col_181` tinyint(1) default NULL,
+  `col_182` tinyint(1) default NULL,
+  `col_183` tinyint(1) default NULL,
+  `col_184` tinyint(1) default NULL,
+  `col_185` tinyint(1) default NULL,
+  `col_186` tinyint(1) default NULL,
+  `col_187` tinyint(1) default NULL,
+  `col_188` tinyint(1) default NULL,
+  `col_189` tinyint(1) default NULL,
+  `col_190` tinyint(1) default NULL,
+  `col_191` tinyint(1) default NULL,
+  `col_192` tinyint(1) default NULL,
+  `col_193` tinyint(1) default NULL,
+  `col_194` tinyint(1) default NULL,
+  `col_195` tinyint(1) default NULL,
+  `col_196` tinyint(1) default NULL,
+  `col_197` tinyint(1) default NULL,
+  `col_198` tinyint(1) default NULL,
+  `col_199` tinyint(1) default NULL,
+  `col_200` tinyint(1) default NULL,
+  `col_201` tinyint(1) default NULL,
+  `col_202` tinyint(1) default NULL,
+  `col_203` tinyint(1) default NULL,
+  `col_204` tinyint(1) default NULL,
+  `col_205` tinyint(1) default NULL,
+  `col_206` tinyint(1) default NULL,
+  `col_207` tinyint(1) default NULL,
+  `col_208` tinyint(1) default NULL,
+  `col_209` tinyint(1) default NULL,
+  `col_210` tinyint(1) default NULL,
+  `col_211` tinyint(1) default NULL,
+  `col_212` tinyint(1) default NULL,
+  `col_213` tinyint(1) default NULL,
+  `col_214` tinyint(1) default NULL,
+  `col_215` tinyint(1) default NULL,
+  `col_216` tinyint(1) default NULL,
+  `col_217` tinyint(1) default NULL,
+  `col_218` tinyint(1) default NULL,
+  `col_219` tinyint(1) default NULL,
+  `col_220` tinyint(1) default NULL,
+  `col_221` tinyint(1) default NULL,
+  `col_222` tinyint(1) default NULL,
+  `col_223` tinyint(1) default NULL,
+  `col_224` tinyint(1) default NULL,
+  `col_225` tinyint(1) default NULL,
+  `col_226` tinyint(1) default NULL,
+  `col_227` tinyint(1) default NULL,
+  `col_228` tinyint(1) default NULL,
+  `col_229` tinyint(1) default NULL,
+  `col_230` tinyint(1) default NULL,
+  `col_231` tinyint(1) default NULL,
+  `col_232` tinyint(1) default NULL,
+  `col_233` tinyint(1) default NULL,
+  `col_234` tinyint(1) default NULL,
+  `col_235` tinyint(1) default NULL,
+  `col_236` tinyint(1) default NULL,
+  `col_237` tinyint(1) default NULL,
+  `col_238` tinyint(1) default NULL,
+  `col_239` tinyint(1) default NULL,
+  `col_240` tinyint(1) default NULL,
+  `col_241` tinyint(1) default NULL,
+  `col_242` tinyint(1) default NULL,
+  `col_243` tinyint(1) default NULL,
+  `col_244` tinyint(1) default NULL,
+  `col_245` tinyint(1) default NULL,
+  `col_246` tinyint(1) default NULL,
+  `col_247` tinyint(1) default NULL,
+  `col_248` tinyint(1) default NULL,
+  `col_249` tinyint(1) default NULL,
+  `col_250` tinyint(1) default NULL,
+  `col_251` tinyint(1) default NULL,
+  `col_252` tinyint(1) default NULL,
+  `col_253` tinyint(1) default NULL,
+  `col_254` tinyint(1) default NULL,
+  `col_255` tinyint(1) default NULL,
+  `col_256` tinyint(1) default NULL,
+  `col_257` tinyint(1) default NULL,
+  `col_258` tinyint(1) default NULL,
+  `col_259` tinyint(1) default NULL,
+  `col_260` tinyint(1) default NULL,
+  `col_261` tinyint(1) default NULL,
+  `col_262` tinyint(1) default NULL,
+  `col_263` tinyint(1) default NULL,
+  `col_264` tinyint(1) default NULL,
+  `col_265` tinyint(1) default NULL,
+  `col_266` tinyint(1) default NULL,
+  `col_267` tinyint(1) default NULL,
+  `col_268` tinyint(1) default NULL,
+  `col_269` tinyint(1) default NULL,
+  `col_270` tinyint(1) default NULL,
+  `col_271` tinyint(1) default NULL,
+  `col_272` tinyint(1) default NULL,
+  `col_273` tinyint(1) default NULL,
+  `col_274` tinyint(1) default NULL,
+  `col_275` tinyint(1) default NULL,
+  `col_276` tinyint(1) default NULL,
+  `col_277` tinyint(1) default NULL,
+  `col_278` tinyint(1) default NULL,
+  `col_279` tinyint(1) default NULL,
+  `col_280` tinyint(1) default NULL,
+  `col_281` tinyint(1) default NULL,
+  `col_282` tinyint(1) default NULL,
+  `col_283` tinyint(1) default NULL,
+  `col_284` tinyint(1) default NULL,
+  `col_285` tinyint(1) default NULL,
+  `col_286` tinyint(1) default NULL,
+  `col_287` tinyint(1) default NULL,
+  `col_288` tinyint(1) default NULL,
+  `col_289` tinyint(1) default NULL,
+  `col_290` tinyint(1) default NULL,
+  `col_291` tinyint(1) default NULL,
+  `col_292` tinyint(1) default NULL,
+  `col_293` tinyint(1) default NULL,
+  `col_294` tinyint(1) default NULL,
+  `col_295` tinyint(1) default NULL,
+  `col_296` tinyint(1) default NULL,
+  `col_297` tinyint(1) default NULL,
+  `col_298` tinyint(1) default NULL,
+  `col_299` tinyint(1) default NULL,
+  `col_300` tinyint(1) default NULL,
+  `col_301` tinyint(1) default NULL,
+  `col_302` tinyint(1) default NULL,
+  `col_303` tinyint(1) default NULL,
+  `col_304` tinyint(1) default NULL,
+  `col_305` tinyint(1) default NULL,
+  `col_306` tinyint(1) default NULL,
+  `col_307` tinyint(1) default NULL,
+  `col_308` tinyint(1) default NULL,
+  `col_309` tinyint(1) default NULL,
+  `col_310` tinyint(1) default NULL,
+  `col_311` tinyint(1) default NULL,
+  `col_312` tinyint(1) default NULL,
+  `col_313` tinyint(1) default NULL,
+  `col_314` tinyint(1) default NULL,
+  `col_315` tinyint(1) default NULL,
+  `col_316` tinyint(1) default NULL,
+  `col_317` tinyint(1) default NULL,
+  `col_318` tinyint(1) default NULL,
+  `col_319` tinyint(1) default NULL,
+  `col_320` tinyint(1) default NULL,
+  `col_321` tinyint(1) default NULL,
+  `col_322` tinyint(1) default NULL,
+  `col_323` tinyint(1) default NULL,
+  `col_324` tinyint(1) default NULL,
+  `col_325` tinyint(1) default NULL,
+  `col_326` tinyint(1) default NULL,
+  `col_327` tinyint(1) default NULL,
+  `col_328` tinyint(1) default NULL,
+  `col_329` tinyint(1) default NULL,
+  `col_330` tinyint(1) default NULL,
+  `col_331` tinyint(1) default NULL,
+  `col_332` tinyint(1) default NULL,
+  `col_333` tinyint(1) default NULL,
+  `col_334` tinyint(1) default NULL,
+  `col_335` tinyint(1) default NULL,
+  `col_336` tinyint(1) default NULL,
+  `col_337` tinyint(1) default NULL,
+  `col_338` tinyint(1) default NULL,
+  `col_339` tinyint(1) default NULL,
+  `col_340` tinyint(1) default NULL,
+  `col_341` tinyint(1) default NULL,
+  `col_342` tinyint(1) default NULL,
+  `col_343` tinyint(1) default NULL,
+  `col_344` tinyint(1) default NULL,
+  `col_345` tinyint(1) default NULL,
+  `col_346` tinyint(1) default NULL,
+  `col_347` tinyint(1) default NULL,
+  `col_348` tinyint(1) default NULL,
+  `col_349` tinyint(1) default NULL,
+  `col_350` tinyint(1) default NULL,
+  `col_351` tinyint(1) default NULL,
+  `col_352` tinyint(1) default NULL,
+  `col_353` tinyint(1) default NULL,
+  `col_354` tinyint(1) default NULL,
+  `col_355` tinyint(1) default NULL,
+  `col_356` tinyint(1) default NULL,
+  `col_357` tinyint(1) default NULL,
+  `col_358` tinyint(1) default NULL,
+  `col_359` tinyint(1) default NULL,
+  `col_360` tinyint(1) default NULL,
+  `col_361` tinyint(1) default NULL,
+  `col_362` tinyint(1) default NULL,
+  `col_363` tinyint(1) default NULL,
+  `col_364` tinyint(1) default NULL,
+  `col_365` tinyint(1) default NULL,
+  `col_366` tinyint(1) default NULL,
+  `col_367` tinyint(1) default NULL,
+  `col_368` tinyint(1) default NULL,
+  `col_369` tinyint(1) default NULL,
+  `col_370` tinyint(1) default NULL,
+  `col_371` tinyint(1) default NULL,
+  `col_372` tinyint(1) default NULL,
+  `col_373` tinyint(1) default NULL,
+  `col_374` tinyint(1) default NULL,
+  `col_375` tinyint(1) default NULL,
+  `col_376` tinyint(1) default NULL,
+  `col_377` tinyint(1) default NULL,
+  `col_378` tinyint(1) default NULL,
+  `col_379` tinyint(1) default NULL,
+  `col_380` tinyint(1) default NULL,
+  `col_381` tinyint(1) default NULL,
+  `col_382` tinyint(1) default NULL,
+  `col_383` tinyint(1) default NULL,
+  `col_384` tinyint(1) default NULL,
+  `col_385` tinyint(1) default NULL,
+  `col_386` tinyint(1) default NULL,
+  `col_387` tinyint(1) default NULL,
+  `col_388` tinyint(1) default NULL,
+  `col_389` tinyint(1) default NULL,
+  `col_390` tinyint(1) default NULL,
+  `col_391` tinyint(1) default NULL,
+  `col_392` tinyint(1) default NULL,
+  `col_393` tinyint(1) default NULL,
+  `col_394` tinyint(1) default NULL,
+  `col_395` tinyint(1) default NULL,
+  `col_396` tinyint(1) default NULL,
+  `col_397` tinyint(1) default NULL,
+  `col_398` tinyint(1) default NULL,
+  `col_399` tinyint(1) default NULL,
+  `col_400` tinyint(1) default NULL,
+  `col_401` tinyint(1) default NULL,
+  `col_402` tinyint(1) default NULL,
+  `col_403` tinyint(1) default NULL,
+  `col_404` tinyint(1) default NULL,
+  `col_405` tinyint(1) default NULL,
+  `col_406` tinyint(1) default NULL,
+  `col_407` tinyint(1) default NULL,
+  `col_408` tinyint(1) default NULL,
+  `col_409` tinyint(1) default NULL,
+  `col_410` tinyint(1) default NULL,
+  `col_411` tinyint(1) default NULL,
+  `col_412` tinyint(1) default NULL,
+  `col_413` tinyint(1) default NULL,
+  `col_414` tinyint(1) default NULL,
+  `col_415` tinyint(1) default NULL,
+  `col_416` tinyint(1) default NULL,
+  `col_417` tinyint(1) default NULL,
+  `col_418` tinyint(1) default NULL,
+  `col_419` tinyint(1) default NULL,
+  `col_420` tinyint(1) default NULL,
+  `col_421` tinyint(1) default NULL,
+  `col_422` tinyint(1) default NULL,
+  `col_423` tinyint(1) default NULL,
+  `col_424` tinyint(1) default NULL,
+  `col_425` tinyint(1) default NULL,
+  `col_426` tinyint(1) default NULL,
+  `col_427` tinyint(1) default NULL,
+  `col_428` tinyint(1) default NULL,
+  `col_429` tinyint(1) default NULL,
+  `col_430` tinyint(1) default NULL,
+  `col_431` tinyint(1) default NULL,
+  `col_432` tinyint(1) default NULL,
+  `col_433` tinyint(1) default NULL,
+  `col_434` tinyint(1) default NULL,
+  `col_435` tinyint(1) default NULL,
+  `col_436` tinyint(1) default NULL,
+  `col_437` tinyint(1) default NULL,
+  `col_438` tinyint(1) default NULL,
+  `col_439` tinyint(1) default NULL,
+  `col_440` tinyint(1) default NULL,
+  `col_441` tinyint(1) default NULL,
+  `col_442` tinyint(1) default NULL,
+  `col_443` tinyint(1) default NULL,
+  `col_444` tinyint(1) default NULL,
+  `col_445` tinyint(1) default NULL,
+  `col_446` tinyint(1) default NULL,
+  `col_447` tinyint(1) default NULL,
+  `col_448` tinyint(1) default NULL,
+  `col_449` tinyint(1) default NULL,
+  `col_450` tinyint(1) default NULL,
+  `col_451` tinyint(1) default NULL,
+  `col_452` tinyint(1) default NULL,
+  `col_453` tinyint(1) default NULL,
+  `col_454` tinyint(1) default NULL,
+  `col_455` tinyint(1) default NULL,
+  `col_456` tinyint(1) default NULL,
+  `col_457` tinyint(1) default NULL,
+  `col_458` tinyint(1) default NULL,
+  `col_459` tinyint(1) default NULL,
+  `col_460` tinyint(1) default NULL,
+  `col_461` tinyint(1) default NULL,
+  `col_462` tinyint(1) default NULL,
+  `col_463` tinyint(1) default NULL,
+  `col_464` tinyint(1) default NULL,
+  `col_465` tinyint(1) default NULL,
+  `col_466` tinyint(1) default NULL,
+  `col_467` tinyint(1) default NULL,
+  `col_468` tinyint(1) default NULL,
+  `col_469` tinyint(1) default NULL,
+  `col_470` tinyint(1) default NULL,
+  `col_471` tinyint(1) default NULL,
+  `col_472` tinyint(1) default NULL,
+  `col_473` tinyint(1) default NULL,
+  `col_474` tinyint(1) default NULL,
+  `col_475` tinyint(1) default NULL,
+  `col_476` tinyint(1) default NULL,
+  `col_477` tinyint(1) default NULL,
+  `col_478` tinyint(1) default NULL,
+  `col_479` tinyint(1) default NULL,
+  `col_480` tinyint(1) default NULL,
+  `col_481` tinyint(1) default NULL,
+  `col_482` tinyint(1) default NULL,
+  `col_483` tinyint(1) default NULL,
+  `col_484` tinyint(1) default NULL,
+  `col_485` tinyint(1) default NULL,
+  `col_486` tinyint(1) default NULL,
+  `col_487` tinyint(1) default NULL,
+  `col_488` tinyint(1) default NULL,
+  `col_489` tinyint(1) default NULL,
+  `col_490` tinyint(1) default NULL,
+  `col_491` tinyint(1) default NULL,
+  `col_492` tinyint(1) default NULL,
+  `col_493` tinyint(1) default NULL,
+  `col_494` tinyint(1) default NULL,
+  `col_495` tinyint(1) default NULL,
+  `col_496` tinyint(1) default NULL,
+  `col_497` tinyint(1) default NULL,
+  `col_498` tinyint(1) default NULL,
+  `col_499` tinyint(1) default NULL,
+  `col_500` tinyint(1) default NULL,
+  `col_501` tinyint(1) default NULL,
+  `col_502` tinyint(1) default NULL,
+  `col_503` tinyint(1) default NULL,
+  `col_504` tinyint(1) default NULL,
+  `col_505` tinyint(1) default NULL,
+  `col_506` tinyint(1) default NULL,
+  `col_507` tinyint(1) default NULL,
+  `col_508` tinyint(1) default NULL,
+  `col_509` tinyint(1) default NULL,
+  `col_510` tinyint(1) default NULL,
+  `col_511` tinyint(1) default NULL,
+  `col_512` tinyint(1) default NULL,
+  `col_513` tinyint(1) default NULL,
+  `col_514` tinyint(1) default NULL,
+  `col_515` tinyint(1) default NULL,
+  `col_516` tinyint(1) default NULL,
+  `col_517` tinyint(1) default NULL,
+  `col_518` tinyint(1) default NULL,
+  `col_519` tinyint(1) default NULL,
+  `col_520` tinyint(1) default NULL,
+  `col_521` tinyint(1) default NULL,
+  `col_522` tinyint(1) default NULL,
+  `col_523` tinyint(1) default NULL,
+  `col_524` tinyint(1) default NULL,
+  `col_525` tinyint(1) default NULL,
+  `col_526` tinyint(1) default NULL,
+  `col_527` tinyint(1) default NULL,
+  `col_528` tinyint(1) default NULL,
+  `col_529` tinyint(1) default NULL,
+  `col_530` tinyint(1) default NULL,
+  `col_531` tinyint(1) default NULL,
+  `col_532` tinyint(1) default NULL,
+  `col_533` tinyint(1) default NULL,
+  `col_534` tinyint(1) default NULL,
+  `col_535` tinyint(1) default NULL,
+  `col_536` tinyint(1) default NULL,
+  `col_537` tinyint(1) default NULL,
+  `col_538` tinyint(1) default NULL,
+  `col_539` tinyint(1) default NULL,
+  `col_540` tinyint(1) default NULL,
+  `col_541` tinyint(1) default NULL,
+  `col_542` tinyint(1) default NULL,
+  `col_543` tinyint(1) default NULL,
+  `col_544` tinyint(1) default NULL,
+  `col_545` tinyint(1) default NULL,
+  `col_546` tinyint(1) default NULL,
+  `col_547` tinyint(1) default NULL,
+  `col_548` tinyint(1) default NULL,
+  `col_549` tinyint(1) default NULL,
+  `col_550` tinyint(1) default NULL,
+  `col_551` tinyint(1) default NULL,
+  `col_552` tinyint(1) default NULL,
+  `col_553` tinyint(1) default NULL,
+  `col_554` tinyint(1) default NULL,
+  `col_555` tinyint(1) default NULL,
+  `col_556` tinyint(1) default NULL,
+  `col_557` tinyint(1) default NULL,
+  `col_558` tinyint(1) default NULL,
+  `col_559` tinyint(1) default NULL,
+  `col_560` tinyint(1) default NULL,
+  `col_561` tinyint(1) default NULL,
+  `col_562` tinyint(1) default NULL,
+  `col_563` tinyint(1) default NULL,
+  `col_564` tinyint(1) default NULL,
+  `col_565` tinyint(1) default NULL,
+  `col_566` tinyint(1) default NULL,
+  `col_567` tinyint(1) default NULL,
+  `col_568` tinyint(1) default NULL,
+  `col_569` tinyint(1) default NULL,
+  `col_570` tinyint(1) default NULL,
+  `col_571` tinyint(1) default NULL,
+  `col_572` tinyint(1) default NULL,
+  `col_573` tinyint(1) default NULL,
+  `col_574` tinyint(1) default NULL,
+  `col_575` tinyint(1) default NULL,
+  `col_576` tinyint(1) default NULL,
+  `col_577` tinyint(1) default NULL,
+  `col_578` tinyint(1) default NULL,
+  `col_579` tinyint(1) default NULL,
+  `col_580` tinyint(1) default NULL,
+  `col_581` tinyint(1) default NULL,
+  `col_582` tinyint(1) default NULL,
+  `col_583` tinyint(1) default NULL,
+  `col_584` tinyint(1) default NULL,
+  `col_585` tinyint(1) default NULL,
+  `col_586` tinyint(1) default NULL,
+  `col_587` tinyint(1) default NULL,
+  `col_588` tinyint(1) default NULL,
+  `col_589` tinyint(1) default NULL,
+  `col_590` tinyint(1) default NULL,
+  `col_591` tinyint(1) default NULL,
+  `col_592` tinyint(1) default NULL,
+  `col_593` tinyint(1) default NULL,
+  `col_594` tinyint(1) default NULL,
+  `col_595` tinyint(1) default NULL,
+  `col_596` tinyint(1) default NULL,
+  `col_597` tinyint(1) default NULL,
+  `col_598` tinyint(1) default NULL,
+  `col_599` tinyint(1) default NULL,
+  `col_600` tinyint(1) default NULL,
+  `col_601` tinyint(1) default NULL,
+  `col_602` tinyint(1) default NULL,
+  `col_603` tinyint(1) default NULL,
+  `col_604` tinyint(1) default NULL,
+  `col_605` tinyint(1) default NULL,
+  `col_606` tinyint(1) default NULL,
+  `col_607` tinyint(1) default NULL,
+  `col_608` tinyint(1) default NULL,
+  `col_609` tinyint(1) default NULL,
+  `col_610` tinyint(1) default NULL,
+  `col_611` tinyint(1) default NULL,
+  `col_612` tinyint(1) default NULL,
+  `col_613` tinyint(1) default NULL,
+  `col_614` tinyint(1) default NULL,
+  `col_615` tinyint(1) default NULL,
+  `col_616` tinyint(1) default NULL,
+  `col_617` tinyint(1) default NULL,
+  `col_618` tinyint(1) default NULL,
+  `col_619` tinyint(1) default NULL,
+  `col_620` tinyint(1) default NULL,
+  `col_621` tinyint(1) default NULL,
+  `col_622` tinyint(1) default NULL,
+  `col_623` tinyint(1) default NULL,
+  `col_624` tinyint(1) default NULL,
+  `col_625` tinyint(1) default NULL,
+  `col_626` tinyint(1) default NULL,
+  `col_627` tinyint(1) default NULL,
+  `col_628` tinyint(1) default NULL,
+  `col_629` tinyint(1) default NULL,
+  `col_630` tinyint(1) default NULL,
+  `col_631` tinyint(1) default NULL,
+  `col_632` tinyint(1) default NULL,
+  `col_633` tinyint(1) default NULL,
+  `col_634` tinyint(1) default NULL,
+  `col_635` tinyint(1) default NULL,
+  `col_636` tinyint(1) default NULL,
+  `col_637` tinyint(1) default NULL,
+  `col_638` tinyint(1) default NULL,
+  `col_639` tinyint(1) default NULL,
+  `col_640` tinyint(1) default NULL,
+  `col_641` tinyint(1) default NULL,
+  `col_642` tinyint(1) default NULL,
+  `col_643` tinyint(1) default NULL,
+  `col_644` tinyint(1) default NULL,
+  `col_645` tinyint(1) default NULL,
+  `col_646` tinyint(1) default NULL,
+  `col_647` tinyint(1) default NULL,
+  `col_648` tinyint(1) default NULL,
+  `col_649` tinyint(1) default NULL,
+  `col_650` tinyint(1) default NULL,
+  `col_651` tinyint(1) default NULL,
+  `col_652` tinyint(1) default NULL,
+  `col_653` tinyint(1) default NULL,
+  `col_654` tinyint(1) default NULL,
+  `col_655` tinyint(1) default NULL,
+  `col_656` tinyint(1) default NULL,
+  `col_657` tinyint(1) default NULL,
+  `col_658` tinyint(1) default NULL,
+  `col_659` tinyint(1) default NULL,
+  `col_660` tinyint(1) default NULL,
+  `col_661` tinyint(1) default NULL,
+  `col_662` tinyint(1) default NULL,
+  `col_663` tinyint(1) default NULL,
+  `col_664` tinyint(1) default NULL,
+  `col_665` tinyint(1) default NULL,
+  `col_666` tinyint(1) default NULL,
+  `col_667` tinyint(1) default NULL,
+  `col_668` tinyint(1) default NULL,
+  `col_669` tinyint(1) default NULL,
+  `col_670` tinyint(1) default NULL,
+  `col_671` tinyint(1) default NULL,
+  `col_672` tinyint(1) default NULL,
+  `col_673` tinyint(1) default NULL,
+  `col_674` tinyint(1) default NULL,
+  `col_675` tinyint(1) default NULL,
+  `col_676` tinyint(1) default NULL,
+  `col_677` tinyint(1) default NULL,
+  `col_678` tinyint(1) default NULL,
+  `col_679` tinyint(1) default NULL,
+  `col_680` tinyint(1) default NULL,
+  `col_681` tinyint(1) default NULL,
+  `col_682` tinyint(1) default NULL,
+  `col_683` tinyint(1) default NULL,
+  `col_684` tinyint(1) default NULL,
+  `col_685` tinyint(1) default NULL,
+  `col_686` tinyint(1) default NULL,
+  `col_687` tinyint(1) default NULL,
+  `col_688` tinyint(1) default NULL,
+  `col_689` tinyint(1) default NULL,
+  `col_690` tinyint(1) default NULL,
+  `col_691` tinyint(1) default NULL,
+  `col_692` tinyint(1) default NULL,
+  `col_693` tinyint(1) default NULL,
+  `col_694` tinyint(1) default NULL,
+  `col_695` tinyint(1) default NULL,
+  `col_696` tinyint(1) default NULL,
+  `col_697` tinyint(1) default NULL,
+  `col_698` tinyint(1) default NULL,
+  `col_699` tinyint(1) default NULL,
+  `col_700` tinyint(1) default NULL,
+  `col_701` tinyint(1) default NULL,
+  `col_702` tinyint(1) default NULL,
+  `col_703` tinyint(1) default NULL,
+  `col_704` tinyint(1) default NULL,
+  `col_705` tinyint(1) default NULL,
+  `col_706` tinyint(1) default NULL,
+  `col_707` tinyint(1) default NULL,
+  `col_708` tinyint(1) default NULL,
+  `col_709` tinyint(1) default NULL,
+  `col_710` tinyint(1) default NULL,
+  `col_711` tinyint(1) default NULL,
+  `col_712` tinyint(1) default NULL,
+  `col_713` tinyint(1) default NULL,
+  `col_714` tinyint(1) default NULL,
+  `col_715` tinyint(1) default NULL,
+  `col_716` tinyint(1) default NULL,
+  `col_717` tinyint(1) default NULL,
+  `col_718` tinyint(1) default NULL,
+  `col_719` tinyint(1) default NULL,
+  `col_720` tinyint(1) default NULL,
+  `col_721` tinyint(1) default NULL,
+  `col_722` tinyint(1) default NULL,
+  `col_723` tinyint(1) default NULL,
+  `col_724` tinyint(1) default NULL,
+  `col_725` tinyint(1) default NULL,
+  `col_726` tinyint(1) default NULL,
+  `col_727` tinyint(1) default NULL,
+  `col_728` tinyint(1) default NULL,
+  `col_729` tinyint(1) default NULL,
+  `col_730` tinyint(1) default NULL,
+  `col_731` tinyint(1) default NULL,
+  `col_732` tinyint(1) default NULL,
+  `col_733` tinyint(1) default NULL,
+  `col_734` tinyint(1) default NULL,
+  `col_735` tinyint(1) default NULL,
+  `col_736` tinyint(1) default NULL,
+  `col_737` tinyint(1) default NULL,
+  `col_738` tinyint(1) default NULL,
+  `col_739` tinyint(1) default NULL,
+  `col_740` tinyint(1) default NULL,
+  `col_741` tinyint(1) default NULL,
+  `col_742` tinyint(1) default NULL,
+  `col_743` tinyint(1) default NULL,
+  `col_744` tinyint(1) default NULL,
+  `col_745` tinyint(1) default NULL,
+  `col_746` tinyint(1) default NULL,
+  `col_747` tinyint(1) default NULL,
+  `col_748` tinyint(1) default NULL,
+  `col_749` tinyint(1) default NULL,
+  `col_750` tinyint(1) default NULL,
+  `col_751` tinyint(1) default NULL,
+  `col_752` tinyint(1) default NULL,
+  `col_753` tinyint(1) default NULL,
+  `col_754` tinyint(1) default NULL,
+  `col_755` tinyint(1) default NULL,
+  `col_756` tinyint(1) default NULL,
+  `col_757` tinyint(1) default NULL,
+  `col_758` tinyint(1) default NULL,
+  `col_759` tinyint(1) default NULL,
+  `col_760` tinyint(1) default NULL,
+  `col_761` tinyint(1) default NULL,
+  `col_762` tinyint(1) default NULL,
+  `col_763` tinyint(1) default NULL,
+  `col_764` tinyint(1) default NULL,
+  `col_765` tinyint(1) default NULL,
+  `col_766` tinyint(1) default NULL,
+  `col_767` tinyint(1) default NULL,
+  `col_768` tinyint(1) default NULL,
+  `col_769` tinyint(1) default NULL,
+  `col_770` tinyint(1) default NULL,
+  `col_771` tinyint(1) default NULL,
+  `col_772` tinyint(1) default NULL,
+  `col_773` tinyint(1) default NULL,
+  `col_774` tinyint(1) default NULL,
+  `col_775` tinyint(1) default NULL,
+  `col_776` tinyint(1) default NULL,
+  `col_777` tinyint(1) default NULL,
+  `col_778` tinyint(1) default NULL,
+  `col_779` tinyint(1) default NULL,
+  `col_780` tinyint(1) default NULL,
+  `col_781` tinyint(1) default NULL,
+  `col_782` tinyint(1) default NULL,
+  `col_783` tinyint(1) default NULL,
+  `col_784` tinyint(1) default NULL,
+  `col_785` tinyint(1) default NULL,
+  `col_786` tinyint(1) default NULL,
+  `col_787` tinyint(1) default NULL,
+  `col_788` tinyint(1) default NULL,
+  `col_789` tinyint(1) default NULL,
+  `col_790` tinyint(1) default NULL,
+  `col_791` tinyint(1) default NULL,
+  `col_792` tinyint(1) default NULL,
+  `col_793` tinyint(1) default NULL,
+  `col_794` tinyint(1) default NULL,
+  `col_795` tinyint(1) default NULL,
+  `col_796` tinyint(1) default NULL,
+  `col_797` tinyint(1) default NULL,
+  `col_798` tinyint(1) default NULL,
+  `col_799` tinyint(1) default NULL,
+  `col_800` tinyint(1) default NULL,
+  `col_801` tinyint(1) default NULL,
+  `col_802` tinyint(1) default NULL,
+  `col_803` tinyint(1) default NULL,
+  `col_804` tinyint(1) default NULL,
+  `col_805` tinyint(1) default NULL,
+  `col_806` tinyint(1) default NULL,
+  `col_807` tinyint(1) default NULL,
+  `col_808` tinyint(1) default NULL,
+  `col_809` tinyint(1) default NULL,
+  `col_810` tinyint(1) default NULL,
+  `col_811` tinyint(1) default NULL,
+  `col_812` tinyint(1) default NULL,
+  `col_813` tinyint(1) default NULL,
+  `col_814` tinyint(1) default NULL,
+  `col_815` tinyint(1) default NULL,
+  `col_816` tinyint(1) default NULL,
+  `col_817` tinyint(1) default NULL,
+  `col_818` tinyint(1) default NULL,
+  `col_819` tinyint(1) default NULL,
+  `col_820` tinyint(1) default NULL,
+  `col_821` tinyint(1) default NULL,
+  `col_822` tinyint(1) default NULL,
+  `col_823` tinyint(1) default NULL,
+  `col_824` tinyint(1) default NULL,
+  `col_825` tinyint(1) default NULL,
+  `col_826` tinyint(1) default NULL,
+  `col_827` tinyint(1) default NULL,
+  `col_828` tinyint(1) default NULL,
+  `col_829` tinyint(1) default NULL,
+  `col_830` tinyint(1) default NULL,
+  `col_831` tinyint(1) default NULL,
+  `col_832` tinyint(1) default NULL,
+  `col_833` tinyint(1) default NULL,
+  `col_834` tinyint(1) default NULL,
+  `col_835` tinyint(1) default NULL,
+  `col_836` tinyint(1) default NULL,
+  `col_837` tinyint(1) default NULL,
+  `col_838` tinyint(1) default NULL,
+  `col_839` tinyint(1) default NULL,
+  `col_840` tinyint(1) default NULL,
+  `col_841` tinyint(1) default NULL,
+  `col_842` tinyint(1) default NULL,
+  `col_843` tinyint(1) default NULL,
+  `col_844` tinyint(1) default NULL,
+  `col_845` tinyint(1) default NULL,
+  `col_846` tinyint(1) default NULL,
+  `col_847` tinyint(1) default NULL,
+  `col_848` tinyint(1) default NULL,
+  `col_849` tinyint(1) default NULL,
+  `col_850` tinyint(1) default NULL,
+  `col_851` tinyint(1) default NULL,
+  `col_852` tinyint(1) default NULL,
+  `col_853` tinyint(1) default NULL,
+  `col_854` tinyint(1) default NULL,
+  `col_855` tinyint(1) default NULL,
+  `col_856` tinyint(1) default NULL,
+  `col_857` tinyint(1) default NULL,
+  `col_858` tinyint(1) default NULL,
+  `col_859` tinyint(1) default NULL,
+  `col_860` tinyint(1) default NULL,
+  `col_861` tinyint(1) default NULL,
+  `col_862` tinyint(1) default NULL,
+  `col_863` tinyint(1) default NULL,
+  `col_864` tinyint(1) default NULL,
+  `col_865` tinyint(1) default NULL,
+  `col_866` tinyint(1) default NULL,
+  `col_867` tinyint(1) default NULL,
+  `col_868` tinyint(1) default NULL,
+  `col_869` tinyint(1) default NULL,
+  `col_870` tinyint(1) default NULL,
+  `col_871` tinyint(1) default NULL,
+  `col_872` tinyint(1) default NULL,
+  `col_873` tinyint(1) default NULL,
+  `col_874` tinyint(1) default NULL,
+  `col_875` tinyint(1) default NULL,
+  `col_876` tinyint(1) default NULL,
+  `col_877` tinyint(1) default NULL,
+  `col_878` tinyint(1) default NULL,
+  `col_879` tinyint(1) default NULL,
+  `col_880` tinyint(1) default NULL,
+  `col_881` tinyint(1) default NULL,
+  `col_882` tinyint(1) default NULL,
+  `col_883` tinyint(1) default NULL,
+  `col_884` tinyint(1) default NULL,
+  `col_885` tinyint(1) default NULL,
+  `col_886` tinyint(1) default NULL,
+  `col_887` tinyint(1) default NULL,
+  `col_888` tinyint(1) default NULL,
+  `col_889` tinyint(1) default NULL,
+  `col_890` tinyint(1) default NULL,
+  `col_891` tinyint(1) default NULL,
+  `col_892` tinyint(1) default NULL,
+  `col_893` tinyint(1) default NULL,
+  `col_894` tinyint(1) default NULL,
+  `col_895` tinyint(1) default NULL,
+  `col_896` tinyint(1) default NULL,
+  `col_897` tinyint(1) default NULL,
+  `col_898` tinyint(1) default NULL,
+  `col_899` tinyint(1) default NULL,
+  `col_900` tinyint(1) default NULL,
+  `col_901` tinyint(1) default NULL,
+  `col_902` tinyint(1) default NULL,
+  `col_903` tinyint(1) default NULL,
+  `col_904` tinyint(1) default NULL,
+  `col_905` tinyint(1) default NULL,
+  `col_906` tinyint(1) default NULL,
+  `col_907` tinyint(1) default NULL,
+  `col_908` tinyint(1) default NULL,
+  `col_909` tinyint(1) default NULL,
+  `col_910` tinyint(1) default NULL,
+  `col_911` tinyint(1) default NULL,
+  `col_912` tinyint(1) default NULL,
+  `col_913` tinyint(1) default NULL,
+  `col_914` tinyint(1) default NULL,
+  `col_915` tinyint(1) default NULL,
+  `col_916` tinyint(1) default NULL,
+  `col_917` tinyint(1) default NULL,
+  `col_918` tinyint(1) default NULL,
+  `col_919` tinyint(1) default NULL,
+  `col_920` tinyint(1) default NULL,
+  `col_921` tinyint(1) default NULL,
+  `col_922` tinyint(1) default NULL,
+  `col_923` tinyint(1) default NULL,
+  `col_924` tinyint(1) default NULL,
+  `col_925` tinyint(1) default NULL,
+  `col_926` tinyint(1) default NULL,
+  `col_927` tinyint(1) default NULL,
+  `col_928` tinyint(1) default NULL,
+  `col_929` tinyint(1) default NULL,
+  `col_930` tinyint(1) default NULL,
+  `col_931` tinyint(1) default NULL,
+  `col_932` tinyint(1) default NULL,
+  `col_933` tinyint(1) default NULL,
+  `col_934` tinyint(1) default NULL,
+  `col_935` tinyint(1) default NULL,
+  `col_936` tinyint(1) default NULL,
+  `col_937` tinyint(1) default NULL,
+  `col_938` tinyint(1) default NULL,
+  `col_939` tinyint(1) default NULL,
+  `col_940` tinyint(1) default NULL,
+  `col_941` tinyint(1) default NULL,
+  `col_942` tinyint(1) default NULL,
+  `col_943` tinyint(1) default NULL,
+  `col_944` tinyint(1) default NULL,
+  `col_945` tinyint(1) default NULL,
+  `col_946` tinyint(1) default NULL,
+  `col_947` tinyint(1) default NULL,
+  `col_948` tinyint(1) default NULL,
+  `col_949` tinyint(1) default NULL,
+  `col_950` tinyint(1) default NULL,
+  `col_951` tinyint(1) default NULL,
+  `col_952` tinyint(1) default NULL,
+  `col_953` tinyint(1) default NULL,
+  `col_954` tinyint(1) default NULL,
+  `col_955` tinyint(1) default NULL,
+  `col_956` tinyint(1) default NULL,
+  `col_957` tinyint(1) default NULL,
+  `col_958` tinyint(1) default NULL,
+  `col_959` tinyint(1) default NULL,
+  `col_960` tinyint(1) default NULL,
+  `col_961` tinyint(1) default NULL,
+  `col_962` tinyint(1) default NULL,
+  `col_963` tinyint(1) default NULL,
+  `col_964` tinyint(1) default NULL,
+  `col_965` tinyint(1) default NULL,
+  `col_966` tinyint(1) default NULL,
+  `col_967` tinyint(1) default NULL,
+  `col_968` tinyint(1) default NULL,
+  `col_969` tinyint(1) default NULL,
+  `col_970` tinyint(1) default NULL,
+  `col_971` tinyint(1) default NULL,
+  `col_972` tinyint(1) default NULL,
+  `col_973` tinyint(1) default NULL,
+  `col_974` tinyint(1) default NULL,
+  `col_975` tinyint(1) default NULL,
+  `col_976` tinyint(1) default NULL,
+  `col_977` tinyint(1) default NULL,
+  `col_978` tinyint(1) default NULL,
+  `col_979` tinyint(1) default NULL,
+  `col_980` tinyint(1) default NULL,
+  `col_981` tinyint(1) default NULL,
+  `col_982` tinyint(1) default NULL,
+  `col_983` tinyint(1) default NULL,
+  `col_984` tinyint(1) default NULL,
+  `col_985` tinyint(1) default NULL,
+  `col_986` tinyint(1) default NULL,
+  `col_987` tinyint(1) default NULL,
+  `col_988` tinyint(1) default NULL,
+  `col_989` tinyint(1) default NULL,
+  `col_990` tinyint(1) default NULL,
+  `col_991` tinyint(1) default NULL,
+  `col_992` tinyint(1) default NULL,
+  `col_993` tinyint(1) default NULL,
+  `col_994` tinyint(1) default NULL,
+  `col_995` tinyint(1) default NULL,
+  `col_996` tinyint(1) default NULL,
+  `col_997` tinyint(1) default NULL,
+  `col_998` tinyint(1) default NULL,
+  `col_999` tinyint(1) default NULL,
+  `col_1000` tinyint(1) default NULL,
+  `col_1001` tinyint(1) default NULL,
+  `col_1002` tinyint(1) default NULL,
+  `col_1003` tinyint(1) default NULL,
+  `col_1004` tinyint(1) default NULL,
+  `col_1005` tinyint(1) default NULL,
+  `col_1006` tinyint(1) default NULL,
+  `col_1007` tinyint(1) default NULL,
+  `col_1008` tinyint(1) default NULL,
+  `col_1009` tinyint(1) default NULL,
+  `col_1010` tinyint(1) default NULL,
+  `col_1011` tinyint(1) default NULL,
+  `col_1012` tinyint(1) default NULL,
+  `col_1013` tinyint(1) default NULL,
+  `col_1014` tinyint(1) default NULL,
+  `col_1015` tinyint(1) default NULL,
+  `col_1016` tinyint(1) default NULL,
+  `col_1017` tinyint(1) default NULL,
+  `col_1018` tinyint(1) default NULL,
+  `col_1019` tinyint(1) default NULL,
+  `col_1020` tinyint(1) default NULL,
+  `col_1021` tinyint(1) default NULL,
+  `col_1022` tinyint(1) default NULL,
+  `col_1023` tinyint(1) default NULL,
+  `col_1024` tinyint(1) default NULL,
+  `col_1025` tinyint(1) default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+--enable_query_log
+CREATE VIEW v1 AS SELECT * FROM t1;
+
+INSERT INTO t1 VALUES();
+SELECT COUNT(*) FROM v1;
+
+--exec $MYSQL_DUMP --allow-keywords --single-transaction --quick --verbose test --result-file $MYSQLTEST_VARDIR/tmp/bug31434.sql
+--exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/bug31434.sql
+--remove_file $MYSQLTEST_VARDIR/tmp/bug31434.sql
+
+SELECT COUNT(*) FROM v1;
+
+DROP VIEW  v1;
+DROP TABLE t1;
+
+SET GLOBAL storage_engine=@old_engine;
diff --git a/mysql-test/t/partition_range.test b/mysql-test/t/partition_range.test
index bc4231d1d71..c02d9049f2e 100644
--- a/mysql-test/t/partition_range.test
+++ b/mysql-test/t/partition_range.test
@@ -807,24 +807,24 @@ DROP TABLE t1;
 #
 # BUG#30573: get wrong result with "group by" on PARTITIONed table
 #
-#create table t1 (a int);
-#insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
-#CREATE TABLE t2 (
-#  defid int(10) unsigned NOT NULL,
-#  day int(10) unsigned NOT NULL,
-#  count int(10) unsigned NOT NULL,
-#  filler char(200),
-#  KEY (defid,day)
-#) 
-#PARTITION BY RANGE (day) (
-#  PARTITION p7 VALUES LESS THAN (20070401) , 
-#  PARTITION p8 VALUES LESS THAN (20070501));
-
-#insert into t2 select 20, 20070311, 1, 'filler' from t1 A, t1 B;
-#insert into t2 select 20, 20070411, 1, 'filler' from t1 A, t1 B;
-#insert into t2 values(52, 20070321, 123, 'filler') ;
-#insert into t2 values(52, 20070322, 456, 'filler') ;
-
-#select sum(count) from t2 ch where ch.defid in (50,52) and ch.day between 20070320 and 20070401 group by defid;
-#drop table t1, t2;
+create table t1 (a int);
+insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
+CREATE TABLE t2 (
+  defid int(10) unsigned NOT NULL,
+  day int(10) unsigned NOT NULL,
+  count int(10) unsigned NOT NULL,
+  filler char(200),
+  KEY (defid,day)
+) 
+PARTITION BY RANGE (day) (
+  PARTITION p7 VALUES LESS THAN (20070401) , 
+  PARTITION p8 VALUES LESS THAN (20070501));
+
+insert into t2 select 20, 20070311, 1, 'filler' from t1 A, t1 B;
+insert into t2 select 20, 20070411, 1, 'filler' from t1 A, t1 B;
+insert into t2 values(52, 20070321, 123, 'filler') ;
+insert into t2 values(52, 20070322, 456, 'filler') ;
+
+select sum(count) from t2 ch where ch.defid in (50,52) and ch.day between 20070320 and 20070401 group by defid;
+drop table t1, t2;
 
diff --git a/mysql-test/t/user_var.test b/mysql-test/t/user_var.test
index f2699ab03d3..5d916e410e3 100644
--- a/mysql-test/t/user_var.test
+++ b/mysql-test/t/user_var.test
@@ -263,4 +263,26 @@ from t1 order by score desc;
 --enable_result_log
 drop table t1;
 
+#
+# Bug#26020: User-Defined Variables are not consistent with columns data types
+#
+
+create table t1(b bigint);
+insert into t1 (b) values (10), (30), (10);
+set @var := 0;
+select if(b=@var, 999, b) , @var := b from t1  order by b;
+drop table t1;
+
+create temporary table t1 (id int);
+insert into t1 values (2), (3), (3), (4);
+set @lastid=-1;
+select @lastid != id, @lastid, @lastid := id from t1;
+drop table t1;
+
+create temporary table t1 (id bigint);
+insert into t1 values (2), (3), (3), (4);
+set @lastid=-1;
+select @lastid != id, @lastid, @lastid := id from t1;
+drop table t1;
+
 --echo End of 5.1 tests
author	Georgi Kodinov <kgeorge@mysql.com>	2008-10-01 12:47:25 +0300
committer	Georgi Kodinov <kgeorge@mysql.com>	2008-10-01 12:47:25 +0300
commit	63a3ce6ef0f75440dd21ec13925c16d475ca37e6 (patch)
tree	60bbb287461767b7a9cafa225bf108abe6eb1f65 /mysql-test
parent	6db425ab4cd2fbd069977336144e99651211ef64 (diff)
parent	6816cf6a6518bb5108fe7907f71e58be994db6e5 (diff)
download	mariadb-git-63a3ce6ef0f75440dd21ec13925c16d475ca37e6.tar.gz