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

Rename send_eof() to my_eof() for consistency with my_ok() and my_error()

Browse Source
This commit is contained in:
kostja@dipika.(none) 2008-02-19 15:58:08 +03:00
parent f106d9738a
commit 72495c968b
17 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/events.cc
View File

@ -737,7 +737,7 @@ send_show_create_event(THD *thd, Event_timed *et, Protocol *protocol)
if (protocol->write()) if (protocol->write())
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
send_eof(thd); my_eof(thd);
DBUG_RETURN(FALSE); DBUG_RETURN(FALSE);
} }

4
sql/handler.cc
View File

@ -1590,7 +1590,7 @@ bool mysql_xa_recover(THD *thd)
} }
pthread_mutex_unlock(&LOCK_xid_cache); pthread_mutex_unlock(&LOCK_xid_cache);
send_eof(thd); my_eof(thd);
DBUG_RETURN(0); DBUG_RETURN(0);
} }
@ -4309,7 +4309,7 @@ bool ha_show_status(THD *thd, handlerton *db_type, enum ha_stat_type stat)
} }
if (!result) if (!result)
send_eof(thd); my_eof(thd);
return result; return result;
} }

4
sql/repl_failsafe.cc
View File

@ -475,7 +475,7 @@ bool show_new_master(THD* thd)
protocol->store((ulonglong) lex_mi->pos); protocol->store((ulonglong) lex_mi->pos);
if (protocol->write()) if (protocol->write())
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
send_eof(thd); my_eof(thd);
DBUG_RETURN(FALSE); DBUG_RETURN(FALSE);
} }
} }
@ -688,7 +688,7 @@ bool show_slave_hosts(THD* thd)
} }
} }
pthread_mutex_unlock(&LOCK_slave_list); pthread_mutex_unlock(&LOCK_slave_list);
send_eof(thd); my_eof(thd);
DBUG_RETURN(FALSE); DBUG_RETURN(FALSE);
} }

2
sql/slave.cc
View File

@ -1451,7 +1451,7 @@ bool show_master_info(THD* thd, Master_info* mi)
if (my_net_write(&thd->net, (uchar*) thd->packet.ptr(), packet->length())) if (my_net_write(&thd->net, (uchar*) thd->packet.ptr(), packet->length()))
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
} }
send_eof(thd); my_eof(thd);
DBUG_RETURN(FALSE); DBUG_RETURN(FALSE);
} }

2
sql/sp.cc
View File

@ -1259,7 +1259,7 @@ sp_show_status_routine(THD *thd, int type, const char *name_pattern)
} }
err_case1: err_case1:
send_eof(thd); my_eof(thd);
err_case: err_case:
table->file->ha_index_end(); table->file->ha_index_end();
close_thread_tables(thd); close_thread_tables(thd);

4
sql/sp_head.cc
View File

@ -2419,7 +2419,7 @@ sp_head::show_create_routine(THD *thd, int type)
err_status= protocol->write(); err_status= protocol->write();
if (!err_status) if (!err_status)
send_eof(thd); my_eof(thd);
DBUG_RETURN(err_status); DBUG_RETURN(err_status);
} }
@ -2611,7 +2611,7 @@ sp_head::show_routine_code(THD *thd)
} }
if (!res) if (!res)
send_eof(thd); my_eof(thd);
DBUG_RETURN(res); DBUG_RETURN(res);
} }

2
sql/sql_acl.cc
View File

@ -4815,7 +4815,7 @@ end:
VOID(pthread_mutex_unlock(&acl_cache->lock)); VOID(pthread_mutex_unlock(&acl_cache->lock));
rw_unlock(&LOCK_grant); rw_unlock(&LOCK_grant);
send_eof(thd); my_eof(thd);
DBUG_RETURN(error); DBUG_RETURN(error);
} }

2
sql/sql_class.cc
View File

@ -1548,7 +1548,7 @@ bool select_send::send_eof()
mysql_unlock_tables(thd, thd->lock); mysql_unlock_tables(thd, thd->lock);
thd->lock=0; thd->lock=0;
} }
::send_eof(thd); ::my_eof(thd);
is_result_set_started= 0; is_result_set_started= 0;
return FALSE; return FALSE;
} }

6
sql/sql_class.h
View File

@ -995,7 +995,7 @@ public:
DA_EMPTY= 0, DA_EMPTY= 0,
/** Set whenever one calls my_ok(). */ /** Set whenever one calls my_ok(). */
DA_OK, DA_OK,
/** Set whenever one calls send_eof(). */ /** Set whenever one calls my_eof(). */
DA_EOF, DA_EOF,
/** Set whenever one calls my_error() or my_message(). */ /** Set whenever one calls my_error() or my_message(). */
DA_ERROR, DA_ERROR,
@ -1063,7 +1063,7 @@ private:
Copied from thd->server_status when the diagnostics area is assigned. Copied from thd->server_status when the diagnostics area is assigned.
We need this member as some places in the code use the following pattern: We need this member as some places in the code use the following pattern:
thd->server_status|= ... thd->server_status|= ...
send_eof(thd); my_eof(thd);
thd->server_status&= ~... thd->server_status&= ~...
Assigned by OK, EOF or ERROR. Assigned by OK, EOF or ERROR.
*/ */
@ -2151,7 +2151,7 @@ my_ok(THD *thd, ha_rows affected_rows= 0, ulonglong id= 0,
/** A short cut for thd->main_da.set_eof_status(). */ /** A short cut for thd->main_da.set_eof_status(). */
inline void inline void
send_eof(THD *thd) my_eof(THD *thd)
{ {
thd->main_da.set_eof_status(thd); thd->main_da.set_eof_status(thd);
} }

2
sql/sql_error.cc
View File

@ -249,6 +249,6 @@ bool mysqld_show_warnings(THD *thd, ulong levels_to_show)
if (protocol->write()) if (protocol->write())
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
} }
send_eof(thd); my_eof(thd);
DBUG_RETURN(FALSE); DBUG_RETURN(FALSE);
} }

2
sql/sql_handler.cc
View File

@ -658,7 +658,7 @@ retry:
} }
ok: ok:
mysql_unlock_tables(thd,lock); mysql_unlock_tables(thd,lock);
send_eof(thd); my_eof(thd);
DBUG_PRINT("exit",("OK")); DBUG_PRINT("exit",("OK"));
DBUG_RETURN(FALSE); DBUG_RETURN(FALSE);

2
sql/sql_help.cc
View File

@ -779,7 +779,7 @@ bool mysqld_help(THD *thd, const char *mask)
if (send_variant_2_list(mem_root,protocol, &categories_list, "Y", 0)) if (send_variant_2_list(mem_root,protocol, &categories_list, "Y", 0))
goto error; goto error;
} }
send_eof(thd); my_eof(thd);
close_system_tables(thd, &open_tables_state_backup); close_system_tables(thd, &open_tables_state_backup);
DBUG_RETURN(FALSE); DBUG_RETURN(FALSE);

8
sql/sql_parse.cc
View File

@ -1348,7 +1348,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
} }
DBUG_PRINT("quit",("Got shutdown command for level %u", level)); DBUG_PRINT("quit",("Got shutdown command for level %u", level));
general_log_print(thd, command, NullS); general_log_print(thd, command, NullS);
send_eof(thd); my_eof(thd);
close_thread_tables(thd); // Free before kill close_thread_tables(thd); // Free before kill
kill_mysql(); kill_mysql();
error=TRUE; error=TRUE;
@ -1434,11 +1434,11 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
switch (opt_command) { switch (opt_command) {
case (int) MYSQL_OPTION_MULTI_STATEMENTS_ON: case (int) MYSQL_OPTION_MULTI_STATEMENTS_ON:
thd->client_capabilities|= CLIENT_MULTI_STATEMENTS; thd->client_capabilities|= CLIENT_MULTI_STATEMENTS;
send_eof(thd); my_eof(thd);
break; break;
case (int) MYSQL_OPTION_MULTI_STATEMENTS_OFF: case (int) MYSQL_OPTION_MULTI_STATEMENTS_OFF:
thd->client_capabilities&= ~CLIENT_MULTI_STATEMENTS; thd->client_capabilities&= ~CLIENT_MULTI_STATEMENTS;
send_eof(thd); my_eof(thd);
break; break;
default: default:
my_message(ER_UNKNOWN_COM_ERROR, ER(ER_UNKNOWN_COM_ERROR), MYF(0)); my_message(ER_UNKNOWN_COM_ERROR, ER(ER_UNKNOWN_COM_ERROR), MYF(0));
@ -1452,7 +1452,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
break; /* purecov: inspected */ break; /* purecov: inspected */
mysql_print_status(); mysql_print_status();
general_log_print(thd, command, NullS); general_log_print(thd, command, NullS);
send_eof(thd); my_eof(thd);
break; break;
case COM_SLEEP: case COM_SLEEP:
case COM_CONNECT: // Impossible here case COM_CONNECT: // Impossible here

2
sql/sql_prepare.cc
View File

@ -2662,7 +2662,7 @@ bool Select_fetch_protocol_binary::send_fields(List<Item> &list, uint flags)
bool Select_fetch_protocol_binary::send_eof() bool Select_fetch_protocol_binary::send_eof()
{ {
::send_eof(thd); ::my_eof(thd);
return FALSE; return FALSE;
} }

8
sql/sql_repl.cc
View File

@ -738,7 +738,7 @@ end:
end_io_cache(&log); end_io_cache(&log);
(void)my_close(file, MYF(MY_WME)); (void)my_close(file, MYF(MY_WME));
send_eof(thd); my_eof(thd);
thd_proc_info(thd, "Waiting to finalize termination"); thd_proc_info(thd, "Waiting to finalize termination");
pthread_mutex_lock(&LOCK_thread_count); pthread_mutex_lock(&LOCK_thread_count);
thd->current_linfo = 0; thd->current_linfo = 0;
@ -1453,7 +1453,7 @@ err:
my_error(ER_ERROR_WHEN_EXECUTING_COMMAND, MYF(0), my_error(ER_ERROR_WHEN_EXECUTING_COMMAND, MYF(0),
"SHOW BINLOG EVENTS", errmsg); "SHOW BINLOG EVENTS", errmsg);
else else
send_eof(thd); my_eof(thd);
pthread_mutex_lock(&LOCK_thread_count); pthread_mutex_lock(&LOCK_thread_count);
thd->current_linfo = 0; thd->current_linfo = 0;
@ -1490,7 +1490,7 @@ bool show_binlog_info(THD* thd)
if (protocol->write()) if (protocol->write())
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
} }
send_eof(thd); my_eof(thd);
DBUG_RETURN(FALSE); DBUG_RETURN(FALSE);
} }
@ -1572,7 +1572,7 @@ bool show_binlogs(THD* thd)
goto err; goto err;
} }
mysql_bin_log.unlock_index(); mysql_bin_log.unlock_index();
send_eof(thd); my_eof(thd);
DBUG_RETURN(FALSE); DBUG_RETURN(FALSE);
err: err:

18
sql/sql_show.cc
View File

@ -224,7 +224,7 @@ bool mysqld_show_authors(THD *thd)
if (protocol->write()) if (protocol->write())
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
} }
send_eof(thd); my_eof(thd);
DBUG_RETURN(FALSE); DBUG_RETURN(FALSE);
} }
@ -258,7 +258,7 @@ bool mysqld_show_contributors(THD *thd)
if (protocol->write()) if (protocol->write())
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
} }
send_eof(thd); my_eof(thd);
DBUG_RETURN(FALSE); DBUG_RETURN(FALSE);
} }
@ -331,7 +331,7 @@ bool mysqld_show_privileges(THD *thd)
if (protocol->write()) if (protocol->write())
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
} }
send_eof(thd); my_eof(thd);
DBUG_RETURN(FALSE); DBUG_RETURN(FALSE);
} }
@ -419,7 +419,7 @@ bool mysqld_show_column_types(THD *thd)
if (protocol->write()) if (protocol->write())
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
} }
send_eof(thd); my_eof(thd);
DBUG_RETURN(FALSE); DBUG_RETURN(FALSE);
} }
@ -666,7 +666,7 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list)
if (protocol->write()) if (protocol->write())
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
send_eof(thd); my_eof(thd);
DBUG_RETURN(FALSE); DBUG_RETURN(FALSE);
} }
@ -747,7 +747,7 @@ bool mysqld_show_create_db(THD *thd, char *dbname,
if (protocol->write()) if (protocol->write())
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
send_eof(thd); my_eof(thd);
DBUG_RETURN(FALSE); DBUG_RETURN(FALSE);
} }
@ -789,7 +789,7 @@ mysqld_list_fields(THD *thd, TABLE_LIST *table_list, const char *wild)
table->use_all_columns(); table->use_all_columns();
if (thd->protocol->send_fields(&field_list, Protocol::SEND_DEFAULTS)) if (thd->protocol->send_fields(&field_list, Protocol::SEND_DEFAULTS))
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
send_eof(thd); my_eof(thd);
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
@ -1738,7 +1738,7 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose)
if (protocol->write()) if (protocol->write())
break; /* purecov: inspected */ break; /* purecov: inspected */
} }
send_eof(thd); my_eof(thd);
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
@ -6760,7 +6760,7 @@ static bool show_create_trigger_impl(THD *thd,
ret_code= p->write(); ret_code= p->write();
if (!ret_code) if (!ret_code)
send_eof(thd); my_eof(thd);
return ret_code != 0; return ret_code != 0;
} }

4
sql/sql_table.cc
View File

@ -4501,7 +4501,7 @@ send_result_message:
goto err; goto err;
} }
send_eof(thd); my_eof(thd);
DBUG_RETURN(FALSE); DBUG_RETURN(FALSE);
err: err:
@ -7311,7 +7311,7 @@ bool mysql_checksum_table(THD *thd, TABLE_LIST *tables,
goto err; goto err;
} }
send_eof(thd); my_eof(thd);
DBUG_RETURN(FALSE); DBUG_RETURN(FALSE);
err: err: