diff options
| author | unknown <monty@mysql.com> | 2004-03-26 11:06:53 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-26 11:06:53 +0200 |
| commit | 918519ea1e19e4b35f011b744d040f91cb7c24c3 (patch) | |
| tree | c3ba76141820fb96b49667dc85d806de3ffc412b /sql/sql_union.cc | |
| parent | 526b25e2633bbc44b867b548f5c7f633517e5b0f (diff) | |
| download | mariadb-git-918519ea1e19e4b35f011b744d040f91cb7c24c3.tar.gz | |
After merge fixes + simple optimizations
mysql-test/r/alter_table.result:
Updated results after merge
mysql-test/r/drop_temp_table.result:
Updated results after merge
mysql-test/r/union.result:
Updated results after merge
sql/sql_db.cc:
optimization: Use my_stat() instead of my_dir() to test if directory exists
sql/sql_union.cc:
Fixed error in merge
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index cb385b482cf..907250b11c8 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -210,7 +210,7 @@ int st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result, for (tmp_order= (ORDER*) global_parameters->order_list.first; tmp_order ; - tmp_order= tmp_order->next; + tmp_order= tmp_order->next) { Item *item= *tmp_order->item; if (((item->type() == Item::FIELD_ITEM) && |