diff options
| author | Andrei Elkin <aelkin@mysql.com> | 2009-12-17 16:50:45 +0200 |
|---|---|---|
| committer | Andrei Elkin <aelkin@mysql.com> | 2009-12-17 16:50:45 +0200 |
| commit | 709f49cbf780681bb74707c9ab2438f163747906 (patch) | |
| tree | 6db2e6078ff8e9a4942edf3af3be2645048619c4 /mysql-test | |
| parent | 5db5e19ad648d16a318b642a315d03ec68e4d881 (diff) | |
| parent | 522c084631ad581ec8f17b187a689f9b992ca06e (diff) | |
| download | mariadb-git-709f49cbf780681bb74707c9ab2438f163747906.tar.gz | |
merge from 5.0 with bug@49740 fixes
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_temporary.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_temporary.test | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_temporary.result b/mysql-test/suite/rpl/r/rpl_temporary.result index 631eb0677b0..87bf525aacc 100644 --- a/mysql-test/suite/rpl/r/rpl_temporary.result +++ b/mysql-test/suite/rpl/r/rpl_temporary.result @@ -36,8 +36,10 @@ ERROR 42000: Access denied; you need the SUPER privilege for this operation SELECT @@session.sql_select_limit = @save_select_limit; @@session.sql_select_limit = @save_select_limit 1 +SET @save_conn_id= connection_id(); SET @@session.pseudo_thread_id=100; 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=1; drop table if exists t1,t2; diff --git a/mysql-test/suite/rpl/t/rpl_temporary.test b/mysql-test/suite/rpl/t/rpl_temporary.test index a59e4f2fd21..29b214e5169 100644 --- a/mysql-test/suite/rpl/t/rpl_temporary.test +++ b/mysql-test/suite/rpl/t/rpl_temporary.test @@ -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 # Now as root, to be sure it works connection con2; +SET @save_conn_id= connection_id(); SET @@session.pseudo_thread_id=100; 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=1; |