database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-06-16 11:21:15 +03:00
Code Activity

Merge mysql.com:/home/hf/work/embt/my41-embt

Browse Source 
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:
unknown
2006-11-13 10:45:22 +04:00
parent f399d65661 28f6e13299
commit 002fefaba7
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libmysqld/examples/test-run
View File

@ -10,7 +10,7 @@
top_builddir=../.. top_builddir=../..
mysql_test_dir=$top_builddir/mysql-test mysql_test_dir=$top_builddir/mysql-test
examples=$top_builddir/libmysqld/examples examples=$top_builddir/libmysqld/examples
mysqltest=$examples/mysqltest mysqltest=$examples/mysqltest_embedded
datadir=$mysql_test_dir/var/master-data datadir=$mysql_test_dir/var/master-data
test_data_dir=test test_data_dir=test
gdb=0 gdb=0

4
libmysqld/lib_sql.cc
View File

@ -584,6 +584,7 @@ void *create_embedded_thd(int client_flag)
thd->set_time(); thd->set_time();
thd->init_for_queries(); thd->init_for_queries();
thd->client_capabilities= client_flag; thd->client_capabilities= client_flag;
thd->real_id= (pthread_t) thd;
thd->db= NULL; thd->db= NULL;
thd->db_length= 0; thd->db_length= 0;
@ -1028,6 +1029,9 @@ void Protocol_simple::prepare_for_resend()
MYSQL_DATA *data= thd->cur_data; MYSQL_DATA *data= thd->cur_data;
DBUG_ENTER("send_data"); DBUG_ENTER("send_data");
if (!thd->mysql) // bootstrap file handling
DBUG_VOID_RETURN;
data->rows++; data->rows++;
if (!(cur= (MYSQL_ROWS *)alloc_root(alloc, sizeof(MYSQL_ROWS)+(field_count + 1) * sizeof(char *)))) if (!(cur= (MYSQL_ROWS *)alloc_root(alloc, sizeof(MYSQL_ROWS)+(field_count + 1) * sizeof(char *))))
{ {

4
sql/item_func.cc
View File

@ -3347,7 +3347,11 @@ longlong Item_func_release_lock::val_int()
} }
else 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)) if (ull->locked && pthread_equal(pthread_self(),ull->thread))
#endif
{ {
result=1; // Release is ok result=1; // Release is ok
item_user_lock_release(ull); item_user_lock_release(ull);