#At file:///misc/mysql/forest/37553/51-37553/
2716 Tatiana A. Nurnberg 2008-11-27 [merge]
auto-merge
modified:
mysql-test/r/innodb_mysql.result
mysql-test/r/log_output_func.result
mysql-test/r/subselect.result
mysql-test/t/innodb_mysql.test
mysql-test/t/log_output_func.test
mysql-test/t/subselect.test
sql/mysql_priv.h
sql/sql_base.cc
sql/sql_update.cc
tests/mysql_client_test.c
=== modified file 'mysql-test/r/innodb_mysql.result'
--- a/mysql-test/r/innodb_mysql.result 2008-11-03 17:46:47 +0000
+++ b/mysql-test/r/innodb_mysql.result 2008-11-27 15:03:13 +0000
@@ -1677,3 +1677,9 @@ select @@session.sql_log_bin, @@session.
CREATE TABLE t1 ( a INT ) ENGINE=InnoDB;
INSERT INTO t1 VALUES(1);
DROP TABLE t1;
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 (a char(50)) ENGINE=InnoDB;
+CREATE INDEX i1 on t1 (a(3));
+SELECT * FROM t1 WHERE a = 'abcde';
+a
+DROP TABLE t1;
=== modified file 'mysql-test/r/log_output_func.result'
--- a/mysql-test/r/log_output_func.result 2008-04-10 13:14:28 +0000
+++ b/mysql-test/r/log_output_func.result 2008-11-27 14:51:48 +0000
@@ -1,13 +1,11 @@
+SET @start_value= @@global.log_output;
+SET @start_general_log= @@global.general_log;
+SET @start_general_log_file= @@global.general_log_file;
'#--------------------FN_DYNVARS_065_01-------------------------#'
SET @@global.log_output = 'NONE';
'connect (con1,localhost,root,,,,)'
-'connection con1'
-SELECT @@global.log_output;
-@@global.log_output
-NONE
SET @@global.log_output = 'TABLE,FILE';
'connect (con2,localhost,root,,,,)'
-'connection con2'
SELECT @@global.log_output;
@@global.log_output
FILE,TABLE
@@ -18,7 +16,7 @@ SET @@global.log_output = 'NONE';
TRUNCATE TABLE mysql.general_log;
DROP TABLE IF EXISTS t1;
CREATE TABLE t1(a INT);
-INSERT INTO t1 value(1);
+INSERT INTO t1 VALUE(1);
SELECT 'abc';
abc
abc
@@ -29,25 +27,33 @@ count(*)
SET @@global.log_output = 'TABLE';
TRUNCATE TABLE mysql.general_log;
DROP TABLE IF EXISTS t1;
-create table t1(a int);
-INSERT INTO t1 value(1);
+CREATE TABLE t1(a int);
+INSERT INTO t1 VALUE(1);
SELECT 'abc';
abc
abc
-SELECT count(*) from mysql.general_log;
-count(*)
-5
-'Bug#35371: Changing general_log file is crashing server'
-'SET @@global.general_log_file = @log_file;'
+SELECT count(*)>4 FROM mysql.general_log;
+count(*)>4
+1
+SET @@global.general_log = 'OFF';
+FLUSH LOGS;
+SET @@global.general_log_file = 'MYSQLTEST_VARDIR/run/mytest.log';
+SET @@global.general_log = 'ON';
SET @@global.log_output = 'FILE';
TRUNCATE TABLE mysql.general_log;
DROP TABLE IF EXISTS t1;
-create table t1(a int);
-INSERT INTO t1 value(1);
+CREATE TABLE t1(a INT);
+INSERT INTO t1 VALUE(1);
SELECT 'abc';
abc
abc
-SELECT count(*) from mysql.general_log;
+SELECT count(*) FROM mysql.general_log;
count(*)
0
DROP TABLE t1;
+connection default;
+SET @@global.general_log= 'OFF';
+SET @@global.general_log_file= @start_general_log_file;
+SET @@global.log_output= @start_value;
+SET @@global.general_log= @start_general_log;
+SET @@global.general_log= 'ON';
=== modified file 'mysql-test/r/subselect.result'
--- a/mysql-test/r/subselect.result 2008-11-21 12:43:06 +0000
+++ b/mysql-test/r/subselect.result 2008-11-27 14:11:54 +0000
@@ -4448,4 +4448,34 @@ SELECT t1.a, (SELECT 1 FROM t2 WHERE t2.
a incorrect
1 1
DROP TABLE t1,t2,t3;
+CREATE TABLE t1 (id int);
+CREATE TABLE t2 (id int, c int);
+INSERT INTO t1 (id) VALUES (1);
+INSERT INTO t2 (id) VALUES (1);
+INSERT INTO t1 (id) VALUES (1);
+INSERT INTO t2 (id) VALUES (1);
+CREATE VIEW v1 AS
+SELECT t2.c AS c FROM t1, t2
+WHERE t1.id=t2.id AND 1 IN (SELECT id FROM t1) WITH CHECK OPTION;
+UPDATE v1 SET c=1;
+CREATE VIEW v2 (a,b) AS
+SELECT t2.id, t2.c AS c FROM t1, t2
+WHERE t1.id=t2.id AND 1 IN (SELECT id FROM t1) WITH CHECK OPTION;
+INSERT INTO v2(a,b) VALUES (2,2);
+ERROR HY000: CHECK OPTION failed 'test.v2'
+INSERT INTO v2(a,b) VALUES (1,2);
+SELECT * FROM v1;
+c
+1
+1
+1
+1
+2
+2
+CREATE VIEW v3 AS
+SELECT t2.c AS c FROM t2
+WHERE 1 IN (SELECT id FROM t1) WITH CHECK OPTION;
+DELETE FROM v3;
+DROP VIEW v1,v2,v3;
+DROP TABLE t1,t2;
End of 5.1 tests.
=== modified file 'mysql-test/t/innodb_mysql.test'
--- a/mysql-test/t/innodb_mysql.test 2008-11-03 17:46:47 +0000
+++ b/mysql-test/t/innodb_mysql.test 2008-11-27 15:03:13 +0000
@@ -43,3 +43,13 @@ CREATE TABLE t1 ( a INT ) ENGINE=InnoDB;
INSERT INTO t1 VALUES(1);
DROP TABLE t1;
+#
+# Bug#37284 Crash in Field_string::type()
+#
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+CREATE TABLE t1 (a char(50)) ENGINE=InnoDB;
+CREATE INDEX i1 on t1 (a(3));
+SELECT * FROM t1 WHERE a = 'abcde';
+DROP TABLE t1;
=== modified file 'mysql-test/t/log_output_func.test'
--- a/mysql-test/t/log_output_func.test 2008-04-10 13:14:28 +0000
+++ b/mysql-test/t/log_output_func.test 2008-11-27 14:51:48 +0000
@@ -10,12 +10,13 @@
# #
# Creation Date: 2008-03-08 #
# Author: Rizwan #
+# Modified: HHunger 2008-08-29
# #
# Description: Test Cases of Dynamic System Variable log_output #
# that checks the behavior of this variable #
# #
-# Reference: http://dev.mysql.com/doc/refman/5.1/en/ #
-# server-system-variables.html #
+# Reference: #
+# http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html #
# #
###############################################################################
@@ -23,6 +24,10 @@
# ps-protocol. So, it is switched off.
--disable_ps_protocol
+SET @start_value= @@global.log_output;
+SET @start_general_log= @@global.general_log;
+SET @start_general_log_file= @@global.general_log_file;
+
--echo '#--------------------FN_DYNVARS_065_01-------------------------#'
##################################################################
# Check if setting log_output is changed in every new connection #
@@ -32,17 +37,12 @@ SET @@global.log_output = 'NONE';
# con1 will be default connection from now on
--echo 'connect (con1,localhost,root,,,,)'
connect (con1,localhost,root,,,,);
---echo 'connection con1'
-connection con1;
-SELECT @@global.log_output;
SET @@global.log_output = 'TABLE,FILE';
+
+# Test that the effect is global
--echo 'connect (con2,localhost,root,,,,)'
connect (con2,localhost,root,,,,);
---echo 'connection con2'
-connection con2;
SELECT @@global.log_output;
-disconnect con2;
-
--echo '#--------------------FN_DYNVARS_065_02-------------------------#'
####################################################
@@ -52,10 +52,9 @@ disconnect con2;
--echo 'connection con1'
connection con1;
-
-#=======================================================================
+#===============================================================
--echo '---Checking general_log when log_output is NONE---'
-#=======================================================================
+#===============================================================
SET @@global.log_output = 'NONE';
TRUNCATE TABLE mysql.general_log;
@@ -64,13 +63,13 @@ TRUNCATE TABLE mysql.general_log;
DROP TABLE IF EXISTS t1;
--enable_warnings
CREATE TABLE t1(a INT);
-INSERT INTO t1 value(1);
+INSERT INTO t1 VALUE(1);
SELECT 'abc';
SELECT count(*) FROM mysql.general_log;
-#==============================================================================
+#===============================================================
--echo '---Checking general_log when log_output is TABLE---'
-#==============================================================================
+#===============================================================
SET @@global.log_output = 'TABLE';
TRUNCATE TABLE mysql.general_log;
@@ -78,35 +77,49 @@ TRUNCATE TABLE mysql.general_log;
--disable_warnings
DROP TABLE IF EXISTS t1;
--enable_warnings
-create table t1(a int);
-INSERT INTO t1 value(1);
+CREATE TABLE t1(a int);
+INSERT INTO t1 VALUE(1);
SELECT 'abc';
-SELECT count(*) from mysql.general_log;
+# At least the last 4 statement should be logged.
+SELECT count(*)>4 FROM mysql.general_log;
-#===========================================================
+#===============================================================
# Checking general_log when log_output is FILE
-#===========================================================
-
-#SET @log_file = "mytest.log";
-#SET @@global.general_log = 0;
-#FLUSH LOGS;
-#SET @@global.general_log_file = @log_file;
---echo 'Bug#35371: Changing general_log file is crashing server'
---echo 'SET @@global.general_log_file = @log_file;'
+#===============================================================
+SET @@global.general_log = 'OFF';
+FLUSH LOGS;
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+eval SET @@global.general_log_file = '$MYSQLTEST_VARDIR/run/mytest.log';
+SET @@global.general_log = 'ON';
SET @@global.log_output = 'FILE';
TRUNCATE TABLE mysql.general_log;
--disable_warnings
DROP TABLE IF EXISTS t1;
--enable_warnings
-create table t1(a int);
-INSERT INTO t1 value(1);
+CREATE TABLE t1(a INT);
+INSERT INTO t1 VALUE(1);
SELECT 'abc';
-SELECT count(*) from mysql.general_log;
+SELECT count(*) FROM mysql.general_log;
DROP TABLE t1;
+file_exists $MYSQLTEST_VARDIR/run/mytest.log ;
+
+#==============================================================
+# Clean up
+#==============================================================
+
+--echo connection default;
+connection default;
+SET @@global.general_log= 'OFF';
+SET @@global.general_log_file= @start_general_log_file;
+SET @@global.log_output= @start_value;
+SET @@global.general_log= @start_general_log;
+SET @@global.general_log= 'ON';
+
--enable_ps_protocol
####################################################
-# Endo of functionality Testing for log_output #
+# End of functionality Testing for log_output #
####################################################
+
=== modified file 'mysql-test/t/subselect.test'
--- a/mysql-test/t/subselect.test 2008-11-21 12:43:06 +0000
+++ b/mysql-test/t/subselect.test 2008-11-27 14:11:54 +0000
@@ -3355,4 +3355,40 @@ SELECT t1.a, (SELECT 1 FROM t2 WHERE t2.
SELECT t1.a, (SELECT 1 FROM t2 WHERE t2.b=t3.c AND t2.c=t1.a ORDER BY t2.d LIMIT 1) AS incorrect FROM t1, t3 WHERE t3.b=t1.a;
DROP TABLE t1,t2,t3;
+
+#
+# Bug#37460 Assertion failed:
+# !table->file || table->file->inited == handler::NONE
+#
+CREATE TABLE t1 (id int);
+CREATE TABLE t2 (id int, c int);
+
+INSERT INTO t1 (id) VALUES (1);
+INSERT INTO t2 (id) VALUES (1);
+INSERT INTO t1 (id) VALUES (1);
+INSERT INTO t2 (id) VALUES (1);
+
+CREATE VIEW v1 AS
+ SELECT t2.c AS c FROM t1, t2
+ WHERE t1.id=t2.id AND 1 IN (SELECT id FROM t1) WITH CHECK OPTION;
+UPDATE v1 SET c=1;
+
+CREATE VIEW v2 (a,b) AS
+ SELECT t2.id, t2.c AS c FROM t1, t2
+ WHERE t1.id=t2.id AND 1 IN (SELECT id FROM t1) WITH CHECK OPTION;
+
+--error 1369
+INSERT INTO v2(a,b) VALUES (2,2);
+INSERT INTO v2(a,b) VALUES (1,2);
+SELECT * FROM v1;
+
+CREATE VIEW v3 AS
+ SELECT t2.c AS c FROM t2
+ WHERE 1 IN (SELECT id FROM t1) WITH CHECK OPTION;
+
+DELETE FROM v3;
+
+DROP VIEW v1,v2,v3;
+DROP TABLE t1,t2;
+
--echo End of 5.1 tests.
=== modified file 'sql/mysql_priv.h'
--- a/sql/mysql_priv.h 2008-11-27 11:33:04 +0000
+++ b/sql/mysql_priv.h 2008-11-27 16:32:34 +0000
@@ -548,6 +548,7 @@ protected:
#define UNCACHEABLE_PREPARE 16
/* For uncorrelated SELECT in an UNION with some correlated SELECTs */
#define UNCACHEABLE_UNITED 32
+#define UNCACHEABLE_CHECKOPTION 64
/* Used to check GROUP BY list in the MODE_ONLY_FULL_GROUP_BY mode */
#define UNDEF_POS (-1)
=== modified file 'sql/sql_base.cc'
--- a/sql/sql_base.cc 2008-11-03 10:40:58 +0000
+++ b/sql/sql_base.cc 2008-11-27 15:03:13 +0000
@@ -3095,7 +3095,10 @@ bool reopen_table(TABLE *table)
for (key=0 ; key < table->s->keys ; key++)
{
for (part=0 ; part < table->key_info[key].usable_key_parts ; part++)
+ {
table->key_info[key].key_part[part].field->table= table;
+ table->key_info[key].key_part[part].field->orig_table= table;
+ }
}
if (table->triggers)
table->triggers->set_table(table);
=== modified file 'sql/sql_update.cc'
--- a/sql/sql_update.cc 2008-10-09 15:57:41 +0000
+++ b/sql/sql_update.cc 2008-11-27 14:11:54 +0000
@@ -1470,6 +1470,32 @@ multi_update::initialize_tables(JOIN *jo
}
table->prepare_for_position();
+ /*
+ enable uncacheable flag if we update a view with check option
+ and check option has a subselect, otherwise, the check option
+ can be evaluated after the subselect was freed as independent
+ (See full_local in JOIN::join_free()).
+ */
+ if (table_ref->check_option && !join->select_lex->uncacheable)
+ {
+ SELECT_LEX_UNIT *tmp_unit;
+ SELECT_LEX *sl;
+ for (tmp_unit= join->select_lex->first_inner_unit();
+ tmp_unit;
+ tmp_unit= tmp_unit->next_unit())
+ {
+ for (sl= tmp_unit->first_select(); sl; sl= sl->next_select())
+ {
+ if (sl->master_unit()->item)
+ {
+ join->select_lex->uncacheable|= UNCACHEABLE_CHECKOPTION;
+ goto loop_end;
+ }
+ }
+ }
+ }
+loop_end:
+
if (table == first_table_for_update && table_ref->check_option)
{
table_map unupdated_tables= table_ref->check_option->used_tables() &
=== modified file 'tests/mysql_client_test.c'
--- a/tests/mysql_client_test.c 2008-11-27 13:05:38 +0000
+++ b/tests/mysql_client_test.c 2008-11-27 14:27:44 +0000
@@ -17578,7 +17578,7 @@ static void test_bug38486(void)
static void test_bug40365(void)
{
- uint rc, i, count= 1;
+ uint rc, i;
MYSQL_STMT *stmt= 0;
MYSQL_BIND my_bind[2];
my_bool is_null[2]= {0};
| Thread |
|---|
| • bzr commit into mysql-5.1 branch (azundris:2716) | Tatiana A. Nurnberg | 27 Nov |
