diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-12-08 18:47:21 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-12-08 18:47:21 +0200 |
| commit | 1c4a8872ebbe47b0f10adc5caa849461b383e549 (patch) | |
| tree | f13ef41527db2e97c71d633c7e230084edaca873 | |
| parent | 9a3e46c520e857c9e32eebc612fe00991dcc5fe3 (diff) | |
| download | mariadb-git-1c4a8872ebbe47b0f10adc5caa849461b383e549.tar.gz | |
Bug #58350: 5.5.7-rc compile failed at sp_head.cc
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
| -rw-r--r-- | sql/sp_head.cc | 2 | ||||
| -rw-r--r-- | sql/sql_connect.cc | 2 | ||||
| -rw-r--r-- | sql/sql_cursor.cc | 2 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 8 | ||||
| -rw-r--r-- | sql/sql_prepare.cc | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 2f165310c28..6017541266b 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -3159,7 +3159,7 @@ sp_instr_stmt::exec_core(THD *thd, uint *nextp) MYSQL_QUERY_EXEC_START(thd->query(), thd->thread_id, (char *) (thd->db ? thd->db : ""), - thd->security_ctx->priv_user, + &thd->security_ctx->priv_user[0], (char *)thd->security_ctx->host_or_ip, 3); int res= mysql_execute_command(thd); diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc index a47493b7d0d..9799ae14b2f 100644 --- a/sql/sql_connect.cc +++ b/sql/sql_connect.cc @@ -736,7 +736,7 @@ void do_handle_one_connection(THD *thd_arg) if (rc) 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); prepare_new_connection_state(thd); diff --git a/sql/sql_cursor.cc b/sql/sql_cursor.cc index acc591f1ea2..f607936d5b9 100644 --- a/sql/sql_cursor.cc +++ b/sql/sql_cursor.cc @@ -111,7 +111,7 @@ int mysql_open_cursor(THD *thd, select_result *result, MYSQL_QUERY_EXEC_START(thd->query(), thd->thread_id, (char *) (thd->db ? thd->db : ""), - thd->security_ctx->priv_user, + &thd->security_ctx->priv_user[0], (char *) thd->security_ctx->host_or_ip, 2); rc= mysql_execute_command(thd); diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index cdeaeee18c1..dff6510817f 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -877,7 +877,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, thd->profiling.start_new_query(); #endif 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); thd->command=command; @@ -1018,7 +1018,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, break; // fatal error is set MYSQL_QUERY_START(thd->query(), thd->thread_id, (char *) (thd->db ? thd->db : ""), - thd->security_ctx->priv_user, + &thd->security_ctx->priv_user[0], (char *) thd->security_ctx->host_or_ip); char *packet_end= thd->query() + thd->query_length(); /* '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, (char *) (thd->db ? thd->db : ""), - thd->security_ctx->priv_user, + &thd->security_ctx->priv_user[0], (char *) thd->security_ctx->host_or_ip); 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(), thd->thread_id, (char *) (thd->db ? thd->db : ""), - thd->security_ctx->priv_user, + &thd->security_ctx->priv_user[0], (char *) thd->security_ctx->host_or_ip, 0); diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 345f7158dbf..f319c0fdd8b 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -3759,7 +3759,7 @@ bool Prepared_statement::execute(String *expanded_query, bool open_cursor) MYSQL_QUERY_EXEC_START(thd->query(), thd->thread_id, (char *) (thd->db ? thd->db : ""), - thd->security_ctx->priv_user, + &thd->security_ctx->priv_user[0], (char *) thd->security_ctx->host_or_ip, 1); error= mysql_execute_command(thd); |