diff options
| author | Andrei Elkin <aelkin@mysql.com> | 2009-11-06 18:35:04 +0200 |
|---|---|---|
| committer | Andrei Elkin <aelkin@mysql.com> | 2009-11-06 18:35:04 +0200 |
| commit | 69d6fcbd3b225c177c4e0e3af65aa2cf9494eff3 (patch) | |
| tree | 44a02955b1dc18fc2e94cd0b4dc6ef62cd81d936 /sql/sql_handler.cc | |
| parent | ea84da107a8d8f6b061d00dcf76c3369f8a96868 (diff) | |
| parent | 684b1d39ac7eab6ff5d9095aaa25dcea35b88a28 (diff) | |
| download | mariadb-git-69d6fcbd3b225c177c4e0e3af65aa2cf9494eff3.tar.gz | |
merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640
Diffstat (limited to 'sql/sql_handler.cc')
| -rw-r--r-- | sql/sql_handler.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index 1e92d95573a..3bbf4b78d07 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -422,16 +422,13 @@ bool mysql_ha_read(THD *thd, TABLE_LIST *tables, String buffer(buff, sizeof(buff), system_charset_info); int error, keyno= -1; uint num_rows; - uchar *key; - uint key_len; + uchar *UNINIT_VAR(key); + uint UNINIT_VAR(key_len); bool need_reopen; DBUG_ENTER("mysql_ha_read"); DBUG_PRINT("enter",("'%s'.'%s' as '%s'", tables->db, tables->table_name, tables->alias)); - LINT_INIT(key); - LINT_INIT(key_len); - thd->lex->select_lex.context.resolve_in_table_list_only(tables); list.push_front(new Item_field(&thd->lex->select_lex.context, NULL, NULL, "*")); |