diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2003-07-02 00:10:47 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2003-07-02 00:10:47 +0300 |
| commit | 12d879c912543fffa77cecfda799bc20ddd35df5 (patch) | |
| tree | 351c9ea12859860f3bf1ad0503470728a4a3de54 /sql/sql_select.cc | |
| parent | 0a23db44911e9e13a3b36bec11b68cfa7a922505 (diff) | |
| download | mariadb-git-12d879c912543fffa77cecfda799bc20ddd35df5.tar.gz | |
Lot's of clean-ups and fixes for 4.0.14.
include/my_global.h:
CONFIG_SMP
mysql-test/r/grant.result:
Test cases for bug fixes
mysql-test/r/insert_select.result:
Test cases for bug fixes
mysql-test/r/union.result:
Test cases for bug fixes
mysql-test/t/grant.test:
Test cases for bug fixes
mysql-test/t/insert_select.test:
Test cases for bug fixes
mysql-test/t/union.test:
Test cases for bug fixes
sql/sql_acl.cc:
Fix for granting global privileges on db level
sql/sql_parse.cc:
Fix for INSERT... SELECT
sql/sql_select.cc:
removing a fix
sql/sql_union.cc:
P
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 6c2d06051d4..eb29946a3d7 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -974,11 +974,7 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds, thd->select_limit)) { if (!join.join_tab[join.const_tables].select->quick) - error= return_zero_rows(&join, result, tables, fields, - 0, select_options, - "Impossible WHERE noticed after reading const tables", - having,procedure); - goto err; + goto err; } } join.having=having; // Actually a parameter |