bk commit into 6.0 tree (hakank:1.2624)

[Hakan Kuecuekyilmaz]

Below is the list of changes that have just been committed into a local
6.0 repository of hakan. When hakan 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, 2007-10-05 18:57:31+02:00, hakank@lu0011.(none) +3 -0
  Temporarily adjusted result file to include a trippled warning.

  BUILD/compile-amd64-noopt@stripped, 2007-10-05 18:57:29+02:00, hakank@lu0011.(none) +8 -0
    New BitKeeper file ``BUILD/compile-amd64-noopt''

  BUILD/compile-amd64-noopt@stripped, 2007-10-05 18:57:29+02:00, hakank@lu0011.(none) +0 -0

  mysql-test/suite/falcon/r/falcon_bug_22161.result@stripped, 2007-10-05 18:57:29+02:00, hakank@lu0011.(none) +1 -0
    Temporarily adjusted result file to include a trippled warning.

  mysql-test/suite/falcon/r/falcon_bug_23189.result@stripped, 2007-10-05 18:57:29+02:00, hakank@lu0011.(none) +1 -0
    Temporarily adjusted result file to include a trippled warning.

diff -Nrup a/BUILD/compile-amd64-noopt b/BUILD/compile-amd64-noopt
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/BUILD/compile-amd64-noopt	2007-10-05 18:57:29 +02:00
@@ -0,0 +1,8 @@
+#! /bin/sh
+
+path=`dirname $0`
+. "$path/SETUP.sh"
+extra_flags="$amd64_cflags -g"
+extra_configs="$amd64_configs $max_no_ndb_configs"
+
+. "$path/FINISH.sh"
diff -Nrup a/mysql-test/suite/falcon/r/falcon_bug_22161.result b/mysql-test/suite/falcon/r/falcon_bug_22161.result
--- a/mysql-test/suite/falcon/r/falcon_bug_22161.result	2007-09-20 17:42:56 +02:00
+++ b/mysql-test/suite/falcon/r/falcon_bug_22161.result	2007-10-05 18:57:29 +02:00
@@ -12,4 +12,5 @@ CREATE INDEX i1 ON t1 (a);
 Warnings:
 Warning	1071	Specified key was too long; max key length is 1100 bytes
 Warning	1071	Specified key was too long; max key length is 1100 bytes
+Warning	1071	Specified key was too long; max key length is 1100 bytes
 DROP TABLE t1;
diff -Nrup a/mysql-test/suite/falcon/r/falcon_bug_23189.result b/mysql-test/suite/falcon/r/falcon_bug_23189.result
--- a/mysql-test/suite/falcon/r/falcon_bug_23189.result	2007-09-20 17:43:05 +02:00
+++ b/mysql-test/suite/falcon/r/falcon_bug_23189.result	2007-10-05 18:57:29 +02:00
@@ -11,5 +11,6 @@ CREATE INDEX i ON t2 (a);
 Warnings:
 Warning	1071	Specified key was too long; max key length is 1100 bytes
 Warning	1071	Specified key was too long; max key length is 1100 bytes
+Warning	1071	Specified key was too long; max key length is 1100 bytes
 DROP TABLE t1;
 DROP TABLE t2;