diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-08-06 16:47:48 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-08-06 16:47:48 -0600 |
| commit | 4bb40187438bdfb8b1d8b091399bd01e0e3425c1 (patch) | |
| tree | 3899db9196d895b67af082ace2454b1268b01d70 /mysql-test | |
| parent | ad5100da0f7041cf7a0dbf3cf2860c0f82fc4c7a (diff) | |
| download | mariadb-git-4bb40187438bdfb8b1d8b091399bd01e0e3425c1.tar.gz | |
misc bug fixes
libmysqld/Makefile.am:
sql_unions -> sql_union
BitKeeper/etc/ignore:
Added libmysqld/sql_union.cc to the ignore list
mysql-test/mysql-test-run.sh:
fix to get path-independent logging
mysql-test/r/rpl_log.result:
fix for path-independent logging
sql/log.cc:
fixed compile error with USING_TRANSACTIONS
sql/log_event.h:
fixed compile error with USING_TRANSACTIONS
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 2 | ||||
| -rw-r--r-- | mysql-test/r/rpl_log.result | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index a3c15236254..4dad16b1e2a 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -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 \ diff --git a/mysql-test/r/rpl_log.result b/mysql-test/r/rpl_log.result index ba5c2ca301d..4c7a1e154aa 100644 --- a/mysql-test/r/rpl_log.result +++ b/mysql-test/r/rpl_log.result @@ -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 |