mirror of
https://github.com/MariaDB/server.git
synced 2025-04-28 06:45:23 +03:00
Merge mysql.com:/home/hf/work/embt/my41-embt
into mysql.com:/home/hf/work/embt/my50-embt sql/item_func.cc: Auto merged mysql-test/t/innodb.test: merging libmysqld/lib_sql.cc: SCCS merged
This commit is contained in:
commit
002fefaba7
@ -10,7 +10,7 @@
|
||||
top_builddir=../..
|
||||
mysql_test_dir=$top_builddir/mysql-test
|
||||
examples=$top_builddir/libmysqld/examples
|
||||
mysqltest=$examples/mysqltest
|
||||
mysqltest=$examples/mysqltest_embedded
|
||||
datadir=$mysql_test_dir/var/master-data
|
||||
test_data_dir=test
|
||||
gdb=0
|
||||
|
@ -584,6 +584,7 @@ void *create_embedded_thd(int client_flag)
|
||||
thd->set_time();
|
||||
thd->init_for_queries();
|
||||
thd->client_capabilities= client_flag;
|
||||
thd->real_id= (pthread_t) thd;
|
||||
|
||||
thd->db= NULL;
|
||||
thd->db_length= 0;
|
||||
@ -1028,6 +1029,9 @@ void Protocol_simple::prepare_for_resend()
|
||||
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 *))))
|
||||
{
|
||||
|
@ -3347,7 +3347,11 @@ longlong Item_func_release_lock::val_int()
|
||||
}
|
||||
else
|
||||
{
|
||||
#ifdef EMBEDDED_LIBRARY
|
||||
if (ull->locked && pthread_equal(current_thd->real_id,ull->thread))
|
||||
#else
|
||||
if (ull->locked && pthread_equal(pthread_self(),ull->thread))
|
||||
#endif
|
||||
{
|
||||
result=1; // Release is ok
|
||||
item_user_lock_release(ull);
|
||||
|
Loading…
x
Reference in New Issue
Block a user