Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent does a push these changes will
be propagated 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://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2006-12-01 23:28:59+01:00, kent@kent-amd64.(none) +18 -0
Merge mysql.com:/home/kent/bk/mysql-5.0-build
into mysql.com:/home/kent/bk/mysql-5.1-build
MERGE: 1.1810.1698.197
client/mysqltest.c@stripped, 2006-12-01 23:11:55+01:00, kent@kent-amd64.(none) +0 -0
Auto merged
MERGE: 1.155.9.70
libmysql/libmysql.c@stripped, 2006-12-01 23:11:55+01:00, kent@kent-amd64.(none) +0 -0
Auto merged
MERGE: 1.233.1.20
mysql-test/lib/mtr_process.pl@stripped, 2006-12-01 23:11:55+01:00, kent@kent-amd64.(none) +0 -0
Auto merged
MERGE: 1.25.2.18
mysql-test/mysql-test-run.pl@stripped, 2006-12-01 23:11:55+01:00, kent@kent-amd64.(none) +0 -0
Auto merged
MERGE: 1.30.49.15
netware/Makefile.am@stripped, 2006-12-01 23:28:54+01:00, kent@kent-amd64.(none) +3 -4
MERGE: 1.15.1.4
sql/field.cc@stripped, 2006-12-01 23:11:55+01:00, kent@kent-amd64.(none) +0 -0
Auto merged
MERGE: 1.256.1.77
sql/item.cc@stripped, 2006-12-01 23:11:56+01:00, kent@kent-amd64.(none) +0 -0
Auto merged
MERGE: 1.113.1.131
sql/item_func.cc@stripped, 2006-12-01 23:11:56+01:00, kent@kent-amd64.(none) +0 -0
Auto merged
MERGE: 1.270.1.45
sql/item_strfunc.cc@stripped, 2006-12-01 23:11:56+01:00, kent@kent-amd64.(none) +0 -0
Auto merged
MERGE: 1.261.1.29
sql/item_sum.cc@stripped, 2006-12-01 23:11:56+01:00, kent@kent-amd64.(none) +0 -0
Auto merged
MERGE: 1.170.1.22
sql/mysqld.cc@stripped, 2006-12-01 23:11:56+01:00, kent@kent-amd64.(none) +0 -0
Auto merged
MERGE: 1.439.1.143
sql/opt_range.cc@stripped, 2006-12-01 23:11:56+01:00, kent@kent-amd64.(none) +0 -0
Auto merged
MERGE: 1.159.1.75
sql/set_var.cc@stripped, 2006-12-01 23:11:56+01:00, kent@kent-amd64.(none) +0 -0
Auto merged
MERGE: 1.125.5.31
sql/sql_base.cc@stripped, 2006-12-01 23:11:56+01:00, kent@kent-amd64.(none) +0 -0
Auto merged
MERGE: 1.235.1.123
sql/sql_cache.cc@stripped, 2006-12-01 23:11:57+01:00, kent@kent-amd64.(none) +0 -0
Auto merged
MERGE: 1.76.1.20
sql/sql_trigger.cc@stripped, 2006-12-01 23:11:57+01:00, kent@kent-amd64.(none) +0 -0
Auto merged
MERGE: 1.35.1.25
sql/sql_yacc.yy@stripped, 2006-12-01 23:11:57+01:00, kent@kent-amd64.(none) +0 -0
Auto merged
MERGE: 1.371.1.127
sql/table.cc@stripped, 2006-12-01 23:11:57+01:00, kent@kent-amd64.(none) +0 -0
Auto merged
MERGE: 1.160.1.80
# 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: kent
# Host: kent-amd64.(none)
# Root: /home/kent/bk/mysql-5.1-build/RESYNC
--- 1.21/netware/Makefile.am 2006-12-01 23:29:05 +01:00
+++ 1.22/netware/Makefile.am 2006-12-01 23:29:05 +01:00
@@ -30,7 +30,7 @@
client/mysqlbinlog.def client/mysqlcheck.def \
client/mysqldump.def client/mysqlimport.def \
client/mysqlshow.def client/mysqltest.def \
- client/mysqlslap.def \
+ client/mysqlslap.def client/mysql_upgrade.def \
sql/mysqld.def extra/mysql_waitpid.def \
extra/my_print_defaults.def \
extra/perror.def extra/replace.def \
@@ -73,7 +73,8 @@
mysql_test_run.def mysql_waitpid.def mysqladmin.def \
mysqlbinlog.def mysqlcheck.def mysqld.def \
mysqld_safe.c mysqld_safe.def mysqldump.def mysqlimport.def \
- mysqlshow.def mysqltest.def mysqlslap.def perror.def \
+ mysqlshow.def mysqltest.def mysqlslap.def mysql_upgrade.def \
+ perror.def \
replace.def resolve_stack_dump.def resolveip.def test_db.sql \
static_init_db.sql \
BUILD/apply-patch BUILD/compile-AUTOTOOLS \
| Thread |
|---|
| • bk commit into 5.1 tree (kent:1.2371) | kent | 1 Dec |
