bk commit into 5.1 tree (istruewing:1.2322)

[ingo]

Below is the list of changes that have just been committed into a local
5.1 repository of istruewing. When istruewing 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-27 15:10:47+02:00, istruewing@stripped +5 -0
  Merge chilla.local:/home/mydev/mysql-5.0-merge
  into  chilla.local:/home/mydev/mysql-5.1-merge
  MERGE: 1.1810.2078.44

  BitKeeper/deleted/.del-CMakeLists.txt~1@stripped, 2006-10-27 15:10:44+02:00,
istruewing@stripped +2 -3
    Merge from 5.0
    MERGE: 1.1.3.2

  BitKeeper/deleted/.del-CMakeLists.txt~1@stripped, 2006-10-27 15:09:04+02:00,
istruewing@stripped +0 -0
    Merge rename: CMakeLists.txt -> BitKeeper/deleted/.del-CMakeLists.txt~1

  BitKeeper/deleted/.del-make_win_bin_dist@stripped, 2006-10-27 15:09:04+02:00,
istruewing@stripped +0 -0
    Auto merged
    MERGE: 1.1.1.2

  BitKeeper/deleted/.del-make_win_bin_dist@stripped, 2006-10-27 15:09:04+02:00,
istruewing@stripped +0 -0
    Merge rename: scripts/make_win_bin_dist -> BitKeeper/deleted/.del-make_win_bin_dist

  configure.in@stripped, 2006-10-27 15:10:44+02:00, istruewing@stripped +0 -2
    Merge from 5.0
    MERGE: 1.245.1.157

  include/mysql.h@stripped, 2006-10-27 15:09:04+02:00, istruewing@stripped +0 -0
    Auto merged
    MERGE: 1.154.1.9

  libmysqld/lib_sql.cc@stripped, 2006-10-27 15:09:04+02:00, istruewing@stripped +0 -0
    Auto merged
    MERGE: 1.107.1.8

# 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:	istruewing
# Host:	chilla.local
# Root:	/home/mydev/mysql-5.1-merge/RESYNC

--- 1.167/include/mysql.h	2006-10-27 15:10:53 +02:00
+++ 1.168/include/mysql.h	2006-10-27 15:10:53 +02:00
@@ -293,12 +293,6 @@ typedef struct st_mysql
   /* needed for embedded server - no net buffer to store the 'info' */
   char *info_buffer;
 #endif
-  /*
-    In embedded server it points to the statement that is processed
-    in the current query. We store some results directly in statement
-    fields then.
-  */
-  struct st_mysql_stmt *current_stmt;
 } MYSQL;
 
 typedef struct st_mysql_res {

--- 1.1.3.1/CMakeLists.txt	2006-10-27 15:10:53 +02:00
+++ 1.4/BitKeeper/deleted/.del-CMakeLists.txt~1	2006-10-27 15:10:53 +02:00
@@ -29,6 +29,8 @@ IF (WITH_MYISAMMRG_STORAGE_ENGINE)
 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")
@@ -121,12 +123,8 @@ ADD_SUBDIRECTORY(heap)
 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.120/libmysqld/lib_sql.cc	2006-10-27 15:10:53 +02:00
+++ 1.121/libmysqld/lib_sql.cc	2006-10-27 15:10:53 +02:00
@@ -100,7 +100,6 @@ emb_advanced_command(MYSQL *mysql, enum 
   mysql->affected_rows= ~(my_ulonglong) 0;
   mysql->field_count= 0;
   net->last_errno= 0;
-  mysql->current_stmt= stmt;
 
   thd->store_globals();				// Fix if more than one connect
   /*