Commit 5e3f06db authored by unknown's avatar unknown
Browse files

Merge bk@192.168.21.1:mysql-5.0-opt 

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


libmysqld/lib_sql.cc:
  Auto merged
mysql-test/include/federated.inc:
  Auto merged
mysql-test/t/flush_block_commit.test:
  Auto merged
mysql-test/t/innodb.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
parents e8be5f6d 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
@@ -585,6 +585,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;
@@ -770,6 +771,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
@@ -1029,6 +1032,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/bdb.result

+0 −34
Original line number Diff line number Diff line
@@ -1928,38 +1928,4 @@ create table t1 (a int) engine=bdb; 
commit;

alter table t1 add primary key(a);

drop table t1;

set autocommit=1;

reset master;

create table bug16206 (a int);

insert into bug16206 values(1);

start transaction;

insert into bug16206 values(2);

commit;

show binlog events;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

f	n	Format_desc	1	n	Server ver: VERSION, Binlog ver: 4

f	n	Query	1	n	use `test`; create table bug16206 (a int)

f	n	Query	1	n	use `test`; insert into bug16206 values(1)

f	n	Query	1	n	use `test`; insert into bug16206 values(2)

drop table bug16206;

reset master;

create table bug16206 (a int) engine=         bdb;

insert into bug16206 values(0);

insert into bug16206 values(1);

start transaction;

insert into bug16206 values(2);

commit;

insert into bug16206 values(3);

show binlog events;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

f	n	Format_desc	1	n	Server ver: VERSION, Binlog ver: 4

f	n	Query	1	n	use `test`; create table bug16206 (a int) engine=         bdb

f	n	Query	1	n	use `test`; insert into bug16206 values(0)

f	n	Query	1	n	use `test`; insert into bug16206 values(1)

f	n	Query	1	n	use `test`; BEGIN

f	n	Query	1	n	use `test`; insert into bug16206 values(2)

f	n	Query	1	n	use `test`; COMMIT

f	n	Query	1	n	use `test`; insert into bug16206 values(3)

drop table bug16206;

set autocommit=0;

End of 5.0 tests

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	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;