diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-23 15:22:21 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-23 15:22:21 +0400 |
| commit | 2dc132b209ef375d7d36a41a2429be001d8e5f45 (patch) | |
| tree | 9a94748e3f29d58645ae7979faaf09464080033d /sql/sql_handler.cc | |
| parent | f3d58bae2011dc043d75268a98e65731da622603 (diff) | |
| parent | 75116feb4b8976df3078f288f31fec7f46462461 (diff) | |
| download | mariadb-git-2dc132b209ef375d7d36a41a2429be001d8e5f45.tar.gz | |
Merge from mysql-next-mr.
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 b44edbd373d..76985f76db7 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, "*")); |