database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Fix automerge: use 'thd->query()' instead of 'thd->query'.

Browse Source
This commit is contained in:
Alexander Nozdrin
2009-11-05 17:51:00 +03:00
parent cbe94583c2
commit 3cf6345535
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/sql_parse.cc
View File

@@ -1220,7 +1220,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
{
if (alloc_query(thd, packet, packet_length))
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 : ""),
thd->security_ctx->priv_user,
(char *) thd->security_ctx->host_or_ip);
@@ -3085,7 +3085,7 @@ end_with_restore_list:
goto error;
DBUG_ASSERT(select_lex->offset_limit == 0);
unit->set_limit(select_lex);
MYSQL_UPDATE_START(thd->query);
MYSQL_UPDATE_START(thd->query());
res= (up_result= mysql_update(thd, all_tables,
select_lex->item_list,
lex->value_list,
@@ -3159,7 +3159,7 @@ end_with_restore_list:
#endif
{
multi_update *result_obj;
MYSQL_MULTI_UPDATE_START(thd->query);
MYSQL_MULTI_UPDATE_START(thd->query());
res= mysql_multi_update(thd, all_tables,
&select_lex->item_list,
&lex->value_list,
@@ -3227,7 +3227,7 @@ end_with_restore_list:
res= 1;
break;
}
MYSQL_INSERT_START(thd->query);
MYSQL_INSERT_START(thd->query());
res= mysql_insert(thd, all_tables, lex->field_list, lex->many_values,
lex->update_list, lex->value_list,
lex->duplicates, lex->ignore);
@@ -3269,7 +3269,7 @@ end_with_restore_list:
}
if (!(res= open_and_lock_tables(thd, all_tables)))
{
MYSQL_INSERT_SELECT_START(thd->query);
MYSQL_INSERT_SELECT_START(thd->query());
/* Skip first table, which is the table we are inserting in */
TABLE_LIST *second_table= first_table->next_local;
select_lex->table_list.first= (uchar*) second_table;
@@ -3355,7 +3355,7 @@ end_with_restore_list:
res= 1;
break;
}
MYSQL_DELETE_START(thd->query);
MYSQL_DELETE_START(thd->query());
res = mysql_delete(thd, all_tables, select_lex->where,
&select_lex->order_list,
unit->select_limit_cnt, select_lex->options,
@@ -3390,7 +3390,7 @@ end_with_restore_list:
if ((res= open_and_lock_tables(thd, all_tables)))
break;
MYSQL_MULTI_DELETE_START(thd->query);
MYSQL_MULTI_DELETE_START(thd->query());
if ((res= mysql_multi_delete_prepare(thd)))
{
MYSQL_MULTI_DELETE_DONE(1, 0);
@@ -6031,7 +6031,7 @@ void mysql_parse(THD *thd, const char *inBuf, uint length,
thd->server_status|= SERVER_MORE_RESULTS_EXISTS;
}
lex->set_trg_event_type_for_tables();
MYSQL_QUERY_EXEC_START(thd->query,
MYSQL_QUERY_EXEC_START(thd->query(),
thd->thread_id,
(char *) (thd->db ? thd->db : ""),
thd->security_ctx->priv_user,
@@ -7896,7 +7896,7 @@ bool parse_sql(THD *thd,
bool ret_value;
DBUG_ASSERT(thd->m_parser_state == NULL);
MYSQL_QUERY_PARSE_START(thd->query);
MYSQL_QUERY_PARSE_START(thd->query());
/* Backup creation context. */
Object_creation_ctx *backup_ctx= NULL;