diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-10 22:30:49 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-10 22:30:49 -0300 |
| commit | db2fe44c844e969405095220287ea98a57f33284 (patch) | |
| tree | 7aee99151209c7e83d2cf2ec0b242e6827f8c55f /sql/sql_table.cc | |
| parent | 90343dd788471cbc384f7f11b7d48fc474ece4c5 (diff) | |
| parent | 0f9ddfa9d8bb8d071266bcc63e92813cf18ccd2b (diff) | |
| download | mariadb-git-db2fe44c844e969405095220287ea98a57f33284.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 5052e29ac30..dce23d1c09c 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -4692,7 +4692,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables, table->next_global= 0; save_next_local= table->next_local; table->next_local= 0; - select->table_list.first= (uchar*)table; + select->table_list.first= table; /* Time zone tables and SP tables can be add to lex->query_tables list, so it have to be prepared. |