1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0

Browse Source 
into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.pass
This commit is contained in:
gluh@gluh.mysql.r18.ru 2003-10-22 15:38:20 +05:00
commit 08cafccec7
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/r/func_crypt.result
View File

@ -7,3 +7,13 @@ old_password('test') password('test')
select length(encrypt('test')), encrypt('test','aa'); select length(encrypt('test')), encrypt('test','aa');
length(encrypt('test')) encrypt('test','aa') length(encrypt('test')) encrypt('test','aa')
13 aaqPiZY5xR5l. 13 aaqPiZY5xR5l.
drop table if exists t1;
create table t1 (name varchar(50), pw varchar(16));
insert into t1 values ('tom', password('my_pass'));
set @pass='my_pass';
select name from t1 where name='tom' and pw=password(@pass);
name
tom
select name from t1 where name='tom' and pw=password(@undefined);
name
drop table t1;

9
mysql-test/t/func_crypt.test
View File

@ -4,3 +4,12 @@ select length(encrypt('foo', 'ff')) <> 0;
--replace_result $1$aa$4OSUA5cjdx0RUQ08opV27/ aaqPiZY5xR5l. --replace_result $1$aa$4OSUA5cjdx0RUQ08opV27/ aaqPiZY5xR5l.
select old_password('test'), password('test'); select old_password('test'), password('test');
select length(encrypt('test')), encrypt('test','aa'); select length(encrypt('test')), encrypt('test','aa');
drop table if exists t1;
create table t1 (name varchar(50), pw varchar(16));
insert into t1 values ('tom', password('my_pass'));
set @pass='my_pass';
select name from t1 where name='tom' and pw=password(@pass);
select name from t1 where name='tom' and pw=password(@undefined);
drop table t1;

2
sql/item_func.cc
View File

@ -2087,7 +2087,7 @@ void Item_func_get_user_var::fix_length_and_dec()
bool Item_func_get_user_var::const_item() const bool Item_func_get_user_var::const_item() const
{ {
return var_entry && current_thd->query_id != var_entry->update_query_id; return (!var_entry || current_thd->query_id != var_entry->update_query_id);
} }