diff options
author | unknown <monty@mashka.mysql.fi> | 2003-07-01 15:02:16 +0300 |
---|---|---|
committer | unknown <monty@mashka.mysql.fi> | 2003-07-01 15:02:16 +0300 |
commit | 5a3c12effb4a0d32bf6b77d4b19edcf1757bb823 (patch) | |
tree | 1dd88e8c946c87dfaa131fd495d71766127a0e94 /mysql-test/r/user_var.result | |
parent | 23a9a5805cd258c5699e782cebdb5763acb1d85d (diff) | |
parent | 1726ae86be52bc129b5788406d60808b15b8bd9f (diff) | |
download | mariadb-git-5a3c12effb4a0d32bf6b77d4b19edcf1757bb823.tar.gz |
Merge with 3.23 tree to get latest bug fixes
BitKeeper/etc/logging_ok:
auto-union
sql/item_func.cc:
Auto merged
mysql-test/t/user_var.test:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/nt_servc.cc:
Auto merged
configure.in:
Use local version
innobase/os/os0file.c:
Use local version
innobase/page/page0page.c:
Use local version
innobase/row/row0sel.c:
Use local version
innobase/row/row0vers.c:
Use local version
mysql-test/r/order_by.result:
Use local version
mysql-test/r/user_var.result:
merge with 3.23
mysql-test/t/order_by.test:
Use local version (test is already in range.test)
sql/log.cc:
Use local version
sql/share/spanish/errmsg.txt:
merge
sql/slave.cc:
Use local version
sql/sql_class.h:
Use local version
sql/sql_select.cc:
Use patch in 4.0 for range with NULL problem
Diffstat (limited to 'mysql-test/r/user_var.result')
-rw-r--r-- | mysql-test/r/user_var.result | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/r/user_var.result b/mysql-test/r/user_var.result index 5e9f3a720c2..0d4f7b401e6 100644 --- a/mysql-test/r/user_var.result +++ b/mysql-test/r/user_var.result @@ -30,3 +30,11 @@ explain select * from t1 where i=@vv1; table type possible_keys key key_len ref rows Extra t1 ref i i 4 const 1 Using where drop table t1,t2; +@a:=10 @b:=1 @a > @b @a < @b +10 1 1 0 +@a:="10" @b:="1" @a > @b @a < @b +10 1 1 0 +@a:=10 @b:=2 @a > @b @a < @b +10 2 1 0 +@a:="10" @b:="2" @a > @b @a < @b +10 2 0 1 |