bk commit into 5.1 tree (joerg:1.2546)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
5.1 repository of joerg. When joerg 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-06-07 16:37:15+02:00, joerg@trift2. +8 -0
  Merge trift2.:/MySQL/M50/push-5.0
  into  trift2.:/MySQL/M51/push-5.1
  MERGE: 1.1810.2945.41

  BitKeeper/deleted/.del-CMakeLists.txt~1@stripped, 2007-06-07 16:37:06+02:00, joerg@trift2.
+0 -0
    Auto merged
    MERGE: 1.1.23.2

  BitKeeper/deleted/.del-CMakeLists.txt~1@stripped, 2007-06-07 16:37:06+02:00,
joerg@trift2. +0 -0
    Merge rename: CMakeLists.txt -> BitKeeper/deleted/.del-CMakeLists.txt~1

  mysql-test/extra/binlog_tests/ctype_cp932_binlog.test@stripped, 2007-06-07 16:37:07+02:00,
joerg@trift2. +0 -0
    Auto merged
    MERGE: 1.2.5.2

  mysql-test/extra/binlog_tests/ctype_cp932_binlog.test@stripped, 2007-06-07
16:37:06+02:00, joerg@trift2. +0 -0
    Merge rename: mysql-test/t/ctype_cp932_binlog.test ->
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test

  mysql-test/mysql-test-run.pl@stripped, 2007-06-07 16:37:07+02:00, joerg@trift2. +0 -0
    Auto merged
    MERGE: 1.30.49.83

  mysql-test/t/mysqltest.test@stripped, 2007-06-07 16:37:07+02:00, joerg@trift2. +0 -0
    Auto merged
    MERGE: 1.24.1.35

  netware/myisam_ftdump.def@stripped, 2007-06-07 16:37:07+02:00, joerg@trift2. +0 -0
    Auto merged
    MERGE: 1.4.1.1

  netware/myisamchk.def@stripped, 2007-06-07 16:37:07+02:00, joerg@trift2. +0 -0
    Auto merged
    MERGE: 1.8.1.1

  netware/myisamlog.def@stripped, 2007-06-07 16:37:08+02:00, joerg@trift2. +0 -0
    Auto merged
    MERGE: 1.8.1.1

  netware/myisampack.def@stripped, 2007-06-07 16:37:08+02:00, joerg@trift2. +0 -0
    Auto merged
    MERGE: 1.8.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:	joerg
# Host:	trift2.
# Root:	/MySQL/M51/push-5.1/RESYNC

--- 1.1.23.1/CMakeLists.txt	2007-06-06 20:06:53 +02:00
+++ 1.21/BitKeeper/deleted/.del-CMakeLists.txt~1	2007-06-07 16:37:06 +02:00
@@ -48,6 +48,8 @@
 ENDIF (WITH_MYISAMMRG_STORAGE_ENGINE)
 
 IF(WITH_INNOBASE_STORAGE_ENGINE)
+  CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/innobase/ib_config.h.in
+               ${CMAKE_SOURCE_DIR}/innobase/ib_config.h @ONLY)
   ADD_DEFINITIONS(-D HAVE_INNOBASE_DB)
   ADD_DEFINITIONS(-D WITH_INNOBASE_STORAGE_ENGINE)
   SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_innobase_plugin")
@@ -181,12 +183,8 @@
 ADD_SUBDIRECTORY(myisam)
 ADD_SUBDIRECTORY(myisammrg)
 ADD_SUBDIRECTORY(client)
-IF(WITH_BERKELEY_STORAGE_ENGINE)
-  ADD_SUBDIRECTORY(bdb)
-ENDIF(WITH_BERKELEY_STORAGE_ENGINE)
-IF(WITH_INNOBASE_STORAGE_ENGINE)
-  ADD_SUBDIRECTORY(innobase)
-ENDIF(WITH_INNOBASE_STORAGE_ENGINE)
+ADD_SUBDIRECTORY(bdb)
+ADD_SUBDIRECTORY(innobase)
 ADD_SUBDIRECTORY(sql)
 ADD_SUBDIRECTORY(sql/examples)
 ADD_SUBDIRECTORY(server-tools/instance-manager)

--- 1.2.5.1/mysql-test/t/ctype_cp932_binlog.test	2007-06-06 20:06:53 +02:00
+++ 1.12/mysql-test/extra/binlog_tests/ctype_cp932_binlog.test	2007-06-07 16:37:07 +02:00
@@ -1,6 +1,5 @@
 -- source include/not_embedded.inc
 -- source include/have_cp932.inc
--- source include/have_log_bin.inc
 
 --character_set cp932
 --disable_warnings
@@ -27,32 +26,9 @@
 # code (and I have used it to test the fix) until there is some way to
 # exercise this code from mysql-test-run.
 EXECUTE stmt1 USING @var1;
-SHOW BINLOG EVENTS FROM 98;
+source include/show_binlog_events.inc;
 SELECT HEX(f1) FROM t1;
 DROP table t1;
 # end test for bug#11338
 
 # End of 4.1 tests
-
-#
-# Bug#18293: Values in stored procedure written to binlog unescaped
-#
-
-delimiter |;
-CREATE TABLE t4 (s1 CHAR(50) CHARACTER SET latin1,
-                 s2 CHAR(50) CHARACTER SET cp932,
-                 d DECIMAL(10,2))|
-CREATE PROCEDURE bug18293 (IN ins1 CHAR(50),
-                           IN ins2 CHAR(50) CHARACTER SET cp932,
-                           IN ind DECIMAL(10,2))
-  BEGIN
-    INSERT INTO t4 VALUES (ins1, ins2, ind);
-  END|
-CALL bug18293("Foo's a Bar", _cp932 0xED40ED41ED42, 47.93)|
-SELECT HEX(s1),HEX(s2),d FROM t4|
-DROP PROCEDURE bug18293|
-DROP TABLE t4|
-SHOW BINLOG EVENTS FROM 362|
-delimiter ;|
-
-# End of 5.0 tests