Below is the list of changes that have just been committed into a
4.0 repository of sasha. When sasha does a push, they will be propogated to
the main repository and within 24 hours after the push to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html
ChangeSet@stripped, 2001-08-06 16:47:48-06:00, sasha@stripped
misc bug fixes
BitKeeper/etc/ignore
1.78 01/08/06 16:47:35 sasha@stripped +1 -0
Added libmysqld/sql_union.cc to the ignore list
mysql-test/mysql-test-run.sh
1.90 01/08/06 16:47:35 sasha@stripped +2 -0
fix to get path-independent logging
mysql-test/r/rpl_log.result
1.11 01/08/06 16:47:35 sasha@stripped +4 -4
fix for path-independent logging
sql/log.cc
1.66 01/08/06 16:47:35 sasha@stripped +1 -1
fixed compile error with USING_TRANSACTIONS
sql/log_event.h
1.51 01/08/06 16:47:35 sasha@stripped +2 -0
fixed compile error with USING_TRANSACTIONS
libmysqld/Makefile.am
1.5 01/08/06 16:47:34 sasha@stripped +2 -2
sql_unions -> sql_union
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: sasha
# Host: mysql.sashanet.com
# Root: /home/sasha/src/bk/mysql-4.0-max
--- 1.89/mysql-test/mysql-test-run.sh Fri Jul 27 12:39:44 2001
+++ 1.90/mysql-test/mysql-test-run.sh Mon Aug 6 16:47:35 2001
@@ -109,6 +109,7 @@
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 @@
--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 \
--- 1.65/sql/log.cc Sat Aug 4 05:48:58 2001
+++ 1.66/sql/log.cc Mon Aug 6 16:47:35 2001
@@ -653,7 +653,7 @@
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
--- 1.50/sql/log_event.h Fri Aug 3 15:57:52 2001
+++ 1.51/sql/log_event.h Mon Aug 6 16:47:35 2001
@@ -210,6 +210,7 @@
{ return 0; }
virtual Log_event_type get_type_code() = 0;
virtual bool is_valid() = 0;
+ virtual bool get_cache_stmt() { return 0; }
Log_event(const char* buf);
#ifndef MYSQL_CLIENT
Log_event(THD* thd_arg, uint16 flags_arg = 0);
@@ -277,6 +278,7 @@
const char* get_db() { return db; }
void pack_info(String* packet);
int exec_event(struct st_master_info* mi);
+ bool get_cache_stmt() { return cache_stmt; }
#endif
Query_log_event(const char* buf, int event_len);
--- 1.4/libmysqld/Makefile.am Fri Jun 15 13:55:15 2001
+++ 1.5/libmysqld/Makefile.am Mon Aug 6 16:47:34 2001
@@ -54,7 +54,7 @@
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 @@
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
--- 1.77/BitKeeper/etc/ignore Sat Aug 4 05:48:58 2001
+++ 1.78/BitKeeper/etc/ignore Mon Aug 6 16:47:35 2001
@@ -376,3 +376,4 @@
tags
tmp/*
vio/viotest-ssl
+libmysqld/sql_union.cc
--- 1.10/mysql-test/r/rpl_log.result Sat Aug 4 05:48:57 2001
+++ 1.11/mysql-test/r/rpl_log.result Mon Aug 6 16:47:35 2001
@@ -47,10 +47,10 @@
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
| Thread |
|---|
| • bk commit into 4.0 tree | sasha | 7 Aug |
