Below is the list of changes that have just been committed into a local
5.0 repository of antony. When antony 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-25 07:04:13-07:00, acurtis@stripped +8 -0
Bug#18176
"make test fails if server built with --without-innodb"
fix tests
mysql-test/r/create.result@stripped, 2006-10-25 07:04:08-07:00, acurtis@stripped +2 -2
alter test for myisam, a copy of original is moved out to create_innodb.test
mysql-test/r/create_innodb.result@stripped, 2006-10-25 07:04:08-07:00, acurtis@stripped +6 -0
New BitKeeper file ``mysql-test/r/create_innodb.result''
mysql-test/r/create_innodb.result@stripped, 2006-10-25 07:04:08-07:00, acurtis@stripped +0 -0
mysql-test/t/create.test@stripped, 2006-10-25 07:04:08-07:00, acurtis@stripped +1 -1
alter test for myisam, a copy of original is moved out to create_innodb.test
mysql-test/t/create_innodb.test@stripped, 2006-10-25 07:04:08-07:00, acurtis@stripped +12 -0
New BitKeeper file ``mysql-test/t/create_innodb.test''
mysql-test/t/create_innodb.test@stripped, 2006-10-25 07:04:08-07:00, acurtis@stripped +0 -0
mysql-test/t/ctype_utf8.test@stripped, 2006-10-25 07:04:08-07:00, acurtis@stripped +4 -0
disable warnings of change of storage engine
mysql-test/t/lock_multi.test@stripped, 2006-10-25 07:04:08-07:00, acurtis@stripped +2 -0
disable warnings of change of storage engine
mysql-test/t/sp.test@stripped, 2006-10-25 07:04:08-07:00, acurtis@stripped +2 -0
disable warnings of change of storage engine
mysql-test/t/view.test@stripped, 2006-10-25 07:04:08-07:00, acurtis@stripped +4 -0
disable warnings of change of storage engine
# 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: acurtis
# Host: ltamd64.xiphis.org
# Root: /home/antony/work2/p3-bug18176.1
--- New file ---
+++ mysql-test/r/create_innodb.result 06/10/25 07:04:08
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;
--- New file ---
+++ mysql-test/t/create_innodb.test 06/10/25 07:04:08
-- source include/have_innodb.inc
#
# 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;
# End of 5.0 tests
--- 1.97/mysql-test/t/ctype_utf8.test 2006-10-25 07:04:27 -07:00
+++ 1.98/mysql-test/t/ctype_utf8.test 2006-10-25 07:04:27 -07:00
@@ -1232,17 +1232,21 @@
# Bug#19960: Inconsistent results when joining
# InnoDB tables using partial UTF8 indexes
#
+--disable_warnings
CREATE TABLE t1 (
colA int(11) NOT NULL,
colB varchar(255) character set utf8 NOT NULL,
PRIMARY KEY (colA)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+--enable_warnings
INSERT INTO t1 (colA, colB) VALUES (1, 'foo'), (2, 'foo bar');
+--disable_warnings
CREATE TABLE t2 (
colA int(11) NOT NULL,
colB varchar(255) character set utf8 NOT NULL,
KEY bad (colA,colB(3))
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+--enable_warnings
INSERT INTO t2 (colA, colB) VALUES (1, 'foo'),(2, 'foo bar');
SELECT * FROM t1 JOIN t2 ON t1.colA=t2.colA AND t1.colB=t2.colB
WHERE t1.colA < 3;
--- 1.167/mysql-test/t/view.test 2006-10-25 07:04:27 -07:00
+++ 1.168/mysql-test/t/view.test 2006-10-25 07:04:27 -07:00
@@ -1801,7 +1801,9 @@
# underlying tables (BUG#6443)
#
set sql_mode='strict_all_tables';
+--disable_warnings
CREATE TABLE t1 (col1 INT NOT NULL, col2 INT NOT NULL) ENGINE = INNODB;
+--enable_warnings
CREATE VIEW v1 (vcol1) AS SELECT col1 FROM t1;
CREATE VIEW v2 (vcol1) AS SELECT col1 FROM t1 WHERE col2 > 2;
-- error 1364
@@ -1857,7 +1859,9 @@
#
# Test for bug #11771: wrong query_id in SELECT * FROM <view>
#
+--disable_warnings
CREATE TABLE t1 (f1 char) ENGINE = innodb;
+--enable_warnings
INSERT INTO t1 VALUES ('A');
CREATE VIEW v1 AS SELECT * FROM t1;
--- 1.122/mysql-test/r/create.result 2006-10-25 07:04:27 -07:00
+++ 1.123/mysql-test/r/create.result 2006-10-25 07:04:27 -07:00
@@ -767,10 +767,10 @@
`i` int(11) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 MAX_ROWS=4294967295
drop table t1;
-create table t1(f1 varchar(800) binary not null, key(f1)) engine = innodb
+create table t1(f1 varchar(800) binary not null, key(f1))
character set utf8 collate utf8_general_ci;
Warnings:
-Warning 1071 Specified key was too long; max key length is 765 bytes
+Warning 1071 Specified key was too long; max key length is 999 bytes
insert into t1 values('aaa');
drop table t1;
create table t1 (upgrade int);
--- 1.81/mysql-test/t/create.test 2006-10-25 07:04:27 -07:00
+++ 1.82/mysql-test/t/create.test 2006-10-25 07:04:27 -07:00
@@ -669,7 +669,7 @@
#
# Bug#17530: Incorrect key truncation on table creation caused server crash.
#
-create table t1(f1 varchar(800) binary not null, key(f1)) engine = innodb
+create table t1(f1 varchar(800) binary not null, key(f1))
character set utf8 collate utf8_general_ci;
insert into t1 values('aaa');
drop table t1;
--- 1.17/mysql-test/t/lock_multi.test 2006-10-25 07:04:27 -07:00
+++ 1.18/mysql-test/t/lock_multi.test 2006-10-25 07:04:27 -07:00
@@ -225,7 +225,9 @@
# Bug #17264: MySQL Server freeze
#
connection locker;
+--disable_warnings
create table t1 (f1 int(12) unsigned not null auto_increment, primary key(f1)) engine=innodb;
+--enable_warnings
lock tables t1 write;
connection writer;
--sleep 2
--- 1.202/mysql-test/t/sp.test 2006-10-25 07:04:27 -07:00
+++ 1.203/mysql-test/t/sp.test 2006-10-25 07:04:27 -07:00
@@ -5630,7 +5630,9 @@
# Bug#13575 SP funcs in select with distinct/group and order by can
# produce bad data
#
+--disable_warnings
create table t3 (f1 int, f2 varchar(3), primary key(f1)) engine=innodb|
+--enable_warnings
insert into t3 values (1,'aaa'),(2,'bbb'),(3,'ccc')|
CREATE FUNCTION bug13575 ( p1 integer )
returns varchar(3)
| Thread |
|---|
| • bk commit into 5.0 tree (acurtis:1.2291) BUG#18176 | antony | 25 Oct |
