Skip to content

M
mariadb
Commit f106d973 authored by kostja@dipika.(none)'s avatar kostja@dipika.(none)
Browse files
Options

Rename send_ok to my_ok. Similarly to my_error, it only records the status, 

does not send it to the client.
parent d8e6308c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 111 deletions
sql/protocol.cc
View file @ f106d973
......@@ -112,8 +112,6 @@ void net_send_error(THD *thd, uint sql_errno, const char *err)
- message : Stored as packed length (1-9 bytes) + message.
Is not stored if no message.
If net->no_send_ok return without sending packet.
@param thd Thread handler
@param affected_rows Number of rows changed by statement
@param id Auto_increment id for first row (if used)
......@@ -128,7 +126,7 @@ net_send_ok(THD *thd,
{
NET *net= &thd->net;
uchar buff[MYSQL_ERRMSG_SIZE+10],*pos;
DBUG_ENTER("send_ok");
DBUG_ENTER("my_ok");
if (! net->vio) // hack for re-parsing queries
{
......@@ -425,8 +423,8 @@ void net_end_statement(THD *thd)
/****************************************************************************
Functions used by the protocol functions (like send_ok) to store strings
and numbers in the header result packet.
Functions used by the protocol functions (like net_send_ok) to store
strings and numbers in the header result packet.
****************************************************************************/
/* The following will only be used for short strings < 65K */
......
sql/repl_failsafe.cc
View file @ f106d973
......@@ -1011,7 +1011,7 @@ err:
mysql_close(&mysql); // safe to call since we always do mysql_init()
if (!error)
send_ok(thd);
my_ok(thd);
return error;
}
......
sql/sql_acl.cc
View file @ f106d973
......@@ -3176,7 +3176,7 @@ bool mysql_table_grant(THD *thd, TABLE_LIST *table_list,
rw_unlock(&LOCK_grant);
if (!result) /* success */
send_ok(thd);
my_ok(thd);
/* Tables are automatically closed */
thd->lex->restore_backup_query_tables_list(&backup);
......@@ -3344,7 +3344,7 @@ bool mysql_routine_grant(THD *thd, TABLE_LIST *table_list, bool is_proc,
rw_unlock(&LOCK_grant);
if (!result && !no_error)
send_ok(thd);
my_ok(thd);
/* Tables are automatically closed */
DBUG_RETURN(result);
......@@ -3460,7 +3460,7 @@ bool mysql_grant(THD *thd, const char *db, List <LEX_USER> &list,
close_thread_tables(thd);
if (!result)
send_ok(thd);
my_ok(thd);
DBUG_RETURN(result);
}
......
sql/sql_binlog.cc
View file @ f106d973
......@@ -231,7 +231,7 @@ void mysql_client_binlog_statement(THD* thd)
DBUG_PRINT("info",("binlog base64 execution finished successfully"));
send_ok(thd);
my_ok(thd);
end:
thd->rli_fake->clear_tables_to_lock();
......
sql/sql_class.cc
View file @ f106d973
......@@ -1583,7 +1583,7 @@ bool select_to_file::send_eof()
function, SELECT INTO has to have an own SQLCOM.
TODO: split from SQLCOM_SELECT
*/
::send_ok(thd,row_count);
::my_ok(thd,row_count);
}
file= -1;
return error;
......@@ -2533,7 +2533,7 @@ bool select_dumpvar::send_eof()
function, SELECT INTO has to have an own SQLCOM.
TODO: split from SQLCOM_SELECT
*/
::send_ok(thd,row_count);
::my_ok(thd,row_count);
return 0;
}
......
sql/sql_class.h
View file @ f106d973
......@@ -993,7 +993,7 @@ public:
{
/** The area is cleared at start of a statement. */
DA_EMPTY= 0,
/** Set whenever one calls send_ok(). */
/** Set whenever one calls my_ok(). */
DA_OK,
/** Set whenever one calls send_eof(). */
DA_EOF,
......@@ -2141,7 +2141,7 @@ private:
/** A short cut for thd->main_da.set_ok_status(). */
inline void
send_ok(THD *thd, ha_rows affected_rows= 0, ulonglong id= 0,
my_ok(THD *thd, ha_rows affected_rows= 0, ulonglong id= 0,
const char *message= NULL)
{
thd->main_da.set_ok_status(thd, affected_rows, id, message);
......
sql/sql_connect.cc
View file @ f106d973
......@@ -334,7 +334,7 @@ check_user(THD *thd, enum enum_server_command command,
if (mysql_change_db(thd, &db_str, FALSE))
DBUG_RETURN(1);
}
send_ok(thd);
my_ok(thd);
DBUG_RETURN(0);
#else
......@@ -483,7 +483,7 @@ check_user(THD *thd, enum enum_server_command command,
DBUG_RETURN(1);
}
}
send_ok(thd);
my_ok(thd);
thd->password= test(passwd_len); // remember for error messages
/* Ready to handle queries */
DBUG_RETURN(0);
......
sql/sql_db.cc
View file @ f106d973
......@@ -595,7 +595,7 @@ CHARSET_INFO *get_default_db_collation(THD *thd, const char *db_name)
In this case the entry should not be logged.
SIDE-EFFECTS
1. Report back to client that command succeeded (send_ok)
1. Report back to client that command succeeded (my_ok)
2. Report errors to client
3. Log event to binary log
(The 'silent' flags turns off 1 and 3.)
......@@ -660,7 +660,7 @@ bool mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info,
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
ER_DB_CREATE_EXISTS, ER(ER_DB_CREATE_EXISTS), db);
if (!silent)
send_ok(thd);
my_ok(thd);
error= 0;
goto exit;
}
......@@ -749,7 +749,7 @@ bool mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info,
/* These DDL methods and logging protected with LOCK_mysql_create_db */
mysql_bin_log.write(&qinfo);
}
send_ok(thd, result);
my_ok(thd, result);
}
exit:
......@@ -826,7 +826,7 @@ bool mysql_alter_db(THD *thd, const char *db, HA_CREATE_INFO *create_info)
/* These DDL methods and logging protected with LOCK_mysql_create_db */
mysql_bin_log.write(&qinfo);
}
send_ok(thd, result);
my_ok(thd, result);
exit:
VOID(pthread_mutex_unlock(&LOCK_mysql_create_db));
......@@ -960,7 +960,7 @@ bool mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent)
}
thd->clear_error();
thd->server_status|= SERVER_STATUS_DB_DROPPED;
send_ok(thd, (ulong) deleted);
my_ok(thd, (ulong) deleted);
thd->server_status&= ~SERVER_STATUS_DB_DROPPED;
}
else if (mysql_bin_log.is_open())
......
sql/sql_delete.cc
View file @ f106d973
......@@ -158,7 +158,7 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
{
free_underlaid_joins(thd, select_lex);
thd->row_count_func= 0;
send_ok(thd, (ha_rows) thd->row_count_func); // No matching records
my_ok(thd, (ha_rows) thd->row_count_func); // No matching records
DBUG_RETURN(0);
}
#endif
......@@ -175,7 +175,7 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
delete select;
free_underlaid_joins(thd, select_lex);
thd->row_count_func= 0;
send_ok(thd, (ha_rows) thd->row_count_func);
my_ok(thd, (ha_rows) thd->row_count_func);
/*
We don't need to call reset_auto_increment in this case, because
mysql_truncate always gives a NULL conds argument, hence we never
......@@ -391,7 +391,7 @@ cleanup:
if (error < 0 || (thd->lex->ignore && !thd->is_fatal_error))
{
thd->row_count_func= deleted;
send_ok(thd, (ha_rows) thd->row_count_func);
my_ok(thd, (ha_rows) thd->row_count_func);
DBUG_PRINT("info",("%ld records deleted",(long) deleted));
}
DBUG_RETURN(error >= 0 || thd->is_error());
......@@ -919,7 +919,7 @@ bool multi_delete::send_eof()
if (!local_error)
{
thd->row_count_func= deleted;
::send_ok(thd, (ha_rows) thd->row_count_func);
::my_ok(thd, (ha_rows) thd->row_count_func);
}
return 0;
}
......@@ -973,7 +973,7 @@ bool mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok)
my_free((char*) table,MYF(0));
/*
If we return here we will not have logged the truncation to the bin log
and we will not send_ok() to the client.
and we will not my_ok() to the client.
*/
goto end;
}
......@@ -1019,7 +1019,7 @@ end:
we don't test current_stmt_binlog_row_based.
*/
write_bin_log(thd, TRUE, thd->query, thd->query_length);
send_ok(thd); // This should return record count
my_ok(thd); // This should return record count
}
VOID(pthread_mutex_lock(&LOCK_open));
unlock_table_name(thd, table_list);
......
sql/sql_do.cc
View file @ f106d973
......@@ -39,6 +39,6 @@ bool mysql_do(THD *thd, List<Item> &values)
ha_autocommit_or_rollback(thd, thd->is_error());
thd->clear_error(); // DO always is OK
}
send_ok(thd);
my_ok(thd);
DBUG_RETURN(FALSE);
}
sql/sql_handler.cc
View file @ f106d973
......@@ -298,7 +298,7 @@ bool mysql_ha_open(THD *thd, TABLE_LIST *tables, bool reopen)
tables->table->open_by_handler= 1;
if (! reopen)
send_ok(thd);
my_ok(thd);
DBUG_PRINT("exit",("OK"));
DBUG_RETURN(FALSE);
......@@ -350,7 +350,7 @@ bool mysql_ha_close(THD *thd, TABLE_LIST *tables)
DBUG_RETURN(TRUE);
}
send_ok(thd);
my_ok(thd);
DBUG_PRINT("exit", ("OK"));
DBUG_RETURN(FALSE);
}
......
sql/sql_insert.cc
View file @ f106d973
......@@ -946,7 +946,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
thd->row_count_func= info.copied + info.deleted +
((thd->client_capabilities & CLIENT_FOUND_ROWS) ?
info.touched : info.updated);
send_ok(thd, (ulong) thd->row_count_func, id);
my_ok(thd, (ulong) thd->row_count_func, id);
}
else
{
......@@ -961,7 +961,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
sprintf(buff, ER(ER_INSERT_INFO), (ulong) info.records,
(ulong) (info.deleted + updated), (ulong) thd->cuted_fields);
thd->row_count_func= info.copied + info.deleted + updated;
::send_ok(thd, (ulong) thd->row_count_func, id, buff);
::my_ok(thd, (ulong) thd->row_count_func, id, buff);
}
thd->abort_on_warning= 0;
DBUG_RETURN(FALSE);
......@@ -3162,7 +3162,7 @@ bool select_insert::send_eof()
(thd->arg_of_last_insert_id_function ?
thd->first_successful_insert_id_in_prev_stmt :
(info.copied ? autoinc_value_of_last_inserted_row : 0));
::send_ok(thd, (ulong) thd->row_count_func, id, buff);
::my_ok(thd, (ulong) thd->row_count_func, id, buff);
DBUG_RETURN(0);
}
......
sql/sql_load.cc
View file @ f106d973
......@@ -509,7 +509,7 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
#endif /*!EMBEDDED_LIBRARY*/
/* ok to client sent only after binlog write and engine commit */
send_ok(thd, info.copied + info.deleted, 0L, name);
my_ok(thd, info.copied + info.deleted, 0L, name);
err:
DBUG_ASSERT(transactional_table || !(info.copied || info.deleted) ||
thd->transaction.stmt.modified_non_trans_table);
......
sql/sql_parse.cc
View file @ f106d973
This diff is collapsed.
sql/sql_partition.cc
View file @ f106d973
......@@ -3995,7 +3995,7 @@ static int fast_end_partition(THD *thd, ulonglong copied,
(ulong) (copied + deleted),
(ulong) deleted,
(ulong) 0);
send_ok(thd, (ha_rows) (copied+deleted),0L, tmp_name);
my_ok(thd, (ha_rows) (copied+deleted),0L, tmp_name);
DBUG_RETURN(FALSE);
}
......
sql/sql_prepare.cc
View file @ f106d973
......@@ -2111,7 +2111,7 @@ void mysql_sql_stmt_prepare(THD *thd)
thd->stmt_map.erase(stmt);
}
else
send_ok(thd, 0L, 0L, "Statement prepared");
my_ok(thd, 0L, 0L, "Statement prepared");
DBUG_VOID_RETURN;
}
......@@ -2494,7 +2494,7 @@ void mysql_stmt_reset(THD *thd, char *packet)
stmt->state= Query_arena::PREPARED;
send_ok(thd);
my_ok(thd);
DBUG_VOID_RETURN;
}
......@@ -2557,7 +2557,7 @@ void mysql_sql_stmt_close(THD *thd)
}
if (stmt->deallocate() == 0)
send_ok(thd);
my_ok(thd);
}
/**
......
sql/sql_rename.cc
View file @ f106d973
......@@ -178,7 +178,7 @@ bool mysql_rename_tables(THD *thd, TABLE_LIST *table_list, bool silent)
if (!silent && !error)
{
write_bin_log(thd, TRUE, thd->query, thd->query_length);
send_ok(thd);
my_ok(thd);
}
if (!error)
......
sql/sql_repl.cc
View file @ f106d973
......@@ -252,7 +252,7 @@ bool purge_error_message(THD* thd, int res)
my_message(errmsg, ER(errmsg), MYF(0));
return TRUE;
}
send_ok(thd);
my_ok(thd);
return FALSE;
}
......@@ -262,7 +262,7 @@ bool purge_master_logs(THD* thd, const char* to_log)
char search_file_name[FN_REFLEN];
if (!mysql_bin_log.is_open())
{
send_ok(thd);
my_ok(thd);
return FALSE;
}
......@@ -277,7 +277,7 @@ bool purge_master_logs_before_date(THD* thd, time_t purge_time)
{
if (!mysql_bin_log.is_open())
{
send_ok(thd);
my_ok(thd);
return 0;
}
return purge_error_message(thd,
......@@ -884,7 +884,7 @@ int start_slave(THD* thd , Master_info* mi, bool net_report)
DBUG_RETURN(1);
}
else if (net_report)
send_ok(thd);
my_ok(thd);
DBUG_RETURN(0);
}
......@@ -936,7 +936,7 @@ int stop_slave(THD* thd, Master_info* mi, bool net_report )
DBUG_RETURN(1);
}
else if (net_report)
send_ok(thd);
my_ok(thd);
DBUG_RETURN(0);
}
......@@ -1279,7 +1279,7 @@ bool change_master(THD* thd, Master_info* mi)
unlock_slave_threads(mi);
thd_proc_info(thd, 0);
send_ok(thd);
my_ok(thd);
DBUG_RETURN(FALSE);
}
......
sql/sql_table.cc
View file @ f106d973
......@@ -1497,7 +1497,7 @@ bool mysql_rm_table(THD *thd,TABLE_LIST *tables, my_bool if_exists,
if (error)
DBUG_RETURN(TRUE);
send_ok(thd);
my_ok(thd);
DBUG_RETURN(FALSE);
}
......@@ -5042,7 +5042,7 @@ err:
if (error == 0)
{
send_ok(thd);
my_ok(thd);
DBUG_RETURN(0);
}
......@@ -6006,7 +6006,7 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);
mysql_bin_log.write(&qinfo);
}
send_ok(thd);
my_ok(thd);
}
unlock_table_names(thd, table_list, (TABLE_LIST*) 0);
......@@ -6244,7 +6244,7 @@ view_err:
if (!error)
{
write_bin_log(thd, TRUE, thd->query, thd->query_length);
send_ok(thd);
my_ok(thd);
}
else if (error > 0)
{
......@@ -6880,7 +6880,7 @@ end_temporary:
my_snprintf(tmp_name, sizeof(tmp_name), ER(ER_INSERT_INFO),
(ulong) (copied + deleted), (ulong) deleted,
(ulong) thd->cuted_fields);
send_ok(thd, copied + deleted, 0L, tmp_name);
my_ok(thd, copied + deleted, 0L, tmp_name);
thd->some_tables_deleted=0;
DBUG_RETURN(FALSE);
......
sql/sql_trigger.cc
View file @ f106d973
......@@ -516,7 +516,7 @@ end:
start_waiting_global_read_lock(thd);
if (!result)
send_ok(thd);
my_ok(thd);
DBUG_RETURN(result);
}
......
sql/sql_update.cc
View file @ f106d973
......@@ -319,7 +319,7 @@ int mysql_update(THD *thd,
if (prune_partitions(thd, table, conds))
{
free_underlaid_joins(thd, select_lex);
send_ok(thd); // No matching records
my_ok(thd); // No matching records
DBUG_RETURN(0);
}
#endif
......@@ -336,7 +336,7 @@ int mysql_update(THD *thd,
{
DBUG_RETURN(1); // Error in where
}
send_ok(thd); // No matching records
my_ok(thd); // No matching records
DBUG_RETURN(0);
}
if (!select && limit != HA_POS_ERROR)
......@@ -815,7 +815,7 @@ int mysql_update(THD *thd,
(ulong) thd->cuted_fields);
thd->row_count_func=
(thd->client_capabilities & CLIENT_FOUND_ROWS) ? found : updated;
send_ok(thd, (ulong) thd->row_count_func, id, buff);
my_ok(thd, (ulong) thd->row_count_func, id, buff);
DBUG_PRINT("info",("%ld records updated", (long) updated));
}
thd->count_cuted_fields= CHECK_FIELD_IGNORE; /* calc cuted fields */
......@@ -1989,6 +1989,6 @@ bool multi_update::send_eof()
(ulong) thd->cuted_fields);
thd->row_count_func=
(thd->client_capabilities & CLIENT_FOUND_ROWS) ? found : updated;
::send_ok(thd, (ulong) thd->row_count_func, id, buff);
::my_ok(thd, (ulong) thd->row_count_func, id, buff);
DBUG_RETURN(FALSE);
}
sql/sql_view.cc
View file @ f106d973
......@@ -599,7 +599,7 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views,
if (res)
goto err;
send_ok(thd);
my_ok(thd);
lex->link_first_table_back(view, link_to_local);
DBUG_RETURN(0);
......@@ -1552,7 +1552,7 @@ bool mysql_drop_view(THD *thd, TABLE_LIST *views, enum_drop_mode drop_mode)
{
DBUG_RETURN(TRUE);
}
send_ok(thd);
my_ok(thd);
DBUG_RETURN(FALSE);
}
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7