mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
Removing net emulation out of embedded library
include/mysql.h: Several structures content changed for embedded case include/violite.h: enum_vio_type extended libmysqld/embedded_priv.h: three new funcs added libmysqld/lib_sql.cc: A lot of changes on the way to excude network emulation libmysqld/lib_vio.c: vio structure changed. we're on the way to remove network... libmysqld/libmysqld.c: A lot of changes. sql/ha_myisam.cc: Network sending modified for embedded case. sql/net_pkg.cc: Exclude network from error sending sql/sql_acl.cc: Exclude access permissions checking in embedded case sql/sql_base.cc: Implementation of send_fields got quite different in enbedded case and now placed in lib_sql.cc sql/sql_class.cc: select_send::send_data for embedded case placed in lib_sql sql/sql_class.h: Extra fields added for embedded case sql/sql_parse.cc: remove this out of server sql/sql_show.cc: lots of similar changes to exclude network emulation sql/sql_table.cc: Network emulation excluded BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
This commit is contained in:
@@ -1060,6 +1060,9 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables,
|
||||
|
||||
thd->open_options|= extra_open_options;
|
||||
table->table = open_ltable(thd, table, lock_type);
|
||||
#ifdef EMBEDDED_LIBRARY
|
||||
thd->net.last_errno= 0; // these errors shouldn't get client
|
||||
#endif
|
||||
thd->open_options&= ~extra_open_options;
|
||||
packet->length(0);
|
||||
if (prepare_func)
|
||||
@@ -1174,8 +1177,8 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables,
|
||||
table->table->real_name);
|
||||
close_thread_tables(thd);
|
||||
table->table=0; // For query cache
|
||||
if (my_net_write(&thd->net, (char*) packet->ptr(),
|
||||
packet->length()))
|
||||
if (SEND_ROW(thd, &thd->net, field_list.elements,
|
||||
(char *)thd->packet.ptr(), thd->packet.length()))
|
||||
goto err;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user