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 eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-3.23

Browse Source 
into eagle.mysql.r18.ru:/home/vva/work/BUG_479_/mysql-3.23


BitKeeper/etc/logging_ok:
  auto-union
This commit is contained in:
unknown
2003-06-26 10:31:35 -04:00
parent 7143815557 50159020c8
commit f6d3f0790c
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/r/user_var.result
View File

@ -14,3 +14,11 @@ table type possible_keys key key_len ref rows Extra
t1 index NULL i 4 NULL 3 where used; Using index t1 index NULL i 4 NULL 3 where used; Using index
table type possible_keys key key_len ref rows Extra table type possible_keys key key_len ref rows Extra
t1 ref i i 4 const 1 where used t1 ref i i 4 const 1 where used
@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

6
mysql-test/t/user_var.test
View File

@ -17,3 +17,9 @@ explain select * from t1 where @vv1:=@vv1+1 and i=@vv1;
explain select @vv1:=i from t1 where i=@vv1; explain select @vv1:=i from t1 where i=@vv1;
explain select * from t1 where i=@vv1; explain select * from t1 where i=@vv1;
drop table t1,t2; drop table t1,t2;
# Check types of variables
select @a:=10, @b:=1, @a > @b, @a < @b;
select @a:="10", @b:="1", @a > @b, @a < @b;
select @a:=10, @b:=2, @a > @b, @a < @b;
select @a:="10", @b:="2", @a > @b, @a < @b;

1
sql/item_func.cc
View File

@ -1676,6 +1676,7 @@ bool Item_func_set_user_var::fix_fields(THD *thd,TABLE_LIST *tables)
if (Item_func::fix_fields(thd,tables) || if (Item_func::fix_fields(thd,tables) ||
!(entry= get_variable(&thd->user_vars, name, 1))) !(entry= get_variable(&thd->user_vars, name, 1)))
return 1; return 1;
entry->type= cached_result_type;
entry->update_query_id=thd->query_id; entry->update_query_id=thd->query_id;
return 0; return 0;
} }