database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-03 14:33:32 +03:00
Code Activity

auto-merge

Browse Source
This commit is contained in:
Tatiana A. Nurnberg
2008-11-27 17:32:34 +01:00
parent 0761b3854d 5f678447cc
commit 8c0c30aa90
10 changed files with 179 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/innodb_mysql.result
View File

@@ -1677,3 +1677,9 @@ select @@session.sql_log_bin, @@session.binlog_format, @@session.tx_isolation;
CREATE TABLE t1 ( a INT ) ENGINE=InnoDB; CREATE TABLE t1 ( a INT ) ENGINE=InnoDB;
INSERT INTO t1 VALUES(1); INSERT INTO t1 VALUES(1);
DROP TABLE t1; 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;

38
mysql-test/r/log_output_func.result
View File

@@ -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-------------------------#' '#--------------------FN_DYNVARS_065_01-------------------------#'
SET @@global.log_output = 'NONE'; SET @@global.log_output = 'NONE';
'connect (con1,localhost,root,,,,)' 'connect (con1,localhost,root,,,,)'
'connection con1'
SELECT @@global.log_output;
@@global.log_output
NONE
SET @@global.log_output = 'TABLE,FILE'; SET @@global.log_output = 'TABLE,FILE';
'connect (con2,localhost,root,,,,)' 'connect (con2,localhost,root,,,,)'
'connection con2'
SELECT @@global.log_output; SELECT @@global.log_output;
@@global.log_output @@global.log_output
FILE,TABLE FILE,TABLE
@@ -18,7 +16,7 @@ SET @@global.log_output = 'NONE';
TRUNCATE TABLE mysql.general_log; TRUNCATE TABLE mysql.general_log;
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
CREATE TABLE t1(a INT); CREATE TABLE t1(a INT);
INSERT INTO t1 value(1); INSERT INTO t1 VALUE(1);
SELECT 'abc'; SELECT 'abc';
abc abc
abc abc
@@ -29,25 +27,33 @@ count(*)
SET @@global.log_output = 'TABLE'; SET @@global.log_output = 'TABLE';
TRUNCATE TABLE mysql.general_log; TRUNCATE TABLE mysql.general_log;
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
create table t1(a int); CREATE TABLE t1(a int);
INSERT INTO t1 value(1); INSERT INTO t1 VALUE(1);
SELECT 'abc'; SELECT 'abc';
abc abc
abc abc
SELECT count(*) from mysql.general_log; SELECT count(*)>4 FROM mysql.general_log;
count(*) count(*)>4
5 1
'Bug#35371: Changing general_log file is crashing server' SET @@global.general_log = 'OFF';
'SET @@global.general_log_file = @log_file;' FLUSH LOGS;
SET @@global.general_log_file = 'MYSQLTEST_VARDIR/run/mytest.log';
SET @@global.general_log = 'ON';
SET @@global.log_output = 'FILE'; SET @@global.log_output = 'FILE';
TRUNCATE TABLE mysql.general_log; TRUNCATE TABLE mysql.general_log;
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
create table t1(a int); CREATE TABLE t1(a INT);
INSERT INTO t1 value(1); INSERT INTO t1 VALUE(1);
SELECT 'abc'; SELECT 'abc';
abc abc
abc abc
SELECT count(*) from mysql.general_log; SELECT count(*) FROM mysql.general_log;
count(*) count(*)
0 0
DROP TABLE t1; 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';

30
mysql-test/r/subselect.result
View File

@@ -4448,4 +4448,34 @@ SELECT t1.a, (SELECT 1 FROM t2 WHERE t2.b=t3.c AND t2.c=t1.a ORDER BY t2.d LIMIT
a incorrect a incorrect
1 1 1 1
DROP TABLE t1,t2,t3; 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. End of 5.1 tests.

10
mysql-test/t/innodb_mysql.test
View File

@@ -43,3 +43,13 @@ CREATE TABLE t1 ( a INT ) ENGINE=InnoDB;
INSERT INTO t1 VALUES(1); INSERT INTO t1 VALUES(1);
DROP TABLE t1; 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;

75
mysql-test/t/log_output_func.test
View File

@@ -10,12 +10,13 @@
# # # #
# Creation Date: 2008-03-08 # # Creation Date: 2008-03-08 #
# Author: Rizwan # # Author: Rizwan #
# Modified: HHunger 2008-08-29
# # # #
# Description: Test Cases of Dynamic System Variable log_output # # Description: Test Cases of Dynamic System Variable log_output #
# that checks the behavior of this variable # # that checks the behavior of this variable #
# # # #
# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # # Reference: #
# server-system-variables.html # # http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html #
# # # #
############################################################################### ###############################################################################
@@ -23,6 +24,10 @@
# ps-protocol. So, it is switched off. # ps-protocol. So, it is switched off.
--disable_ps_protocol --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-------------------------#' --echo '#--------------------FN_DYNVARS_065_01-------------------------#'
################################################################## ##################################################################
# Check if setting log_output is changed in every new connection # # 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 # con1 will be default connection from now on
--echo 'connect (con1,localhost,root,,,,)' --echo 'connect (con1,localhost,root,,,,)'
connect (con1,localhost,root,,,,); connect (con1,localhost,root,,,,);
--echo 'connection con1'
connection con1;
SELECT @@global.log_output;
SET @@global.log_output = 'TABLE,FILE'; SET @@global.log_output = 'TABLE,FILE';
# Test that the effect is global
--echo 'connect (con2,localhost,root,,,,)' --echo 'connect (con2,localhost,root,,,,)'
connect (con2,localhost,root,,,,); connect (con2,localhost,root,,,,);
--echo 'connection con2'
connection con2;
SELECT @@global.log_output; SELECT @@global.log_output;
disconnect con2;
--echo '#--------------------FN_DYNVARS_065_02-------------------------#' --echo '#--------------------FN_DYNVARS_065_02-------------------------#'
#################################################### ####################################################
@@ -52,10 +52,9 @@ disconnect con2;
--echo 'connection con1' --echo 'connection con1'
connection con1; connection con1;
#===============================================================
#=======================================================================
--echo '---Checking general_log when log_output is NONE---' --echo '---Checking general_log when log_output is NONE---'
#======================================================================= #===============================================================
SET @@global.log_output = 'NONE'; SET @@global.log_output = 'NONE';
TRUNCATE TABLE mysql.general_log; TRUNCATE TABLE mysql.general_log;
@@ -64,13 +63,13 @@ TRUNCATE TABLE mysql.general_log;
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
--enable_warnings --enable_warnings
CREATE TABLE t1(a INT); CREATE TABLE t1(a INT);
INSERT INTO t1 value(1); INSERT INTO t1 VALUE(1);
SELECT 'abc'; SELECT 'abc';
SELECT count(*) FROM mysql.general_log; SELECT count(*) FROM mysql.general_log;
#============================================================================== #===============================================================
--echo '---Checking general_log when log_output is TABLE---' --echo '---Checking general_log when log_output is TABLE---'
#============================================================================== #===============================================================
SET @@global.log_output = 'TABLE'; SET @@global.log_output = 'TABLE';
TRUNCATE TABLE mysql.general_log; TRUNCATE TABLE mysql.general_log;
@@ -78,35 +77,49 @@ TRUNCATE TABLE mysql.general_log;
--disable_warnings --disable_warnings
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
--enable_warnings --enable_warnings
create table t1(a int); CREATE TABLE t1(a int);
INSERT INTO t1 value(1); INSERT INTO t1 VALUE(1);
SELECT 'abc'; 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 # 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'; SET @@global.log_output = 'FILE';
TRUNCATE TABLE mysql.general_log; TRUNCATE TABLE mysql.general_log;
--disable_warnings --disable_warnings
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
--enable_warnings --enable_warnings
create table t1(a int); CREATE TABLE t1(a INT);
INSERT INTO t1 value(1); INSERT INTO t1 VALUE(1);
SELECT 'abc'; SELECT 'abc';
SELECT count(*) from mysql.general_log; SELECT count(*) FROM mysql.general_log;
DROP TABLE t1; 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 --enable_ps_protocol
#################################################### ####################################################
# Endo of functionality Testing for log_output # # End of functionality Testing for log_output #
#################################################### ####################################################

36
mysql-test/t/subselect.test
View File

@@ -3355,4 +3355,40 @@ SELECT t1.a, (SELECT 1 FROM t2 WHERE t2.b=t3.c AND t2.c=t1.a ORDER BY t2.d LIMIT
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; 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; 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. --echo End of 5.1 tests.

1
sql/mysql_priv.h
View File

@@ -548,6 +548,7 @@ protected:
#define UNCACHEABLE_PREPARE 16 #define UNCACHEABLE_PREPARE 16
/* For uncorrelated SELECT in an UNION with some correlated SELECTs */ /* For uncorrelated SELECT in an UNION with some correlated SELECTs */
#define UNCACHEABLE_UNITED 32 #define UNCACHEABLE_UNITED 32
#define UNCACHEABLE_CHECKOPTION 64
/* Used to check GROUP BY list in the MODE_ONLY_FULL_GROUP_BY mode */ /* Used to check GROUP BY list in the MODE_ONLY_FULL_GROUP_BY mode */
#define UNDEF_POS (-1) #define UNDEF_POS (-1)

3
sql/sql_base.cc
View File

@@ -3095,7 +3095,10 @@ bool reopen_table(TABLE *table)
for (key=0 ; key < table->s->keys ; key++) for (key=0 ; key < table->s->keys ; key++)
{ {
for (part=0 ; part < table->key_info[key].usable_key_parts ; part++) 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->table= table;
table->key_info[key].key_part[part].field->orig_table= table;
}
} }
if (table->triggers) if (table->triggers)
table->triggers->set_table(table); table->triggers->set_table(table);

26
sql/sql_update.cc
View File

@@ -1470,6 +1470,32 @@ multi_update::initialize_tables(JOIN *join)
} }
table->prepare_for_position(); 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) if (table == first_table_for_update && table_ref->check_option)
{ {
table_map unupdated_tables= table_ref->check_option->used_tables() & table_map unupdated_tables= table_ref->check_option->used_tables() &

2
tests/mysql_client_test.c
View File

@@ -17578,7 +17578,7 @@ static void test_bug38486(void)
static void test_bug40365(void) static void test_bug40365(void)
{ {
uint rc, i, count= 1; uint rc, i;
MYSQL_STMT *stmt= 0; MYSQL_STMT *stmt= 0;
MYSQL_BIND my_bind[2]; MYSQL_BIND my_bind[2];
my_bool is_null[2]= {0}; my_bool is_null[2]= {0};