mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
9e6784924a
Fixed compile-pentium64 scripts Fixed wrong estimate of update_with_key_prefix in sql-bench Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into mysql.com:/home/my/mysql-5.1 Fixed unsafe define of uint4korr() Fixed that --extern works with mysql-test-run.pl Small trivial cleanups This also fixes a bug in counting number of rows that are updated when we have many simultanous queries Move all connection handling and command exectuion main loop from sql_parse.cc to sql_connection.cc Split handle_one_connection() into reusable sub functions. Split create_new_thread() into reusable sub functions. Added thread_scheduler; Preliminary interface code for future thread_handling code. Use 'my_thread_id' for internal thread id's Make thr_alarm_kill() to depend on thread_id instead of thread Make thr_abort_locks_for_thread() depend on thread_id instead of thread In store_globals(), set my_thread_var->id to be thd->thread_id. Use my_thread_var->id as basis for my_thread_name() The above changes makes the connection we have between THD and threads more soft. Added a lot of DBUG_PRINT() and DBUG_ASSERT() functions Fixed compiler warnings Fixed core dumps when running with --debug Removed setting of signal masks (was never used) Made event code call pthread_exit() (portability fix) Fixed that event code doesn't call DBUG_xxx functions before my_thread_init() is called. Made handling of thread_id and thd->variables.pseudo_thread_id uniform. Removed one common 'not freed memory' warning from mysqltest Fixed a couple of usage of not initialized warnings (unlikely cases) Suppress compiler warnings from bdb and (for the moment) warnings from ndb BitKeeper/deleted/.del-SETUP.sh.rej: Rename: BUILD/SETUP.sh.rej -> BitKeeper/deleted/.del-SETUP.sh.rej BitKeeper/deleted/.del-configure.in.rej: Rename: configure.in.rej -> BitKeeper/deleted/.del-configure.in.rej BitKeeper/deleted/.del-my_global.h.rej: Rename: include/my_global.h.rej -> BitKeeper/deleted/.del-my_global.h.rej BitKeeper/deleted/.del-my_pthread.h.rej: Rename: include/my_pthread.h.rej -> BitKeeper/deleted/.del-my_pthread.h.rej BitKeeper/deleted/.del-mysql_client_test.c.rej: Rename: tests/mysql_client_test.c.rej -> BitKeeper/deleted/.del-mysql_client_test.c.rej BitKeeper/deleted/.del-mysqld.cc.rej~35c1c438e11ebd89: Rename: sql/mysqld.cc.rej -> BitKeeper/deleted/.del-mysqld.cc.rej~35c1c438e11ebd89 BitKeeper/deleted/.del-sql_parse.cc.rej: Rename: sql/sql_parse.cc.rej -> BitKeeper/deleted/.del-sql_parse.cc.rej BitKeeper/deleted/.del-table.cc.rej: Rename: sql/table.cc.rej -> BitKeeper/deleted/.del-table.cc.rej BitKeeper/deleted/.del-thr_alarm.c.rej: Rename: mysys/thr_alarm.c.rej -> BitKeeper/deleted/.del-thr_alarm.c.rej BUILD/compile-pentium64: Update this to be in line with compile-pentium BUILD/compile-pentium: Send command line options to SETUP.sh BUILD/compile-solaris-sparc-debug: Update scripts BUILD/compile-solaris-sparc-forte: Update scripts BUILD/compile-solaris-sparc-purify: Update scripts BUILD/compile-solaris-sparc: Update scripts BitKeeper/deleted/.del-DbtupSystemRestart.cpp~15b54d7e4e75d2d: Removed compiler warning BitKeeper/deleted/.del-ha_berkeley.cc: Moved get_auto_primary_key() here as int5store() gives (wrong) compiler warnings in win64 configure.in: Added detection of port_create and port.h (for future)as --- manual merge BitKeeper/deleted/.del-ha_berkeley.h: Moved get_auto_primary_key() to ha_berkeley.cc BitKeeper/deleted/.del-mysqlmanager.c~e97636d71145a0b: Fixed compiler warnings BitKeeper/etc/ignore: added storage/ndb/src/ndbapi/ndberror_check client/mysqlbinlog.cc: Removed not needed 'static' (caused compiler warning) client/mysqldump.c: Fixed compiler warnings from 'max' build client/mysqltest.c: Free warning and query memory no abort. (Removes strange warnings on screen if mysql-test-run fails) Removed compiler warnings Portability fix for windows (windows doesn't have mode_t) client/sql_string.h: Removed compiler warning cmd-line-utils/readline/xmalloc.c: Fixed compiler warnings from 'max' build extra/charset2html.c: Fixed compiler warnings extra/comp_err.c: Fixed compiler warnings from 'max' build extra/yassl/include/lock.hpp: Fix for windows64 extra/yassl/include/openssl/ssl.h: Changed prototype for SSL_set_fd() to fix compiler warnings (and possible errors) on windows 64 bit extra/yassl/include/socket_wrapper.hpp: Moved socket_t to ssl.h, to be able to removed compiler warnings on windows 64 bit extra/yassl/include/yassl.hpp: Fix for windows64 extra/yassl/src/ssl.cpp: Removed compiler warning Detect wrong parameter (Happens when running test suite on solaris) Changed prototype for SSL_set_fd() to fix compiler warnings (and possible errors) on windows 64 bit extra/yassl/taocrypt/src/integer.cpp: Fixed compiler warnings extra/yassl/testsuite/testsuite.cpp: Removed compiler warning include/config-win.h: Added HAVE_WINSOCK2 (for future) include/my_dbug.h: Fixed DBUG_PROCESS() so that we don't get compiler warnings for it include/my_global.h: Fixed unsafe define of uint4korr() manual merge (ignore changes from 5.0) Fixed warnings on win64 when using int5store and int6store include/my_pthread.h: Added my_thread_id typedef Renamed 'my_thread_id() function to my_thead_dbug_id() include/thr_alarm.h: Make thr_alarm_kill() to depend on thread_id instead of thread include/thr_lock.h: Make thr_abort_locks_for_thread() depend on thread_id instead of thread libmysql/libmysql.def: Fixed compiler warnings on win64 libmysqld/CMakeLists.txt: Added missing files libmysqld/Makefile.am: Added new files libmysqld/lib_sql.cc: Remove not needed code (store_globals() now takes care of things) mysql-test/lib/mtr_report.pl: Removed wrong messages when using --extern mysql-test/mysql-test-run.pl: Fixed that --extern works Print help on stdout instead of stderr (make it easier to pipe it to less) Fixed typo that caused mysql-test-run.pl to fail on Solaris mysql-test/r/keywords.result: manual merge mysql-test/r/ndb_lock.result: After merge fixes mysql-test/r/ps.result: Portability fix mysql-test/t/disabled.def: Disabled ndb_alter_table as this very often fails for me (and have done it for a long time) mysql-test/t/keywords.test: manual merge mysql-test/t/ndb_lock.test: Added other possible error code mysql-test/t/ps.test: Portability fix (when compiling without DLOPEN) mysql-test/t/wait_timeout.test: Don't run this if we are not using a thread per connection (as other thread_handling code may not support timeouts) mysys/base64.c: Fixed compiler warnings on win64 mysys/mf_keycache.c: Fixed compiler warnings mysys/my_getopt.c: Fixed compiler warning mysys/my_init.c: Fixed compiler warning Re-indented long comment mysys/my_thr_init.c: Always use mysys_var->id to generate thread name (makes things uniform accross thread implementations and thread usage) Always generate my_thread_name() when using DBUG Ensure mysys_var->pthread_self is set Fixed compiler warnings mysys/ptr_cmp.c: Fixed compiler warnings from 'max' build mysys/thr_alarm.c: Change thr_alarm_kill() to use mysys_var->id instead of thread id Fixed compiler warning on windows mysys/thr_lock.c: Change thr_abort_locks_for_thread() to use mysys_var->id instead of thread id Add purecov statements around not tested code Fixed compiler warnings mysys/thr_mutex.c: my_thread_id() -> my_thread_dbug_id() server-tools/instance-manager/guardian.cc: Fixed compiler warning server-tools/instance-manager/instance.cc: Fixed compiler warning server-tools/instance-manager/mysql_connection.cc: Fixed compiler warnings server-tools/instance-manager/mysqlmanager.cc: Fixed compiler warnings sql/CMakeLists.txt: Added missing files sql/Makefile.am: Added new files sql/event_scheduler.cc: Added pthread_exit() calls Ensure DBUG_xxx calls are not made before my_thread_init() Use common functions to set up thread handling sql/field.h: manual merge sql/ha_ndbcluster.cc: Removed some trivial 'current_thd' calls sql/handler.cc: Avoid warnings on KILL_CONNECTION Don't print out null pointer with printf() (Causes crashes on Solaris) sql/item.cc: Fixed compiler warnings from 'max' build sql/item_cmpfunc.cc: After merge fixes sql/item_func.cc: Merge embedded and normal code usage (GET_LOCK, RELEASE_LOCK now works on my_thread_id instead of pthread_t) Fixed compiler warning sql/item_strfunc.cc: Fixed compiler warning sql/item_timefunc.cc: Fixed compiler warnings sql/lock.cc: Use (new) parameter to thr_abort_locks_for_thread() sql/log.cc: Fixed compiler warning sql/log_event.cc: Fixed compiler warnings about not used variable sql/mysql_priv.h: Remove TEST_NO_THREADS (not needed with new scheduler interface) Added functions from sql_connect.cc and new functions from sql_parse.cc sql/mysqld.cc: Use thread_scheduler structure to dispatch calls (make code more dynamic) Change --one-thread option to use thread_scheduler interface Made ONE_THREAD option independent of DBUG_BUILD --one-thread is now depricated. One should instead use '--thread-handling=no-threads' Remove not used uname() function. Split create_new_thread() into reusable sub functions. Preliminary interface code for future thread_handling code. Fixed compiler warnings sql/parse_file.cc: Don't send zero pointer to fn_format() (Causes crashes when using --debug) sql/repl_failsafe.cc: Setup pseudo_thread_id same way as other code sql/set_var.cc: Added variables 'thread_handling' Prepare for future variable 'thread_pool_size' Fixed compiler warnings sql/set_var.h: Fixed compiler warning sql/slave.cc: Setup pseudo_thread_id same way as other code Removed not used signal mask sql/sql_acl.cc: Fixed compiler warnings from 'max' build sql/sql_base.cc: Fixed long comments Normalized variable setup Don't destroy value of thd->variables.pseduo_thread_id More DBUG_PRINT()'s More DBUG_ASSERT()'s Fixed compiler warnings from 'max' build sql/sql_class.cc: Remove thd->real_id and thd->dbug_thread_id Added DBUG_ASSERT() Use thread_scheduler to signal threads to be killed. In THD::store_globals(), set my_thread_var->id to be thd->thread_id. Fixed compiler warnings sql/sql_class.h: Use 'my_thread_id' for internal thread id's Remove not needed THD elements: block_signals and dbug_thread_id Added 'thread_scheduler' scheduling extension element to THD sql/sql_insert.cc: After merge fixes (This actually fixes a bug in old code when many connections are in use) Setup pseudo_thread_id same way as other code Removed not used signal mask Initialize variable that may be used unitialized on error conditions (not fatal) sql/sql_parse.cc: Move connection related code to sql_connect.cc Remove setting of signal mask (not needed) Ensure TABLE_LIST->alias is set for generated TABLE_LIST elements (fixed core dumps when running with --debug) Added previous 'optional' element to reset_mgh() Removed not needed DBUG_PRINT call sql/sql_partition.cc: Fixed compiler warnings sql/sql_prepare.cc: Removed not needed casts Fixed compiler warnings from 'max' build sql/sql_select.cc: Fixed compiler warnings sql-bench/bench-init.pl.sh: Added --one-missing-tests sql-bench/example: Better example sql-bench/run-all-tests.sh: Added --only-missing-tests sql-bench/test-insert.sh: Fixed wrong estimate of update_with_key_prefix sql/sql_show.cc: Don't send pthread_kill() to threads to detect if they exists. (Not that useful and causes problems with future thread_handling code) Fixed compiler warnings sql/sql_table.cc: Simplify code Fixed compiler warnings sql/sql_test.cc: Remove dbug_thread_id from test output sql/sql_view.cc: Don't send zero pointer to fn_format() sql/tztime.cc: Fixed compiler warning sql/udf_example.def: Fixed compiler warnings on win64 sql/unireg.cc: Initialize variable that may be used unitialized on error conditions storage/archive/archive_test.c: Fixed compiler warnings storage/archive/azio.c: Fixed compiler warnings storage/innobase/dict/dict0crea.c: Fixed compiler warnings detected on windows64 storage/innobase/dict/dict0dict.c: Fixed compiler warnings detected on windows64 storage/innobase/dict/dict0load.c: Fixed compiler warnings detected on windows64 storage/innobase/dict/dict0mem.c: Fixed compiler warnings detected on windows64 storage/innobase/eval/eval0proc.c: Fixed compiler warnings detected on windows64 storage/innobase/handler/ha_innodb.cc: Fixed compiler warnings detected on windows64 storage/innobase/include/ut0byte.ic: Fixed compiler warnings on win64 storage/innobase/include/ut0ut.ic: Fixed compiler warnings on win64 storage/innobase/mtr/mtr0log.c: Fixed compiler warnings detected on windows64 storage/innobase/pars/pars0lex.l: Fixed warnings on win64 storage/innobase/rem/rem0cmp.c: Fixed compiler warnings detected on windows64 storage/innobase/row/row0mysql.c: Fixed compiler warnings detected on windows64 storage/innobase/row/row0sel.c: Fixed compiler warnings detected on windows64 storage/innobase/sync/sync0rw.c: Fixed compiler warnings detected on windows64 storage/innobase/trx/trx0trx.c: Fixed compiler warnings detected on windows64 storage/myisam/mi_log.c: my_thread_id() -> my_thread_debug_id() storage/myisam/mi_packrec.c: Fixed compiler warnings detected on windows64 storage/myisam/myisamchk.c: Fixed compiler warnings from 'max' build storage/ndb/src/common/debugger/EventLogger.cpp: Fixed compiler warnings storage/ndb/src/common/util/ConfigValues.cpp: Removed compiler warnings storage/ndb/src/common/util/NdbSqlUtil.cpp: Removed compiler warnings storage/ndb/src/cw/cpcd/CPCD.hpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/backup/Backup.cpp: Fixed compiler warnings detected on windows64 storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp: Fixed compiler warnings detected on windows64 storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: Fixed compiler warnings detected on windows64 storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/diskpage.hpp: Fixed compiler warnings storage/ndb/src/kernel/vm/ndbd_malloc.cpp: Fixed compiler warnings storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp: Fixed compiler warnings storage/ndb/src/mgmclient/main.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/NdbOperationExec.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/SignalSender.cpp: Fixed compiler warnings storage/ndb/tools/restore/consumer_restore.cpp: Fixed compiler warnings strings/ctype-ucs2.c: Fixed compiler warnings strings/ctype-utf8.c: Fixed compiler warnings strings/decimal.c: Fixed compiler warnings strings/my_strchr.c: Fixed conflict between function and prototype support-files/compiler_warnings.supp: Ignore warnings from sql_yacc.cc that are hard to remove Ignore some not important warnings from windows 64 bit build Suppress warnings from bdb and (for the moment) warnings from ndb Suppress all warnings for all pushbuild platforms (should make all trees green) vio/viosslfactories.c: Added DBUG_PRINT BUILD/compile-pentium64-max: New BitKeeper file ``BUILD/compile-pentium64-max'' libmysqld/scheduler.cc: New BitKeeper file ``libmysqld/scheduler.cc'' libmysqld/sql_connect.cc: New BitKeeper file ``libmysqld/sql_connect.cc'' mysql-test/include/one_thread_per_connection.inc: New BitKeeper file ``mysql-test/include/one_thread_per_connection.inc'' mysql-test/r/no-threads.result: New BitKeeper file ``mysql-test/r/no-threads.result'' mysql-test/r/one_thread_per_connection.require: New BitKeeper file ``mysql-test/r/one_thread_per_connection.require'' mysql-test/t/no-threads-master.opt: New BitKeeper file ``mysql-test/t/no-threads-master.opt'' mysql-test/t/no-threads.test: New BitKeeper file ``mysql-test/t/no-threads.test'' sql/scheduler.cc: New BitKeeper file ``sql/scheduler.cc'' sql/scheduler.h: New BitKeeper file ``sql/scheduler.h'' sql/sql_connect.cc: New BitKeeper file ``sql/sql_connect.cc''
1084 lines
27 KiB
C++
1084 lines
27 KiB
C++
/*
|
|
* Copyright (c) 2000
|
|
* SWsoft company
|
|
*
|
|
* This material is provided "as is", with absolutely no warranty expressed
|
|
* or implied. Any use is at your own risk.
|
|
*
|
|
* Permission to use or copy this software for any purpose is hereby granted
|
|
* without fee, provided the above notices are retained on all copies.
|
|
* Permission to modify the code and to distribute modified code is granted,
|
|
* provided the above notices are retained, and a notice that the code was
|
|
* modified is included with the above copyright notice.
|
|
*
|
|
|
|
This code was modified by the MySQL team
|
|
*/
|
|
|
|
/*
|
|
The following is needed to not cause conflicts when we include mysqld.cc
|
|
*/
|
|
|
|
#define main main1
|
|
#define mysql_unix_port mysql_inix_port1
|
|
#define mysql_port mysql_port1
|
|
|
|
extern "C"
|
|
{
|
|
extern unsigned long max_allowed_packet, net_buffer_length;
|
|
}
|
|
|
|
#if defined(__WIN__) && !defined(USING_CMAKE)
|
|
#include "../sql/mysqld.cpp"
|
|
#else
|
|
#include "../sql/mysqld.cc"
|
|
#endif
|
|
|
|
C_MODE_START
|
|
|
|
#include <mysql.h>
|
|
#undef ER
|
|
#include "errmsg.h"
|
|
#include <sql_common.h>
|
|
#include "embedded_priv.h"
|
|
|
|
static my_bool emb_read_query_result(MYSQL *mysql);
|
|
|
|
|
|
/*
|
|
Reads error information from the MYSQL_DATA and puts
|
|
it into proper MYSQL members
|
|
|
|
SYNOPSIS
|
|
embedded_get_error()
|
|
mysql connection handler
|
|
data query result
|
|
|
|
NOTES
|
|
after that function error information will be accessible
|
|
with usual functions like mysql_error()
|
|
data is my_free-d in this function
|
|
most of the data is stored in data->embedded_info structure
|
|
*/
|
|
|
|
void embedded_get_error(MYSQL *mysql, MYSQL_DATA *data)
|
|
{
|
|
NET *net= &mysql->net;
|
|
struct embedded_query_result *ei= data->embedded_info;
|
|
net->last_errno= ei->last_errno;
|
|
strmake(net->last_error, ei->info, sizeof(net->last_error));
|
|
memcpy(net->sqlstate, ei->sqlstate, sizeof(net->sqlstate));
|
|
my_free((gptr) data, MYF(0));
|
|
}
|
|
|
|
static my_bool
|
|
emb_advanced_command(MYSQL *mysql, enum enum_server_command command,
|
|
const char *header, ulong header_length,
|
|
const char *arg, ulong arg_length, my_bool skip_check,
|
|
MYSQL_STMT *stmt)
|
|
{
|
|
my_bool result= 1;
|
|
THD *thd=(THD *) mysql->thd;
|
|
NET *net= &mysql->net;
|
|
|
|
thd->clear_data_list();
|
|
/* Check that we are calling the client functions in right order */
|
|
if (mysql->status != MYSQL_STATUS_READY)
|
|
{
|
|
strmov(net->last_error,
|
|
ER(net->last_errno=CR_COMMANDS_OUT_OF_SYNC));
|
|
return 1;
|
|
}
|
|
|
|
/* Clear result variables */
|
|
thd->clear_error();
|
|
mysql->affected_rows= ~(my_ulonglong) 0;
|
|
mysql->field_count= 0;
|
|
net->last_errno= 0;
|
|
thd->current_stmt= stmt;
|
|
|
|
thd->store_globals(); // Fix if more than one connect
|
|
/*
|
|
We have to call free_old_query before we start to fill mysql->fields
|
|
for new query. In the case of embedded server we collect field data
|
|
during query execution (not during data retrieval as it is in remote
|
|
client). So we have to call free_old_query here
|
|
*/
|
|
free_old_query(mysql);
|
|
|
|
thd->extra_length= arg_length;
|
|
thd->extra_data= (char *)arg;
|
|
if (header)
|
|
{
|
|
arg= header;
|
|
arg_length= header_length;
|
|
}
|
|
|
|
thd->net.no_send_error= 0;
|
|
result= dispatch_command(command, thd, (char *) arg, arg_length + 1);
|
|
thd->cur_data= 0;
|
|
|
|
if (!skip_check)
|
|
result= thd->net.last_errno ? -1 : 0;
|
|
|
|
return result;
|
|
}
|
|
|
|
static void emb_flush_use_result(MYSQL *mysql)
|
|
{
|
|
THD *thd= (THD*) mysql->thd;
|
|
if (thd->cur_data)
|
|
{
|
|
free_rows(thd->cur_data);
|
|
thd->cur_data= 0;
|
|
}
|
|
else if (thd->first_data)
|
|
{
|
|
MYSQL_DATA *data= thd->first_data;
|
|
thd->first_data= data->embedded_info->next;
|
|
free_rows(data);
|
|
}
|
|
}
|
|
|
|
|
|
/*
|
|
reads dataset from the next query result
|
|
|
|
SYNOPSIS
|
|
emb_read_rows()
|
|
mysql connection handle
|
|
other parameters are not used
|
|
|
|
NOTES
|
|
It just gets next MYSQL_DATA from the result's queue
|
|
|
|
RETURN
|
|
pointer to MYSQL_DATA with the coming recordset
|
|
*/
|
|
|
|
static MYSQL_DATA *
|
|
emb_read_rows(MYSQL *mysql, MYSQL_FIELD *mysql_fields __attribute__((unused)),
|
|
unsigned int fields __attribute__((unused)))
|
|
{
|
|
MYSQL_DATA *result= ((THD*)mysql->thd)->cur_data;
|
|
((THD*)mysql->thd)->cur_data= 0;
|
|
if (result->embedded_info->last_errno)
|
|
{
|
|
embedded_get_error(mysql, result);
|
|
return NULL;
|
|
}
|
|
*result->embedded_info->prev_ptr= NULL;
|
|
return result;
|
|
}
|
|
|
|
|
|
static MYSQL_FIELD *emb_list_fields(MYSQL *mysql)
|
|
{
|
|
MYSQL_DATA *res;
|
|
if (emb_read_query_result(mysql))
|
|
return 0;
|
|
res= ((THD*) mysql->thd)->cur_data;
|
|
((THD*) mysql->thd)->cur_data= 0;
|
|
mysql->field_alloc= res->alloc;
|
|
my_free((gptr) res,MYF(0));
|
|
mysql->status= MYSQL_STATUS_READY;
|
|
return mysql->fields;
|
|
}
|
|
|
|
static my_bool emb_read_prepare_result(MYSQL *mysql, MYSQL_STMT *stmt)
|
|
{
|
|
THD *thd= (THD*) mysql->thd;
|
|
MYSQL_DATA *res;
|
|
|
|
stmt->stmt_id= thd->client_stmt_id;
|
|
stmt->param_count= thd->client_param_count;
|
|
stmt->field_count= 0;
|
|
mysql->warning_count= thd->total_warn_count;
|
|
|
|
if (thd->first_data)
|
|
{
|
|
if (emb_read_query_result(mysql))
|
|
return 1;
|
|
stmt->field_count= mysql->field_count;
|
|
mysql->status= MYSQL_STATUS_READY;
|
|
res= thd->cur_data;
|
|
thd->cur_data= NULL;
|
|
if (!(mysql->server_status & SERVER_STATUS_AUTOCOMMIT))
|
|
mysql->server_status|= SERVER_STATUS_IN_TRANS;
|
|
|
|
stmt->fields= mysql->fields;
|
|
stmt->mem_root= res->alloc;
|
|
mysql->fields= NULL;
|
|
my_free((gptr) res,MYF(0));
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/**************************************************************************
|
|
Get column lengths of the current row
|
|
If one uses mysql_use_result, res->lengths contains the length information,
|
|
else the lengths are calculated from the offset between pointers.
|
|
**************************************************************************/
|
|
|
|
static void emb_fetch_lengths(ulong *to, MYSQL_ROW column,
|
|
unsigned int field_count)
|
|
{
|
|
MYSQL_ROW end;
|
|
|
|
for (end=column + field_count; column != end ; column++,to++)
|
|
*to= *column ? *(uint *)((*column) - sizeof(uint)) : 0;
|
|
}
|
|
|
|
static my_bool emb_read_query_result(MYSQL *mysql)
|
|
{
|
|
THD *thd= (THD*) mysql->thd;
|
|
MYSQL_DATA *res= thd->first_data;
|
|
DBUG_ASSERT(!thd->cur_data);
|
|
thd->first_data= res->embedded_info->next;
|
|
if (res->embedded_info->last_errno &&
|
|
!res->embedded_info->fields_list)
|
|
{
|
|
embedded_get_error(mysql, res);
|
|
return 1;
|
|
}
|
|
|
|
mysql->warning_count= res->embedded_info->warning_count;
|
|
mysql->server_status= res->embedded_info->server_status;
|
|
mysql->field_count= res->fields;
|
|
mysql->fields= res->embedded_info->fields_list;
|
|
mysql->affected_rows= res->embedded_info->affected_rows;
|
|
mysql->insert_id= res->embedded_info->insert_id;
|
|
mysql->net.last_errno= 0;
|
|
mysql->net.last_error[0]= 0;
|
|
mysql->info= 0;
|
|
|
|
if (res->embedded_info->info[0])
|
|
{
|
|
strmake(mysql->info_buffer, res->embedded_info->info, MYSQL_ERRMSG_SIZE-1);
|
|
mysql->info= mysql->info_buffer;
|
|
}
|
|
|
|
if (res->embedded_info->fields_list)
|
|
{
|
|
mysql->status=MYSQL_STATUS_GET_RESULT;
|
|
thd->cur_data= res;
|
|
}
|
|
else
|
|
my_free((gptr) res, MYF(0));
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int emb_stmt_execute(MYSQL_STMT *stmt)
|
|
{
|
|
DBUG_ENTER("emb_stmt_execute");
|
|
char header[5];
|
|
THD *thd;
|
|
my_bool res;
|
|
|
|
int4store(header, stmt->stmt_id);
|
|
header[4]= stmt->flags;
|
|
thd= (THD*)stmt->mysql->thd;
|
|
thd->client_param_count= stmt->param_count;
|
|
thd->client_params= stmt->params;
|
|
|
|
res= test(emb_advanced_command(stmt->mysql, COM_STMT_EXECUTE, 0, 0,
|
|
header, sizeof(header), 1, stmt) ||
|
|
emb_read_query_result(stmt->mysql));
|
|
stmt->affected_rows= stmt->mysql->affected_rows;
|
|
stmt->insert_id= stmt->mysql->insert_id;
|
|
stmt->server_status= stmt->mysql->server_status;
|
|
if (res)
|
|
{
|
|
NET *net= &stmt->mysql->net;
|
|
set_stmt_errmsg(stmt, net->last_error, net->last_errno, net->sqlstate);
|
|
DBUG_RETURN(1);
|
|
}
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
int emb_read_binary_rows(MYSQL_STMT *stmt)
|
|
{
|
|
MYSQL_DATA *data;
|
|
if (!(data= emb_read_rows(stmt->mysql, 0, 0)))
|
|
{
|
|
set_stmt_errmsg(stmt, stmt->mysql->net.last_error,
|
|
stmt->mysql->net.last_errno, stmt->mysql->net.sqlstate);
|
|
return 1;
|
|
}
|
|
stmt->result= *data;
|
|
my_free((char *) data, MYF(0));
|
|
set_stmt_errmsg(stmt, stmt->mysql->net.last_error,
|
|
stmt->mysql->net.last_errno, stmt->mysql->net.sqlstate);
|
|
return 0;
|
|
}
|
|
|
|
int emb_read_rows_from_cursor(MYSQL_STMT *stmt)
|
|
{
|
|
MYSQL *mysql= stmt->mysql;
|
|
THD *thd= (THD*) mysql->thd;
|
|
MYSQL_DATA *res= thd->first_data;
|
|
DBUG_ASSERT(!thd->first_data->embedded_info->next);
|
|
thd->first_data= 0;
|
|
if (res->embedded_info->last_errno)
|
|
{
|
|
embedded_get_error(mysql, res);
|
|
set_stmt_errmsg(stmt, mysql->net.last_error,
|
|
mysql->net.last_errno, mysql->net.sqlstate);
|
|
return 1;
|
|
}
|
|
|
|
thd->cur_data= res;
|
|
mysql->warning_count= res->embedded_info->warning_count;
|
|
mysql->server_status= res->embedded_info->server_status;
|
|
mysql->net.last_errno= 0;
|
|
mysql->net.last_error[0]= 0;
|
|
|
|
return emb_read_binary_rows(stmt);
|
|
}
|
|
|
|
int emb_unbuffered_fetch(MYSQL *mysql, char **row)
|
|
{
|
|
THD *thd= (THD*) mysql->thd;
|
|
MYSQL_DATA *data= thd->cur_data;
|
|
if (data && data->embedded_info->last_errno)
|
|
{
|
|
embedded_get_error(mysql, data);
|
|
thd->cur_data= 0;
|
|
return 1;
|
|
}
|
|
if (!data || !data->data)
|
|
{
|
|
*row= NULL;
|
|
if (data)
|
|
{
|
|
thd->cur_data= thd->first_data;
|
|
thd->first_data= data->embedded_info->next;
|
|
free_rows(data);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
*row= (char *)data->data->data;
|
|
data->data= data->data->next;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static void emb_free_embedded_thd(MYSQL *mysql)
|
|
{
|
|
THD *thd= (THD*)mysql->thd;
|
|
thd->clear_data_list();
|
|
thread_count--;
|
|
thd->store_globals();
|
|
delete thd;
|
|
mysql->thd=0;
|
|
}
|
|
|
|
static const char * emb_read_statistics(MYSQL *mysql)
|
|
{
|
|
THD *thd= (THD*)mysql->thd;
|
|
return thd->net.last_error;
|
|
}
|
|
|
|
|
|
static MYSQL_RES * emb_store_result(MYSQL *mysql)
|
|
{
|
|
return mysql_store_result(mysql);
|
|
}
|
|
|
|
int emb_read_change_user_result(MYSQL *mysql,
|
|
char *buff __attribute__((unused)),
|
|
const char *passwd __attribute__((unused)))
|
|
{
|
|
return mysql_errno(mysql);
|
|
}
|
|
|
|
MYSQL_METHODS embedded_methods=
|
|
{
|
|
emb_read_query_result,
|
|
emb_advanced_command,
|
|
emb_read_rows,
|
|
emb_store_result,
|
|
emb_fetch_lengths,
|
|
emb_flush_use_result,
|
|
emb_list_fields,
|
|
emb_read_prepare_result,
|
|
emb_stmt_execute,
|
|
emb_read_binary_rows,
|
|
emb_unbuffered_fetch,
|
|
emb_free_embedded_thd,
|
|
emb_read_statistics,
|
|
emb_read_query_result,
|
|
emb_read_change_user_result,
|
|
emb_read_rows_from_cursor
|
|
};
|
|
|
|
/*
|
|
Make a copy of array and the strings array points to
|
|
*/
|
|
|
|
char **copy_arguments(int argc, char **argv)
|
|
{
|
|
uint length= 0;
|
|
char **from, **res, **end= argv+argc;
|
|
|
|
for (from=argv ; from != end ; from++)
|
|
length+= strlen(*from);
|
|
|
|
if ((res= (char**) my_malloc(sizeof(argv)*(argc+1)+length+argc,
|
|
MYF(MY_WME))))
|
|
{
|
|
char **to= res, *to_str= (char*) (res+argc+1);
|
|
for (from=argv ; from != end ;)
|
|
{
|
|
*to++= to_str;
|
|
to_str= strmov(to_str, *from++)+1;
|
|
}
|
|
*to= 0; // Last ptr should be null
|
|
}
|
|
return res;
|
|
}
|
|
|
|
char ** copy_arguments_ptr= 0;
|
|
|
|
int init_embedded_server(int argc, char **argv, char **groups)
|
|
{
|
|
/*
|
|
This mess is to allow people to call the init function without
|
|
having to mess with a fake argv
|
|
*/
|
|
int *argcp;
|
|
char ***argvp;
|
|
int fake_argc = 1;
|
|
char *fake_argv[] = { (char *)"", 0 };
|
|
const char *fake_groups[] = { "server", "embedded", 0 };
|
|
my_bool acl_error;
|
|
if (argc)
|
|
{
|
|
argcp= &argc;
|
|
argvp= (char***) &argv;
|
|
}
|
|
else
|
|
{
|
|
argcp= &fake_argc;
|
|
argvp= (char ***) &fake_argv;
|
|
}
|
|
if (!groups)
|
|
groups= (char**) fake_groups;
|
|
|
|
my_progname= (char *)"mysql_embedded";
|
|
|
|
/*
|
|
Perform basic logger initialization logger. Should be called after
|
|
MY_INIT, as it initializes mutexes. Log tables are inited later.
|
|
*/
|
|
logger.init_base();
|
|
|
|
if (init_common_variables("my", *argcp, *argvp, (const char **)groups))
|
|
{
|
|
mysql_server_end();
|
|
return 1;
|
|
}
|
|
|
|
/* Get default temporary directory */
|
|
opt_mysql_tmpdir=getenv("TMPDIR"); /* Use this if possible */
|
|
#if defined( __WIN__) || defined(OS2)
|
|
if (!opt_mysql_tmpdir)
|
|
opt_mysql_tmpdir=getenv("TEMP");
|
|
if (!opt_mysql_tmpdir)
|
|
opt_mysql_tmpdir=getenv("TMP");
|
|
#endif
|
|
if (!opt_mysql_tmpdir || !opt_mysql_tmpdir[0])
|
|
opt_mysql_tmpdir=(char*) P_tmpdir; /* purecov: inspected */
|
|
|
|
umask(((~my_umask) & 0666));
|
|
if (init_server_components())
|
|
{
|
|
mysql_server_end();
|
|
return 1;
|
|
}
|
|
|
|
error_handler_hook = my_message_sql;
|
|
|
|
acl_error= 0;
|
|
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
|
if (!(acl_error= acl_init(opt_noacl)) &&
|
|
!opt_noacl)
|
|
(void) grant_init();
|
|
#endif
|
|
if (acl_error || my_tz_init((THD *)0, default_tz_name, opt_bootstrap))
|
|
{
|
|
mysql_server_end();
|
|
return 1;
|
|
}
|
|
|
|
init_max_user_conn();
|
|
init_update_queries();
|
|
|
|
#ifdef HAVE_DLOPEN
|
|
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
|
if (!opt_noacl)
|
|
#endif
|
|
udf_init();
|
|
#endif
|
|
|
|
(void) thr_setconcurrency(concurrency); // 10 by default
|
|
|
|
if (flush_time && flush_time != ~(ulong) 0L)
|
|
{
|
|
pthread_t hThread;
|
|
if (pthread_create(&hThread,&connection_attrib,handle_manager,0))
|
|
sql_print_error("Warning: Can't create thread to manage maintenance");
|
|
}
|
|
|
|
// FIXME initialize binlog_filter and rpl_filter if not already done
|
|
// corresponding delete is in clean_up()
|
|
if(!binlog_filter) binlog_filter = new Rpl_filter;
|
|
if(!rpl_filter) rpl_filter = new Rpl_filter;
|
|
|
|
if (opt_init_file)
|
|
{
|
|
if (read_init_file(opt_init_file))
|
|
{
|
|
mysql_server_end();
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
execute_ddl_log_recovery();
|
|
return 0;
|
|
}
|
|
|
|
void end_embedded_server()
|
|
{
|
|
my_free((char*) copy_arguments_ptr, MYF(MY_ALLOW_ZERO_PTR));
|
|
copy_arguments_ptr=0;
|
|
release_ddl_log();
|
|
clean_up(0);
|
|
}
|
|
|
|
|
|
void init_embedded_mysql(MYSQL *mysql, int client_flag)
|
|
{
|
|
THD *thd = (THD *)mysql->thd;
|
|
thd->mysql= mysql;
|
|
mysql->server_version= server_version;
|
|
init_alloc_root(&mysql->field_alloc, 8192, 0);
|
|
}
|
|
|
|
void *create_embedded_thd(int client_flag)
|
|
{
|
|
THD * thd= new THD;
|
|
thd->thread_id= thread_id++;
|
|
|
|
thd->thread_stack= (char*) &thd;
|
|
if (thd->store_globals())
|
|
{
|
|
fprintf(stderr,"store_globals failed.\n");
|
|
goto err;
|
|
}
|
|
|
|
/* TODO - add init_connect command execution */
|
|
|
|
if (thd->variables.max_join_size == HA_POS_ERROR)
|
|
thd->options |= OPTION_BIG_SELECTS;
|
|
thd->proc_info=0; // Remove 'login'
|
|
thd->command=COM_SLEEP;
|
|
thd->version=refresh_version;
|
|
thd->set_time();
|
|
thd->init_for_queries();
|
|
thd->client_capabilities= client_flag;
|
|
thd->real_id= pthread_self();
|
|
|
|
thd->db= NULL;
|
|
thd->db_length= 0;
|
|
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
|
thd->security_ctx->db_access= DB_ACLS;
|
|
thd->security_ctx->master_access= ~NO_ACCESS;
|
|
#endif
|
|
thd->cur_data= 0;
|
|
thd->first_data= 0;
|
|
thd->data_tail= &thd->first_data;
|
|
bzero((char*) &thd->net, sizeof(thd->net));
|
|
|
|
thread_count++;
|
|
return thd;
|
|
err:
|
|
delete(thd);
|
|
return NULL;
|
|
}
|
|
|
|
|
|
#ifdef NO_EMBEDDED_ACCESS_CHECKS
|
|
int check_embedded_connection(MYSQL *mysql, const char *db)
|
|
{
|
|
int result;
|
|
THD *thd= (THD*)mysql->thd;
|
|
thd_init_client_charset(thd, mysql->charset->number);
|
|
thd->update_charset();
|
|
Security_context *sctx= thd->security_ctx;
|
|
sctx->host_or_ip= sctx->host= (char*) my_localhost;
|
|
strmake(sctx->priv_host, (char*) my_localhost, MAX_HOSTNAME-1);
|
|
sctx->priv_user= sctx->user= my_strdup(mysql->user, MYF(0));
|
|
result= check_user(thd, COM_CONNECT, NULL, 0, db, true);
|
|
emb_read_query_result(mysql);
|
|
return result;
|
|
}
|
|
|
|
#else
|
|
int check_embedded_connection(MYSQL *mysql, const char *db)
|
|
{
|
|
THD *thd= (THD*)mysql->thd;
|
|
Security_context *sctx= thd->security_ctx;
|
|
int result;
|
|
char scramble_buff[SCRAMBLE_LENGTH];
|
|
int passwd_len;
|
|
|
|
thd_init_client_charset(thd, mysql->charset->number);
|
|
thd->update_charset();
|
|
if (mysql->options.client_ip)
|
|
{
|
|
sctx->host= my_strdup(mysql->options.client_ip, MYF(0));
|
|
sctx->ip= my_strdup(sctx->host, MYF(0));
|
|
}
|
|
else
|
|
sctx->host= (char*)my_localhost;
|
|
sctx->host_or_ip= sctx->host;
|
|
|
|
if (acl_check_host(sctx->host, sctx->ip))
|
|
{
|
|
result= ER_HOST_NOT_PRIVILEGED;
|
|
goto err;
|
|
}
|
|
|
|
sctx->user= my_strdup(mysql->user, MYF(0));
|
|
if (mysql->passwd && mysql->passwd[0])
|
|
{
|
|
memset(thd->scramble, 55, SCRAMBLE_LENGTH); // dummy scramble
|
|
thd->scramble[SCRAMBLE_LENGTH]= 0;
|
|
scramble(scramble_buff, thd->scramble, mysql->passwd);
|
|
passwd_len= SCRAMBLE_LENGTH;
|
|
}
|
|
else
|
|
passwd_len= 0;
|
|
|
|
if((result= check_user(thd, COM_CONNECT,
|
|
scramble_buff, passwd_len, db, true)))
|
|
goto err;
|
|
|
|
return 0;
|
|
err:
|
|
{
|
|
NET *net= &mysql->net;
|
|
memcpy(net->last_error, thd->net.last_error, sizeof(net->last_error));
|
|
memcpy(net->sqlstate, thd->net.sqlstate, sizeof(net->sqlstate));
|
|
}
|
|
return result;
|
|
}
|
|
#endif
|
|
|
|
C_MODE_END
|
|
|
|
void THD::clear_data_list()
|
|
{
|
|
while (first_data)
|
|
{
|
|
MYSQL_DATA *data= first_data;
|
|
first_data= data->embedded_info->next;
|
|
free_rows(data);
|
|
}
|
|
data_tail= &first_data;
|
|
free_rows(cur_data);
|
|
cur_data= 0;
|
|
}
|
|
|
|
void THD::clear_error()
|
|
{
|
|
net.last_error[0]= 0;
|
|
net.last_errno= 0;
|
|
net.report_error= 0;
|
|
}
|
|
|
|
static char *dup_str_aux(MEM_ROOT *root, const char *from, uint length,
|
|
CHARSET_INFO *fromcs, CHARSET_INFO *tocs)
|
|
{
|
|
uint32 dummy32;
|
|
uint dummy_err;
|
|
char *result;
|
|
|
|
/* 'tocs' is set 0 when client issues SET character_set_results=NULL */
|
|
if (tocs && String::needs_conversion(0, fromcs, tocs, &dummy32))
|
|
{
|
|
uint new_len= (tocs->mbmaxlen * length) / fromcs->mbminlen + 1;
|
|
result= (char *)alloc_root(root, new_len);
|
|
length= copy_and_convert(result, new_len,
|
|
tocs, from, length, fromcs, &dummy_err);
|
|
}
|
|
else
|
|
{
|
|
result= (char *)alloc_root(root, length + 1);
|
|
memcpy(result, from, length);
|
|
}
|
|
|
|
result[length]= 0;
|
|
return result;
|
|
}
|
|
|
|
|
|
/*
|
|
creates new result and hooks it to the list
|
|
|
|
SYNOPSIS
|
|
alloc_new_dataset()
|
|
|
|
NOTES
|
|
allocs the MYSQL_DATA + embedded_query_result couple
|
|
to store the next query result,
|
|
links these two and attach it to the THD::data_tail
|
|
|
|
RETURN
|
|
pointer to the newly created query result
|
|
*/
|
|
|
|
MYSQL_DATA *THD::alloc_new_dataset()
|
|
{
|
|
MYSQL_DATA *data;
|
|
struct embedded_query_result *emb_data;
|
|
if (!my_multi_malloc(MYF(MY_WME | MY_ZEROFILL),
|
|
&data, sizeof(*data),
|
|
&emb_data, sizeof(*emb_data),
|
|
NULL))
|
|
return NULL;
|
|
|
|
emb_data->prev_ptr= &data->data;
|
|
cur_data= data;
|
|
*data_tail= data;
|
|
data_tail= &emb_data->next;
|
|
data->embedded_info= emb_data;
|
|
return data;
|
|
}
|
|
|
|
|
|
/*
|
|
stores server_status and warning_count in the current
|
|
query result structures
|
|
|
|
SYNOPSIS
|
|
write_eof_packet()
|
|
thd current thread
|
|
|
|
NOTES
|
|
should be called to after we get the recordset-result
|
|
|
|
*/
|
|
|
|
static void write_eof_packet(THD *thd)
|
|
{
|
|
if (!thd->mysql) // bootstrap file handling
|
|
return;
|
|
/*
|
|
The following test should never be true, but it's better to do it
|
|
because if 'is_fatal_error' is set the server is not going to execute
|
|
other queries (see the if test in dispatch_command / COM_QUERY)
|
|
*/
|
|
if (thd->is_fatal_error)
|
|
thd->server_status&= ~SERVER_MORE_RESULTS_EXISTS;
|
|
thd->cur_data->embedded_info->server_status= thd->server_status;
|
|
/*
|
|
Don't send warn count during SP execution, as the warn_list
|
|
is cleared between substatements, and mysqltest gets confused
|
|
*/
|
|
thd->cur_data->embedded_info->warning_count=
|
|
(thd->spcont ? 0 : min(thd->total_warn_count, 65535));
|
|
}
|
|
|
|
|
|
/*
|
|
allocs new query result and initialises Protocol::alloc
|
|
|
|
SYNOPSIS
|
|
Protocol::begin_dataset()
|
|
|
|
RETURN
|
|
0 if success
|
|
1 if memory allocation failed
|
|
*/
|
|
|
|
int Protocol::begin_dataset()
|
|
{
|
|
MYSQL_DATA *data= thd->alloc_new_dataset();
|
|
if (!data)
|
|
return 1;
|
|
alloc= &data->alloc;
|
|
init_alloc_root(alloc,8192,0); /* Assume rowlength < 8192 */
|
|
alloc->min_malloc=sizeof(MYSQL_ROWS);
|
|
return 0;
|
|
}
|
|
|
|
|
|
/*
|
|
remove last row of current recordset
|
|
|
|
SYNOPSIS
|
|
Protocol_simple::remove_last_row()
|
|
|
|
NOTES
|
|
does the loop from the beginning of the current recordset to
|
|
the last record and cuts it off.
|
|
Not supposed to be frequently called.
|
|
*/
|
|
|
|
void Protocol_simple::remove_last_row()
|
|
{
|
|
MYSQL_DATA *data= thd->cur_data;
|
|
MYSQL_ROWS **last_row_hook= &data->data;
|
|
uint count= data->rows;
|
|
DBUG_ENTER("Protocol_simple::remove_last_row");
|
|
while (--count)
|
|
last_row_hook= &(*last_row_hook)->next;
|
|
|
|
*last_row_hook= 0;
|
|
data->embedded_info->prev_ptr= last_row_hook;
|
|
data->rows--;
|
|
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
bool Protocol::send_fields(List<Item> *list, uint flags)
|
|
{
|
|
List_iterator_fast<Item> it(*list);
|
|
Item *item;
|
|
MYSQL_FIELD *client_field;
|
|
MEM_ROOT *field_alloc;
|
|
CHARSET_INFO *thd_cs= thd->variables.character_set_results;
|
|
CHARSET_INFO *cs= system_charset_info;
|
|
MYSQL_DATA *data;
|
|
DBUG_ENTER("send_fields");
|
|
|
|
if (!thd->mysql) // bootstrap file handling
|
|
DBUG_RETURN(0);
|
|
|
|
if (begin_dataset())
|
|
goto err;
|
|
|
|
data= thd->cur_data;
|
|
data->fields= field_count= list->elements;
|
|
field_alloc= &data->alloc;
|
|
|
|
if (!(client_field= data->embedded_info->fields_list=
|
|
(MYSQL_FIELD*)alloc_root(field_alloc, sizeof(MYSQL_FIELD)*field_count)))
|
|
goto err;
|
|
|
|
while ((item= it++))
|
|
{
|
|
Send_field server_field;
|
|
item->make_field(&server_field);
|
|
|
|
/* Keep things compatible for old clients */
|
|
if (server_field.type == MYSQL_TYPE_VARCHAR)
|
|
server_field.type= MYSQL_TYPE_VAR_STRING;
|
|
|
|
client_field->db= dup_str_aux(field_alloc, server_field.db_name,
|
|
strlen(server_field.db_name), cs, thd_cs);
|
|
client_field->table= dup_str_aux(field_alloc, server_field.table_name,
|
|
strlen(server_field.table_name), cs, thd_cs);
|
|
client_field->name= dup_str_aux(field_alloc, server_field.col_name,
|
|
strlen(server_field.col_name), cs, thd_cs);
|
|
client_field->org_table= dup_str_aux(field_alloc, server_field.org_table_name,
|
|
strlen(server_field.org_table_name), cs, thd_cs);
|
|
client_field->org_name= dup_str_aux(field_alloc, server_field.org_col_name,
|
|
strlen(server_field.org_col_name), cs, thd_cs);
|
|
if (item->collation.collation == &my_charset_bin || thd_cs == NULL)
|
|
{
|
|
/* No conversion */
|
|
client_field->charsetnr= server_field.charsetnr;
|
|
client_field->length= server_field.length;
|
|
}
|
|
else
|
|
{
|
|
uint max_char_len;
|
|
/* With conversion */
|
|
client_field->charsetnr= thd_cs->number;
|
|
max_char_len= (server_field.type >= (int) MYSQL_TYPE_TINY_BLOB &&
|
|
server_field.type <= (int) MYSQL_TYPE_BLOB) ?
|
|
server_field.length / item->collation.collation->mbminlen :
|
|
server_field.length / item->collation.collation->mbmaxlen;
|
|
client_field->length= max_char_len * thd_cs->mbmaxlen;
|
|
}
|
|
client_field->type= server_field.type;
|
|
client_field->flags= server_field.flags;
|
|
client_field->decimals= server_field.decimals;
|
|
client_field->db_length= strlen(client_field->db);
|
|
client_field->table_length= strlen(client_field->table);
|
|
client_field->name_length= strlen(client_field->name);
|
|
client_field->org_name_length= strlen(client_field->org_name);
|
|
client_field->org_table_length= strlen(client_field->org_table);
|
|
|
|
client_field->catalog= dup_str_aux(field_alloc, "def", 3, cs, thd_cs);
|
|
client_field->catalog_length= 3;
|
|
|
|
if (INTERNAL_NUM_FIELD(client_field))
|
|
client_field->flags|= NUM_FLAG;
|
|
|
|
if (flags & (int) Protocol::SEND_DEFAULTS)
|
|
{
|
|
char buff[80];
|
|
String tmp(buff, sizeof(buff), default_charset_info), *res;
|
|
|
|
if (!(res=item->val_str(&tmp)))
|
|
{
|
|
client_field->def_length= 0;
|
|
client_field->def= strmake_root(field_alloc, "",0);
|
|
}
|
|
else
|
|
{
|
|
client_field->def_length= res->length();
|
|
client_field->def= strmake_root(field_alloc, res->ptr(),
|
|
client_field->def_length);
|
|
}
|
|
}
|
|
else
|
|
client_field->def=0;
|
|
client_field->max_length= 0;
|
|
++client_field;
|
|
}
|
|
|
|
if (flags & SEND_EOF)
|
|
write_eof_packet(thd);
|
|
|
|
DBUG_RETURN(prepare_for_send(list));
|
|
err:
|
|
my_error(ER_OUT_OF_RESOURCES, MYF(0)); /* purecov: inspected */
|
|
DBUG_RETURN(1); /* purecov: inspected */
|
|
}
|
|
|
|
bool Protocol::write()
|
|
{
|
|
if (!thd->mysql) // bootstrap file handling
|
|
return false;
|
|
|
|
*next_field= 0;
|
|
return false;
|
|
}
|
|
|
|
bool Protocol_prep::write()
|
|
{
|
|
MYSQL_ROWS *cur;
|
|
MYSQL_DATA *data= thd->cur_data;
|
|
|
|
data->rows++;
|
|
if (!(cur= (MYSQL_ROWS *)alloc_root(alloc,
|
|
sizeof(MYSQL_ROWS)+packet->length())))
|
|
{
|
|
my_error(ER_OUT_OF_RESOURCES,MYF(0));
|
|
return true;
|
|
}
|
|
cur->data= (MYSQL_ROW)(((char *)cur) + sizeof(MYSQL_ROWS));
|
|
memcpy(cur->data, packet->ptr()+1, packet->length()-1);
|
|
cur->length= packet->length(); /* To allow us to do sanity checks */
|
|
|
|
*data->embedded_info->prev_ptr= cur;
|
|
data->embedded_info->prev_ptr= &cur->next;
|
|
cur->next= 0;
|
|
|
|
return false;
|
|
}
|
|
|
|
void
|
|
send_ok(THD *thd,ha_rows affected_rows,ulonglong id,const char *message)
|
|
{
|
|
DBUG_ENTER("send_ok");
|
|
MYSQL_DATA *data;
|
|
MYSQL *mysql= thd->mysql;
|
|
|
|
if (!mysql) // bootstrap file handling
|
|
DBUG_VOID_RETURN;
|
|
if (thd->net.no_send_ok) // hack for re-parsing queries
|
|
DBUG_VOID_RETURN;
|
|
if (!(data= thd->alloc_new_dataset()))
|
|
return;
|
|
data->embedded_info->affected_rows= affected_rows;
|
|
data->embedded_info->insert_id= id;
|
|
if (message)
|
|
strmake(data->embedded_info->info, message,
|
|
sizeof(data->embedded_info->info)-1);
|
|
|
|
write_eof_packet(thd);
|
|
thd->cur_data= 0;
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
void
|
|
send_eof(THD *thd)
|
|
{
|
|
write_eof_packet(thd);
|
|
thd->cur_data= 0;
|
|
}
|
|
|
|
|
|
void net_send_error_packet(THD *thd, uint sql_errno, const char *err)
|
|
{
|
|
MYSQL_DATA *data= thd->cur_data ? thd->cur_data : thd->alloc_new_dataset();
|
|
struct embedded_query_result *ei= data->embedded_info;
|
|
|
|
ei->last_errno= sql_errno;
|
|
strmake(ei->info, err, sizeof(ei->info)-1);
|
|
strmov(ei->sqlstate, mysql_errno_to_sqlstate(sql_errno));
|
|
thd->cur_data= 0;
|
|
}
|
|
|
|
|
|
void Protocol_simple::prepare_for_resend()
|
|
{
|
|
MYSQL_ROWS *cur;
|
|
MYSQL_DATA *data= thd->cur_data;
|
|
DBUG_ENTER("send_data");
|
|
|
|
if (!thd->mysql) // bootstrap file handling
|
|
DBUG_VOID_RETURN;
|
|
|
|
data->rows++;
|
|
if (!(cur= (MYSQL_ROWS *)alloc_root(alloc, sizeof(MYSQL_ROWS)+(field_count + 1) * sizeof(char *))))
|
|
{
|
|
my_error(ER_OUT_OF_RESOURCES,MYF(0));
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
cur->data= (MYSQL_ROW)(((char *)cur) + sizeof(MYSQL_ROWS));
|
|
|
|
*data->embedded_info->prev_ptr= cur;
|
|
data->embedded_info->prev_ptr= &cur->next;
|
|
next_field=cur->data;
|
|
next_mysql_field= data->embedded_info->fields_list;
|
|
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
bool Protocol_simple::store_null()
|
|
{
|
|
*(next_field++)= NULL;
|
|
++next_mysql_field;
|
|
return false;
|
|
}
|
|
|
|
bool Protocol::net_store_data(const char *from, uint length)
|
|
{
|
|
char *field_buf;
|
|
if (!thd->mysql) // bootstrap file handling
|
|
return false;
|
|
|
|
if (!(field_buf=alloc_root(alloc, length + sizeof(uint) + 1)))
|
|
return true;
|
|
*(uint *)field_buf= length;
|
|
*next_field= field_buf + sizeof(uint);
|
|
memcpy(*next_field, from, length);
|
|
(*next_field)[length]= 0;
|
|
if (next_mysql_field->max_length < length)
|
|
next_mysql_field->max_length=length;
|
|
++next_field;
|
|
++next_mysql_field;
|
|
return false;
|
|
}
|
|
|