Commit ea1f7e4b authored by unknown's avatar unknown
Browse files

several fixes to make tests pass in embedded-server mode 


libmysqld/lib_sql.cc:
  check for bootstrap added
mysql-test/include/federated.inc:
  disabled in embedded
mysql-test/mysql-test-run.pl:
  we disable ssh in embedded server
mysql-test/r/bdb.result:
  part moved to bdb_notembedded as it uses binlog
mysql-test/r/flush_block_commit.result:
  part moved to flush_block_commit_notembedded
mysql-test/r/insert.result:
  part moved to insert_notembedded as delayed works differently in embedded server
mysql-test/r/insert_select.result:
  part moved to insert_notembedded as GRANTS usually disabled in embedded server
mysql-test/r/join.result:
  access rights hidden in result
mysql-test/t/backup.test:
  now available in embedded server
mysql-test/t/bdb.test:
  part moved to bdb_notembedded as it uses binlog
mysql-test/t/delayed.test:
  code trimmed
mysql-test/t/execution_constants.test:
  skipped in embedded-server mode
mysql-test/t/flush_block_commit.test:
  moved to flush_block_commit_notembedded
mysql-test/t/information_schema_db.test:
  skipped in embedded-server
mysql-test/t/innodb.test:
  directories replaced to be embedded-server compliant
mysql-test/t/insert.test:
  part moved to insert_notembedded
mysql-test/t/insert_select.test:
  part moved to insert_notembedded
mysql-test/t/join.test:
  access rights hidden
mysql-test/t/status.test:
  skipped in embedded server
mysql-test/t/trigger.test:
  directories replaced to be embedded-server compliant
sql/item_strfunc.cc:
  extra contexts not needed whan access checks disabled
sql/share/errmsg.txt:
  bigger paths reserved to prevent test's fails
mysql-test/r/bdb_notembedded.result:
  ***MISSING WEAVE***
mysql-test/r/flush_block_commit_notembedded.result:
  added
mysql-test/r/insert_notembedded.result:
  added
mysql-test/t/bdb_notembedded.test:
  ***MISSING WEAVE***
mysql-test/t/flush_block_commit_notembedded.test:
  added
mysql-test/t/insert_notembedded.test:
  added
parent 71419317

libmysqld/lib_sql.cc

+2 −0
Original line number Diff line number Diff line
@@ -770,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

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/mysql-test-run.pl

+1 −0
Original line number Diff line number Diff line
@@ -750,6 +750,7 @@ sub command_line_setup () { 
    push(@glob_test_mode, "embedded");

    $opt_skip_rpl= 1;              # We never run replication with embedded

    $opt_skip_ndbcluster= 1;

    $opt_skip_ssl= 1;



    if ( $opt_extern )

    {

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;