bk commit into 5.1 tree (tomas:1.1913)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.1913 05/10/06 12:45:30 tomas@stripped +5 -0
  merge

  sql/ha_partition.h
    1.3 05/10/06 12:45:16 tomas@stripped +1 -1
    merge

  sql/ha_partition.cc
    1.5 05/10/06 12:45:16 tomas@stripped +6 -2
    merge

  libmysqld/Makefile.am
    1.66 05/10/06 12:45:16 tomas@stripped +1 -0
    merge

  storage/ndb/tools/ndb_size.tmpl
    1.2 05/10/06 10:56:01 tomas@stripped +0 -0
    Rename: ndb/tools/ndb_size.tmpl -> storage/ndb/tools/ndb_size.tmpl

  storage/ndb/tools/ndb_size.pl
    1.3 05/10/06 10:56:00 tomas@stripped +0 -0
    Rename: ndb/tools/ndb_size.pl -> storage/ndb/tools/ndb_size.pl

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1

--- 1.65/libmysqld/Makefile.am	2005-10-06 10:28:59 +02:00
+++ 1.66/libmysqld/Makefile.am	2005-10-06 12:45:16 +02:00
@@ -63,6 +63,7 @@
 	spatial.cc gstream.cc sql_help.cc tztime.cc sql_cursor.cc \
 	sp_head.cc sp_pcontext.cc sp.cc sp_cache.cc sp_rcontext.cc \
 	parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \
+        rpl_filter.cc \
 	ha_blackhole.cc ha_archive.cc sql_partition.cc ha_partition.cc
 
 libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources) $(sqlexamplessources)

--- 1.4/sql/ha_partition.cc	2005-09-20 05:32:03 +02:00
+++ 1.5/sql/ha_partition.cc	2005-10-06 12:45:16 +02:00
@@ -69,6 +69,10 @@
 
 static handlerton partition_hton = {
   "partition",
+  SHOW_OPTION_YES,
+  "", /* A comment used by SHOW to describe an engine */
+  DB_TYPE_PARTITION_DB,
+  0, /* Method that initizlizes a storage engine */
   0, /* slot */
   0, /* savepoint size */
   NULL /*ndbcluster_close_connection*/,
@@ -1048,7 +1052,7 @@
 }
 
 
-int ha_partition::start_stmt(THD *thd)
+int ha_partition::start_stmt(THD *thd, thr_lock_type lock_type)
 {
   int error= 0;
   handler **file;
@@ -1056,7 +1060,7 @@
   file= m_file;
   do
   {
-    if ((error= (*file)->start_stmt(thd)))
+    if ((error= (*file)->start_stmt(thd, lock_type)))
       break;
   } while (*(++file));
   DBUG_RETURN(error);

--- 1.2/sql/ha_partition.h	2005-08-19 16:25:28 +02:00
+++ 1.3/sql/ha_partition.h	2005-10-06 12:45:16 +02:00
@@ -228,7 +228,7 @@
     When table is locked a statement is started by calling start_stmt
     instead of external_lock
   */
-  virtual int start_stmt(THD * thd);
+  virtual int start_stmt(THD * thd, thr_lock_type lock_type);
   /*
     Lock count is number of locked underlying handlers (I assume)
   */