1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug #58350: 5.5.7-rc compile failed at sp_head.cc

Browse Source 
Fixed the references to security_ctx->priv_user
to be real char * pointers instead of a C array name reference.
This is somehow important for some 3d party 
dtrace replacements
This commit is contained in:
Georgi Kodinov 2010-12-08 18:47:21 +02:00
parent 9a3e46c520
commit 1c4a8872eb
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sp_head.cc
View File

@ -3159,7 +3159,7 @@ sp_instr_stmt::exec_core(THD *thd, uint *nextp)
MYSQL_QUERY_EXEC_START(thd->query(), MYSQL_QUERY_EXEC_START(thd->query(),
thd->thread_id, thd->thread_id,
(char *) (thd->db ? thd->db : ""), (char *) (thd->db ? thd->db : ""),
thd->security_ctx->priv_user, &thd->security_ctx->priv_user[0],
(char *)thd->security_ctx->host_or_ip, (char *)thd->security_ctx->host_or_ip,
3); 3);
int res= mysql_execute_command(thd); int res= mysql_execute_command(thd);

2
sql/sql_connect.cc
View File

@ -736,7 +736,7 @@ void do_handle_one_connection(THD *thd_arg)
if (rc) if (rc)
goto end_thread; goto end_thread;
MYSQL_CONNECTION_START(thd->thread_id, thd->security_ctx->priv_user, MYSQL_CONNECTION_START(thd->thread_id, &thd->security_ctx->priv_user[0],
(char *) thd->security_ctx->host_or_ip); (char *) thd->security_ctx->host_or_ip);
prepare_new_connection_state(thd); prepare_new_connection_state(thd);

2
sql/sql_cursor.cc
View File

@ -111,7 +111,7 @@ int mysql_open_cursor(THD *thd, select_result *result,
MYSQL_QUERY_EXEC_START(thd->query(), MYSQL_QUERY_EXEC_START(thd->query(),
thd->thread_id, thd->thread_id,
(char *) (thd->db ? thd->db : ""), (char *) (thd->db ? thd->db : ""),
thd->security_ctx->priv_user, &thd->security_ctx->priv_user[0],
(char *) thd->security_ctx->host_or_ip, (char *) thd->security_ctx->host_or_ip,
2); 2);
rc= mysql_execute_command(thd); rc= mysql_execute_command(thd);

8
sql/sql_parse.cc
View File

@ -877,7 +877,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
thd->profiling.start_new_query(); thd->profiling.start_new_query();
#endif #endif
MYSQL_COMMAND_START(thd->thread_id, command, MYSQL_COMMAND_START(thd->thread_id, command,
thd->security_ctx->priv_user, &thd->security_ctx->priv_user[0],
(char *) thd->security_ctx->host_or_ip); (char *) thd->security_ctx->host_or_ip);
thd->command=command; thd->command=command;
@ -1018,7 +1018,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
break; // fatal error is set break; // fatal error is set
MYSQL_QUERY_START(thd->query(), thd->thread_id, MYSQL_QUERY_START(thd->query(), thd->thread_id,
(char *) (thd->db ? thd->db : ""), (char *) (thd->db ? thd->db : ""),
thd->security_ctx->priv_user, &thd->security_ctx->priv_user[0],
(char *) thd->security_ctx->host_or_ip); (char *) thd->security_ctx->host_or_ip);
char *packet_end= thd->query() + thd->query_length(); char *packet_end= thd->query() + thd->query_length();
/* 'b' stands for 'buffer' parameter', special for 'my_snprintf' */ /* 'b' stands for 'buffer' parameter', special for 'my_snprintf' */
@ -1070,7 +1070,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
MYSQL_QUERY_START(beginning_of_next_stmt, thd->thread_id, MYSQL_QUERY_START(beginning_of_next_stmt, thd->thread_id,
(char *) (thd->db ? thd->db : ""), (char *) (thd->db ? thd->db : ""),
thd->security_ctx->priv_user, &thd->security_ctx->priv_user[0],
(char *) thd->security_ctx->host_or_ip); (char *) thd->security_ctx->host_or_ip);
thd->set_query_and_id(beginning_of_next_stmt, length, thd->set_query_and_id(beginning_of_next_stmt, length,
@ -5489,7 +5489,7 @@ void mysql_parse(THD *thd, char *rawbuf, uint length,
MYSQL_QUERY_EXEC_START(thd->query(), MYSQL_QUERY_EXEC_START(thd->query(),
thd->thread_id, thd->thread_id,
(char *) (thd->db ? thd->db : ""), (char *) (thd->db ? thd->db : ""),
thd->security_ctx->priv_user, &thd->security_ctx->priv_user[0],
(char *) thd->security_ctx->host_or_ip, (char *) thd->security_ctx->host_or_ip,
0); 0);

2
sql/sql_prepare.cc
View File

@ -3759,7 +3759,7 @@ bool Prepared_statement::execute(String *expanded_query, bool open_cursor)
MYSQL_QUERY_EXEC_START(thd->query(), MYSQL_QUERY_EXEC_START(thd->query(),
thd->thread_id, thd->thread_id,
(char *) (thd->db ? thd->db : ""), (char *) (thd->db ? thd->db : ""),
thd->security_ctx->priv_user, &thd->security_ctx->priv_user[0],
(char *) thd->security_ctx->host_or_ip, (char *) thd->security_ctx->host_or_ip,
1); 1);
error= mysql_execute_command(thd); error= mysql_execute_command(thd);