bk commit into 4.1 tree (holyfoot:1.2540)

[holyfoot]

Below is the list of changes that have just been committed into a local
4.1 repository of hf. When hf does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-13 10:39:15+04:00, holyfoot@stripped +4 -0
  embedded-mode tests fixed

  libmysqld/examples/test-run@stripped, 2006-11-13 10:39:13+04:00, holyfoot@stripped +1 -1
    mysql_embedded should be run here

  libmysqld/lib_sql.cc@stripped, 2006-11-13 10:39:13+04:00, holyfoot@stripped +4 -0
    thd->real_id setup added
    bootstrap check added

  mysql-test/t/innodb.test@stripped, 2006-11-13 10:39:13+04:00, holyfoot@stripped +3 -0
    paths can be different in embedded server - replace_result added

  sql/item_func.cc@stripped, 2006-11-13 10:39:13+04:00, holyfoot@stripped +4 -0
    we should compare real_id-s in embedded server

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	holyfoot
# Host:	deer.(none)
# Root:	/home/hf/work/embt/my41-embt

--- 1.266/sql/item_func.cc	2006-11-13 10:39:19 +04:00
+++ 1.267/sql/item_func.cc	2006-11-13 10:39:19 +04:00
@@ -2238,7 +2238,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);

--- 1.80/mysql-test/t/innodb.test	2006-11-13 10:39:19 +04:00
+++ 1.81/mysql-test/t/innodb.test	2006-11-13 10:39:19 +04:00
@@ -1299,6 +1299,7 @@ drop table test_checksum;
 
 set foreign_key_checks=0;
 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
 create table t1(a char(10) primary key, b varchar(20)) engine = innodb;
 set foreign_key_checks=1;
@@ -1309,6 +1310,7 @@ drop table t2;
 
 set foreign_key_checks=0;
 create table t1(a varchar(10) primary key) engine = innodb DEFAULT CHARSET=latin1;
+--replace_result \\ / $MYSQL_TEST_DIR . /var/master-data/ /
 -- error 1005
 create table t2 (a varchar(10), foreign key (a) references t1(a)) engine = innodb DEFAULT CHARSET=utf8;
 set foreign_key_checks=1;
@@ -1338,6 +1340,7 @@ drop table t2,t1;
 set foreign_key_checks=0;
 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;
+--replace_result \\ / $MYSQL_TEST_DIR . /var/master-data/ /
 -- error 1025
 rename table t3 to t1;
 set foreign_key_checks=1;

--- 1.129/libmysqld/lib_sql.cc	2006-11-13 10:39:19 +04:00
+++ 1.130/libmysqld/lib_sql.cc	2006-11-13 10:39:19 +04:00
@@ -517,6 +517,7 @@ void *create_embedded_thd(int client_fla
   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;
@@ -814,6 +815,9 @@ void Protocol_simple::prepare_for_resend
   MYSQL_DATA *data= thd->data;
 
   DBUG_ENTER("send_data");
+
+  if (!thd->mysql)            // bootstrap file handling
+    DBUG_VOID_RETURN;
 
   if (!data)
   {

--- 1.5/libmysqld/examples/test-run	2006-11-13 10:39:19 +04:00
+++ 1.6/libmysqld/examples/test-run	2006-11-13 10:39:19 +04:00
@@ -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