Commit d9737f20 authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

misc bug fixes

parent 31f269f1

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -376,3 +376,4 @@ support-files/mysql.spec 
tags

tmp/*

vio/viotest-ssl

libmysqld/sql_union.cc

libmysqld/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ sqlsources = convert.cc derror.cc field.cc field_conv.cc filesort.cc \ 
	sql_rename.cc sql_repl.cc sql_select.cc sql_show.cc \

	sql_string.cc sql_table.cc sql_test.cc sql_udf.cc \

	sql_update.cc sql_yacc.cc table.cc thr_malloc.cc time.cc \

	unireg.cc uniques.cc stacktrace.c sql_unions.cc hash_filo.cc

	unireg.cc uniques.cc stacktrace.c sql_union.cc hash_filo.cc



## XXX: we should not have to duplicate info from the sources list

sqlobjects = convert.lo derror.lo field.lo field_conv.lo filesort.lo \
@@ -72,7 +72,7 @@ sqlobjects = convert.lo derror.lo field.lo field_conv.lo filesort.lo \ 
	sql_rename.lo sql_repl.lo sql_select.lo sql_show.lo \

	sql_string.lo sql_table.lo sql_test.lo sql_udf.lo \

	sql_update.lo sql_yacc.lo table.lo thr_malloc.lo time.lo \

	unireg.lo uniques.lo stacktrace.lo sql_unions.lo hash_filo.lo

	unireg.lo uniques.lo stacktrace.lo sql_union.lo hash_filo.lo



EXTRA_DIST = lib_vio.c

mysql-test/mysql-test-run.sh

+2 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ USERT=0 
SYST=0

REALT=0

MYSQL_TMP_DIR=$MYSQL_TEST_DIR/var/tmp

SLAVE_LOAD_TMPDIR=../../var/tmp #needs to be same length to test logging

RES_SPACE="      "

MYSQLD_SRC_DIRS="strings mysys include extra regex isam merge myisam \

 myisammrg heap sql"
@@ -570,6 +571,7 @@ start_slave() 
	    --tmpdir=$MYSQL_TMP_DIR \

            --language=$LANGUAGE \

	    --skip-innodb --skip-slave-start \

	    --slave-load-tmpdir=$SLAVE_LOAD_TMPDIR \

	    --report-host=127.0.0.1 --report-user=root \

	    --report-port=$SLAVE_MYPORT \

	     $SMALL_SERVER \

mysql-test/r/rpl_log.result

+4 −4
Original line number Diff line number Diff line
@@ -47,10 +47,10 @@ slave-bin.001 253 Query 1 4 use test; insert into t1 values (NULL) 
slave-bin.001	316	Query	1	5	use test; drop table t1

slave-bin.001	364	Query	1	6	use test; create table t1 (word char(20) not null)

slave-bin.001	439	Create_file	1	7	db=test;table=t1;file_id=1;block_len=81

slave-bin.001	646	Exec_load	1	8	;file_id=1

slave-bin.001	669	Query	1	9	use test; drop table t1

slave-bin.001	717	Rotate	1	4	slave-bin.002;pos=4; forced by master

slave-bin.001	757	Stop	2	5	

slave-bin.001	616	Exec_load	1	8	;file_id=1

slave-bin.001	639	Query	1	9	use test; drop table t1

slave-bin.001	687	Rotate	1	4	slave-bin.002;pos=4; forced by master

slave-bin.001	727	Stop	2	5	

Log_name	Pos	Event_type	Server_id	Log_seq	Info

slave-bin.002	4	Start	2	1	Server ver: $VERSION, Binlog ver: 2

slave-bin.002	79	Slave	2	10	host=127.0.0.1,port=$MASTER_MYPORT,log=master-bin.002,pos=4

sql/log.cc

+1 −1
Original line number Diff line number Diff line
@@ -653,7 +653,7 @@ bool MYSQL_LOG::write(Log_event* event_info) 
    THD *thd=event_info->thd;

    const char* db = event_info->get_db();

#ifdef USING_TRANSACTIONS    

    IO_CACHE *file = ((event_info->cache_stmt && thd) ?

    IO_CACHE *file = ((event_info->get_cache_stmt() && thd) ?

		      &thd->transaction.trans_log :

		      &log_file);

#else