diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-17 18:09:04 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-17 18:09:04 +0300 |
| commit | 5069a666709a66335ded54c6fab4832e155840c1 (patch) | |
| tree | 4d0f676967368da9dbb6b7ddde1033a278f2e17c /mysql-test/suite/rpl/r/rpl_temporary.result | |
| parent | 7e15d855f1fbc72bae6c0ee75dd2b61477c2eaff (diff) | |
| parent | 709f49cbf780681bb74707c9ab2438f163747906 (diff) | |
| download | mariadb-git-5069a666709a66335ded54c6fab4832e155840c1.tar.gz | |
Automerge from mysql-5.1-bugteam to mysql-trunk-merge.
Diffstat (limited to 'mysql-test/suite/rpl/r/rpl_temporary.result')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_temporary.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_temporary.result b/mysql-test/suite/rpl/r/rpl_temporary.result index b2400a03f63..bceece8d682 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 (at least one of) the SUPER privilege(s) fo 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; |