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

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

Browse Source 
does not send it to the client.
This commit is contained in:
unknown 2008-02-19 15:45:21 +03:00
parent ead02981ea
commit 14021c96c4
22 changed files with 109 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sql/protocol.cc
View File

@ -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 */

2
sql/repl_failsafe.cc
View File

@ -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;
}

6
sql/sql_acl.cc
View File

@ -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);
}

2
sql/sql_binlog.cc
View File

@ -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();

4
sql/sql_class.cc
View File

@ -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;
}

4
sql/sql_class.h
View File

@ -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);

4
sql/sql_connect.cc
View File

@ -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);

10
sql/sql_db.cc
View File

@ -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())

12
sql/sql_delete.cc
View File

@ -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);

2
sql/sql_do.cc
View File

@ -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);
}

4
sql/sql_handler.cc
View File

@ -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);
}

6
sql/sql_insert.cc
View File

@ -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);
}

2
sql/sql_load.cc
View File

@ -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);

106
sql/sql_parse.cc
View File

@ -913,7 +913,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
if (!mysql_change_db(thd, &tmp, FALSE))
{
general_log_write(thd, command, thd->db, thd->db_length);
send_ok(thd);
my_ok(thd);
}
break;
}
@ -921,7 +921,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
case COM_REGISTER_SLAVE:
{
if (!register_slave(thd, (uchar*)packet, packet_length))
send_ok(thd);
my_ok(thd);
break;
}
#endif
@ -1322,7 +1322,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
break;
general_log_print(thd, command, NullS);
if (!reload_acl_and_cache(thd, options, (TABLE_LIST*) 0, &not_used))
send_ok(thd);
my_ok(thd);
break;
}
#ifndef EMBEDDED_LIBRARY
@ -1386,7 +1386,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
(uint) (queries_per_second1000 % 1000));
#ifdef EMBEDDED_LIBRARY
/* Store the buffer in permanent memory */
send_ok(thd, 0, 0, buff);
my_ok(thd, 0, 0, buff);
#endif
#ifdef SAFEMALLOC
if (sf_malloc_cur_memory) // Using SAFEMALLOC
@ -1407,7 +1407,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
}
case COM_PING:
status_var_increment(thd->status_var.com_other);
send_ok(thd); // Tell client we are alive
my_ok(thd); // Tell client we are alive
break;
case COM_PROCESS_INFO:
status_var_increment(thd->status_var.com_stat[SQLCOM_SHOW_PROCESSLIST]);
@ -2075,7 +2075,7 @@ mysql_execute_command(THD *thd)
break;
case SQLCOM_EMPTY_QUERY:
send_ok(thd);
my_ok(thd);
break;
case SQLCOM_HELP:
@ -2242,7 +2242,7 @@ mysql_execute_command(THD *thd)
{
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 0,
"the master info structure does not exist");
send_ok(thd);
my_ok(thd);
}
pthread_mutex_unlock(&LOCK_active_mi);
break;
@ -2300,7 +2300,7 @@ mysql_execute_command(THD *thd)
if (!fetch_master_table(thd, first_table->db, first_table->table_name,
active_mi, 0, 0))
{
send_ok(thd);
my_ok(thd);
}
pthread_mutex_unlock(&LOCK_active_mi);
break;
@ -2511,7 +2511,7 @@ mysql_execute_command(THD *thd)
&alter_info, 0, 0);
}
if (!res)
send_ok(thd);
my_ok(thd);
}
/* put tables back for PS rexecuting */
@ -3194,7 +3194,7 @@ end_with_restore_list:
LEX_STRING db_str= { (char *) select_lex->db, strlen(select_lex->db) };
if (!mysql_change_db(thd, &db_str, FALSE))
send_ok(thd);
my_ok(thd);
break;
}
@ -3247,7 +3247,7 @@ end_with_restore_list:
about the ONE_SHOT property of that SET. So we use a |= instead of = .
*/
thd->one_shot_set|= lex->one_shot_set;
send_ok(thd);
my_ok(thd);
}
break;
}
@ -3267,7 +3267,7 @@ end_with_restore_list:
}
if (thd->global_read_lock)
unlock_global_read_lock(thd);
send_ok(thd);
my_ok(thd);
break;
case SQLCOM_LOCK_TABLES:
unlock_locked_tables(thd);
@ -3288,7 +3288,7 @@ end_with_restore_list:
#endif /*HAVE_QUERY_CACHE*/
thd->locked_tables=thd->lock;
thd->lock=0;
send_ok(thd);
my_ok(thd);
}
else
{
@ -3425,7 +3425,7 @@ end_with_restore_list:
res= mysql_upgrade_db(thd, db);
if (!res)
send_ok(thd);
my_ok(thd);
break;
}
case SQLCOM_ALTER_DB:
@ -3510,7 +3510,7 @@ end_with_restore_list:
}
DBUG_PRINT("info",("DDL error code=%d", res));
if (!res)
send_ok(thd);
my_ok(thd);
} while (0);
/* Don't do it, if we are inside a SP */
@ -3529,7 +3529,7 @@ end_with_restore_list:
if (!(res= Events::drop_event(thd,
lex->spname->m_db, lex->spname->m_name,
lex->drop_if_exists)))
send_ok(thd);
my_ok(thd);
break;
case SQLCOM_CREATE_FUNCTION: // UDF function
{
@ -3537,7 +3537,7 @@ end_with_restore_list:
break;
#ifdef HAVE_DLOPEN
if (!(res = mysql_create_function(thd, &lex->udf)))
send_ok(thd);
my_ok(thd);
#else
my_error(ER_CANT_OPEN_LIBRARY, MYF(0), lex->udf.dl, 0, "feature disabled");
res= TRUE;
@ -3554,7 +3554,7 @@ end_with_restore_list:
goto error;
/* Conditionally writes to binlog */
if (!(res= mysql_create_user(thd, lex->users_list)))
send_ok(thd);
my_ok(thd);
break;
}
case SQLCOM_DROP_USER:
@ -3566,7 +3566,7 @@ end_with_restore_list:
goto error;
/* Conditionally writes to binlog */
if (!(res= mysql_drop_user(thd, lex->users_list)))
send_ok(thd);
my_ok(thd);
break;
}
case SQLCOM_RENAME_USER:
@ -3578,7 +3578,7 @@ end_with_restore_list:
goto error;
/* Conditionally writes to binlog */
if (!(res= mysql_rename_user(thd, lex->users_list)))
send_ok(thd);
my_ok(thd);
break;
}
case SQLCOM_REVOKE_ALL:
@ -3590,7 +3590,7 @@ end_with_restore_list:
break;
/* Conditionally writes to binlog */
if (!(res = mysql_revoke_all(thd, lex->users_list)))
send_ok(thd);
my_ok(thd);
break;
}
case SQLCOM_REVOKE:
@ -3727,7 +3727,7 @@ end_with_restore_list:
{
write_bin_log(thd, FALSE, thd->query, thd->query_length);
}
send_ok(thd);
my_ok(thd);
}
break;
@ -3799,19 +3799,19 @@ end_with_restore_list:
}
if (begin_trans(thd))
goto error;
send_ok(thd);
my_ok(thd);
break;
case SQLCOM_COMMIT:
if (end_trans(thd, lex->tx_release ? COMMIT_RELEASE :
lex->tx_chain ? COMMIT_AND_CHAIN : COMMIT))
goto error;
send_ok(thd);
my_ok(thd);
break;
case SQLCOM_ROLLBACK:
if (end_trans(thd, lex->tx_release ? ROLLBACK_RELEASE :
lex->tx_chain ? ROLLBACK_AND_CHAIN : ROLLBACK))
goto error;
send_ok(thd);
my_ok(thd);
break;
case SQLCOM_RELEASE_SAVEPOINT:
{
@ -3828,7 +3828,7 @@ end_with_restore_list:
if (ha_release_savepoint(thd, sv))
res= TRUE; // cannot happen
else
send_ok(thd);
my_ok(thd);
thd->transaction.savepoints=sv->prev;
}
else
@ -3857,7 +3857,7 @@ end_with_restore_list:
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
ER_WARNING_NOT_COMPLETE_ROLLBACK,
ER(ER_WARNING_NOT_COMPLETE_ROLLBACK));
send_ok(thd);
my_ok(thd);
}
thd->transaction.savepoints=sv;
}
@ -3868,7 +3868,7 @@ end_with_restore_list:
case SQLCOM_SAVEPOINT:
if (!(thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN) ||
thd->in_sub_stmt) || !opt_using_transactions)
send_ok(thd);
my_ok(thd);
else
{
SAVEPOINT **sv, *newsv;
@ -3905,7 +3905,7 @@ end_with_restore_list:
{
newsv->prev=thd->transaction.savepoints;
thd->transaction.savepoints=newsv;
send_ok(thd);
my_ok(thd);
}
}
break;
@ -4005,7 +4005,7 @@ end_with_restore_list:
create_sp_error:
if (sp_result != SP_OK )
goto error;
send_ok(thd);
my_ok(thd);
break; /* break super switch */
} /* end case group bracket */
case SQLCOM_CALL:
@ -4098,7 +4098,7 @@ create_sp_error:
thd->server_status&= ~bits_to_be_cleared;
if (!res)
send_ok(thd, (ulong) (thd->row_count_func < 0 ? 0 :
my_ok(thd, (ulong) (thd->row_count_func < 0 ? 0 :
thd->row_count_func));
else
{
@ -4176,7 +4176,7 @@ create_sp_error:
switch (sp_result)
{
case SP_OK:
send_ok(thd);
my_ok(thd);
break;
case SP_KEY_NOT_FOUND:
my_error(ER_SP_DOES_NOT_EXIST, MYF(0),
@ -4241,7 +4241,7 @@ create_sp_error:
if (!(res = mysql_drop_function(thd, &lex->spname->m_name)))
{
send_ok(thd);
my_ok(thd);
break;
}
}
@ -4258,7 +4258,7 @@ create_sp_error:
res= sp_result;
switch (sp_result) {
case SP_OK:
send_ok(thd);
my_ok(thd);
break;
case SP_KEY_NOT_FOUND:
if (lex->drop_if_exists)
@ -4267,7 +4267,7 @@ create_sp_error:
ER_SP_DOES_NOT_EXIST, ER(ER_SP_DOES_NOT_EXIST),
SP_COM_STRING(lex), lex->spname->m_name.str);
res= FALSE;
send_ok(thd);
my_ok(thd);
break;
}
my_error(ER_SP_DOES_NOT_EXIST, MYF(0),
@ -4399,7 +4399,7 @@ create_sp_error:
break;
}
thd->transaction.xid_state.xa_state=XA_ACTIVE;
send_ok(thd);
my_ok(thd);
break;
}
if (thd->lex->xa_opt != XA_NONE)
@ -4430,7 +4430,7 @@ create_sp_error:
thd->transaction.all.modified_non_trans_table= FALSE;
thd->options= ((thd->options & ~(OPTION_KEEP_LOG)) | OPTION_BEGIN);
thd->server_status|= SERVER_STATUS_IN_TRANS;
send_ok(thd);
my_ok(thd);
break;
case SQLCOM_XA_END:
/* fake it */
@ -4451,7 +4451,7 @@ create_sp_error:
break;
}
thd->transaction.xid_state.xa_state=XA_IDLE;
send_ok(thd);
my_ok(thd);
break;
case SQLCOM_XA_PREPARE:
if (thd->transaction.xid_state.xa_state != XA_IDLE)
@ -4473,7 +4473,7 @@ create_sp_error:
break;
}
thd->transaction.xid_state.xa_state=XA_PREPARED;
send_ok(thd);
my_ok(thd);
break;
case SQLCOM_XA_COMMIT:
if (!thd->transaction.xid_state.xid.eq(thd->lex->xid))
@ -4485,7 +4485,7 @@ create_sp_error:
{
ha_commit_or_rollback_by_xid(thd->lex->xid, 1);
xid_cache_delete(xs);
send_ok(thd);
my_ok(thd);
}
break;
}
@ -4496,7 +4496,7 @@ create_sp_error:
if ((r= ha_commit(thd)))
my_error(r == 1 ? ER_XA_RBROLLBACK : ER_XAER_RMERR, MYF(0));
else
send_ok(thd);
my_ok(thd);
}
else if (thd->transaction.xid_state.xa_state == XA_PREPARED &&
thd->lex->xa_opt == XA_NONE)
@ -4511,7 +4511,7 @@ create_sp_error:
if (ha_commit_one_phase(thd, 1))
my_error(ER_XAER_RMERR, MYF(0));
else
send_ok(thd);
my_ok(thd);
start_waiting_global_read_lock(thd);
}
}
@ -4537,7 +4537,7 @@ create_sp_error:
{
ha_commit_or_rollback_by_xid(thd->lex->xid, 0);
xid_cache_delete(xs);
send_ok(thd);
my_ok(thd);
}
break;
}
@ -4551,7 +4551,7 @@ create_sp_error:
if (ha_rollback(thd))
my_error(ER_XAER_RMERR, MYF(0));
else
send_ok(thd);
my_ok(thd);
thd->options&= ~(OPTION_BEGIN | OPTION_KEEP_LOG);
thd->transaction.all.modified_non_trans_table= FALSE;
thd->server_status&= ~SERVER_STATUS_IN_TRANS;
@ -4565,16 +4565,16 @@ create_sp_error:
if (check_access(thd, ALTER_ACL, thd->db, 0, 1, 0, thd->db ? is_schema_db(thd->db) : 0))
break;
if (!(res= mysql_alter_tablespace(thd, lex->alter_tablespace_info)))
send_ok(thd);
my_ok(thd);
break;
case SQLCOM_INSTALL_PLUGIN:
if (! (res= mysql_install_plugin(thd, &thd->lex->comment,
&thd->lex->ident)))
send_ok(thd);
my_ok(thd);
break;
case SQLCOM_UNINSTALL_PLUGIN:
if (! (res= mysql_uninstall_plugin(thd, &thd->lex->comment)))
send_ok(thd);
my_ok(thd);
break;
case SQLCOM_BINLOG_BASE64_EVENT:
{
@ -4601,7 +4601,7 @@ create_sp_error:
my_error(error, MYF(0), lex->server_options.server_name);
break;
}
send_ok(thd, 1);
my_ok(thd, 1);
break;
}
case SQLCOM_ALTER_SERVER:
@ -4620,7 +4620,7 @@ create_sp_error:
my_error(error, MYF(0), lex->server_options.server_name);
break;
}
send_ok(thd, 1);
my_ok(thd, 1);
break;
}
case SQLCOM_DROP_SERVER:
@ -4642,18 +4642,18 @@ create_sp_error:
}
else
{
send_ok(thd, 0);
my_ok(thd, 0);
}
break;
}
send_ok(thd, 1);
my_ok(thd, 1);
break;
}
default:
#ifndef EMBEDDED_LIBRARY
DBUG_ASSERT(0); /* Impossible */
#endif
send_ok(thd);
my_ok(thd);
break;
}
thd_proc_info(thd, "query end");
@ -6660,7 +6660,7 @@ void sql_kill(THD *thd, ulong id, bool only_kill_query)
{
uint error;
if (!(error= kill_one_thread(thd, id, only_kill_query)))
send_ok(thd);
my_ok(thd);
else
my_error(error, MYF(0), id);
}

2
sql/sql_partition.cc
View File

@ -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);
}

6
sql/sql_prepare.cc
View File

@ -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);
}
/**

2
sql/sql_rename.cc
View File

@ -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)

12
sql/sql_repl.cc
View File

@ -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);
}

10
sql/sql_table.cc
View File

@ -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);

2
sql/sql_trigger.cc
View File

@ -516,7 +516,7 @@ end:
start_waiting_global_read_lock(thd);
if (!result)
send_ok(thd);
my_ok(thd);
DBUG_RETURN(result);
}

8
sql/sql_update.cc
View File

@ -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);
}

4
sql/sql_view.cc
View File

@ -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);
}