diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-02-07 17:57:07 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-02-07 17:57:07 +0200 |
| commit | 5db7246f78d62f07433b3e623e20002536ff20b2 (patch) | |
| tree | 47bb4c4c761190424e909ac9f98674ad71c80b6d /mysql-test | |
| parent | f06b0d9f3cfeaee8098db22eeecf41f6c072c479 (diff) | |
| download | mariadb-git-5db7246f78d62f07433b3e623e20002536ff20b2.tar.gz | |
Fix problem in MIN/MAX optimisation (from last patch)
Don't make OLD_PASSWORD() a reserved word
mysql-test/r/explain.result:
Test select count(*)
mysql-test/r/func_crypt.result:
Test old_password()
mysql-test/t/explain.test:
Test select count(*)
mysql-test/t/func_crypt.test:
Test old_password()
sql/item_create.cc:
Don't make OLD_PASSWORD() a reserved word
sql/item_create.h:
Don't make OLD_PASSWORD() a reserved word
sql/lex.h:
Don't make OLD_PASSWORD() a reserved word
sql/opt_range.cc:
Remove blank space
sql/opt_sum.cc:
Fix problem in MIN/MAX optimisation
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/explain.result | 13 | ||||
| -rw-r--r-- | mysql-test/r/func_crypt.result | 9 | ||||
| -rw-r--r-- | mysql-test/t/explain.test | 8 | ||||
| -rw-r--r-- | mysql-test/t/func_crypt.test | 3 |
4 files changed, 29 insertions, 4 deletions
diff --git a/mysql-test/r/explain.result b/mysql-test/r/explain.result index fa15165722d..d433078a251 100644 --- a/mysql-test/r/explain.result +++ b/mysql-test/r/explain.result @@ -31,3 +31,16 @@ drop table t1; explain select 1; Comment No tables used +create table t1 (a int not null); +explain select count(*) from t1; +Comment +Select tables optimized away +insert into t1 values(1); +explain select count(*) from t1; +Comment +Select tables optimized away +insert into t1 values(1); +explain select count(*) from t1; +Comment +Select tables optimized away +drop table t1; diff --git a/mysql-test/r/func_crypt.result b/mysql-test/r/func_crypt.result index cf464ec21b2..742de833bf7 100644 --- a/mysql-test/r/func_crypt.result +++ b/mysql-test/r/func_crypt.result @@ -1,6 +1,9 @@ select length(encrypt('foo', 'ff')) <> 0; length(encrypt('foo', 'ff')) <> 0 1 -select password('test'),length(encrypt('test')),encrypt('test','aa'); -password('test') length(encrypt('test')) encrypt('test','aa') -378b243e220ca493 13 aaqPiZY5xR5l. +select old_password('test'), password('test'); +old_password('test') password('test') +378b243e220ca493 378b243e220ca493 +select length(encrypt('test')), encrypt('test','aa'); +length(encrypt('test')) encrypt('test','aa') +13 aaqPiZY5xR5l. diff --git a/mysql-test/t/explain.test b/mysql-test/t/explain.test index 8a41ebe5b4f..045598e97df 100644 --- a/mysql-test/t/explain.test +++ b/mysql-test/t/explain.test @@ -20,3 +20,11 @@ explain select * from t1 ignore key (str,str,foo) where str="foo"; drop table t1; explain select 1; + +create table t1 (a int not null); +explain select count(*) from t1; +insert into t1 values(1); +explain select count(*) from t1; +insert into t1 values(1); +explain select count(*) from t1; +drop table t1; diff --git a/mysql-test/t/func_crypt.test b/mysql-test/t/func_crypt.test index 55c0d6d3b9d..f403d96e885 100644 --- a/mysql-test/t/func_crypt.test +++ b/mysql-test/t/func_crypt.test @@ -2,4 +2,5 @@ select length(encrypt('foo', 'ff')) <> 0; --replace_result $1$aa$4OSUA5cjdx0RUQ08opV27/ aaqPiZY5xR5l. -select password('test'),length(encrypt('test')),encrypt('test','aa'); +select old_password('test'), password('test'); +select length(encrypt('test')), encrypt('test','aa'); |