diff options
| author | unknown <evgen@moonbone.local> | 2007-03-08 00:27:42 +0300 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2007-03-08 00:27:42 +0300 |
| commit | 1631f65dfd757282ac480fd20b3fe7b262f500c5 (patch) | |
| tree | 67d2840aff0aa74b19ea0dfd7f459ed121400971 | |
| parent | d7738740449fc83ec348529314b22673cdbada76 (diff) | |
| download | mariadb-git-1631f65dfd757282ac480fd20b3fe7b262f500c5.tar.gz | |
sql_select.cc:
Postfix for bug#22331 for windows platform.
explain.test, explain.result:
Cleanup after bugfix#22331.
mysql-test/t/explain.test:
Cleanup after bugfix#22331.
mysql-test/r/explain.result:
Cleanup after bugfix#22331.
sql/sql_select.cc:
Postfix for bug#22331 for windows platform.
| -rw-r--r-- | mysql-test/r/explain.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/explain.test | 1 | ||||
| -rw-r--r-- | sql/sql_select.cc | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/r/explain.result b/mysql-test/r/explain.result index 221a8695f60..e0afaaef201 100644 --- a/mysql-test/r/explain.result +++ b/mysql-test/r/explain.result @@ -85,4 +85,5 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 system NULL NULL NULL NULL 1 Warnings: Note 1003 select `test`.`t1`.`f1` AS `f1`,`test`.`t1`.`f2` AS `f2` from `test`.`t1` having 1 +drop view v1; drop table t1; diff --git a/mysql-test/t/explain.test b/mysql-test/t/explain.test index 85bbbfea154..04cf37f457a 100644 --- a/mysql-test/t/explain.test +++ b/mysql-test/t/explain.test @@ -63,6 +63,7 @@ explain extended select * from t1 where 0; explain extended select * from t1 where 1; explain extended select * from t1 having 0; explain extended select * from t1 having 1; +drop view v1; drop table t1; # End of 5.0 tests. diff --git a/sql/sql_select.cc b/sql/sql_select.cc index fc67ffac2fb..06352d48154 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -7622,7 +7622,7 @@ static COND* substitute_for_best_equal_field(COND *cond, } } if (!((Item_cond*)cond)->argument_list()->elements) - cond= new Item_int(cond->val_bool()); + cond= new Item_int((int32)cond->val_bool()); } else if (cond->type() == Item::FUNC_ITEM && |