MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:msvensson Date:September 28 2006 1:13pm
Subject:bk commit into 5.0 tree (msvensson:1.2273) BUG#22436
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 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-09-28 15:13:40+02:00, msvensson@neptunus.(none) +7 -0
  Bug#22436 Four tests require "innodb" to be configured, fail in "classic" build
   - Disable warnings when creating the "innodb" tables if it works anyway.
   - Move test that are really innodb dependent to innodb_mysql 

  mysql-test/r/create.result@stripped, 2006-09-28 15:13:37+02:00, msvensson@neptunus.(none) +0 -6
    Move the innodb dependent test to innodb_mysql.test

  mysql-test/r/innodb_mysql.result@stripped, 2006-09-28 15:13:37+02:00, msvensson@neptunus.(none) +6 -0
    Move the innodb dependent test to innodb_mysql.test

  mysql-test/t/create.test@stripped, 2006-09-28 15:13:37+02:00, msvensson@neptunus.(none) +0 -8
    Move the innodb dependent test to innodb_mysql.test

  mysql-test/t/innodb_mysql.test@stripped, 2006-09-28 15:13:37+02:00, msvensson@neptunus.(none) +8 -0
    Move the innodb dependent test to innodb_mysql.test

  mysql-test/t/lock_multi.test@stripped, 2006-09-28 15:13:37+02:00, msvensson@neptunus.(none) +3 -0
    Disable warnings while creating the innodb table. If innodb is not available, the table will be created with default engine and thus create a warning. Regardless of this, test output should be the same.

  mysql-test/t/sp.test@stripped, 2006-09-28 15:13:37+02:00, msvensson@neptunus.(none) +3 -0
    Disable warnings while creating the innodb table. If innodb is not available, the table will be created with default engine and thus create a warning. Regardless of this, test output should be the same.

  mysql-test/t/view.test@stripped, 2006-09-28 15:13:37+02:00, msvensson@neptunus.(none) +5 -0
    Disable warnings while creating the innodb table. If innodb is not available, the table will be created with default engine and thus create a warning. Regardless of this, test output should be the same.

# 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/bug22436/my50-bug22436

--- 1.8/mysql-test/r/innodb_mysql.result	2006-09-28 15:13:45 +02:00
+++ 1.9/mysql-test/r/innodb_mysql.result	2006-09-28 15:13:45 +02:00
@@ -337,3 +337,9 @@
 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;

--- 1.8/mysql-test/t/innodb_mysql.test	2006-09-28 15:13:45 +02:00
+++ 1.9/mysql-test/t/innodb_mysql.test	2006-09-28 15:13:45 +02:00
@@ -302,3 +302,11 @@
   WHERE t1.name LIKE 'A%' OR FALSE;
 
 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;

--- 1.161/mysql-test/t/view.test	2006-09-28 15:13:45 +02:00
+++ 1.162/mysql-test/t/view.test	2006-09-28 15:13:45 +02:00
@@ -1801,7 +1801,10 @@
 # underlying tables (BUG#6443)
 #
 set sql_mode='strict_all_tables';
+# Disable warnings to allow test to run aslo without InnoDB
+--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 +1860,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.121/mysql-test/r/create.result	2006-09-28 15:13:45 +02:00
+++ 1.122/mysql-test/r/create.result	2006-09-28 15:13:45 +02:00
@@ -767,9 +767,3 @@
   `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 
-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;

--- 1.80/mysql-test/t/create.test	2006-09-28 15:13:45 +02:00
+++ 1.81/mysql-test/t/create.test	2006-09-28 15:13:45 +02:00
@@ -666,12 +666,4 @@
 show create table t1;
 drop table t1;
 
-#
-# 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.17/mysql-test/t/lock_multi.test	2006-09-28 15:13:45 +02:00
+++ 1.18/mysql-test/t/lock_multi.test	2006-09-28 15:13:45 +02:00
@@ -225,7 +225,10 @@
 # Bug #17264: MySQL Server freeze
 #
 connection locker;
+# Disable warnings to allow test to run also without InnoDB
+--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.199/mysql-test/t/sp.test	2006-09-28 15:13:45 +02:00
+++ 1.200/mysql-test/t/sp.test	2006-09-28 15:13:45 +02:00
@@ -5634,7 +5634,10 @@
 # Bug#13575 SP funcs in select with distinct/group and order by can
 #           produce bad data
 #
+# Disable warnings to allow test to run also without InnoDB
+--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 (msvensson:1.2273) BUG#22436msvensson28 Sep