Skip to content

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

word substitution in error messages removed - can create problems for i18n

parent a1acc652
Show whitespace changes
Inline Side-by-side
Showing with 155 additions and 175 deletions
include/mysqld_error.h
View file @ b5056c63
......@@ -295,12 +295,11 @@
#define ER_BAD_SLAVE_UNTIL_COND 1276
#define ER_MISSING_SKIP_SLAVE 1277
#define ER_UNTIL_COND_IGNORED 1278
#define ER_WRONG_NAME 1279
#define ER_TABLE 1280
#define ER_DATABASE 1281
#define ER_COLUMN 1282
#define ER_INDEX 1283
#define ER_CATALOG 1284
#define ER_WARN_QC_RESIZE 1285
#define ER_BAD_FT_COLUMN 1286
#define ER_ERROR_MESSAGES 287
#define ER_WRONG_NAME_FOR_TABLE 1279
#define ER_WRONG_NAME_FOR_DATABASE 1280
#define ER_WRONG_NAME_FOR_COLUMN 1281
#define ER_WRONG_NAME_FOR_INDEX 1282
#define ER_WRONG_NAME_FOR_CATALOG 1283
#define ER_WARN_QC_RESIZE 1284
#define ER_BAD_FT_COLUMN 1285
#define ER_ERROR_MESSAGES 286
include/sql_state.h
View file @ b5056c63
......@@ -159,4 +159,8 @@ ER_WARN_TOO_MANY_RECORDS, "01000", "",
ER_WARN_NULL_TO_NOTNULL, "01000", "",
ER_WARN_DATA_OUT_OF_RANGE, "01000", "",
ER_WARN_DATA_TRUNCATED, "01000", "",
ER_WRONG_NAME, "42000", "",
ER_WRONG_NAME_FOR_TABLE, "42000", "",
ER_WRONG_NAME_FOR_DATABASE, "42000", "",
ER_WRONG_NAME_FOR_COLUMN, "42000", "",
ER_WRONG_NAME_FOR_INDEX, "42000", "",
ER_WRONG_NAME_FOR_CATALOG, "42000", "",
mysql-test/r/query_cache.result
View file @ b5056c63
......@@ -586,7 +586,7 @@ select * from t1;
a
set GLOBAL query_cache_size=1024;
Warnings:
Warning 1285 Query cache failed to set size 1024, new query cache size is 0
Warning 1284 Query cache failed to set size 1024, new query cache size is 0
show global variables like "query_cache_size";
Variable_name Value
query_cache_size 0
......@@ -594,7 +594,7 @@ select * from t1;
a
set GLOBAL query_cache_size=10240;
Warnings:
Warning 1285 Query cache failed to set size 10240, new query cache size is 0
Warning 1284 Query cache failed to set size 10240, new query cache size is 0
show global variables like "query_cache_size";
Variable_name Value
query_cache_size 0
......@@ -602,7 +602,7 @@ select * from t1;
a
set GLOBAL query_cache_size=20480;
Warnings:
Warning 1285 Query cache failed to set size 20480, new query cache size is 0
Warning 1284 Query cache failed to set size 20480, new query cache size is 0
show global variables like "query_cache_size";
Variable_name Value
query_cache_size 0
......@@ -610,7 +610,7 @@ select * from t1;
a
set GLOBAL query_cache_size=40960;
Warnings:
Warning 1285 Query cache failed to set size 40960, new query cache size is 0
Warning 1284 Query cache failed to set size 40960, new query cache size is 0
show global variables like "query_cache_size";
Variable_name Value
query_cache_size 0
......
mysql-test/t/create.test
View file @ b5056c63
......@@ -70,9 +70,9 @@ drop database test_$1;
create table `` (a int);
--error 1279
drop table if exists ``;
--error 1279
--error 1281
create table t1 (`` int);
--error 1279
--error 1282
create table t1 (i int, index `` (i));
#
......
mysql-test/t/fulltext.test
View file @ b5056c63
......@@ -133,9 +133,9 @@ select * from t2 having MATCH inhalt AGAINST ('foobar');
# check of fulltext errors
#
--error 1286
--error 1285
CREATE TABLE t3 (t int(11),i text,fulltext tix (t,i));
--error 1286
--error 1285
CREATE TABLE t3 (t int(11),i text,
j varchar(200) CHARACTER SET latin2,
fulltext tix (i,j));
......
mysql-test/t/overflow.test
View file @ b5056c63
connect (con1,localhost,boo,,);
connection con1;
-- error 1064,1102,1279
-- error 1064,1102,1280
drop database AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA;
sql/share/czech/errmsg.txt
View file @ b5056c63
......@@ -291,11 +291,10 @@ character-set=latin2
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
"Incorrect %s name '%-.100s'",
"table",
"database",
"column",
"index",
"catalog",
"Incorrect table name '%-.100s'",
"Incorrect database name '%-.100s'",
"Incorrect column name '%-.100s'",
"Incorrect index name '%-.100s'",
"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
sql/share/danish/errmsg.txt
View file @ b5056c63
......@@ -285,11 +285,10 @@ character-set=latin1
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
"Incorrect %s name '%-.100s'",
"table",
"database",
"column",
"index",
"catalog",
"Incorrect table name '%-.100s'",
"Incorrect database name '%-.100s'",
"Incorrect column name '%-.100s'",
"Incorrect index name '%-.100s'",
"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
sql/share/dutch/errmsg.txt
View file @ b5056c63
......@@ -293,11 +293,10 @@ character-set=latin1
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
"Incorrect %s name '%-.100s'",
"table",
"database",
"column",
"index",
"catalog",
"Incorrect table name '%-.100s'",
"Incorrect database name '%-.100s'",
"Incorrect column name '%-.100s'",
"Incorrect index name '%-.100s'",
"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
sql/share/english/errmsg.txt
View file @ b5056c63
......@@ -282,11 +282,10 @@ character-set=latin1
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to use --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL. Otherwise you will get problems if you get an unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
"Incorrect %s name '%-.100s'",
"table",
"database",
"column",
"index",
"catalog",
"Incorrect table name '%-.100s'",
"Incorrect database name '%-.100s'",
"Incorrect column name '%-.100s'",
"Incorrect index name '%-.100s'",
"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
sql/share/estonian/errmsg.txt
View file @ b5056c63
......@@ -287,11 +287,10 @@ character-set=latin7
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
"Incorrect %s name '%-.100s'",
"table",
"database",
"column",
"index",
"catalog",
"Incorrect table name '%-.100s'",
"Incorrect database name '%-.100s'",
"Incorrect column name '%-.100s'",
"Incorrect index name '%-.100s'",
"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
sql/share/french/errmsg.txt
View file @ b5056c63
......@@ -282,11 +282,10 @@ character-set=latin1
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
"Incorrect %s name '%-.100s'",
"table",
"database",
"column",
"index",
"catalog",
"Incorrect table name '%-.100s'",
"Incorrect database name '%-.100s'",
"Incorrect column name '%-.100s'",
"Incorrect index name '%-.100s'",
"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
sql/share/german/errmsg.txt
View file @ b5056c63
......@@ -294,11 +294,10 @@ character-set=latin1
"Falscher Parameter oder falsche Kombination von Parametern für START SLAVE UNTIL",
"Es wird empfohlen, mit --skip-slave-start zu starten, wenn mit START SLAVE UNTIL eine Schritt-für-Schritt-Replikation ausgeführt wird. Ansonsten gibt es Probleme, wenn der Slave-Server unerwartet neu startet",
"SQL-Thread soll nicht gestartet werden. Daher werden UNTIL-Optionen ignoriert",
"Incorrect %s name '%-.100s'",
"table",
"database",
"column",
"index",
"catalog",
"Incorrect table name '%-.100s'",
"Incorrect database name '%-.100s'",
"Incorrect column name '%-.100s'",
"Incorrect index name '%-.100s'",
"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
sql/share/greek/errmsg.txt
View file @ b5056c63
......@@ -282,11 +282,10 @@ character-set=greek
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
"Incorrect %s name '%-.100s'",
"table",
"database",
"column",
"index",
"catalog",
"Incorrect table name '%-.100s'",
"Incorrect database name '%-.100s'",
"Incorrect column name '%-.100s'",
"Incorrect index name '%-.100s'",
"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
sql/share/hungarian/errmsg.txt
View file @ b5056c63
......@@ -284,11 +284,10 @@ character-set=latin2
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
"Incorrect %s name '%-.100s'",
"table",
"database",
"column",
"index",
"catalog",
"Incorrect table name '%-.100s'",
"Incorrect database name '%-.100s'",
"Incorrect column name '%-.100s'",
"Incorrect index name '%-.100s'",
"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
sql/share/italian/errmsg.txt
View file @ b5056c63
......@@ -282,11 +282,10 @@ character-set=latin1
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
"Incorrect %s name '%-.100s'",
"table",
"database",
"column",
"index",
"catalog",
"Incorrect table name '%-.100s'",
"Incorrect database name '%-.100s'",
"Incorrect column name '%-.100s'",
"Incorrect index name '%-.100s'",
"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
sql/share/japanese/errmsg.txt
View file @ b5056c63
......@@ -284,11 +284,10 @@ character-set=ujis
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
"Incorrect %s name '%-.100s'",
"table",
"database",
"column",
"index",
"catalog",
"Incorrect table name '%-.100s'",
"Incorrect database name '%-.100s'",
"Incorrect column name '%-.100s'",
"Incorrect index name '%-.100s'",
"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
sql/share/korean/errmsg.txt
View file @ b5056c63
......@@ -282,11 +282,10 @@ character-set=euckr
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
"Incorrect %s name '%-.100s'",
"table",
"database",
"column",
"index",
"catalog",
"Incorrect table name '%-.100s'",
"Incorrect database name '%-.100s'",
"Incorrect column name '%-.100s'",
"Incorrect index name '%-.100s'",
"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
sql/share/norwegian-ny/errmsg.txt
View file @ b5056c63
......@@ -284,11 +284,10 @@ character-set=latin1
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
"Incorrect %s name '%-.100s'",
"table",
"database",
"column",
"index",
"catalog",
"Incorrect table name '%-.100s'",
"Incorrect database name '%-.100s'",
"Incorrect column name '%-.100s'",
"Incorrect index name '%-.100s'",
"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
sql/share/norwegian/errmsg.txt
View file @ b5056c63
......@@ -284,11 +284,10 @@ character-set=latin1
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
"Incorrect %s name '%-.100s'",
"table",
"database",
"column",
"index",
"catalog",
"Incorrect table name '%-.100s'",
"Incorrect database name '%-.100s'",
"Incorrect column name '%-.100s'",
"Incorrect index name '%-.100s'",
"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
sql/share/polish/errmsg.txt
View file @ b5056c63
......@@ -286,11 +286,10 @@ character-set=latin2
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
"Incorrect %s name '%-.100s'",
"table",
"database",
"column",
"index",
"catalog",
"Incorrect table name '%-.100s'",
"Incorrect database name '%-.100s'",
"Incorrect column name '%-.100s'",
"Incorrect index name '%-.100s'",
"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
sql/share/portuguese/errmsg.txt
View file @ b5056c63
......@@ -283,11 +283,10 @@ character-set=latin1
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
"Incorrect %s name '%-.100s'",
"table",
"database",
"column",
"index",
"catalog",
"Incorrect table name '%-.100s'",
"Incorrect database name '%-.100s'",
"Incorrect column name '%-.100s'",
"Incorrect index name '%-.100s'",
"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
sql/share/romanian/errmsg.txt
View file @ b5056c63
......@@ -286,11 +286,10 @@ character-set=latin2
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
"Incorrect %s name '%-.100s'",
"table",
"database",
"column",
"index",
"catalog",
"Incorrect table name '%-.100s'",
"Incorrect database name '%-.100s'",
"Incorrect column name '%-.100s'",
"Incorrect index name '%-.100s'",
"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
sql/share/russian/errmsg.txt
View file @ b5056c63
......@@ -284,11 +284,10 @@ character-set=koi8r
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
"Incorrect %s name '%-.100s'",
"table",
"database",
"column",
"index",
"catalog",
"Incorrect table name '%-.100s'",
"Incorrect database name '%-.100s'",
"Incorrect column name '%-.100s'",
"Incorrect index name '%-.100s'",
"Incorrect catalog name '%-.100s'",
" %lu, - %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
sql/share/serbian/errmsg.txt
View file @ b5056c63
......@@ -277,11 +277,10 @@ character-set=cp1250
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
"Incorrect %s name '%-.100s'",
"table",
"database",
"column",
"index",
"catalog",
"Incorrect table name '%-.100s'",
"Incorrect database name '%-.100s'",
"Incorrect column name '%-.100s'",
"Incorrect index name '%-.100s'",
"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
sql/share/slovak/errmsg.txt
View file @ b5056c63
......@@ -290,11 +290,10 @@ character-set=latin2
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
"Incorrect %s name '%-.100s'",
"table",
"database",
"column",
"index",
"catalog",
"Incorrect table name '%-.100s'",
"Incorrect database name '%-.100s'",
"Incorrect column name '%-.100s'",
"Incorrect index name '%-.100s'",
"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
sql/share/spanish/errmsg.txt
View file @ b5056c63
......@@ -284,11 +284,10 @@ character-set=latin1
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
"Incorrect %s name '%-.100s'",
"table",
"database",
"column",
"index",
"catalog",
"Incorrect table name '%-.100s'",
"Incorrect database name '%-.100s'",
"Incorrect column name '%-.100s'",
"Incorrect index name '%-.100s'",
"Incorrect catalog name '%-.100s'",
"Query cache failed to set size %lu, new query cache size is %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
sql/share/swedish/errmsg.txt
View file @ b5056c63
......@@ -282,11 +282,10 @@ character-set=latin1
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
"Felaktigt %s namn '%-.100s'",
"tabell",
"databas",
"kolumn",
"index",
"katalog",
"Incorrect table name '%-.100s'",
"Incorrect database name '%-.100s'",
"Incorrect column name '%-.100s'",
"Incorrect index name '%-.100s'",
"Incorrect catalog name '%-.100s'",
"Storleken av "Query cache" kunde inte sättas till %lu, ny storlek är %lu",
"Kolumn '%-.64s' kan inte vara del av ett FULLTEXT index",
sql/share/ukrainian/errmsg.txt
View file @ b5056c63
......@@ -287,11 +287,10 @@ character-set=koi8u
"Wrong parameter or combination of parameters for START SLAVE UNTIL",
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
"SQL thread is not to be started so UNTIL options are ignored",
"Incorrect %s name '%-.100s'",
"table",
"database",
"column",
"index",
"catalog",
"Incorrect table name '%-.100s'",
"Incorrect database name '%-.100s'",
"Incorrect column name '%-.100s'",
"Incorrect index name '%-.100s'",
"Incorrect catalog name '%-.100s'",
" Ԧ ͦ %lu, ͦ Ԧ - %lu",
"Column '%-.64s' cannot be part of FULLTEXT index",
sql/sql_db.cc
View file @ b5056c63
......@@ -609,7 +609,7 @@ bool mysql_change_db(THD *thd, const char *name)
}
if ((db_length > NAME_LEN) || check_db_name(dbname))
{
net_printf(thd, ER_WRONG_NAME, ER(ER_DATABASE), dbname);
net_printf(thd, ER_WRONG_NAME_FOR_DATABASE, dbname);
x_free(dbname);
DBUG_RETURN(1);
}
......@@ -675,7 +675,7 @@ int mysqld_show_create_db(THD *thd, char *dbname,
if (check_db_name(dbname))
{
net_printf(thd,ER_WRONG_NAME, ER(ER_DATABASE), dbname);
net_printf(thd,ER_WRONG_NAME_FOR_DATABASE, dbname);
DBUG_RETURN(1);
}
......
sql/sql_parse.cc
View file @ b5056c63
......@@ -1085,7 +1085,7 @@ int mysql_table_dump(THD* thd, char* db, char* tbl_name, int fd)
if (!db || check_db_name(db))
{
net_printf(thd,ER_WRONG_NAME, ER(ER_DATABASE), db ? db : "NULL");
net_printf(thd,ER_WRONG_NAME_FOR_DATABASE, db ? db : "NULL");
goto err;
}
if (lower_case_table_names)
......@@ -1429,7 +1429,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
// null test to handle EOM
if (!db || !strip_sp(db) || check_db_name(db))
{
net_printf(thd,ER_WRONG_NAME, ER(ER_DATABASE), db ? db : "NULL");
net_printf(thd,ER_WRONG_NAME_FOR_DATABASE, db ? db : "NULL");
break;
}
if (check_access(thd,CREATE_ACL,db,0,1,0))
......@@ -1445,7 +1445,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
// null test to handle EOM
if (!db || !strip_sp(db) || check_db_name(db))
{
net_printf(thd,ER_WRONG_NAME, ER(ER_DATABASE), db ? db : "NULL");
net_printf(thd,ER_WRONG_NAME_FOR_DATABASE, db ? db : "NULL");
break;
}
if (check_access(thd,DROP_ACL,db,0,1,0))
......@@ -2048,7 +2048,7 @@ mysql_execute_command(THD *thd)
#endif
if (strlen(tables->real_name) > NAME_LEN)
{
net_printf(thd,ER_WRONG_NAME, ER(ER_TABLE), tables->real_name);
net_printf(thd,ER_WRONG_NAME_FOR_TABLE, tables->real_name);
break;
}
LOCK_ACTIVE_MI;
......@@ -2093,7 +2093,7 @@ mysql_execute_command(THD *thd)
#endif
if (strlen(tables->real_name) > NAME_LEN)
{
net_printf(thd, ER_WRONG_NAME, ER(ER_TABLE), tables->alias);
net_printf(thd, ER_WRONG_NAME_FOR_TABLE, tables->alias);
res=0;
break;
}
......@@ -2226,7 +2226,7 @@ mysql_execute_command(THD *thd)
ulong priv=0;
if (lex->name && (!lex->name[0] || strlen(lex->name) > NAME_LEN))
{
net_printf(thd, ER_WRONG_NAME, ER(ER_TABLE), lex->name);
net_printf(thd, ER_WRONG_NAME_FOR_TABLE, lex->name);
res=0;
break;
}
......@@ -2805,7 +2805,7 @@ mysql_execute_command(THD *thd)
remove_escape(db); // Fix escaped '_'
if (check_db_name(db))
{
net_printf(thd,ER_WRONG_NAME, ER(ER_DATABASE), db);
net_printf(thd,ER_WRONG_NAME_FOR_DATABASE, db);
goto error;
}
#ifndef NO_EMBEDDED_ACCESS_CHECKS
......@@ -2970,7 +2970,7 @@ mysql_execute_command(THD *thd)
{
if (!strip_sp(lex->name) || check_db_name(lex->name))
{
net_printf(thd,ER_WRONG_NAME, ER(ER_DATABASE), lex->name);
net_printf(thd,ER_WRONG_NAME_FOR_DATABASE, lex->name);
break;
}
/*
......@@ -2998,7 +2998,7 @@ mysql_execute_command(THD *thd)
{
if (!strip_sp(lex->name) || check_db_name(lex->name))
{
net_printf(thd, ER_WRONG_NAME, ER(ER_DATABASE), lex->name);
net_printf(thd, ER_WRONG_NAME_FOR_DATABASE, lex->name);
break;
}
/*
......@@ -3031,7 +3031,7 @@ mysql_execute_command(THD *thd)
{
if (!strip_sp(lex->name) || check_db_name(lex->name))
{
net_printf(thd, ER_WRONG_NAME, ER(ER_DATABASE), lex->name);
net_printf(thd, ER_WRONG_NAME_FOR_DATABASE, lex->name);
break;
}
if (check_access(thd,ALTER_ACL,lex->name,0,1,0))
......@@ -3048,7 +3048,7 @@ mysql_execute_command(THD *thd)
{
if (!strip_sp(lex->name) || check_db_name(lex->name))
{
net_printf(thd,ER_WRONG_NAME, ER(ER_DATABASE), lex->name);
net_printf(thd,ER_WRONG_NAME_FOR_DATABASE, lex->name);
break;
}
if (check_access(thd,DROP_ACL,lex->name,0,1,0))
......@@ -4298,7 +4298,7 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd,
if (check_table_name(table->table.str,table->table.length) ||
table->db.str && check_db_name(table->db.str))
{
net_printf(thd, ER_WRONG_NAME, ER(ER_TABLE), table->table.str);
net_printf(thd, ER_WRONG_NAME_FOR_TABLE, table->table.str);
DBUG_RETURN(0);
}
......@@ -4652,7 +4652,7 @@ static bool append_file_to_dir(THD *thd, char **filename_ptr, char *table_name)
if (strlen(*filename_ptr)+strlen(table_name) >= FN_REFLEN-1 ||
!test_if_hard_path(*filename_ptr))
{
my_error(ER_WRONG_NAME, MYF(0), ER(ER_TABLE), *filename_ptr);
my_error(ER_WRONG_NAME_FOR_TABLE, MYF(0), *filename_ptr);
return 1;
}
/* Fix is using unix filename format on dos */
......
sql/sql_table.cc
View file @ b5056c63
......@@ -437,7 +437,7 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
if (check_column_name(sql_field->field_name))
{
my_error(ER_WRONG_NAME, MYF(0), ER(ER_COLUMN), sql_field->field_name);
my_error(ER_WRONG_NAME_FOR_COLUMN, MYF(0), sql_field->field_name);
DBUG_RETURN(-1);
}
......@@ -888,7 +888,7 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
}
if (!key_info->name || check_column_name(key_info->name))
{
my_error(ER_WRONG_NAME, MYF(0), ER(ER_INDEX), key_info->name);
my_error(ER_WRONG_NAME_FOR_INDEX, MYF(0), key_info->name);
DBUG_RETURN(-1);
}
if (!(key_info->flags & HA_NULL_PART_KEY))
......@@ -1777,7 +1777,7 @@ int mysql_create_like_table(THD* thd, TABLE_LIST* table,
check_table_name(src_table,table_ident->table.length)) ||
table_ident->db.str && check_db_name((src_db= table_ident->db.str)))
{
my_error(ER_WRONG_NAME, MYF(0), ER(ER_TABLE), src_table);
my_error(ER_WRONG_NAME_FOR_TABLE, MYF(0), src_table);
DBUG_RETURN(-1);
}
......
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