Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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-10-23 15:59:00+08:00, msvensson@neptunus.(none) +31 -0
Merge bk-internal:/home/bk/mysql-5.1-new-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
MERGE: 1.2324.1.6
client/mysqldump.c@stripped, 2006-10-23 15:58:55+08:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.256.1.1
client/mysqltest.c@stripped, 2006-10-23 15:58:55+08:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.239.1.1
mysql-test/extra/rpl_tests/rpl_log.test@stripped, 2006-10-23 15:58:55+08:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.39.1.1
mysql-test/extra/rpl_tests/rpl_max_relay_size.test@stripped, 2006-10-23 15:58:55+08:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.18.1.1
mysql-test/include/mix1.inc@stripped, 2006-10-23 15:58:55+08:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.14.1.1
mysql-test/lib/mtr_cases.pl@stripped, 2006-10-23 15:58:55+08:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.45.1.1
mysql-test/lib/mtr_misc.pl@stripped, 2006-10-23 15:58:55+08:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.17.1.1
mysql-test/mysql-test-run.pl@stripped, 2006-10-23 15:58:55+08:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.201.1.1
mysql-test/r/create.result@stripped, 2006-10-23 15:58:55+08:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.127.1.1
mysql-test/r/innodb_mysql.result@stripped, 2006-10-23 15:58:55+08:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.14.1.1
mysql-test/r/mysqltest.result@stripped, 2006-10-23 15:58:55+08:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.46.1.1
mysql-test/r/rpl_000015.result@stripped, 2006-10-23 15:58:55+08:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.36.1.1
mysql-test/r/rpl_change_master.result@stripped, 2006-10-23 15:58:55+08:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.18.1.1
mysql-test/r/rpl_err_ignoredtable.result@stripped, 2006-10-23 15:58:55+08:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.26.1.1
mysql-test/r/rpl_loaddata.result@stripped, 2006-10-23 15:58:55+08:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.35.1.1
mysql-test/r/rpl_replicate_do.result@stripped, 2006-10-23 15:58:55+08:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.35.1.1
mysql-test/r/rpl_stm_log.result@stripped, 2006-10-23 15:58:55+08:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.71.1.1
mysql-test/r/rpl_stm_max_relay_size.result@stripped, 2006-10-23 15:58:55+08:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.23.1.1
mysql-test/t/create.test@stripped, 2006-10-23 15:58:55+08:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.84.1.1
mysql-test/t/lock_multi.test@stripped, 2006-10-23 15:58:55+08:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.21.1.1
mysql-test/t/mysqltest.test@stripped, 2006-10-23 15:58:55+08:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.57.1.1
mysql-test/t/rpl_000015.test@stripped, 2006-10-23 15:58:55+08:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.34.1.1
mysql-test/t/rpl_change_master.test@stripped, 2006-10-23 15:58:55+08:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.15.1.1
mysql-test/t/rpl_drop_db.test@stripped, 2006-10-23 15:58:55+08:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.10.1.1
mysql-test/t/rpl_err_ignoredtable.test@stripped, 2006-10-23 15:58:55+08:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.25.1.1
mysql-test/t/rpl_loaddata.test@stripped, 2006-10-23 15:58:55+08:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.26.1.1
mysql-test/t/rpl_replicate_do.test@stripped, 2006-10-23 15:58:55+08:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.27.1.1
mysql-test/t/rpl_stm_log-master.opt@stripped, 2006-10-23 15:58:55+08:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.4.1.1
mysql-test/t/sp.test@stripped, 2006-10-23 15:58:56+08:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.200.1.1
mysql-test/t/view.test@stripped, 2006-10-23 15:58:56+08:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.168.1.1
sql/sql_class.cc@stripped, 2006-10-23 15:58:56+08:00, msvensson@neptunus.(none) +0 -0
Auto merged
MERGE: 1.294.1.1
# 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: msvensson
# Host: neptunus.(none)
# Root: /home/msvensson/mysql/mysql-5.1-new-maint/RESYNC
--- 1.15/mysql-test/r/innodb_mysql.result 2006-10-23 15:59:07 +08:00
+++ 1.16/mysql-test/r/innodb_mysql.result 2006-10-23 15:59:07 +08:00
@@ -300,12 +300,6 @@
1 SIMPLE t2 index NULL fkey 5 NULL 5 Using index
1 SIMPLE t1 eq_ref PRIMARY PRIMARY 4 test.t2.fkey 1 Using where
DROP TABLE t1,t2;
-create table t1(f1 varchar(800) binary not null, key(f1)) engine = innodb
-character set utf8 collate utf8_general_ci;
-Warnings:
-Warning 1071 Specified key was too long; max key length is 765 bytes
-insert into t1 values('aaa');
-drop table t1;
CREATE TABLE t1 (a int, b int);
insert into t1 values (1,1),(1,2);
CREATE TABLE t2 (primary key (a)) select * from t1;
--- 1.15/mysql-test/include/mix1.inc 2006-10-23 15:59:07 +08:00
+++ 1.16/mysql-test/include/mix1.inc 2006-10-23 15:59:07 +08:00
@@ -342,12 +342,6 @@
DROP TABLE t1,t2;
#
-# Bug#17530: Incorrect key truncation on table creation caused server crash.
-#
-create table t1(f1 varchar(800) binary not null, key(f1)) engine = innodb
- character set utf8 collate utf8_general_ci;
-insert into t1 values('aaa');
-drop table t1;
# Test of behaviour with CREATE ... SELECT
#
| Thread |
|---|
| • bk commit into 5.1 tree (msvensson:1.2327) | msvensson | 23 Oct |
