database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

merge from 5.0 with bug@49740 fixes

Browse Source
This commit is contained in:
Andrei Elkin
2009-12-17 16:50:45 +02:00
parent 5db5e19ad6 522c084631
commit 709f49cbf7
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/rpl/r/rpl_temporary.result
View File

@ -36,8 +36,10 @@ ERROR 42000: Access denied; you need the SUPER privilege for this operation
SELECT @@session.sql_select_limit = @save_select_limit; SELECT @@session.sql_select_limit = @save_select_limit;
@@session.sql_select_limit = @save_select_limit @@session.sql_select_limit = @save_select_limit
1 1
SET @save_conn_id= connection_id();
SET @@session.pseudo_thread_id=100; SET @@session.pseudo_thread_id=100;
SET @@session.pseudo_thread_id=connection_id(); SET @@session.pseudo_thread_id=connection_id();
SET @@session.pseudo_thread_id=@save_conn_id;
SET @@session.sql_log_bin=0; SET @@session.sql_log_bin=0;
SET @@session.sql_log_bin=1; SET @@session.sql_log_bin=1;
drop table if exists t1,t2; drop table if exists t1,t2;

2
mysql-test/suite/rpl/t/rpl_temporary.test
View File

@ -116,8 +116,10 @@ SET @@session.sql_select_limit=10, @@session.sql_log_bin=0;
SELECT @@session.sql_select_limit = @save_select_limit; #shouldn't have changed SELECT @@session.sql_select_limit = @save_select_limit; #shouldn't have changed
# Now as root, to be sure it works # Now as root, to be sure it works
connection con2; connection con2;
SET @save_conn_id= connection_id();
SET @@session.pseudo_thread_id=100; SET @@session.pseudo_thread_id=100;
SET @@session.pseudo_thread_id=connection_id(); SET @@session.pseudo_thread_id=connection_id();
SET @@session.pseudo_thread_id=@save_conn_id;
SET @@session.sql_log_bin=0; SET @@session.sql_log_bin=0;
SET @@session.sql_log_bin=1; SET @@session.sql_log_bin=1;