mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-30 12:15:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

post-merge fixes

Browse source
This commit is contained in:
Sergei Golubchik 2015-04-28 21:24:32 +02:00
commit 6f17e233bf
11 changed files with 194 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

11
sql/sql_admin.cc
View file

@ -869,7 +869,16 @@ send_result_message:
size_t length;
protocol->store(STRING_WITH_LEN("error"), system_charset_info);
if (table->table->file->ha_table_flags() & HA_CAN_REPAIR)
#if MYSQL_VERSION_ID > 100104
#error fix the error message to take TABLE or VIEW as an argument
#else
if (table->view)
length= my_snprintf(buf, sizeof(buf),
"Upgrade required. Please do \"REPAIR VIEW %`s\" or dump/reload to fix it!",
table->table_name);
else
#endif
if (table->table->file->ha_table_flags() & HA_CAN_REPAIR || table->view)
length= my_snprintf(buf, sizeof(buf), ER(ER_TABLE_NEEDS_UPGRADE),
table->table_name);
else