diff options
| author | Staale Smedseng <staale.smedseng@sun.com> | 2009-09-17 17:25:52 +0200 |
|---|---|---|
| committer | Staale Smedseng <staale.smedseng@sun.com> | 2009-09-17 17:25:52 +0200 |
| commit | 5051100a1ad79060abc07fd63f4d376e05c116b5 (patch) | |
| tree | 0320f9cfba455c1d3cb00160205b3412461fffb3 /sql/sql_handler.cc | |
| parent | 4d6bf3ce1510a3ae2d1f33af204f5e31dec77f7c (diff) | |
| parent | 38b6d49e826e1fde46c445d790eb7609b14c4220 (diff) | |
| download | mariadb-git-5051100a1ad79060abc07fd63f4d376e05c116b5.tar.gz | |
Merge from 5.0
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, "*")); |