Commit eee5b972 authored by unknown's avatar unknown

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-bugteam

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-bugteam

parents 97354b19 290b6c00
...@@ -34,6 +34,6 @@ END| ...@@ -34,6 +34,6 @@ END|
INSERT INTO t2 VALUES (2),(10+bug23333()); INSERT INTO t2 VALUES (2),(10+bug23333());
SHOW MASTER STATUS; SHOW MASTER STATUS;
File Position Binlog_Do_DB Binlog_Ignore_DB File Position Binlog_Do_DB Binlog_Ignore_DB
# 184136 # 184141
DROP FUNCTION bug23333; DROP FUNCTION bug23333;
DROP TABLE t1, t2; DROP TABLE t1, t2;
...@@ -34,12 +34,12 @@ Log_name Pos Event_type Server_id End_log_pos Info ...@@ -34,12 +34,12 @@ Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 362 Query 1 528 use `test`; CREATE TABLE t4 (s1 CHAR(50) CHARACTER SET latin1, master-bin.000001 362 Query 1 528 use `test`; CREATE TABLE t4 (s1 CHAR(50) CHARACTER SET latin1,
s2 CHAR(50) CHARACTER SET cp932, s2 CHAR(50) CHARACTER SET cp932,
d DECIMAL(10,2)) d DECIMAL(10,2))
master-bin.000001 528 Query 1 776 use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE bug18293 (IN ins1 CHAR(50), master-bin.000001 528 Query 1 777 use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE `bug18293`(IN ins1 CHAR(50),
IN ins2 CHAR(50) CHARACTER SET cp932, IN ins2 CHAR(50) CHARACTER SET cp932,
IN ind DECIMAL(10,2)) IN ind DECIMAL(10,2))
BEGIN BEGIN
INSERT INTO t4 VALUES (ins1, ins2, ind); INSERT INTO t4 VALUES (ins1, ins2, ind);
END END
master-bin.000001 776 Query 1 987 use `test`; INSERT INTO t4 VALUES ( NAME_CONST('ins1',_latin1 0x466F6F2773206120426172), NAME_CONST('ins2',_cp932 0xED40ED41ED42), NAME_CONST('ind',47.93)) master-bin.000001 777 Query 1 988 use `test`; INSERT INTO t4 VALUES ( NAME_CONST('ins1',_latin1 0x466F6F2773206120426172), NAME_CONST('ins2',_cp932 0xED40ED41ED42), NAME_CONST('ind',47.93))
master-bin.000001 987 Query 1 1076 use `test`; DROP PROCEDURE bug18293 master-bin.000001 988 Query 1 1077 use `test`; DROP PROCEDURE bug18293
master-bin.000001 1076 Query 1 1155 use `test`; DROP TABLE t4 master-bin.000001 1077 Query 1 1156 use `test`; DROP TABLE t4
...@@ -268,7 +268,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq ...@@ -268,7 +268,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq
SET @@session.sql_mode=0/*!*/; SET @@session.sql_mode=0/*!*/;
/*!\C latin1 *//*!*/; /*!\C latin1 *//*!*/;
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/; SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
CREATE DEFINER=`root`@`localhost` procedure p1() CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`()
begin begin
select 1; select 1;
end end
......
This diff is collapsed.
...@@ -577,3 +577,55 @@ set global log_bin_trust_function_creators=0; ...@@ -577,3 +577,55 @@ set global log_bin_trust_function_creators=0;
drop database mysqltest; drop database mysqltest;
drop database mysqltest2; drop database mysqltest2;
sync_slave_with_master; sync_slave_with_master;
#
# Bug#36570: Parse error of CREATE PROCEDURE stmt with comments on slave
#
connection master;
use test;
delimiter |;
/*!50001 create procedure `mysqltestbug36570_p1`() */
begin
select 1;
end|
use mysql|
create procedure test.` mysqltestbug36570_p2`(/*!50001 a int*/)`label`:
begin
select a;
end|
/*!50001 create function test.mysqltestbug36570_f1() */
returns int
/*!50001 deterministic */
begin
return 3;
end|
use test|
delimiter ;|
--replace_column 5 t 6 t
show procedure status like '%mysqltestbug36570%';
show create procedure ` mysqltestbug36570_p2`;
sync_slave_with_master;
connection slave;
--replace_column 5 t 6 t
show procedure status like '%mysqltestbug36570%';
show create procedure ` mysqltestbug36570_p2`;
call ` mysqltestbug36570_p2`(42);
--replace_column 5 t 6 t
show function status like '%mysqltestbug36570%';
connection master;
flush logs;
--replace_regex s/$MYSQL_TEST_DIR/MYSQL_TEST_DIR/ s/TIMESTAMP=[0-9]*/TIMESTAMP=t/
--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000001
use test;
drop procedure mysqltestbug36570_p1;
drop procedure ` mysqltestbug36570_p2`;
drop function mysqltestbug36570_f1;
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
static bool static bool
create_string(THD *thd, String *buf, create_string(THD *thd, String *buf,
int sp_type, int sp_type,
sp_name *name, const char *db, ulong dblen,
const char *name, ulong namelen,
const char *params, ulong paramslen, const char *params, ulong paramslen,
const char *returns, ulong returnslen, const char *returns, ulong returnslen,
const char *body, ulong bodylen, const char *body, ulong bodylen,
...@@ -427,7 +428,8 @@ db_load_routine(THD *thd, int type, sp_name *name, sp_head **sphp, ...@@ -427,7 +428,8 @@ db_load_routine(THD *thd, int type, sp_name *name, sp_head **sphp,
if (!create_string(thd, &defstr, if (!create_string(thd, &defstr,
type, type,
name, NULL, 0,
name->m_name.str, name->m_name.length,
params, strlen(params), params, strlen(params),
returns, strlen(returns), returns, strlen(returns),
body, strlen(body), body, strlen(body),
...@@ -518,6 +520,7 @@ db_create_routine(THD *thd, int type, sp_head *sp) ...@@ -518,6 +520,7 @@ db_create_routine(THD *thd, int type, sp_head *sp)
DBUG_ENTER("db_create_routine"); DBUG_ENTER("db_create_routine");
DBUG_PRINT("enter", ("type: %d name: %.*s",type,sp->m_name.length, DBUG_PRINT("enter", ("type: %d name: %.*s",type,sp->m_name.length,
sp->m_name.str)); sp->m_name.str));
String retstr(64);
if (!(table= open_proc_table_for_update(thd))) if (!(table= open_proc_table_for_update(thd)))
ret= SP_OPEN_TABLE_FAILED; ret= SP_OPEN_TABLE_FAILED;
...@@ -568,7 +571,6 @@ db_create_routine(THD *thd, int type, sp_head *sp) ...@@ -568,7 +571,6 @@ db_create_routine(THD *thd, int type, sp_head *sp)
store(sp->m_params.str, sp->m_params.length, system_charset_info); store(sp->m_params.str, sp->m_params.length, system_charset_info);
if (sp->m_type == TYPE_ENUM_FUNCTION) if (sp->m_type == TYPE_ENUM_FUNCTION)
{ {
String retstr(64);
sp_returns_type(thd, retstr, sp); sp_returns_type(thd, retstr, sp);
table->field[MYSQL_PROC_FIELD_RETURNS]-> table->field[MYSQL_PROC_FIELD_RETURNS]->
store(retstr.ptr(), retstr.length(), system_charset_info); store(retstr.ptr(), retstr.length(), system_charset_info);
...@@ -625,13 +627,21 @@ db_create_routine(THD *thd, int type, sp_head *sp) ...@@ -625,13 +627,21 @@ db_create_routine(THD *thd, int type, sp_head *sp)
String log_query; String log_query;
log_query.set_charset(system_charset_info); log_query.set_charset(system_charset_info);
log_query.append(STRING_WITH_LEN("CREATE "));
append_definer(thd, &log_query, &thd->lex->definer->user, if (!create_string(thd, &log_query,
&thd->lex->definer->host); sp->m_type,
log_query.append(thd->lex->stmt_definition_begin, (sp->m_explicit_name ? sp->m_db.str : NULL),
(char *)sp->m_body_begin - (sp->m_explicit_name ? sp->m_db.length : 0),
thd->lex->stmt_definition_begin + sp->m_name.str, sp->m_name.length,
sp->m_body.length); sp->m_params.str, sp->m_params.length,
retstr.c_ptr(), retstr.length(),
sp->m_body.str, sp->m_body.length,
sp->m_chistics, &(thd->lex->definer->user),
&(thd->lex->definer->host)))
{
ret= SP_INTERNAL_ERROR;
goto done;
}
/* Such a statement can always go directly to binlog, no trans cache */ /* Such a statement can always go directly to binlog, no trans cache */
Query_log_event qinfo(thd, log_query.c_ptr(), log_query.length(), 0, Query_log_event qinfo(thd, log_query.c_ptr(), log_query.length(), 0,
...@@ -1798,7 +1808,8 @@ sp_cache_routines_and_add_tables_for_triggers(THD *thd, LEX *lex, ...@@ -1798,7 +1808,8 @@ sp_cache_routines_and_add_tables_for_triggers(THD *thd, LEX *lex,
static bool static bool
create_string(THD *thd, String *buf, create_string(THD *thd, String *buf,
int type, int type,
sp_name *name, const char *db, ulong dblen,
const char *name, ulong namelen,
const char *params, ulong paramslen, const char *params, ulong paramslen,
const char *returns, ulong returnslen, const char *returns, ulong returnslen,
const char *body, ulong bodylen, const char *body, ulong bodylen,
...@@ -1807,7 +1818,7 @@ create_string(THD *thd, String *buf, ...@@ -1807,7 +1818,7 @@ create_string(THD *thd, String *buf,
const LEX_STRING *definer_host) const LEX_STRING *definer_host)
{ {
/* Make some room to begin with */ /* Make some room to begin with */
if (buf->alloc(100 + name->m_qname.length + paramslen + returnslen + bodylen + if (buf->alloc(100 + dblen + 1 + namelen + paramslen + returnslen + bodylen +
chistics->comment.length + 10 /* length of " DEFINER= "*/ + chistics->comment.length + 10 /* length of " DEFINER= "*/ +
USER_HOST_BUFF_SIZE)) USER_HOST_BUFF_SIZE))
return FALSE; return FALSE;
...@@ -1818,7 +1829,12 @@ create_string(THD *thd, String *buf, ...@@ -1818,7 +1829,12 @@ create_string(THD *thd, String *buf,
buf->append(STRING_WITH_LEN("FUNCTION ")); buf->append(STRING_WITH_LEN("FUNCTION "));
else else
buf->append(STRING_WITH_LEN("PROCEDURE ")); buf->append(STRING_WITH_LEN("PROCEDURE "));
append_identifier(thd, buf, name->m_name.str, name->m_name.length); if (dblen > 0)
{
append_identifier(thd, buf, db, dblen);
buf->append('.');
}
append_identifier(thd, buf, name, namelen);
buf->append('('); buf->append('(');
buf->append(params, paramslen); buf->append(params, paramslen);
buf->append(')'); buf->append(')');
......
...@@ -522,6 +522,8 @@ sp_head::init(LEX *lex) ...@@ -522,6 +522,8 @@ sp_head::init(LEX *lex)
m_qname.str= NULL; m_qname.str= NULL;
m_qname.length= 0; m_qname.length= 0;
m_explicit_name= false;
m_db.str= NULL; m_db.str= NULL;
m_db.length= 0; m_db.length= 0;
...@@ -564,6 +566,8 @@ sp_head::init_sp_name(THD *thd, sp_name *spname) ...@@ -564,6 +566,8 @@ sp_head::init_sp_name(THD *thd, sp_name *spname)
m_name.str= strmake_root(thd->mem_root, spname->m_name.str, m_name.str= strmake_root(thd->mem_root, spname->m_name.str,
spname->m_name.length); spname->m_name.length);
m_explicit_name= spname->m_explicit_name;
if (spname->m_qname.length == 0) if (spname->m_qname.length == 0)
spname->init_qname(thd); spname->init_qname(thd);
......
...@@ -121,6 +121,7 @@ class sp_head :private Query_arena ...@@ -121,6 +121,7 @@ class sp_head :private Query_arena
st_sp_chistics *m_chistics; st_sp_chistics *m_chistics;
ulong m_sql_mode; // For SHOW CREATE and execution ulong m_sql_mode; // For SHOW CREATE and execution
LEX_STRING m_qname; // db.name LEX_STRING m_qname; // db.name
bool m_explicit_name; /**< Prepend the db name? */
/** /**
Key representing routine in the set of stored routines used by statement. Key representing routine in the set of stored routines used by statement.
[routine_type]db.name\0 [routine_type]db.name\0
......
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