database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

postreview changes

Browse Source 
include/mysqld_error.h:
  checksum error message
sql/share/czech/errmsg.txt:
  checksum error message
sql/share/danish/errmsg.txt:
  checksum error message
sql/share/dutch/errmsg.txt:
  checksum error message
sql/share/english/errmsg.txt:
  checksum error message
sql/share/estonian/errmsg.txt:
  checksum error message
sql/share/french/errmsg.txt:
  checksum error message
sql/share/german/errmsg.txt:
  checksum error message
sql/share/greek/errmsg.txt:
  checksum error message
sql/share/hungarian/errmsg.txt:
  checksum error message
sql/share/italian/errmsg.txt:
  checksum error message
sql/share/japanese/errmsg.txt:
  checksum error message
sql/share/korean/errmsg.txt:
  checksum error message
sql/share/norwegian-ny/errmsg.txt:
  checksum error message
sql/share/norwegian/errmsg.txt:
  checksum error message
sql/share/polish/errmsg.txt:
  checksum error message
sql/share/portuguese/errmsg.txt:
  checksum error message
sql/share/romanian/errmsg.txt:
  checksum error message
sql/share/russian/errmsg.txt:
  checksum error message
sql/share/serbian/errmsg.txt:
  checksum error message
sql/share/slovak/errmsg.txt:
  checksum error message
sql/share/spanish/errmsg.txt:
  checksum error message
sql/share/swedish/errmsg.txt:
  checksum error message
sql/share/ukrainian/errmsg.txt:
  checksum error message
sql/sql_table.cc:
  fixed layout
  fixed comment
  allow cocalization of error
This commit is contained in:
unknown
2004-11-21 16:35:42 +02:00
parent b3c9963971
commit 00e79db8ac
25 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sql/sql_table.cc
View File

@@ -1747,10 +1747,9 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
uint extra_open_options,
int (*prepare_func)(THD *, TABLE_LIST *,
HA_CHECK_OPT *),
int (handler::*operator_func)
(THD *, HA_CHECK_OPT *),
int (view_operator_func)
(THD *, TABLE_LIST*))
int (handler::*operator_func)(THD *,
HA_CHECK_OPT *),
int (view_operator_func)(THD *, TABLE_LIST*))
{
TABLE_LIST *table, *next_global_table;
List<Item> field_list;
@@ -1808,12 +1807,16 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
}
/*
for this command used only temporary table method (without
filling tables), so if opening succeed, table will be opened
CHECK TABLE command is only command where VIEW allowed here and this
command use only temporary teble method for VIEWs resolving => there
can't be VIEW tree substitition of join view => if opening table
succeed then table->table will have real TABLE pointer as value (in
case of join view substitution table->table can be 0, but here it is
impossible)
*/
if (!table->table)
{
char buf[ERRMSGSIZE+25];
char buf[ERRMSGSIZE+ERRMSGSIZE+2];
const char *err_msg;
protocol->prepare_for_resend();
protocol->store(table_name, system_charset_info);
@@ -1825,7 +1828,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
if (table->view &&
view_checksum(thd, table) == HA_ADMIN_WRONG_CHECKSUM)
{
strxmov(buf, "View checksum failed and ", err_msg, NullS);
strxmov(buf, err_msg, "; ", ER(ER_VIEW_CHECKSUM), NullS);
err_msg= (const char *)buf;
}
protocol->store(err_msg, system_charset_info);
@@ -1961,7 +1964,8 @@ send_result_message:
case HA_ADMIN_WRONG_CHECKSUM:
{
protocol->store("note", 4, system_charset_info);
protocol->store("Checksum error", 14, system_charset_info);
protocol->store(ER(ER_VIEW_CHECKSUM), strlen(ER(ER_VIEW_CHECKSUM)),
system_charset_info);
break;
}