summaryrefslogtreecommitdiff
path: root/mysql-test/t/rpl_user_variables.test
diff options
context:
space:
mode:
authorunknown <sergefp@mysql.com>2006-05-11 20:41:11 +0400
committerunknown <sergefp@mysql.com>2006-05-11 20:41:11 +0400
commit704a69eb91994903df33c8b328c42f5a526fe6a8 (patch)
treef04746533d7440846635354da29f8f656edbf988 /mysql-test/t/rpl_user_variables.test
parentca42197d951663a585c20dbd033b7bcb482085c1 (diff)
parentc438e4903c144b52c0094eef194f821dc6cc8505 (diff)
downloadmariadb-git-704a69eb91994903df33c8b328c42f5a526fe6a8.tar.gz
Bug#19136: Manual 5.0->5.1 merge
sql/item_func.cc: Auto merged sql/sql_select.cc: Auto merged
Diffstat (limited to 'mysql-test/t/rpl_user_variables.test')
-rw-r--r--mysql-test/t/rpl_user_variables.test1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/rpl_user_variables.test b/mysql-test/t/rpl_user_variables.test
index cb2a1e1d853..cc0dd60d01b 100644
--- a/mysql-test/t/rpl_user_variables.test
+++ b/mysql-test/t/rpl_user_variables.test
@@ -55,6 +55,7 @@ SELECT * FROM t1 ORDER BY n;
sync_slave_with_master;
SELECT * FROM t1 ORDER BY n;
connection master;
+insert into t1 select * FROM (select @var1 union select @var2) AS t2;
drop table t1;
sync_slave_with_master;
stop slave;