bk commit into 5.0 tree (grog:1.2039) BUG#17359

[Greg Lehey]

Below is the list of changes that have just been committed into a local
5.0 repository of grog. When grog 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
  1.2039 06/02/14 11:10:10 grog@stripped +6 -0
  Update tests to check for the presence of the features they test.
  
  This issue was found while testing the patch to BUG#14286.  It does
  not address all problems: one test (innodb_unsafe_binlog) does not 
  run far enough to determine that it should not run.  This problem 
  has been reported in BUG#17359.

  mysql-test/t/view.test
    1.135 06/02/14 11:10:05 grog@stripped +1 -0
    Don't run this test if InnoDB is not configured.

  mysql-test/t/insert.test
    1.22 06/02/14 11:10:05 grog@stripped +1 -0
    Don't run this test if InnoDB is not configured.

  mysql-test/t/innodb_unsafe_binlog.test
    1.2 06/02/14 11:10:05 grog@stripped +1 -1
    Don't run this test if InnoDB is not configured.

  mysql-test/t/information_schema.test
    1.70 06/02/14 11:10:04 grog@stripped +2 -0
    Don't run this test if ucs2 is not available.

  mysql-test/t/group_min_max.test
    1.19 06/02/14 11:10:04 grog@stripped +1 -0
    Don't run this test if InnoDB is not configured.

  mysql-test/t/func_group.test
    1.46 06/02/14 11:10:04 grog@stripped +1 -0
    Don't run this test if InnoDB is not configured.

# 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:	grog
# Host:	echunga.lemis.com
# Root:	/src/MySQL/FreeBSD/5.0

--- 1.1/mysql-test/t/innodb_unsafe_binlog.test	2006-01-16 21:33:57 +10:30
+++ 1.2/mysql-test/t/innodb_unsafe_binlog.test	2006-02-14 11:10:05 +10:30
@@ -1,10 +1,10 @@
--- source include/have_innodb.inc
 #
 # Note that these tests uses a innodb_locks_unsafe_for_binlog option.
 #
 # Test cases for a bug #15650 DELETE with LEFT JOIN crashes server
 #
 
+-- source include/have_innodb.inc
 --disable_warnings
 drop table if exists t1,t2;
 --enable_warnings

--- 1.134/mysql-test/t/view.test	2006-02-02 15:13:37 +10:30
+++ 1.135/mysql-test/t/view.test	2006-02-14 11:10:05 +10:30
@@ -1,3 +1,4 @@
+-- source include/have_innodb.inc
 --disable_warnings
 drop table if exists t1,t2,t3,t4,t9,`t1a``b`,v1,v2,v3,v4,v5,v6;
 drop view if exists t1,t2,`t1a``b`,v1,v2,v3,v4,v5,v6;

--- 1.69/mysql-test/t/information_schema.test	2006-01-27 18:54:41 +10:30
+++ 1.70/mysql-test/t/information_schema.test	2006-02-14 11:10:04 +10:30
@@ -660,6 +660,8 @@
 #             over information schema
 #
 
+-- source include/have_ucs2.inc
+
 CREATE TABLE t1 (a int);
 CREATE TABLE t2 (b int);
 

--- 1.45/mysql-test/t/func_group.test	2005-11-17 00:46:53 +10:30
+++ 1.46/mysql-test/t/func_group.test	2006-02-14 11:10:04 +10:30
@@ -2,6 +2,7 @@
 # simple test of all group functions
 #
 
+-- source include/have_innodb.inc
 --disable_warnings
 drop table if exists t1,t2;
 --enable_warnings

--- 1.21/mysql-test/t/insert.test	2006-02-01 21:06:27 +10:30
+++ 1.22/mysql-test/t/insert.test	2006-02-14 11:10:05 +10:30
@@ -1,6 +1,7 @@
 #
 # Test of refering to old values
 #
+-- source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists t1,t2,t3;

--- 1.18/mysql-test/t/group_min_max.test	2006-02-07 06:05:06 +10:30
+++ 1.19/mysql-test/t/group_min_max.test	2006-02-14 11:10:04 +10:30
@@ -10,6 +10,7 @@
 # - C IS NOT NULL
 # - HAVING clause
 
+-- source include/have_innodb.inc
 --disable_warnings
 drop table if exists t1;
 --enable_warnings