diff options
| author | unknown <timour@mysql.com> | 2005-06-23 20:06:35 +0300 |
|---|---|---|
| committer | unknown <timour@mysql.com> | 2005-06-23 20:06:35 +0300 |
| commit | 5d12a0bf493aa13e525ed9b2707bc402ed685bc0 (patch) | |
| tree | c055f548bb836e127fb6fbf1b78e941d24d2697a /sql | |
| parent | ab008ede4e75f67f8ad91dd0fe1e5d48f9b539fa (diff) | |
| parent | 109323717470d3d7c2507b0e424a340eb05a0679 (diff) | |
| download | mariadb-git-5d12a0bf493aa13e525ed9b2707bc402ed685bc0.tar.gz | |
Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/timka/mysql/src/4.1-virgin
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_cmpfunc.cc | 4 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 3098e5dc77e..f24638d1a93 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -1174,6 +1174,8 @@ Item *Item_func_case::find_item(String *str) String *first_expr_str,*tmp; longlong first_expr_int; double first_expr_real; + char buff[MAX_FIELD_WIDTH]; + String buff_str(buff,sizeof(buff),default_charset()); /* These will be initialized later */ LINT_INIT(first_expr_str); @@ -1186,7 +1188,7 @@ Item *Item_func_case::find_item(String *str) { case STRING_RESULT: // We can't use 'str' here as this may be overwritten - if (!(first_expr_str= args[first_expr_num]->val_str(&str_value))) + if (!(first_expr_str= args[first_expr_num]->val_str(&buff_str))) return else_expr_num != -1 ? args[else_expr_num] : 0; // Impossible break; case INT_RESULT: diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 233104c9a90..2eeae8f7332 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2882,7 +2882,6 @@ unsent_create_error: } else res= -1; - first_local_table->next= tables; lex->select_lex.table_list.first= (byte*) first_local_table; break; } |