Commit 62576974 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/d2/hf/clean/my41-clean 

into  mysql.com:/d2/hf/common/my41-common


sql/item_func.cc:
  Auto merged
parents fc9642b4 ca98fb63

libmysqld/examples/test-run

+1 −1
Original line number Diff line number Diff line
@@ -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

libmysqld/lib_sql.cc

+4 −0
Original line number Diff line number Diff line
@@ -521,6 +521,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;
@@ -819,6 +820,9 @@ void Protocol_simple::prepare_for_resend() 


  DBUG_ENTER("send_data");



  if (!thd->mysql)            // bootstrap file handling

    DBUG_VOID_RETURN;



  if (!data)

  {

    if (!(data= (MYSQL_DATA*) my_malloc(sizeof(MYSQL_DATA),

mysql-test/t/delayed.test

+2 −0
Original line number Diff line number Diff line 
# delayed works differently in embedded server

--source include/not_embedded.inc

#

# test of DELAYED insert and timestamps

# (Can't be tested with purify :( )

mysql-test/t/innodb.test

+3 −0
Original line number Diff line number Diff line
@@ -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;

sql/item_func.cc

+4 −0
Original line number Diff line number Diff line
@@ -2239,7 +2239,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);