Commit 298aff12 authored by unknown's avatar unknown
Browse files

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

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


libmysqld/lib_sql.cc:
  Auto merged
BitKeeper/deleted/.del-bdb.result:
  Auto merged
BitKeeper/deleted/.del-bdb.test:
  Auto merged
mysql-test/r/insert_select.result:
  Auto merged
mysql-test/r/join.result:
  Auto merged
mysql-test/t/backup.test:
  Auto merged
mysql-test/t/delayed.test:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysql-test/t/status.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  merging
mysql-test/r/flush_block_commit.result:
  SCCS merged
mysql-test/r/insert.result:
  merging
mysql-test/t/innodb.test:
  merging
mysql-test/t/insert.test:
  merging
sql/share/errmsg.txt:
  merging
parents bbc5d138 ea1f7e4b

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

+6 −0
Original line number Diff line number Diff line
@@ -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;
@@ -769,6 +770,8 @@ MYSQL_DATA *THD::alloc_new_dataset() 


static void write_eof_packet(THD *thd)

{

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

    return;

  /*

    The following test should never be true, but it's better to do it

    because if 'is_fatal_error' is set the server is not going to execute
@@ -1028,6 +1031,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 *))))

  {

mysql-test/include/federated.inc

+1 −0
Original line number Diff line number Diff line 
--source include/not_embedded.inc

--source ./include/have_federated_db.inc



source ./include/master-slave.inc;

mysql-test/r/flush_block_commit.result

+0 −15
Original line number Diff line number Diff line
@@ -37,18 +37,3 @@ show create database test; 
Database	Create Database

test	CREATE DATABASE `test` /*!40100 DEFAULT CHARACTER SET latin1 */

drop table t1;
 
create table t1 (a int) engine=innodb;

reset master;

set autocommit=0;

insert t1 values (1);

flush tables with read lock;

show master status;

File	Position	Binlog_Do_DB	Binlog_Ignore_DB

master-bin.000001	102		

 commit;

show master status;

File	Position	Binlog_Do_DB	Binlog_Ignore_DB

master-bin.000001	102		

unlock tables;

drop table t1;

set autocommit=1;

mysql-test/r/flush_block_commit_notembedded.result

0 → 100644
+15 −0
Original line number Diff line number Diff line 
create table t1 (a int) engine=innodb;

reset master;

set autocommit=0;

insert t1 values (1);

flush tables with read lock;

show master status;

File	Position	Binlog_Do_DB	Binlog_Ignore_DB

master-bin.000001	98		

 commit;

show master status;

File	Position	Binlog_Do_DB	Binlog_Ignore_DB

master-bin.000001	98		

unlock tables;

drop table t1;

set autocommit=1;