diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-06-17 17:31:51 +0400 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-06-17 17:31:51 +0400 |
| commit | cc6dabba377bd05bb9a6a9ffaa985bbe5e38bcc1 (patch) | |
| tree | 9413ba739bc0dbf1e647293756a3503f17dcde07 /sql/sql_table.cc | |
| parent | 91a7b147056a228804f81726127035aa305702ff (diff) | |
| parent | 45c7bf3c54fa852b312773688fdce15bffe49abf (diff) | |
| download | mariadb-git-cc6dabba377bd05bb9a6a9ffaa985bbe5e38bcc1.tar.gz | |
Merge trunk-bugfixing -> trunk-runtime
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 3e9d26bd253..902e7fa7b5f 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -4693,7 +4693,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. |