Skip to content

M
mariadb
Commit c0541317 authored by unknown's avatar unknown
Browse files
Options

Delete duplicate error message names 


include/mysqld_error.h:
  Delete duplicate error names
include/sql_state.h:
  Delete duplicate error names
myisam/ft_dump.c:
  Delete wrong patch
myisam/myisamchk.c:
  Delete wrong patch
mysql-test/r/query_cache.result:
  Fix after deleting duplicated error messages
mysql-test/t/create.test:
  Fix after deleting duplicated error messages
mysql-test/t/fulltext.test:
  Fix after deleting duplicated error messages
mysql-test/t/key_cache.test:
  Fix after deleting duplicated error messages
sql/share/czech/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/danish/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/dutch/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/english/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/estonian/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/french/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/german/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/greek/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/hungarian/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/italian/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/japanese/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/korean/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/norwegian-ny/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/norwegian/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/polish/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/portuguese/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/romanian/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/russian/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/serbian/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/slovak/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/spanish/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/swedish/errmsg.txt:
  Fix after deleting duplicated error messages
sql/share/ukrainian/errmsg.txt:
  Fix after deleting duplicated error messages
sql/sql_db.cc:
  Fix after deleting duplicated error messages
sql/sql_parse.cc:
  Fix after deleting duplicated error messages
sql/sql_table.cc:
  Fix after deleting duplicated error messages
tests/client_test.c:
  CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS
parent 6b671182
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 115 deletions
include/mysqld_error.h
View file @ c0541317
......@@ -295,12 +295,9 @@
#define ER_BAD_SLAVE_UNTIL_COND 1276
#define ER_MISSING_SKIP_SLAVE 1277
#define ER_UNTIL_COND_IGNORED 1278
#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_UNKNOWN_KEY_CACHE 1286
#define ER_ERROR_MESSAGES 287
#define ER_WRONG_NAME_FOR_INDEX 1279
#define ER_WRONG_NAME_FOR_CATALOG 1280
#define ER_WARN_QC_RESIZE 1281
#define ER_BAD_FT_COLUMN 1282
#define ER_UNKNOWN_KEY_CACHE 1283
#define ER_ERROR_MESSAGES 284
include/sql_state.h
View file @ c0541317
......@@ -159,8 +159,5 @@ 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_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", "",
myisam/ft_dump.c
View file @ c0541317
......@@ -84,7 +84,6 @@ int main(int argc,char *argv[])
if (!(info=mi_open(argv[0],2,HA_OPEN_ABORT_IF_LOCKED)))
goto err;
VOID(mi_extra(info, HA_EXTRA_SET_KEY_CACHE, dflt_keycache));
inx=atoi(argv[1]);
*buf2=0;
......
myisam/myisamchk.c
View file @ c0541317
......@@ -795,7 +795,6 @@ static int myisamchk(MI_CHECK *param, my_string filename)
share->tot_locks-= share->r_locks;
share->r_locks=0;
raid_chunks=share->base.raid_chunks;
VOID(mi_extra(info, HA_EXTRA_SET_KEY_CACHE, dflt_keycache));
/*
Skip the checking of the file if:
......
mysql-test/r/query_cache.result
View file @ c0541317
......@@ -586,7 +586,7 @@ select * from t1;
a
set GLOBAL query_cache_size=1024;
Warnings:
Warning 1284 Query cache failed to set size 1024, new query cache size is 0
Warning 1281 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 1284 Query cache failed to set size 10240, new query cache size is 0
Warning 1281 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 1284 Query cache failed to set size 20480, new query cache size is 0
Warning 1281 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 1284 Query cache failed to set size 40960, new query cache size is 0
Warning 1281 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 @ c0541317
......@@ -40,9 +40,9 @@ create table t1 (ordid int(8) not null auto_increment, ord varchar(50) not null
-- error 1044,1
create table not_existing_database.test (a int);
--error 1279
--error 1103
create table `a/a` (a int);
--error 1279
--error 1103
create table `aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa int);
--error 1059
create table a (`aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` int);
......@@ -66,13 +66,13 @@ create table test_$1.test2$ (a int);
drop table test_$1.test2$;
drop database test_$1;
--error 1279
--error 1103
create table `` (a int);
--error 1279
--error 1103
drop table if exists ``;
--error 1281
--error 1166
create table t1 (`` int);
--error 1282
--error 1279
create table t1 (i int, index `` (i));
#
......@@ -262,7 +262,7 @@ create table non_existing_database.t1 like t1;
create table t3 like non_existing_table;
--error 1050
create temporary table t3 like t1;
--error 1279
--error 1103
create table t3 like `a/a`;
drop table t1, t2, t3;
drop table t3;
......
mysql-test/t/fulltext.test
View file @ c0541317
......@@ -133,9 +133,9 @@ select * from t2 having MATCH inhalt AGAINST ('foobar');
# check of fulltext errors
#
--error 1285
--error 1282
CREATE TABLE t3 (t int(11),i text,fulltext tix (t,i));
--error 1285
--error 1282
CREATE TABLE t3 (t int(11),i text,
j varchar(200) CHARACTER SET latin2,
fulltext tix (i,j));
......
mysql-test/t/key_cache.test
View file @ c0541317
......@@ -99,7 +99,7 @@ explain select a from t2;
select a from t2;
# Test some error conditions
--error 1287
--error 1283
cache index t1 in unknown_key_cache;
cache index t1 keys (unknown_key) in keycache1;
......
sql/share/czech/errmsg.txt
View file @ c0541317
......@@ -291,9 +291,6 @@ 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 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",
......
sql/share/danish/errmsg.txt
View file @ c0541317
......@@ -285,9 +285,6 @@ 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 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",
......
sql/share/dutch/errmsg.txt
View file @ c0541317
......@@ -293,9 +293,6 @@ 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 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",
......
sql/share/english/errmsg.txt
View file @ c0541317
......@@ -282,9 +282,6 @@ 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 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",
......
sql/share/estonian/errmsg.txt
View file @ c0541317
......@@ -287,9 +287,6 @@ 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 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",
......
sql/share/french/errmsg.txt
View file @ c0541317
......@@ -282,9 +282,6 @@ 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 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",
......
sql/share/german/errmsg.txt
View file @ c0541317
......@@ -294,9 +294,6 @@ 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 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",
......
sql/share/greek/errmsg.txt
View file @ c0541317
......@@ -282,9 +282,6 @@ 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 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",
......
sql/share/hungarian/errmsg.txt
View file @ c0541317
......@@ -284,9 +284,6 @@ 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 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",
......
sql/share/italian/errmsg.txt
View file @ c0541317
......@@ -282,9 +282,6 @@ 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 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",
......
sql/share/japanese/errmsg.txt
View file @ c0541317
......@@ -284,9 +284,6 @@ 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 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",
......
sql/share/korean/errmsg.txt
View file @ c0541317
......@@ -282,9 +282,6 @@ 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 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",
......
sql/share/norwegian-ny/errmsg.txt
View file @ c0541317
......@@ -284,9 +284,6 @@ 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 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",
......
sql/share/norwegian/errmsg.txt
View file @ c0541317
......@@ -284,9 +284,6 @@ 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 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",
......
sql/share/polish/errmsg.txt
View file @ c0541317
......@@ -286,9 +286,6 @@ 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 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",
......
sql/share/portuguese/errmsg.txt
View file @ c0541317
......@@ -283,9 +283,6 @@ 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 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",
......
sql/share/romanian/errmsg.txt
View file @ c0541317
......@@ -286,9 +286,6 @@ 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 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",
......
sql/share/russian/errmsg.txt
View file @ c0541317
......@@ -284,9 +284,6 @@ 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 table name '%-.100s'",
"Incorrect database name '%-.100s'",
"Incorrect column name '%-.100s'",
"Incorrect index name '%-.100s'",
"Incorrect catalog name '%-.100s'",
" %lu, - %lu",
......
sql/share/serbian/errmsg.txt
View file @ c0541317
......@@ -277,9 +277,6 @@ 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 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",
......
sql/share/slovak/errmsg.txt
View file @ c0541317
......@@ -290,9 +290,6 @@ 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 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",
......
sql/share/spanish/errmsg.txt
View file @ c0541317
......@@ -284,9 +284,6 @@ 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 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",
......
sql/share/swedish/errmsg.txt
View file @ c0541317
......@@ -282,9 +282,6 @@ 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 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",
......
sql/share/ukrainian/errmsg.txt
View file @ c0541317
......@@ -287,9 +287,6 @@ 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 table name '%-.100s'",
"Incorrect database name '%-.100s'",
"Incorrect column name '%-.100s'",
"Incorrect index name '%-.100s'",
"Incorrect catalog name '%-.100s'",
" Ԧ ͦ %lu, ͦ Ԧ - %lu",
......
sql/sql_db.cc
View file @ c0541317
......@@ -612,7 +612,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_FOR_DATABASE, dbname);
net_printf(thd, ER_WRONG_DB_NAME, dbname);
x_free(dbname);
DBUG_RETURN(1);
}
......@@ -678,7 +678,7 @@ int mysqld_show_create_db(THD *thd, char *dbname,
if (check_db_name(dbname))
{
net_printf(thd,ER_WRONG_NAME_FOR_DATABASE, dbname);
net_printf(thd,ER_WRONG_DB_NAME, dbname);
DBUG_RETURN(1);
}
......
sql/sql_parse.cc
View file @ c0541317
......@@ -1092,7 +1092,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_FOR_DATABASE, db ? db : "NULL");
net_printf(thd,ER_WRONG_DB_NAME, db ? db : "NULL");
goto err;
}
if (lower_case_table_names)
......@@ -1436,7 +1436,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_FOR_DATABASE, db ? db : "NULL");
net_printf(thd,ER_WRONG_DB_NAME, db ? db : "NULL");
break;
}
if (check_access(thd,CREATE_ACL,db,0,1,0))
......@@ -1452,7 +1452,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_FOR_DATABASE, db ? db : "NULL");
net_printf(thd,ER_WRONG_DB_NAME, db ? db : "NULL");
break;
}
if (check_access(thd,DROP_ACL,db,0,1,0))
......@@ -2072,7 +2072,7 @@ mysql_execute_command(THD *thd)
#endif
if (strlen(tables->real_name) > NAME_LEN)
{
net_printf(thd,ER_WRONG_NAME_FOR_TABLE, tables->real_name);
net_printf(thd,ER_WRONG_TABLE_NAME, tables->real_name);
break;
}
LOCK_ACTIVE_MI;
......@@ -2117,7 +2117,7 @@ mysql_execute_command(THD *thd)
#endif
if (strlen(tables->real_name) > NAME_LEN)
{
net_printf(thd, ER_WRONG_NAME_FOR_TABLE, tables->alias);
net_printf(thd, ER_WRONG_TABLE_NAME, tables->alias);
res=0;
break;
}
......@@ -2263,7 +2263,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_FOR_TABLE, lex->name);
net_printf(thd, ER_WRONG_TABLE_NAME, lex->name);
res=0;
break;
}
......@@ -2842,7 +2842,7 @@ mysql_execute_command(THD *thd)
remove_escape(db); // Fix escaped '_'
if (check_db_name(db))
{
net_printf(thd,ER_WRONG_NAME_FOR_DATABASE, db);
net_printf(thd,ER_WRONG_DB_NAME, db);
goto error;
}
#ifndef NO_EMBEDDED_ACCESS_CHECKS
......@@ -3007,7 +3007,7 @@ mysql_execute_command(THD *thd)
{
if (!strip_sp(lex->name) || check_db_name(lex->name))
{
net_printf(thd,ER_WRONG_NAME_FOR_DATABASE, lex->name);
net_printf(thd,ER_WRONG_DB_NAME, lex->name);
break;
}
/*
......@@ -3035,7 +3035,7 @@ mysql_execute_command(THD *thd)
{
if (!strip_sp(lex->name) || check_db_name(lex->name))
{
net_printf(thd, ER_WRONG_NAME_FOR_DATABASE, lex->name);
net_printf(thd, ER_WRONG_DB_NAME, lex->name);
break;
}
/*
......@@ -3068,7 +3068,7 @@ mysql_execute_command(THD *thd)
{
if (!strip_sp(lex->name) || check_db_name(lex->name))
{
net_printf(thd, ER_WRONG_NAME_FOR_DATABASE, lex->name);
net_printf(thd, ER_WRONG_DB_NAME, lex->name);
break;
}
if (check_access(thd,ALTER_ACL,lex->name,0,1,0))
......@@ -3085,7 +3085,7 @@ mysql_execute_command(THD *thd)
{
if (!strip_sp(lex->name) || check_db_name(lex->name))
{
net_printf(thd,ER_WRONG_NAME_FOR_DATABASE, lex->name);
net_printf(thd,ER_WRONG_DB_NAME, lex->name);
break;
}
if (check_access(thd,DROP_ACL,lex->name,0,1,0))
......@@ -4335,7 +4335,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_FOR_TABLE, table->table.str);
net_printf(thd, ER_WRONG_TABLE_NAME, table->table.str);
DBUG_RETURN(0);
}
......@@ -4698,7 +4698,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_FOR_TABLE, MYF(0), *filename_ptr);
my_error(ER_WRONG_TABLE_NAME, MYF(0), *filename_ptr);
return 1;
}
/* Fix is using unix filename format on dos */
......
sql/sql_table.cc
View file @ c0541317
......@@ -443,7 +443,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_FOR_COLUMN, MYF(0), sql_field->field_name);
my_error(ER_WRONG_COLUMN_NAME, MYF(0), sql_field->field_name);
DBUG_RETURN(-1);
}
......@@ -1754,7 +1754,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_FOR_TABLE, MYF(0), src_table);
my_error(ER_WRONG_TABLE_NAME, MYF(0), src_table);
DBUG_RETURN(-1);
}
......
tests/client_test.c
View file @ c0541317
......@@ -4859,7 +4859,7 @@ static void test_multi_query()
}
if (!(mysql_real_connect(l_mysql,opt_host,opt_user,
opt_password, current_db, opt_port,
opt_unix_socket, CLIENT_MULTI_QUERIES))) /* enable multi queries */
opt_unix_socket, CLIENT_MULTI_STATEMENTS))) /* enable multi queries */
{
fprintf(stdout,"\n connection failed(%s)", mysql_error(l_mysql));
exit(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