Commit ca98fb63 authored by unknown's avatar unknown

Merge bk@192.168.21.1:mysql-4.1-opt

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


libmysqld/lib_sql.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
parents 63fce3a2 f660dfa6
...@@ -10,7 +10,7 @@ ...@@ -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
......
...@@ -521,6 +521,7 @@ void *create_embedded_thd(int client_flag) ...@@ -521,6 +521,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;
...@@ -819,6 +820,9 @@ void Protocol_simple::prepare_for_resend() ...@@ -819,6 +820,9 @@ void Protocol_simple::prepare_for_resend()
DBUG_ENTER("send_data"); DBUG_ENTER("send_data");
if (!thd->mysql) // bootstrap file handling
DBUG_VOID_RETURN;
if (!data) if (!data)
{ {
if (!(data= (MYSQL_DATA*) my_malloc(sizeof(MYSQL_DATA), if (!(data= (MYSQL_DATA*) my_malloc(sizeof(MYSQL_DATA),
......
# delayed works differently in embedded server
--source include/not_embedded.inc
# #
# test of DELAYED insert and timestamps # test of DELAYED insert and timestamps
# (Can't be tested with purify :( ) # (Can't be tested with purify :( )
......
...@@ -1299,6 +1299,7 @@ drop table test_checksum; ...@@ -1299,6 +1299,7 @@ drop table test_checksum;
set foreign_key_checks=0; set foreign_key_checks=0;
create table t2 (a int primary key, b int, foreign key (b) references t1(a)) engine = innodb; create table t2 (a int primary key, b int, foreign key (b) references t1(a)) engine = innodb;
--replace_result \\ / $MYSQL_TEST_DIR . /var/master-data/ /
-- error 1005 -- error 1005
create table t1(a char(10) primary key, b varchar(20)) engine = innodb; create table t1(a char(10) primary key, b varchar(20)) engine = innodb;
set foreign_key_checks=1; set foreign_key_checks=1;
...@@ -1309,6 +1310,7 @@ drop table t2; ...@@ -1309,6 +1310,7 @@ drop table t2;
set foreign_key_checks=0; set foreign_key_checks=0;
create table t1(a varchar(10) primary key) engine = innodb DEFAULT CHARSET=latin1; create table t1(a varchar(10) primary key) engine = innodb DEFAULT CHARSET=latin1;
--replace_result \\ / $MYSQL_TEST_DIR . /var/master-data/ /
-- error 1005 -- error 1005
create table t2 (a varchar(10), foreign key (a) references t1(a)) engine = innodb DEFAULT CHARSET=utf8; create table t2 (a varchar(10), foreign key (a) references t1(a)) engine = innodb DEFAULT CHARSET=utf8;
set foreign_key_checks=1; set foreign_key_checks=1;
...@@ -1338,6 +1340,7 @@ drop table t2,t1; ...@@ -1338,6 +1340,7 @@ drop table t2,t1;
set foreign_key_checks=0; set foreign_key_checks=0;
create table t2 (a varchar(10), foreign key (a) references t1(a)) engine = innodb DEFAULT CHARSET=latin1; create table t2 (a varchar(10), foreign key (a) references t1(a)) engine = innodb DEFAULT CHARSET=latin1;
create table t3(a varchar(10) primary key) engine = innodb DEFAULT CHARSET=utf8; create table t3(a varchar(10) primary key) engine = innodb DEFAULT CHARSET=utf8;
--replace_result \\ / $MYSQL_TEST_DIR . /var/master-data/ /
-- error 1025 -- error 1025
rename table t3 to t1; rename table t3 to t1;
set foreign_key_checks=1; set foreign_key_checks=1;
......
...@@ -2238,7 +2238,11 @@ longlong Item_func_release_lock::val_int() ...@@ -2238,7 +2238,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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment