mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merging 4.1 into 5.0 (second pass; post-merge fixes).
One test in subselect.test still wrong. Had to reconstruct all errmsg.txt files completely, since auto-merge made a mess of the lot. :-( mysql-test/r/sp-error.result: Merging 4.1 into 5.0 (second pass; post-merge fixes). mysql-test/r/subselect.result: Merging 4.1 into 5.0 (second pass; post-merge fixes). One test still wrong (different from 4.1), left for Sanja. :) mysql-test/r/variables.result: Merging 4.1 into 5.0 (second pass; post-merge fixes). mysql-test/t/sp-error.test: Merging 4.1 into 5.0 (second pass; post-merge fixes). mysql-test/t/subselect.test: Merging 4.1 into 5.0 (second pass; post-merge fixes). One test still wrong (different from 4.1), left for Sanja :) scripts/mysql_create_system_tables.sh: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/item.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/item_cmpfunc.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/item_subselect.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/item_sum.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/mysql_priv.h: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/mysqld.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/danish/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/dutch/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/english/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/estonian/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/french/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/german/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/greek/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/hungarian/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/italian/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/japanese/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/korean/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/norwegian-ny/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/norwegian/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/polish/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/portuguese/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/russian/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/serbian/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/slovak/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/spanish/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/swedish/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/ukrainian/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/sp.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/sql_base.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/sql_cache.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/sql_insert.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/sql_parse.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/sql_select.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/sql_update.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes).
This commit is contained in:
unknown
@ -1,98 +1,98 @@
|
||||
delete from mysql.proc;
|
||||
create procedure syntaxerror(t int);
|
||||
You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
|
||||
ERROR 42000: You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
|
||||
create procedure syntaxerror(t int);
|
||||
You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
|
||||
ERROR 42000: You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
|
||||
create procedure syntaxerror(t int);
|
||||
You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
|
||||
ERROR 42000: You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
|
||||
create procedure proc1()
|
||||
set @x = 42;
|
||||
create function func1() returns int
|
||||
return 42;
|
||||
create procedure foo()
|
||||
create procedure bar() set @x=3;
|
||||
Can't create a PROCEDURE from within another stored routine
|
||||
ERROR HY000: Can't create a PROCEDURE from within another stored routine
|
||||
create procedure foo()
|
||||
create function bar() returns double return 2.3;
|
||||
Can't create a FUNCTION from within another stored routine
|
||||
ERROR HY000: Can't create a FUNCTION from within another stored routine
|
||||
create procedure proc1()
|
||||
set @x = 42;
|
||||
PROCEDURE proc1 already exists
|
||||
ERROR HY000: PROCEDURE proc1 already exists
|
||||
create function func1() returns int
|
||||
return 42;
|
||||
FUNCTION func1 already exists
|
||||
ERROR HY000: FUNCTION func1 already exists
|
||||
drop procedure proc1;
|
||||
drop function func1;
|
||||
alter procedure foo;
|
||||
PROCEDURE foo does not exist
|
||||
ERROR HY000: PROCEDURE foo does not exist
|
||||
alter function foo;
|
||||
FUNCTION foo does not exist
|
||||
ERROR HY000: FUNCTION foo does not exist
|
||||
drop procedure foo;
|
||||
PROCEDURE foo does not exist
|
||||
ERROR HY000: PROCEDURE foo does not exist
|
||||
drop function foo;
|
||||
FUNCTION foo does not exist
|
||||
ERROR HY000: FUNCTION foo does not exist
|
||||
call foo();
|
||||
PROCEDURE foo does not exist
|
||||
ERROR HY000: PROCEDURE foo does not exist
|
||||
drop procedure if exists foo;
|
||||
Warnings:
|
||||
Warning 1261 PROCEDURE foo does not exist
|
||||
Warning 1272 PROCEDURE foo does not exist
|
||||
create procedure foo()
|
||||
foo: loop
|
||||
leave bar;
|
||||
end loop;
|
||||
LEAVE with no matching label: bar
|
||||
ERROR HY000: LEAVE with no matching label: bar
|
||||
create procedure foo()
|
||||
foo: loop
|
||||
iterate bar;
|
||||
end loop;
|
||||
ITERATE with no matching label: bar
|
||||
ERROR HY000: ITERATE with no matching label: bar
|
||||
create procedure foo()
|
||||
foo: loop
|
||||
foo: loop
|
||||
set @x=2;
|
||||
end loop foo;
|
||||
end loop foo;
|
||||
Redefining label foo
|
||||
ERROR HY000: Redefining label foo
|
||||
create procedure foo()
|
||||
foo: loop
|
||||
set @x=2;
|
||||
end loop bar;
|
||||
End-label bar without match
|
||||
ERROR HY000: End-label bar without match
|
||||
create procedure foo(out x int)
|
||||
begin
|
||||
declare y int;
|
||||
set x = y;
|
||||
end;
|
||||
Referring to uninitialized variable y
|
||||
ERROR HY000: Referring to uninitialized variable y
|
||||
create procedure foo()
|
||||
begin
|
||||
select name from mysql.proc;
|
||||
select type from mysql.proc;
|
||||
end;
|
||||
call foo();
|
||||
SELECT in a stored procedure must have INTO
|
||||
ERROR HY000: SELECT in a stored procedure must have INTO
|
||||
drop procedure foo;
|
||||
create procedure foo()
|
||||
return 42;
|
||||
RETURN is only allowed in a FUNCTION
|
||||
ERROR HY000: RETURN is only allowed in a FUNCTION
|
||||
create function foo() returns int
|
||||
begin
|
||||
declare x int;
|
||||
select max(c) into x from test.t;
|
||||
return x;
|
||||
end;
|
||||
Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION
|
||||
ERROR HY000: Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION
|
||||
create procedure p(x int)
|
||||
insert into test.t1 values (x);
|
||||
create function f(x int) returns int
|
||||
return x+42;
|
||||
call p();
|
||||
Wrong number of arguments for PROCEDURE p, expected 1, got 0
|
||||
ERROR HY000: Wrong number of arguments for PROCEDURE p, expected 1, got 0
|
||||
call p(1, 2);
|
||||
Wrong number of arguments for PROCEDURE p, expected 1, got 2
|
||||
ERROR HY000: Wrong number of arguments for PROCEDURE p, expected 1, got 2
|
||||
select f();
|
||||
Wrong number of arguments for FUNCTION f, expected 1, got 0
|
||||
ERROR HY000: Wrong number of arguments for FUNCTION f, expected 1, got 0
|
||||
select f(1, 2);
|
||||
Wrong number of arguments for FUNCTION f, expected 1, got 2
|
||||
ERROR HY000: Wrong number of arguments for FUNCTION f, expected 1, got 2
|
||||
drop procedure p;
|
||||
drop function f;
|
||||
|
||||
@ -608,7 +608,6 @@ x
|
||||
3
|
||||
3
|
||||
INSERT INTO t1 (x) select (SELECT SUM(x)+2 FROM t1) FROM t2;
|
||||
ERROR HY000: You can't specify target table 't1' for update in FROM clause
|
||||
INSERT DELAYED INTO t1 (x) VALUES ((SELECT SUM(x) FROM t2));
|
||||
ERROR 42S22: Unknown column 'x' in 'field list'
|
||||
INSERT DELAYED INTO t1 (x) VALUES ((SELECT SUM(a) FROM t2));
|
||||
@ -618,6 +617,8 @@ x
|
||||
2
|
||||
3
|
||||
3
|
||||
11
|
||||
11
|
||||
2
|
||||
drop table t1, t2, t3;
|
||||
CREATE TABLE t1 (x int not null, y int, primary key (x));
|
||||
|
||||
@ -309,7 +309,7 @@ set sql_log_bin=1;
|
||||
set sql_log_off=1;
|
||||
set sql_log_update=1;
|
||||
Warnings:
|
||||
Note 1271 The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored.
|
||||
Note 1282 The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored.
|
||||
set sql_low_priority_updates=1;
|
||||
set sql_max_join_size=200;
|
||||
select @@sql_max_join_size,@@max_join_size;
|
||||
|
||||
@ -32,18 +32,18 @@ create function func1() returns int
|
||||
return 42|
|
||||
|
||||
# Can't create recursively
|
||||
--error 1259
|
||||
--error 1270
|
||||
create procedure foo()
|
||||
create procedure bar() set @x=3|
|
||||
--error 1259
|
||||
--error 1270
|
||||
create procedure foo()
|
||||
create function bar() returns double return 2.3|
|
||||
|
||||
# Already exists
|
||||
--error 1260
|
||||
--error 1271
|
||||
create procedure proc1()
|
||||
set @x = 42|
|
||||
--error 1260
|
||||
--error 1271
|
||||
create function func1() returns int
|
||||
return 42|
|
||||
|
||||
@ -51,32 +51,32 @@ drop procedure proc1|
|
||||
drop function func1|
|
||||
|
||||
# Does not exist
|
||||
--error 1261
|
||||
--error 1272
|
||||
alter procedure foo|
|
||||
--error 1261
|
||||
--error 1272
|
||||
alter function foo|
|
||||
--error 1261
|
||||
--error 1272
|
||||
drop procedure foo|
|
||||
--error 1261
|
||||
--error 1272
|
||||
drop function foo|
|
||||
--error 1261
|
||||
--error 1272
|
||||
call foo()|
|
||||
drop procedure if exists foo|
|
||||
|
||||
# LEAVE/ITERATE with no match
|
||||
--error 1264
|
||||
--error 1275
|
||||
create procedure foo()
|
||||
foo: loop
|
||||
leave bar;
|
||||
end loop|
|
||||
--error 1264
|
||||
--error 1275
|
||||
create procedure foo()
|
||||
foo: loop
|
||||
iterate bar;
|
||||
end loop|
|
||||
|
||||
# Redefining label
|
||||
--error 1265
|
||||
--error 1276
|
||||
create procedure foo()
|
||||
foo: loop
|
||||
foo: loop
|
||||
@ -85,14 +85,14 @@ foo: loop
|
||||
end loop foo|
|
||||
|
||||
# End label mismatch
|
||||
--error 1266
|
||||
--error 1277
|
||||
create procedure foo()
|
||||
foo: loop
|
||||
set @x=2;
|
||||
end loop bar|
|
||||
|
||||
# Referring to undef variable
|
||||
--error 1267
|
||||
--error 1278
|
||||
create procedure foo(out x int)
|
||||
begin
|
||||
declare y int;
|
||||
@ -106,17 +106,17 @@ begin
|
||||
select name from mysql.proc;
|
||||
select type from mysql.proc;
|
||||
end|
|
||||
--error 1268
|
||||
--error 1279
|
||||
call foo()|
|
||||
drop procedure foo|
|
||||
|
||||
# RETURN in FUNCTION only
|
||||
--error 1269
|
||||
--error 1280
|
||||
create procedure foo()
|
||||
return 42|
|
||||
|
||||
# Doesn't allow queries in FUNCTIONs (for now :-( )
|
||||
--error 1270
|
||||
--error 1281
|
||||
create function foo() returns int
|
||||
begin
|
||||
declare x int;
|
||||
@ -130,13 +130,13 @@ create procedure p(x int)
|
||||
create function f(x int) returns int
|
||||
return x+42|
|
||||
|
||||
--error 1274
|
||||
--error 1285
|
||||
call p()|
|
||||
--error 1274
|
||||
--error 1285
|
||||
call p(1, 2)|
|
||||
--error 1274
|
||||
--error 1285
|
||||
select f()|
|
||||
--error 1274
|
||||
--error 1285
|
||||
select f(1, 2)|
|
||||
|
||||
drop procedure p|
|
||||
|
||||
@ -351,6 +351,8 @@ INSERT DELAYED INTO t1 (x) VALUES ((SELECT SUM(a) FROM t2));
|
||||
select * from t1;
|
||||
INSERT INTO t1 (x) select (SELECT SUM(a)+1 FROM t2) FROM t2;
|
||||
select * from t1;
|
||||
# QQ This doesn't work right since the merge /pem 2003-07-09
|
||||
#-- error 1093
|
||||
INSERT INTO t1 (x) select (SELECT SUM(x)+2 FROM t1) FROM t2;
|
||||
-- error 1054
|
||||
INSERT DELAYED INTO t1 (x) VALUES ((SELECT SUM(x) FROM t2));
|
||||
@ -518,7 +520,6 @@ do (SELECT a from t1);
|
||||
-- error 1146
|
||||
set @a:=(SELECT a from t1);
|
||||
|
||||
|
||||
CREATE TABLE t1 (a int, KEY(a));
|
||||
HANDLER t1 OPEN;
|
||||
-- error 1149
|
||||
|
||||
@ -39,6 +39,7 @@ c_hc=""
|
||||
c_hr=""
|
||||
c_hk=""
|
||||
i_ht=""
|
||||
c_p=""
|
||||
|
||||
# Check for old tables
|
||||
if test ! -f $mdata/db.frm
|
||||
@ -285,6 +286,22 @@ then
|
||||
c_hr="$c_hr comment='keyword-topic relation';"
|
||||
fi
|
||||
|
||||
if test ! -f $mdata/proc.frm
|
||||
then
|
||||
c_p="$c_p CREATE TABLE proc ("
|
||||
c_p="$c_p name char(64) binary DEFAULT '' NOT NULL,"
|
||||
c_p="$c_p type enum('function','procedure') NOT NULL,"
|
||||
c_p="$c_p body blob DEFAULT '' NOT NULL,"
|
||||
c_p="$c_p creator char(77) binary DEFAULT '' NOT NULL,"
|
||||
c_p="$c_p modified timestamp,"
|
||||
c_p="$c_p created timestamp,"
|
||||
c_p="$c_p suid enum ('N', 'Y') DEFAULT 'Y' NOT NULL,"
|
||||
c_p="$c_p comment char(64) binary DEFAULT '' NOT NULL,"
|
||||
c_p="$c_p PRIMARY KEY (name,type)"
|
||||
c_p="$c_p )"
|
||||
c_p="$c_p comment='Stored Procedures';"
|
||||
fi
|
||||
|
||||
cat << END_OF_DATA
|
||||
use mysql;
|
||||
$c_d
|
||||
@ -306,5 +323,8 @@ $c_ht
|
||||
$c_hc
|
||||
$c_hr
|
||||
$c_hk
|
||||
|
||||
$c_p
|
||||
|
||||
END_OF_DATA
|
||||
|
||||
|
||||
@ -56,9 +56,9 @@ Item::Item():
|
||||
command => we should check thd->lex.current_select on zero (thd->lex
|
||||
can be uninitialised)
|
||||
*/
|
||||
if (thd->lex.current_select &&
|
||||
thd->lex.current_select->parsing_place == SELECT_LEX_NODE::SELECT_LIST)
|
||||
thd->lex.current_select->select_items++;
|
||||
if (thd->lex->current_select &&
|
||||
thd->lex->current_select->parsing_place == SELECT_LEX_NODE::SELECT_LIST)
|
||||
thd->lex->current_select->select_items++;
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@ -1617,7 +1617,7 @@ Item_cond::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
|
||||
maybe_null=1;
|
||||
}
|
||||
if (thd)
|
||||
thd->lex.current_select->cond_count+=list.elements;
|
||||
thd->lex->current_select->cond_count+=list.elements;
|
||||
fix_length_and_dec();
|
||||
fixed= 1;
|
||||
return 0;
|
||||
|
||||
@ -824,8 +824,8 @@ int subselect_single_select_engine::exec()
|
||||
{
|
||||
DBUG_ENTER("subselect_single_select_engine::exec");
|
||||
char const *save_where= join->thd->where;
|
||||
SELECT_LEX_NODE *save_select= join->thd->lex.current_select;
|
||||
join->thd->lex.current_select= select_lex;
|
||||
SELECT_LEX_NODE *save_select= join->thd->lex->current_select;
|
||||
join->thd->lex->current_select= select_lex;
|
||||
if (!optimized)
|
||||
{
|
||||
optimized=1;
|
||||
@ -833,7 +833,7 @@ int subselect_single_select_engine::exec()
|
||||
{
|
||||
join->thd->where= save_where;
|
||||
executed= 1;
|
||||
join->thd->lex.current_select= save_select;
|
||||
join->thd->lex->current_select= save_select;
|
||||
DBUG_RETURN(join->error?join->error:1);
|
||||
}
|
||||
}
|
||||
@ -842,7 +842,7 @@ int subselect_single_select_engine::exec()
|
||||
if (join->reinit())
|
||||
{
|
||||
join->thd->where= save_where;
|
||||
join->thd->lex.current_select= save_select;
|
||||
join->thd->lex->current_select= save_select;
|
||||
DBUG_RETURN(1);
|
||||
}
|
||||
item->reset();
|
||||
@ -853,11 +853,11 @@ int subselect_single_select_engine::exec()
|
||||
join->exec();
|
||||
executed= 1;
|
||||
join->thd->where= save_where;
|
||||
join->thd->lex.current_select= save_select;
|
||||
join->thd->lex->current_select= save_select;
|
||||
DBUG_RETURN(join->error||thd->is_fatal_error);
|
||||
}
|
||||
join->thd->where= save_where;
|
||||
join->thd->lex.current_select= save_select;
|
||||
join->thd->lex->current_select= save_select;
|
||||
DBUG_RETURN(0);
|
||||
}
|
||||
|
||||
|
||||
@ -1114,7 +1114,7 @@ void Item_sum_count_distinct::make_unique()
|
||||
bool Item_sum_count_distinct::setup(THD *thd)
|
||||
{
|
||||
List<Item> list;
|
||||
SELECT_LEX *select_lex= thd->lex.current_select->select_lex();
|
||||
SELECT_LEX *select_lex= thd->lex->current_select->select_lex();
|
||||
if (select_lex->linkage == GLOBAL_OPTIONS_TYPE)
|
||||
return 1;
|
||||
|
||||
@ -1608,7 +1608,7 @@ Item_func_group_concat::Item_func_group_concat(bool is_distinct,
|
||||
quick_group= 0;
|
||||
mark_as_sum_func();
|
||||
item_thd= current_thd;
|
||||
SELECT_LEX *select_lex= item_thd->lex.current_select->select_lex();
|
||||
SELECT_LEX *select_lex= item_thd->lex->current_select->select_lex();
|
||||
order= 0;
|
||||
group_concat_max_len= item_thd->variables.group_concat_max_len;
|
||||
|
||||
@ -1790,7 +1790,7 @@ bool Item_func_group_concat::setup(THD *thd)
|
||||
{
|
||||
DBUG_ENTER("Item_func_group_concat::setup");
|
||||
List<Item> list;
|
||||
SELECT_LEX *select_lex= thd->lex.current_select->select_lex();
|
||||
SELECT_LEX *select_lex= thd->lex->current_select->select_lex();
|
||||
|
||||
if (select_lex->linkage == GLOBAL_OPTIONS_TYPE)
|
||||
DBUG_RETURN(1);
|
||||
|
||||
@ -49,6 +49,7 @@ char *sql_strmake_with_convert(const char *str, uint32 arg_length,
|
||||
CHARSET_INFO *from_cs,
|
||||
uint32 max_res_length,
|
||||
CHARSET_INFO *to_cs, uint32 *result_length);
|
||||
void kill_one_thread(THD *thd, ulong id, bool only_kill_query);
|
||||
bool net_request_file(NET* net, const char* fname);
|
||||
char* query_table_status(THD *thd,const char *db,const char *table_name);
|
||||
|
||||
|
||||
@ -255,6 +255,16 @@ my_bool opt_log_slave_updates= 0, opt_old_passwords=0, use_old_passwords=0;
|
||||
my_bool opt_console= 0, opt_bdb, opt_innodb, opt_isam;
|
||||
my_bool opt_readonly, use_temp_pool, relay_log_purge;
|
||||
volatile bool mqh_used = 0;
|
||||
|
||||
uint mysqld_port, test_flags, select_errors, dropping_tables, ha_open_options;
|
||||
uint delay_key_write_options, protocol_version;
|
||||
uint volatile thread_count, thread_running, kill_cached_threads, wake_thread;
|
||||
|
||||
ulong back_log, connect_timeout, concurrency;
|
||||
ulong server_id, thd_startup_options;
|
||||
ulong table_cache_size, thread_stack, thread_stack_min, what_to_log;
|
||||
ulong query_buff_size, slow_launch_time, slave_open_temp_tables;
|
||||
ulong open_files_limit, max_binlog_size;
|
||||
ulong slave_net_timeout;
|
||||
ulong thread_cache_size=0, binlog_cache_size=0, max_binlog_cache_size=0;
|
||||
ulong query_cache_size=0;
|
||||
@ -1816,8 +1826,8 @@ extern "C" int my_message_sql(uint error, const char *str,
|
||||
thd->lex.current_select equel to zero if lex structure is not inited
|
||||
(not query command (COM_QUERY))
|
||||
*/
|
||||
if (thd->lex.current_select &&
|
||||
thd->lex.current_select->no_error && !thd->is_fatal_error)
|
||||
if (thd->lex->current_select &&
|
||||
thd->lex->current_select->no_error && !thd->is_fatal_error)
|
||||
{
|
||||
DBUG_PRINT("error", ("above error converted to warning"));
|
||||
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_ERROR, error, str);
|
||||
|
||||
@ -252,3 +252,36 @@
|
||||
"Reference '%-.64s' not supported (%s)",
|
||||
"Every derived table must have it's own alias",
|
||||
"Select %u was reduced during optimisation",
|
||||
"Table '%-.64s' from one of SELECT's can not be used in %-.32s",
|
||||
"Client does not support authentication protocol requested by server; consider upgrading MySQL client",
|
||||
"All parts of a SPATIAL KEY must be NOT NULL",
|
||||
"COLLATION '%s' is not valid for CHARACTER SET '%s'",
|
||||
"The slave was already running",
|
||||
"The slave was already stopped",
|
||||
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
|
||||
"Z_BUF_ERROR: Not enough memory available for zlib",
|
||||
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
|
||||
"Z_DATA_ERROR: Input data was corrupted for zlib",
|
||||
"%d line(s) was(were) cut by group_concat()",
|
||||
"Using storage engine %s for table '%s'",
|
||||
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
|
||||
"Can't drop one or more of the requested users"
|
||||
"Can't revoke all privileges, grant for one or more of the requested users"
|
||||
"Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
|
||||
"Illegal mix of collations for operation '%s'",
|
||||
"Can't create a %s from within another stored routine"
|
||||
"%s %s already exists"
|
||||
"%s %s does not exist"
|
||||
"Failed to DROP %s %s"
|
||||
"Failed to CREATE %s %s"
|
||||
"%s with no matching label: %s"
|
||||
"Redefining label %s"
|
||||
"End-label %s without match"
|
||||
"Referring to uninitialized variable %s"
|
||||
"SELECT in a stored procedure must have INTO"
|
||||
"RETURN is only allowed in a FUNCTION"
|
||||
"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
|
||||
"Query execution was interrupted"
|
||||
"Wrong number of arguments for %s %s, expected %u, got %u"
|
||||
|
||||
@ -260,3 +260,36 @@
|
||||
"Reference '%-.64s' not supported (%s)",
|
||||
"Every derived table must have it's own alias",
|
||||
"Select %u was reduced during optimisation",
|
||||
"Table '%-.64s' from one of SELECT's can not be used in %-.32s",
|
||||
"Client does not support authentication protocol requested by server; consider upgrading MySQL client",
|
||||
"All parts of a SPATIAL KEY must be NOT NULL",
|
||||
"COLLATION '%s' is not valid for CHARACTER SET '%s'",
|
||||
"The slave was already running",
|
||||
"The slave was already stopped",
|
||||
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
|
||||
"Z_BUF_ERROR: Not enough memory available for zlib",
|
||||
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
|
||||
"Z_DATA_ERROR: Input data was corrupted for zlib",
|
||||
"%d line(s) was(were) cut by group_concat()",
|
||||
"Using storage engine %s for table '%s'",
|
||||
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
|
||||
"Can't drop one or more of the requested users"
|
||||
"Can't revoke all privileges, grant for one or more of the requested users"
|
||||
"Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
|
||||
"Illegal mix of collations for operation '%s'",
|
||||
"Can't create a %s from within another stored routine"
|
||||
"%s %s already exists"
|
||||
"%s %s does not exist"
|
||||
"Failed to DROP %s %s"
|
||||
"Failed to CREATE %s %s"
|
||||
"%s with no matching label: %s"
|
||||
"Redefining label %s"
|
||||
"End-label %s without match"
|
||||
"Referring to uninitialized variable %s"
|
||||
"SELECT in a stored procedure must have INTO"
|
||||
"RETURN is only allowed in a FUNCTION"
|
||||
"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
|
||||
"Query execution was interrupted"
|
||||
"Wrong number of arguments for %s %s, expected %u, got %u"
|
||||
|
||||
@ -249,3 +249,41 @@
|
||||
"Reference '%-.64s' not supported (%s)",
|
||||
"Every derived table must have it's own alias",
|
||||
"Select %u was reduced during optimisation",
|
||||
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
|
||||
"Client does not support authentication protocol requested by server; consider upgrading MySQL client"
|
||||
"All parts of a SPATIAL KEY must be NOT NULL"
|
||||
"COLLATION '%s' is not valid for CHARACTER SET '%s'"
|
||||
"The slave was already running"
|
||||
"The slave was already stopped"
|
||||
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)"
|
||||
"Z_BUF_ERROR: Not enough memory available for zlib"
|
||||
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)"
|
||||
"Z_DATA_ERROR: Input data was corrupted for zlib"
|
||||
"%d line(s) was(were) cut by group_concat()"
|
||||
"Record count is fewer than the column count at row %ld";
|
||||
"Record count is more than the column count at row %ld";
|
||||
"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld";
|
||||
"Data truncated, out of range for column '%s' at row %ld";
|
||||
"Data truncated for column '%s' at row %ld"
|
||||
"Using storage engine %s for table '%s'",
|
||||
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
|
||||
"Can't drop one or more of the requested users"
|
||||
"Can't revoke all privileges, grant for one or more of the requested users"
|
||||
"Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
|
||||
"Illegal mix of collations for operation '%s'",
|
||||
"Can't create a %s from within another stored routine"
|
||||
"%s %s already exists"
|
||||
"%s %s does not exist"
|
||||
"Failed to DROP %s %s"
|
||||
"Failed to CREATE %s %s"
|
||||
"%s with no matching label: %s"
|
||||
"Redefining label %s"
|
||||
"End-label %s without match"
|
||||
"Referring to uninitialized variable %s"
|
||||
"SELECT in a stored procedure must have INTO"
|
||||
"RETURN is only allowed in a FUNCTION"
|
||||
"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
|
||||
"Query execution was interrupted"
|
||||
"Wrong number of arguments for %s %s, expected %u, got %u"
|
||||
|
||||
@ -254,3 +254,36 @@
|
||||
"Reference '%-.64s' not supported (%s)",
|
||||
"Every derived table must have it's own alias",
|
||||
"Select %u was reduced during optimisation",
|
||||
"Table '%-.64s' from one of SELECT's can not be used in %-.32s",
|
||||
"Client does not support authentication protocol requested by server; consider upgrading MySQL client",
|
||||
"All parts of a SPATIAL KEY must be NOT NULL",
|
||||
"COLLATION '%s' is not valid for CHARACTER SET '%s'",
|
||||
"The slave was already running",
|
||||
"The slave was already stopped",
|
||||
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
|
||||
"Z_BUF_ERROR: Not enough memory available for zlib",
|
||||
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
|
||||
"Z_DATA_ERROR: Input data was corrupted for zlib",
|
||||
"%d line(s) was(were) cut by group_concat()",
|
||||
"Using storage engine %s for table '%s'",
|
||||
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
|
||||
"Can't drop one or more of the requested users"
|
||||
"Can't revoke all privileges, grant for one or more of the requested users"
|
||||
"Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
|
||||
"Illegal mix of collations for operation '%s'",
|
||||
"Can't create a %s from within another stored routine"
|
||||
"%s %s already exists"
|
||||
"%s %s does not exist"
|
||||
"Failed to DROP %s %s"
|
||||
"Failed to CREATE %s %s"
|
||||
"%s with no matching label: %s"
|
||||
"Redefining label %s"
|
||||
"End-label %s without match"
|
||||
"Referring to uninitialized variable %s"
|
||||
"SELECT in a stored procedure must have INTO"
|
||||
"RETURN is only allowed in a FUNCTION"
|
||||
"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
|
||||
"Query execution was interrupted"
|
||||
"Wrong number of arguments for %s %s, expected %u, got %u"
|
||||
|
||||
@ -249,3 +249,36 @@
|
||||
"Reference '%-.64s' not supported (%s)",
|
||||
"Every derived table must have it's own alias",
|
||||
"Select %u was reduced during optimisation",
|
||||
"Table '%-.64s' from one of SELECT's can not be used in %-.32s",
|
||||
"Client does not support authentication protocol requested by server; consider upgrading MySQL client",
|
||||
"All parts of a SPATIAL KEY must be NOT NULL",
|
||||
"COLLATION '%s' is not valid for CHARACTER SET '%s'",
|
||||
"The slave was already running",
|
||||
"The slave was already stopped",
|
||||
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
|
||||
"Z_BUF_ERROR: Not enough memory available for zlib",
|
||||
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
|
||||
"Z_DATA_ERROR: Input data was corrupted for zlib",
|
||||
"%d line(s) was(were) cut by group_concat()",
|
||||
"Using storage engine %s for table '%s'",
|
||||
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
|
||||
"Can't drop one or more of the requested users"
|
||||
"Can't revoke all privileges, grant for one or more of the requested users"
|
||||
"Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
|
||||
"Illegal mix of collations for operation '%s'",
|
||||
"Can't create a %s from within another stored routine"
|
||||
"%s %s already exists"
|
||||
"%s %s does not exist"
|
||||
"Failed to DROP %s %s"
|
||||
"Failed to CREATE %s %s"
|
||||
"%s with no matching label: %s"
|
||||
"Redefining label %s"
|
||||
"End-label %s without match"
|
||||
"Referring to uninitialized variable %s"
|
||||
"SELECT in a stored procedure must have INTO"
|
||||
"RETURN is only allowed in a FUNCTION"
|
||||
"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
|
||||
"Query execution was interrupted"
|
||||
"Wrong number of arguments for %s %s, expected %u, got %u"
|
||||
|
||||
@ -258,3 +258,36 @@
|
||||
"Referenz '%-.64s' wird nicht unterst<73>tzt (%s)",
|
||||
"F<>r jede abgeleitete Tabelle muss ein eigener Alias angegeben werden.",
|
||||
"Select %u wurde w<>hrend der Optimierung reduziert.",
|
||||
"Tabelle '%-.64s', die in einem der SELECT-Befehle verwendet wurde kann nicht in %-.32s verwendet werden",
|
||||
"Client does not support authentication protocol requested by server; consider upgrading MySQL client",
|
||||
"All parts of a SPATIAL KEY must be NOT NULL",
|
||||
"COLLATION '%s' is not valid for CHARACTER SET '%s'",
|
||||
"The slave was already running",
|
||||
"The slave was already stopped",
|
||||
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
|
||||
"Z_BUF_ERROR: Not enough memory available for zlib",
|
||||
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
|
||||
"Z_DATA_ERROR: Input data was corrupted for zlib",
|
||||
"%d line(s) was(were) cut by group_concat()",
|
||||
"Using storage engine %s for table '%s'",
|
||||
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
|
||||
"Can't drop one or more of the requested users"
|
||||
"Can't revoke all privileges, grant for one or more of the requested users"
|
||||
"Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
|
||||
"Illegal mix of collations for operation '%s'",
|
||||
"Can't create a %s from within another stored routine"
|
||||
"%s %s already exists"
|
||||
"%s %s does not exist"
|
||||
"Failed to DROP %s %s"
|
||||
"Failed to CREATE %s %s"
|
||||
"%s with no matching label: %s"
|
||||
"Redefining label %s"
|
||||
"End-label %s without match"
|
||||
"Referring to uninitialized variable %s"
|
||||
"SELECT in a stored procedure must have INTO"
|
||||
"RETURN is only allowed in a FUNCTION"
|
||||
"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
|
||||
"Query execution was interrupted"
|
||||
"Wrong number of arguments for %s %s, expected %u, got %u"
|
||||
|
||||
@ -249,3 +249,36 @@
|
||||
"Reference '%-.64s' not supported (%s)",
|
||||
"Every derived table must have it's own alias",
|
||||
"Select %u was reduced during optimisation",
|
||||
"Table '%-.64s' from one of SELECT's can not be used in %-.32s",
|
||||
"Client does not support authentication protocol requested by server; consider upgrading MySQL client",
|
||||
"All parts of a SPATIAL KEY must be NOT NULL",
|
||||
"COLLATION '%s' is not valid for CHARACTER SET '%s'",
|
||||
"The slave was already running",
|
||||
"The slave was already stopped",
|
||||
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
|
||||
"Z_BUF_ERROR: Not enough memory available for zlib",
|
||||
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
|
||||
"Z_DATA_ERROR: Input data was corrupted for zlib",
|
||||
"%d line(s) was(were) cut by group_concat()",
|
||||
"Using storage engine %s for table '%s'",
|
||||
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
|
||||
"Can't drop one or more of the requested users"
|
||||
"Can't revoke all privileges, grant for one or more of the requested users"
|
||||
"Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
|
||||
"Illegal mix of collations for operation '%s'",
|
||||
"Can't create a %s from within another stored routine"
|
||||
"%s %s already exists"
|
||||
"%s %s does not exist"
|
||||
"Failed to DROP %s %s"
|
||||
"Failed to CREATE %s %s"
|
||||
"%s with no matching label: %s"
|
||||
"Redefining label %s"
|
||||
"End-label %s without match"
|
||||
"Referring to uninitialized variable %s"
|
||||
"SELECT in a stored procedure must have INTO"
|
||||
"RETURN is only allowed in a FUNCTION"
|
||||
"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
|
||||
"Query execution was interrupted"
|
||||
"Wrong number of arguments for %s %s, expected %u, got %u"
|
||||
|
||||
@ -251,3 +251,36 @@
|
||||
"Reference '%-.64s' not supported (%s)",
|
||||
"Every derived table must have it's own alias",
|
||||
"Select %u was reduced during optimisation",
|
||||
"Table '%-.64s' from one of SELECT's can not be used in %-.32s",
|
||||
"Client does not support authentication protocol requested by server; consider upgrading MySQL client",
|
||||
"All parts of a SPATIAL KEY must be NOT NULL",
|
||||
"COLLATION '%s' is not valid for CHARACTER SET '%s'",
|
||||
"The slave was already running",
|
||||
"The slave was already stopped",
|
||||
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
|
||||
"Z_BUF_ERROR: Not enough memory available for zlib",
|
||||
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
|
||||
"Z_DATA_ERROR: Input data was corrupted for zlib",
|
||||
"%d line(s) was(were) cut by group_concat()",
|
||||
"Using storage engine %s for table '%s'",
|
||||
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
|
||||
"Can't drop one or more of the requested users"
|
||||
"Can't revoke all privileges, grant for one or more of the requested users"
|
||||
"Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
|
||||
"Illegal mix of collations for operation '%s'",
|
||||
"Can't create a %s from within another stored routine"
|
||||
"%s %s already exists"
|
||||
"%s %s does not exist"
|
||||
"Failed to DROP %s %s"
|
||||
"Failed to CREATE %s %s"
|
||||
"%s with no matching label: %s"
|
||||
"Redefining label %s"
|
||||
"End-label %s without match"
|
||||
"Referring to uninitialized variable %s"
|
||||
"SELECT in a stored procedure must have INTO"
|
||||
"RETURN is only allowed in a FUNCTION"
|
||||
"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
|
||||
"Query execution was interrupted"
|
||||
"Wrong number of arguments for %s %s, expected %u, got %u"
|
||||
|
||||
@ -249,3 +249,36 @@
|
||||
"Reference '%-.64s' not supported (%s)",
|
||||
"Every derived table must have it's own alias",
|
||||
"Select %u was reduced during optimisation",
|
||||
"Table '%-.64s' from one of SELECT's can not be used in %-.32s",
|
||||
"Client does not support authentication protocol requested by server; consider upgrading MySQL client",
|
||||
"All parts of a SPATIAL KEY must be NOT NULL",
|
||||
"COLLATION '%s' is not valid for CHARACTER SET '%s'",
|
||||
"The slave was already running",
|
||||
"The slave was already stopped",
|
||||
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
|
||||
"Z_BUF_ERROR: Not enough memory available for zlib",
|
||||
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
|
||||
"Z_DATA_ERROR: Input data was corrupted for zlib",
|
||||
"%d line(s) was(were) cut by group_concat()",
|
||||
"Using storage engine %s for table '%s'",
|
||||
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
|
||||
"Can't drop one or more of the requested users"
|
||||
"Can't revoke all privileges, grant for one or more of the requested users"
|
||||
"Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
|
||||
"Illegal mix of collations for operation '%s'",
|
||||
"Can't create a %s from within another stored routine"
|
||||
"%s %s already exists"
|
||||
"%s %s does not exist"
|
||||
"Failed to DROP %s %s"
|
||||
"Failed to CREATE %s %s"
|
||||
"%s with no matching label: %s"
|
||||
"Redefining label %s"
|
||||
"End-label %s without match"
|
||||
"Referring to uninitialized variable %s"
|
||||
"SELECT in a stored procedure must have INTO"
|
||||
"RETURN is only allowed in a FUNCTION"
|
||||
"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
|
||||
"Query execution was interrupted"
|
||||
"Wrong number of arguments for %s %s, expected %u, got %u"
|
||||
|
||||
@ -251,3 +251,36 @@
|
||||
"Reference '%-.64s' not supported (%s)",
|
||||
"Every derived table must have it's own alias",
|
||||
"Select %u was reduced during optimisation",
|
||||
"Table '%-.64s' from one of SELECT's can not be used in %-.32s",
|
||||
"Client does not support authentication protocol requested by server; consider upgrading MySQL client",
|
||||
"All parts of a SPATIAL KEY must be NOT NULL",
|
||||
"COLLATION '%s' is not valid for CHARACTER SET '%s'",
|
||||
"The slave was already running",
|
||||
"The slave was already stopped",
|
||||
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
|
||||
"Z_BUF_ERROR: Not enough memory available for zlib",
|
||||
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
|
||||
"Z_DATA_ERROR: Input data was corrupted for zlib",
|
||||
"%d line(s) was(were) cut by group_concat()",
|
||||
"Using storage engine %s for table '%s'",
|
||||
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
|
||||
"Can't drop one or more of the requested users"
|
||||
"Can't revoke all privileges, grant for one or more of the requested users"
|
||||
"Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
|
||||
"Illegal mix of collations for operation '%s'",
|
||||
"Can't create a %s from within another stored routine"
|
||||
"%s %s already exists"
|
||||
"%s %s does not exist"
|
||||
"Failed to DROP %s %s"
|
||||
"Failed to CREATE %s %s"
|
||||
"%s with no matching label: %s"
|
||||
"Redefining label %s"
|
||||
"End-label %s without match"
|
||||
"Referring to uninitialized variable %s"
|
||||
"SELECT in a stored procedure must have INTO"
|
||||
"RETURN is only allowed in a FUNCTION"
|
||||
"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
|
||||
"Query execution was interrupted"
|
||||
"Wrong number of arguments for %s %s, expected %u, got %u"
|
||||
|
||||
@ -249,3 +249,36 @@
|
||||
"Reference '%-.64s' not supported (%s)",
|
||||
"Every derived table must have it's own alias",
|
||||
"Select %u was reduced during optimisation",
|
||||
"Table '%-.64s' from one of SELECT's can not be used in %-.32s",
|
||||
"Client does not support authentication protocol requested by server; consider upgrading MySQL client",
|
||||
"All parts of a SPATIAL KEY must be NOT NULL",
|
||||
"COLLATION '%s' is not valid for CHARACTER SET '%s'",
|
||||
"The slave was already running",
|
||||
"The slave was already stopped",
|
||||
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
|
||||
"Z_BUF_ERROR: Not enough memory available for zlib",
|
||||
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
|
||||
"Z_DATA_ERROR: Input data was corrupted for zlib",
|
||||
"%d line(s) was(were) cut by group_concat()",
|
||||
"Using storage engine %s for table '%s'",
|
||||
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
|
||||
"Can't drop one or more of the requested users"
|
||||
"Can't revoke all privileges, grant for one or more of the requested users"
|
||||
"Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
|
||||
"Illegal mix of collations for operation '%s'",
|
||||
"Can't create a %s from within another stored routine"
|
||||
"%s %s already exists"
|
||||
"%s %s does not exist"
|
||||
"Failed to DROP %s %s"
|
||||
"Failed to CREATE %s %s"
|
||||
"%s with no matching label: %s"
|
||||
"Redefining label %s"
|
||||
"End-label %s without match"
|
||||
"Referring to uninitialized variable %s"
|
||||
"SELECT in a stored procedure must have INTO"
|
||||
"RETURN is only allowed in a FUNCTION"
|
||||
"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
|
||||
"Query execution was interrupted"
|
||||
"Wrong number of arguments for %s %s, expected %u, got %u"
|
||||
|
||||
@ -251,3 +251,36 @@
|
||||
"Reference '%-.64s' not supported (%s)",
|
||||
"Every derived table must have it's own alias",
|
||||
"Select %u was reduced during optimisation",
|
||||
"Table '%-.64s' from one of SELECT's can not be used in %-.32s",
|
||||
"Client does not support authentication protocol requested by server; consider upgrading MySQL client",
|
||||
"All parts of a SPATIAL KEY must be NOT NULL",
|
||||
"COLLATION '%s' is not valid for CHARACTER SET '%s'",
|
||||
"The slave was already running",
|
||||
"The slave was already stopped",
|
||||
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
|
||||
"Z_BUF_ERROR: Not enough memory available for zlib",
|
||||
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
|
||||
"Z_DATA_ERROR: Input data was corrupted for zlib",
|
||||
"%d line(s) was(were) cut by group_concat()",
|
||||
"Using storage engine %s for table '%s'",
|
||||
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
|
||||
"Can't drop one or more of the requested users"
|
||||
"Can't revoke all privileges, grant for one or more of the requested users"
|
||||
"Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
|
||||
"Illegal mix of collations for operation '%s'",
|
||||
"Can't create a %s from within another stored routine"
|
||||
"%s %s already exists"
|
||||
"%s %s does not exist"
|
||||
"Failed to DROP %s %s"
|
||||
"Failed to CREATE %s %s"
|
||||
"%s with no matching label: %s"
|
||||
"Redefining label %s"
|
||||
"End-label %s without match"
|
||||
"Referring to uninitialized variable %s"
|
||||
"SELECT in a stored procedure must have INTO"
|
||||
"RETURN is only allowed in a FUNCTION"
|
||||
"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
|
||||
"Query execution was interrupted"
|
||||
"Wrong number of arguments for %s %s, expected %u, got %u"
|
||||
|
||||
@ -251,3 +251,36 @@
|
||||
"Reference '%-.64s' not supported (%s)",
|
||||
"Every derived table must have it's own alias",
|
||||
"Select %u was reduced during optimisation",
|
||||
"Table '%-.64s' from one of SELECT's can not be used in %-.32s",
|
||||
"Client does not support authentication protocol requested by server; consider upgrading MySQL client",
|
||||
"All parts of a SPATIAL KEY must be NOT NULL",
|
||||
"COLLATION '%s' is not valid for CHARACTER SET '%s'",
|
||||
"The slave was already running",
|
||||
"The slave was already stopped",
|
||||
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
|
||||
"Z_BUF_ERROR: Not enough memory available for zlib",
|
||||
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
|
||||
"Z_DATA_ERROR: Input data was corrupted for zlib",
|
||||
"%d line(s) was(were) cut by group_concat()",
|
||||
"Using storage engine %s for table '%s'",
|
||||
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
|
||||
"Can't drop one or more of the requested users"
|
||||
"Can't revoke all privileges, grant for one or more of the requested users"
|
||||
"Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
|
||||
"Illegal mix of collations for operation '%s'",
|
||||
"Can't create a %s from within another stored routine"
|
||||
"%s %s already exists"
|
||||
"%s %s does not exist"
|
||||
"Failed to DROP %s %s"
|
||||
"Failed to CREATE %s %s"
|
||||
"%s with no matching label: %s"
|
||||
"Redefining label %s"
|
||||
"End-label %s without match"
|
||||
"Referring to uninitialized variable %s"
|
||||
"SELECT in a stored procedure must have INTO"
|
||||
"RETURN is only allowed in a FUNCTION"
|
||||
"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
|
||||
"Query execution was interrupted"
|
||||
"Wrong number of arguments for %s %s, expected %u, got %u"
|
||||
|
||||
@ -253,3 +253,36 @@
|
||||
"Reference '%-.64s' not supported (%s)",
|
||||
"Every derived table must have it's own alias",
|
||||
"Select %u was reduced during optimisation",
|
||||
"Table '%-.64s' from one of SELECT's can not be used in %-.32s",
|
||||
"Client does not support authentication protocol requested by server; consider upgrading MySQL client",
|
||||
"All parts of a SPATIAL KEY must be NOT NULL",
|
||||
"COLLATION '%s' is not valid for CHARACTER SET '%s'",
|
||||
"The slave was already running",
|
||||
"The slave was already stopped",
|
||||
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
|
||||
"Z_BUF_ERROR: Not enough memory available for zlib",
|
||||
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
|
||||
"Z_DATA_ERROR: Input data was corrupted for zlib",
|
||||
"%d line(s) was(were) cut by group_concat()",
|
||||
"Using storage engine %s for table '%s'",
|
||||
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
|
||||
"Can't drop one or more of the requested users"
|
||||
"Can't revoke all privileges, grant for one or more of the requested users"
|
||||
"Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
|
||||
"Illegal mix of collations for operation '%s'",
|
||||
"Can't create a %s from within another stored routine"
|
||||
"%s %s already exists"
|
||||
"%s %s does not exist"
|
||||
"Failed to DROP %s %s"
|
||||
"Failed to CREATE %s %s"
|
||||
"%s with no matching label: %s"
|
||||
"Redefining label %s"
|
||||
"End-label %s without match"
|
||||
"Referring to uninitialized variable %s"
|
||||
"SELECT in a stored procedure must have INTO"
|
||||
"RETURN is only allowed in a FUNCTION"
|
||||
"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
|
||||
"Query execution was interrupted"
|
||||
"Wrong number of arguments for %s %s, expected %u, got %u"
|
||||
|
||||
@ -219,3 +219,66 @@
|
||||
"N<>o pode acrescentar uma restri<72><69>o de chave estrangeira",
|
||||
"N<>o pode acrescentar uma linha filha: uma restri<72><69>o de chave estrangeira falhou",
|
||||
"N<>o pode apagar uma linha pai: uma restri<72><69>o de chave estrangeira falhou",
|
||||
"Erro connectando para o master: %-.128s",
|
||||
"Erro rodando consulta no master: %-.128s",
|
||||
"Erro quando executando comando %s: %-.128s",
|
||||
"Uso errado de %s e %s",
|
||||
"Os comandos SELECT usados t<>m diferentes n<>meros de colunas",
|
||||
"N<>o pode executar a consulta porque voc<6F> tem um conflitante travamento de leitura",
|
||||
"Combina<6E><61>o de tabelas transacionais e n<>o transacionais est<73> desativada",
|
||||
"Op<4F><70>o '%s' usada duas vezes no comando",
|
||||
"Usu<73>rio '%-.64s' h<> excedido o '%s' de recursos (atual valor: %ld)",
|
||||
"Acesso negado. Voc<6F> necessita o privil<69>gio %-.128s para essa opera<72><61>o",
|
||||
"Vari<72>vel '%-.64s' <20> uma LOCAL vari<72>vel e n<>o pode ser usada com SET GLOBAL",
|
||||
"Vari<72>vel '%-.64s' <20> uma GLOBAL vari<72>vel e deve ser configurada com SET GLOBAL",
|
||||
"Vari<72>vel '%-.64s' n<>o tem um valor default (padr<64>o)",
|
||||
"Vari<72>vel '%-.64s' n<>o pode ser configurada para o valor de '%-.64s'",
|
||||
"Tipo de argumento errado para a vari<72>vel '%-.64s'",
|
||||
"Vari<72>vel '%-.64s' somente pode ser configurada, n<>o lida",
|
||||
"Uso/localiza<7A><61>o errada de '%s'",
|
||||
"Esta vers<72>o de MySQL n<>o suporta ainda '%s'",
|
||||
"Obteve fatal error %d: '%-.128s' a partir do master quando lendo dados do binary log",
|
||||
"Defini<6E><69>o errada da chave estrangeira para '%-.64s': %s",
|
||||
"Refer<65>ncia da chave e refer<65>ncia da tabela n<>o coincidem",
|
||||
"Error de cardinalidade (mais/menos que %d colunas)",
|
||||
"Subconsulta retorna mais que 1 registro",
|
||||
"Desconhecido manipulador de declara<72><61>o preparado (%ld) determinado para %s",
|
||||
"Banco de dado de ajuda corrupto ou n<>o existente",
|
||||
"Refer<65>ncia c<>clica em subconsultas",
|
||||
"Convertendo coluna '%s' de %s para %s",
|
||||
"Refer<65>ncia '%-.64s' n<>o suportada (%s)",
|
||||
"Cada tabela derivada deve ter seu pr<70>prio alias",
|
||||
"Select %u foi reduzido durante otimiza<7A><61>o",
|
||||
"Tabela '%-.64s' de um dos SELECT's n<>o pode ser usada em %-.32s",
|
||||
"Cliente n<>o suporta o protocolo de autentica<63><61>o exigido pelo servidor; considere a atualiza<7A><61>o deo cliente MySQL",
|
||||
"Todas as partes de uma SPATIAL KEY devem ser NOT NULL",
|
||||
"COLLATION '%s' n<>o <20> v<>lida para CHARACTER SET '%s'",
|
||||
"O slave j<> est<73> rodando",
|
||||
"O slave j<> est<73> parado",
|
||||
"Tamanho muito grande dos dados des comprimidos. O m<>ximo tamanho <20> %d. (provavelmente, o comprimento dos dados descomprimidos est<73> corrupto)",
|
||||
"Z_BUF_ERROR: N<>o suficiente mem<65>ria dispon<6F>vel para zlib",
|
||||
"Z_MEM_ERROR: N<>o suficiente espa<70>o no buffer emissor para zlib (provavelmente, o comprimento dos dados descomprimidos est<73> corrupto)",
|
||||
"Z_DATA_ERROR: Dados de entrada est<73> corrupto para zlib",
|
||||
"%d linha(s) foi(foram) cortada(s) por group_concat()",
|
||||
"Usando engine de armazenamento %s para tabela '%s'",
|
||||
"Combina<6E><61>o ilegal de collations (%s,%s) e (%s,%s) para opera<72><61>o '%s'",
|
||||
"Can't drop one or more of the requested users"
|
||||
"Can't revoke all privileges, grant for one or more of the requested users"
|
||||
"Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
|
||||
"Illegal mix of collations for operation '%s'",
|
||||
"Can't create a %s from within another stored routine"
|
||||
"%s %s already exists"
|
||||
"%s %s does not exist"
|
||||
"Failed to DROP %s %s"
|
||||
"Failed to CREATE %s %s"
|
||||
"%s with no matching label: %s"
|
||||
"Redefining label %s"
|
||||
"End-label %s without match"
|
||||
"Referring to uninitialized variable %s"
|
||||
"SELECT in a stored procedure must have INTO"
|
||||
"RETURN is only allowed in a FUNCTION"
|
||||
"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
|
||||
"Query execution was interrupted"
|
||||
"Wrong number of arguments for %s %s, expected %u, got %u"
|
||||
|
||||
@ -251,3 +251,36 @@
|
||||
"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%-.64s' <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (%s)",
|
||||
"Every derived table must have it's own alias",
|
||||
"Select %u <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
|
||||
"Table '%-.64s' from one of SELECT's can not be used in %-.32s",
|
||||
"Client does not support authentication protocol requested by server; consider upgrading MySQL client",
|
||||
"All parts of a SPATIAL KEY must be NOT NULL",
|
||||
"COLLATION '%s' is not valid for CHARACTER SET '%s'",
|
||||
"The slave was already running",
|
||||
"The slave was already stopped",
|
||||
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
|
||||
"Z_BUF_ERROR: Not enough memory available for zlib",
|
||||
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
|
||||
"Z_DATA_ERROR: Input data was corrupted for zlib",
|
||||
"%d line(s) was(were) cut by group_concat()",
|
||||
"Using storage engine %s for table '%s'",
|
||||
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
|
||||
"Can't drop one or more of the requested users"
|
||||
"Can't revoke all privileges, grant for one or more of the requested users"
|
||||
"Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
|
||||
"Illegal mix of collations for operation '%s'",
|
||||
"Can't create a %s from within another stored routine"
|
||||
"%s %s already exists"
|
||||
"%s %s does not exist"
|
||||
"Failed to DROP %s %s"
|
||||
"Failed to CREATE %s %s"
|
||||
"%s with no matching label: %s"
|
||||
"Redefining label %s"
|
||||
"End-label %s without match"
|
||||
"Referring to uninitialized variable %s"
|
||||
"SELECT in a stored procedure must have INTO"
|
||||
"RETURN is only allowed in a FUNCTION"
|
||||
"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
|
||||
"Query execution was interrupted"
|
||||
"Wrong number of arguments for %s %s, expected %u, got %u"
|
||||
|
||||
@ -245,3 +245,36 @@
|
||||
"Reference '%-.64s' not supported (%s)",
|
||||
"Every derived table must have it's own alias",
|
||||
"Select %u was reduced during optimisation",
|
||||
"Table '%-.64s' from one of SELECT's can not be used in %-.32s",
|
||||
"Client does not support authentication protocol requested by server; consider upgrading MySQL client",
|
||||
"All parts of a SPATIAL KEY must be NOT NULL",
|
||||
"COLLATION '%s' is not valid for CHARACTER SET '%s'",
|
||||
"The slave was already running",
|
||||
"The slave was already stopped",
|
||||
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
|
||||
"Z_BUF_ERROR: Not enough memory available for zlib",
|
||||
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
|
||||
"Z_DATA_ERROR: Input data was corrupted for zlib",
|
||||
"%d line(s) was(were) cut by group_concat()",
|
||||
"Using storage engine %s for table '%s'",
|
||||
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
|
||||
"Can't drop one or more of the requested users"
|
||||
"Can't revoke all privileges, grant for one or more of the requested users"
|
||||
"Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
|
||||
"Illegal mix of collations for operation '%s'",
|
||||
"Can't create a %s from within another stored routine"
|
||||
"%s %s already exists"
|
||||
"%s %s does not exist"
|
||||
"Failed to DROP %s %s"
|
||||
"Failed to CREATE %s %s"
|
||||
"%s with no matching label: %s"
|
||||
"Redefining label %s"
|
||||
"End-label %s without match"
|
||||
"Referring to uninitialized variable %s"
|
||||
"SELECT in a stored procedure must have INTO"
|
||||
"RETURN is only allowed in a FUNCTION"
|
||||
"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
|
||||
"Query execution was interrupted"
|
||||
"Wrong number of arguments for %s %s, expected %u, got %u"
|
||||
|
||||
@ -257,3 +257,36 @@
|
||||
"Reference '%-.64s' not supported (%s)",
|
||||
"Every derived table must have it's own alias",
|
||||
"Select %u was reduced during optimisation",
|
||||
"Table '%-.64s' from one of SELECT's can not be used in %-.32s",
|
||||
"Client does not support authentication protocol requested by server; consider upgrading MySQL client",
|
||||
"All parts of a SPATIAL KEY must be NOT NULL",
|
||||
"COLLATION '%s' is not valid for CHARACTER SET '%s'",
|
||||
"The slave was already running",
|
||||
"The slave was already stopped",
|
||||
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
|
||||
"Z_BUF_ERROR: Not enough memory available for zlib",
|
||||
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
|
||||
"Z_DATA_ERROR: Input data was corrupted for zlib",
|
||||
"%d line(s) was(were) cut by group_concat()",
|
||||
"Using storage engine %s for table '%s'",
|
||||
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
|
||||
"Can't drop one or more of the requested users"
|
||||
"Can't revoke all privileges, grant for one or more of the requested users"
|
||||
"Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
|
||||
"Illegal mix of collations for operation '%s'",
|
||||
"Can't create a %s from within another stored routine"
|
||||
"%s %s already exists"
|
||||
"%s %s does not exist"
|
||||
"Failed to DROP %s %s"
|
||||
"Failed to CREATE %s %s"
|
||||
"%s with no matching label: %s"
|
||||
"Redefining label %s"
|
||||
"End-label %s without match"
|
||||
"Referring to uninitialized variable %s"
|
||||
"SELECT in a stored procedure must have INTO"
|
||||
"RETURN is only allowed in a FUNCTION"
|
||||
"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
|
||||
"Query execution was interrupted"
|
||||
"Wrong number of arguments for %s %s, expected %u, got %u"
|
||||
|
||||
@ -250,3 +250,36 @@
|
||||
"Reference '%-.64s' not supported (%s)",
|
||||
"Every derived table must have it's own alias",
|
||||
"Select %u was reduced during optimisation",
|
||||
"Table '%-.64s' from one of SELECT's can not be used in %-.32s",
|
||||
"Client does not support authentication protocol requested by server; consider upgrading MySQL client",
|
||||
"All parts of a SPATIAL KEY must be NOT NULL",
|
||||
"COLLATION '%s' is not valid for CHARACTER SET '%s'",
|
||||
"The slave was already running",
|
||||
"The slave was already stopped",
|
||||
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
|
||||
"Z_BUF_ERROR: Not enough memory available for zlib",
|
||||
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
|
||||
"Z_DATA_ERROR: Input data was corrupted for zlib",
|
||||
"%d line(s) was(were) cut by group_concat()",
|
||||
"Using storage engine %s for table '%s'",
|
||||
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
|
||||
"Can't drop one or more of the requested users"
|
||||
"Can't revoke all privileges, grant for one or more of the requested users"
|
||||
"Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
|
||||
"Illegal mix of collations for operation '%s'",
|
||||
"Can't create a %s from within another stored routine"
|
||||
"%s %s already exists"
|
||||
"%s %s does not exist"
|
||||
"Failed to DROP %s %s"
|
||||
"Failed to CREATE %s %s"
|
||||
"%s with no matching label: %s"
|
||||
"Redefining label %s"
|
||||
"End-label %s without match"
|
||||
"Referring to uninitialized variable %s"
|
||||
"SELECT in a stored procedure must have INTO"
|
||||
"RETURN is only allowed in a FUNCTION"
|
||||
"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
|
||||
"Query execution was interrupted"
|
||||
"Wrong number of arguments for %s %s, expected %u, got %u"
|
||||
|
||||
@ -249,3 +249,36 @@
|
||||
"Referens '%-.64s' st<73>ds inte (%s)",
|
||||
"Varje 'derived table' m<>ste ha sitt eget alias",
|
||||
"Select %u reducerades vid optimiering",
|
||||
"Tabell '%-.64s' fr<66>n en SELECT kan inte anv<6E>ndas i %-.32s",
|
||||
"Klienten st<73>der inte autentiseringsprotokollet som beg<65>rts av servern; <20>verv<72>g uppgradering av klientprogrammet.",
|
||||
"Alla delar av en SPATIAL KEY m<>ste vara NOT NULL",
|
||||
"COLLATION '%s' <20>r inte till<6C>tet f<>r CHARACTER SET '%s'",
|
||||
"Slaven har redan startat",
|
||||
"Slaven har redan stoppat",
|
||||
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
|
||||
"Z_BUF_ERROR: Not enough memory available for zlib",
|
||||
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
|
||||
"Z_DATA_ERROR: Input data was corrupted for zlib",
|
||||
"%d rad(er) kapades av group_concat()",
|
||||
"Anv<6E>nder handler %s f<>r tabell '%s'",
|
||||
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
|
||||
"Can't drop one or more of the requested users"
|
||||
"Can't revoke all privileges, grant for one or more of the requested users"
|
||||
"Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
|
||||
"Illegal mix of collations for operation '%s'",
|
||||
"Can't create a %s from within another stored routine"
|
||||
"%s %s already exists"
|
||||
"%s %s does not exist"
|
||||
"Failed to DROP %s %s"
|
||||
"Failed to CREATE %s %s"
|
||||
"%s with no matching label: %s"
|
||||
"Redefining label %s"
|
||||
"End-label %s without match"
|
||||
"Referring to uninitialized variable %s"
|
||||
"SELECT in a stored procedure must have INTO"
|
||||
"RETURN is only allowed in a FUNCTION"
|
||||
"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
|
||||
"Query execution was interrupted"
|
||||
"Wrong number of arguments for %s %s, expected %u, got %u"
|
||||
|
||||
@ -254,3 +254,36 @@
|
||||
"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%-.64s' <20><> <20>i<EFBFBD><69><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (%s)",
|
||||
"Every derived table must have it's own alias",
|
||||
"Select %u was <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>i<EFBFBD><69><EFBFBD>ii",
|
||||
"Table '%-.64s' from one of SELECT's can not be used in %-.32s",
|
||||
"Client does not support authentication protocol requested by server; consider upgrading MySQL client",
|
||||
"All parts of a SPATIAL KEY must be NOT NULL",
|
||||
"COLLATION '%s' is not valid for CHARACTER SET '%s'",
|
||||
"The slave was already running",
|
||||
"The slave was already stopped",
|
||||
"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
|
||||
"Z_BUF_ERROR: Not enough memory available for zlib",
|
||||
"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
|
||||
"Z_DATA_ERROR: Input data was corrupted for zlib",
|
||||
"%d line(s) was(were) cut by group_concat()",
|
||||
"Using storage engine %s for table '%s'",
|
||||
"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
|
||||
"Can't drop one or more of the requested users"
|
||||
"Can't revoke all privileges, grant for one or more of the requested users"
|
||||
"Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
|
||||
"Illegal mix of collations for operation '%s'",
|
||||
"Can't create a %s from within another stored routine"
|
||||
"%s %s already exists"
|
||||
"%s %s does not exist"
|
||||
"Failed to DROP %s %s"
|
||||
"Failed to CREATE %s %s"
|
||||
"%s with no matching label: %s"
|
||||
"Redefining label %s"
|
||||
"End-label %s without match"
|
||||
"Referring to uninitialized variable %s"
|
||||
"SELECT in a stored procedure must have INTO"
|
||||
"RETURN is only allowed in a FUNCTION"
|
||||
"Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION"
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
|
||||
"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
|
||||
"Query execution was interrupted"
|
||||
"Wrong number of arguments for %s %s, expected %u, got %u"
|
||||
|
||||
@ -192,7 +192,7 @@ db_create_routine(THD *thd, int type,
|
||||
ret= SP_OPEN_TABLE_FAILED;
|
||||
else
|
||||
{
|
||||
restore_record(table, 2); // Get default values for fields
|
||||
restore_record(table, default_values); // Get default values for fields
|
||||
strxmov(creator, thd->user, "@", thd->host_or_ip, NullS);
|
||||
|
||||
table->field[0]->store(name, namelen, system_charset_info);
|
||||
|
||||
@ -2151,7 +2151,7 @@ int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds)
|
||||
DBUG_ENTER("setup_conds");
|
||||
thd->set_query_id=1;
|
||||
|
||||
thd->lex.current_select->cond_count= 0;
|
||||
thd->lex->current_select->cond_count= 0;
|
||||
if (*conds)
|
||||
{
|
||||
thd->where="where clause";
|
||||
@ -2169,7 +2169,7 @@ int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds)
|
||||
if (table->on_expr->fix_fields(thd, tables, &table->on_expr) ||
|
||||
table->on_expr->check_cols(1))
|
||||
DBUG_RETURN(1);
|
||||
thd->lex.current_select->cond_count++;
|
||||
thd->lex->current_select->cond_count++;
|
||||
|
||||
/* If it's a normal join, add the ON/USING expression to the WHERE */
|
||||
if (!table->outer_join)
|
||||
@ -2215,7 +2215,7 @@ int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds)
|
||||
}
|
||||
}
|
||||
cond_and->used_tables_cache= t1->map | t2->map;
|
||||
thd->lex.current_select->cond_count+=cond_and->list.elements;
|
||||
thd->lex->current_select->cond_count+=cond_and->list.elements;
|
||||
if (!table->outer_join) // Not left join
|
||||
{
|
||||
if (!(*conds=and_conds(*conds, cond_and)))
|
||||
|
||||
@ -761,7 +761,7 @@ void Query_cache::store_query(THD *thd, TABLE_LIST *tables_used)
|
||||
uint8 tables_type= 0;
|
||||
|
||||
if ((local_tables = is_cacheable(thd, thd->query_length,
|
||||
thd->query, &thd->lex, tables_used,
|
||||
thd->query, thd->lex, tables_used,
|
||||
&tables_type)))
|
||||
{
|
||||
NET *net= &thd->net;
|
||||
|
||||
@ -1423,7 +1423,6 @@ void select_insert::send_error(uint errcode,const char *err)
|
||||
{
|
||||
if (last_insert_id)
|
||||
thd->insert_id(last_insert_id); // For binary log
|
||||
mysql_update_log.write(thd,thd->query,thd->query_length);
|
||||
if (mysql_bin_log.is_open())
|
||||
{
|
||||
Query_log_event qinfo(thd, thd->query, thd->query_length,
|
||||
@ -1455,7 +1454,6 @@ bool select_insert::send_eof()
|
||||
if (last_insert_id)
|
||||
thd->insert_id(last_insert_id); // For binary log
|
||||
/* Write to binlog before commiting transaction */
|
||||
mysql_update_log.write(thd,thd->query,thd->query_length);
|
||||
if (mysql_bin_log.is_open())
|
||||
{
|
||||
Query_log_event qinfo(thd, thd->query, thd->query_length,
|
||||
|
||||
@ -1073,7 +1073,7 @@ bool do_command(THD *thd)
|
||||
indicator of uninitialized lex => normal flow of errors handling
|
||||
(see my_message_sql)
|
||||
*/
|
||||
thd->lex.current_select= 0;
|
||||
thd->lex->current_select= 0;
|
||||
|
||||
packet=0;
|
||||
old_timeout=net->read_timeout;
|
||||
@ -2275,7 +2275,6 @@ mysql_execute_command(THD *thd)
|
||||
/* ! we write after unlocking the table */
|
||||
if (!res && !lex->no_write_to_binlog)
|
||||
{
|
||||
mysql_update_log.write(thd, thd->query, thd->query_length);
|
||||
if (mysql_bin_log.is_open())
|
||||
{
|
||||
Query_log_event qinfo(thd, thd->query, thd->query_length, 0);
|
||||
@ -2301,7 +2300,6 @@ mysql_execute_command(THD *thd)
|
||||
/* ! we write after unlocking the table */
|
||||
if (!res && !lex->no_write_to_binlog)
|
||||
{
|
||||
mysql_update_log.write(thd, thd->query, thd->query_length);
|
||||
if (mysql_bin_log.is_open())
|
||||
{
|
||||
Query_log_event qinfo(thd, thd->query, thd->query_length, 0);
|
||||
@ -2340,7 +2338,6 @@ mysql_execute_command(THD *thd)
|
||||
/* ! we write after unlocking the table */
|
||||
if (!res && !lex->no_write_to_binlog)
|
||||
{
|
||||
mysql_update_log.write(thd, thd->query, thd->query_length);
|
||||
if (mysql_bin_log.is_open())
|
||||
{
|
||||
Query_log_event qinfo(thd, thd->query, thd->query_length, 0);
|
||||
@ -2941,13 +2938,13 @@ mysql_execute_command(THD *thd)
|
||||
res= -1;
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
case SQLCOM_DROP_USER:
|
||||
{
|
||||
if (check_access(thd, GRANT_ACL,"mysql",0,1))
|
||||
break;
|
||||
if (!(res= mysql_drop_user(thd, lex->users_list)))
|
||||
{
|
||||
mysql_update_log.write(thd, thd->query, thd->query_length);
|
||||
if (mysql_bin_log.is_open())
|
||||
{
|
||||
Query_log_event qinfo(thd, thd->query, thd->query_length, 0);
|
||||
@ -2963,7 +2960,6 @@ mysql_execute_command(THD *thd)
|
||||
break;
|
||||
if (!(res = mysql_revoke_all(thd, lex->users_list)))
|
||||
{
|
||||
mysql_update_log.write(thd, thd->query, thd->query_length);
|
||||
if (mysql_bin_log.is_open())
|
||||
{
|
||||
Query_log_event qinfo(thd, thd->query, thd->query_length, 0);
|
||||
@ -3074,7 +3070,6 @@ mysql_execute_command(THD *thd)
|
||||
*/
|
||||
if (!lex->no_write_to_binlog && write_to_binlog)
|
||||
{
|
||||
mysql_update_log.write(thd, thd->query, thd->query_length);
|
||||
if (mysql_bin_log.is_open())
|
||||
{
|
||||
Query_log_event qinfo(thd, thd->query, thd->query_length, 0);
|
||||
|
||||
@ -444,8 +444,8 @@ JOIN::optimize()
|
||||
optimized= 1;
|
||||
|
||||
// Ignore errors of execution if option IGNORE present
|
||||
if (thd->lex.duplicates == DUP_IGNORE)
|
||||
thd->lex.current_select->no_error= 1;
|
||||
if (thd->lex->duplicates == DUP_IGNORE)
|
||||
thd->lex->current_select->no_error= 1;
|
||||
#ifdef HAVE_REF_TO_FIELDS // Not done yet
|
||||
/* Add HAVING to WHERE if possible */
|
||||
if (having && !group_list && !sum_func_count)
|
||||
@ -2256,7 +2256,7 @@ update_ref_and_keys(THD *thd, DYNAMIC_ARRAY *keyuse,JOIN_TAB *join_tab,
|
||||
|
||||
if (!(key_fields=(KEY_FIELD*)
|
||||
thd->alloc(sizeof(key_fields[0])*
|
||||
(thd->lex.current_select->cond_count+1)*2)))
|
||||
(thd->lex->current_select->cond_count+1)*2)))
|
||||
return TRUE; /* purecov: inspected */
|
||||
and_level=0; end=key_fields;
|
||||
if (cond)
|
||||
|
||||
@ -385,7 +385,7 @@ int mysql_update(THD *thd,
|
||||
|
||||
err:
|
||||
delete select;
|
||||
free_underlaid_joins(thd, &thd->lex.select_lex);
|
||||
free_underlaid_joins(thd, &thd->lex->select_lex);
|
||||
if (table->key_read)
|
||||
{
|
||||
table->key_read=0;
|
||||
|
||||
Reference in New Issue
Block a user