diff options
| author | unknown <igor@rurik.mysql.com> | 2006-05-07 14:06:12 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-05-07 14:06:12 -0700 |
| commit | 30a7094f96a67db0397f2a2c98c59929adfe58dc (patch) | |
| tree | 411e89df18113e205dcb729a79aa0b8cfde616e4 /sql/sql_prepare.cc | |
| parent | 5b09d7a5e11470613d35808a89892262e1c8951c (diff) | |
| parent | e4e67d587e5714a4faaa60da80f0fc51ac99d7a7 (diff) | |
| download | mariadb-git-30a7094f96a67db0397f2a2c98c59929adfe58dc.tar.gz | |
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
mysql-test/r/having.result:
Auto merged
mysql-test/t/having.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_lex.h:
Auto merged
mysql-test/r/rpl_user_variables.result:
Manual merge
mysql-test/t/rpl_user_variables.test:
Manual merge
sql/sql_lex.cc:
Manual merge
sql/sql_prepare.cc:
Manual merge
sql/sql_select.cc:
Manual merge
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index f7935a55572..d615b6528e2 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -1965,7 +1965,6 @@ static const char *get_dynamic_sql_string(LEX *lex, uint *query_len) memcpy(query_str, var_value->ptr(), var_value->length()); query_str[len]= '\0'; // Safety (mostly for debug) *query_len= len; - } else { query_str= lex->prepared_stmt_code.str; @@ -2105,7 +2104,6 @@ void reinit_stmt_before_use(THD *thd, LEX *lex) /* Fix ORDER list */ for (order= (ORDER *)sl->order_list.first; order; order= order->next) order->item= &order->item_ptr; - } { SELECT_LEX_UNIT *unit= sl->master_unit(); unit->unclean(); |