Skip to content

M
MariaDB
Commit 00e79db8 authored by unknown's avatar unknown
Browse files
Options

postreview changes 


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
parent b3c99639
Show whitespace changes
Inline Side-by-side
Showing with 39 additions and 11 deletions
include/mysqld_error.h
View file @ 00e79db8
......@@ -408,4 +408,5 @@
#define ER_WRONG_MAGIC 1389
#define ER_PS_MANY_PARAM 1390
#define ER_KEY_PART_0 1391
#define ER_ERROR_MESSAGES 392
#define ER_VIEW_CHECKSUM 1392
#define ER_ERROR_MESSAGES 393
sql/share/czech/errmsg.txt
View file @ 00e79db8
......@@ -420,3 +420,4 @@ character-set=latin2
"Wrong magic in %-.64s"
"Prepared statement contains too many placeholders"
"Key part '%-.64s' length cannot be 0"
"View text checksum failed"
sql/share/danish/errmsg.txt
View file @ 00e79db8
......@@ -411,3 +411,4 @@ character-set=latin1
"Wrong magic in %-.64s"
"Prepared statement contains too many placeholders"
"Key part '%-.64s' length cannot be 0"
"View text checksum failed"
sql/share/dutch/errmsg.txt
View file @ 00e79db8
......@@ -420,3 +420,4 @@ character-set=latin1
"Wrong magic in %-.64s"
"Prepared statement contains too many placeholders"
"Key part '%-.64s' length cannot be 0"
"View text checksum failed"
sql/share/english/errmsg.txt
View file @ 00e79db8
......@@ -408,3 +408,4 @@ character-set=latin1
"Wrong magic in %-.64s"
"Prepared statement contains too many placeholders"
"Key part '%-.64s' length cannot be 0"
"View text checksum failed"
sql/share/estonian/errmsg.txt
View file @ 00e79db8
......@@ -413,3 +413,4 @@ character-set=latin7
"Wrong magic in %-.64s"
"Prepared statement contains too many placeholders"
"Key part '%-.64s' length cannot be 0"
"View text checksum failed"
sql/share/french/errmsg.txt
View file @ 00e79db8
......@@ -408,3 +408,4 @@ character-set=latin1
"Wrong magic in %-.64s"
"Prepared statement contains too many placeholders"
"Key part '%-.64s' length cannot be 0"
"View text checksum failed"
sql/share/german/errmsg.txt
View file @ 00e79db8
......@@ -421,3 +421,4 @@ character-set=latin1
"Wrong magic in %-.64s"
"Prepared statement contains too many placeholders"
"Key part '%-.64s' length cannot be 0"
"View text checksum failed"
sql/share/greek/errmsg.txt
View file @ 00e79db8
......@@ -408,3 +408,4 @@ character-set=greek
"Wrong magic in %-.64s"
"Prepared statement contains too many placeholders"
"Key part '%-.64s' length cannot be 0"
"View text checksum failed"
sql/share/hungarian/errmsg.txt
View file @ 00e79db8
......@@ -413,3 +413,4 @@ character-set=latin2
"Wrong magic in %-.64s"
"Prepared statement contains too many placeholders"
"Key part '%-.64s' length cannot be 0"
"View text checksum failed"
sql/share/italian/errmsg.txt
View file @ 00e79db8
......@@ -408,3 +408,4 @@ character-set=latin1
"Wrong magic in %-.64s"
"Prepared statement contains too many placeholders"
"Key part '%-.64s' length cannot be 0"
"View text checksum failed"
sql/share/japanese/errmsg.txt
View file @ 00e79db8
......@@ -412,3 +412,4 @@ character-set=ujis
"Wrong magic in %-.64s"
"Prepared statement contains too many placeholders"
"Key part '%-.64s' length cannot be 0"
"View text checksum failed"
sql/share/korean/errmsg.txt
View file @ 00e79db8
......@@ -408,3 +408,4 @@ character-set=euckr
"Wrong magic in %-.64s"
"Prepared statement contains too many placeholders"
"Key part '%-.64s' length cannot be 0"
"View text checksum failed"
sql/share/norwegian-ny/errmsg.txt
View file @ 00e79db8
......@@ -410,3 +410,4 @@ character-set=latin1
"Wrong magic in %-.64s"
"Prepared statement contains too many placeholders"
"Key part '%-.64s' length cannot be 0"
"View text checksum failed"
sql/share/norwegian/errmsg.txt
View file @ 00e79db8
......@@ -410,3 +410,4 @@ character-set=latin1
"Wrong magic in %-.64s"
"Prepared statement contains too many placeholders"
"Key part '%-.64s' length cannot be 0"
"View text checksum failed"
sql/share/polish/errmsg.txt
View file @ 00e79db8
......@@ -413,3 +413,4 @@ character-set=latin2
"Wrong magic in %-.64s"
"Prepared statement contains too many placeholders"
"Key part '%-.64s' length cannot be 0"
"View text checksum failed"
sql/share/portuguese/errmsg.txt
View file @ 00e79db8
......@@ -410,3 +410,4 @@ character-set=latin1
"Wrong magic in %-.64s"
"Prepared statement contains too many placeholders"
"Key part '%-.64s' length cannot be 0"
"View text checksum failed"
sql/share/romanian/errmsg.txt
View file @ 00e79db8
......@@ -413,3 +413,4 @@ character-set=latin2
"Wrong magic in %-.64s"
"Prepared statement contains too many placeholders"
"Key part '%-.64s' length cannot be 0"
"View text checksum failed"
sql/share/russian/errmsg.txt
View file @ 00e79db8
......@@ -413,3 +413,4 @@ character-set=koi8r
"Wrong magic in %-.64s"
"Prepared statement contains too many placeholders"
"Key part '%-.64s' length cannot be 0"
" VIEW "
sql/share/serbian/errmsg.txt
View file @ 00e79db8
......@@ -401,3 +401,4 @@ character-set=cp1250
"Wrong magic in %-.64s"
"Prepared statement contains too many placeholders"
"Key part '%-.64s' length cannot be 0"
"View text checksum failed"
sql/share/slovak/errmsg.txt
View file @ 00e79db8
......@@ -416,3 +416,4 @@ character-set=latin2
"Wrong magic in %-.64s"
"Prepared statement contains too many placeholders"
"Key part '%-.64s' length cannot be 0"
"View text checksum failed"
sql/share/spanish/errmsg.txt
View file @ 00e79db8
......@@ -412,3 +412,4 @@ character-set=latin1
"Wrong magic in %-.64s"
"Prepared statement contains too many placeholders"
"Key part '%-.64s' length cannot be 0"
"View text checksum failed"
sql/share/swedish/errmsg.txt
View file @ 00e79db8
......@@ -408,3 +408,4 @@ character-set=latin1
"Wrong magic in %-.64s"
"Prepared statement contains too many placeholders"
"Key part '%-.64s' length cannot be 0"
"View text checksum failed"
sql/share/ukrainian/errmsg.txt
View file @ 00e79db8
......@@ -391,7 +391,7 @@ character-set=koi8u
"Incorrect %-.32s value: '%-.128s' for column '%.64s' at row %ld",
"Illegal %s '%-.64s' value found during parsing",
"CHECK OPTION VIEW '%-.64s.%-.64s' "
"צ CHECK OPTION VIEW '%-.64s.%-.64s' "
"צ CHECK OPTION VIEW '%-.64s.%-.64s' "
"Access denied; you are not the procedure/function definer of '%s'"
"Failed purging old relay logs: %s"
"Password hash should be a %d-digit hexadecimal number"
......@@ -414,3 +414,4 @@ character-set=koi8u
"Wrong magic in %-.64s"
"Prepared statement contains too many placeholders"
"Key part '%-.64s' length cannot be 0"
"צ ϧ VIEW "
sql/sql_table.cc
View file @ 00e79db8
......@@ -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 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7