List:Commits« Previous MessageNext Message »
From:tomas Date:January 5 2006 10:43am
Subject:bk commit into 5.1 tree (tomas:1.1981)
View as plain text  
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.1981 06/01/05 11:43:27 tomas@stripped +4 -0
  update to be exactly as 5.1-new rev 1.1980

  sql/sql_lex.h
    1.214 06/01/05 11:43:19 tomas@stripped +2 -1
    update to be exactly as 5.1-new rev 1.1980

  sql/handler.cc
    1.198 06/01/05 11:43:19 tomas@stripped +24 -18
    update to be exactly as 5.1-new rev 1.1980

  sql/ha_partition.cc
    1.15 06/01/05 11:43:19 tomas@stripped +2 -2
    update to be exactly as 5.1-new rev 1.1980

  mysql-test/t/binlog_row_innodb_stat-master.opt
    1.2 06/01/05 11:43:19 tomas@stripped +1 -0
    update to be exactly as 5.1-new rev 1.1980

# 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-wl1012-v3.old

--- 1.197/sql/handler.cc	2006-01-05 11:30:57 +01:00
+++ 1.198/sql/handler.cc	2006-01-05 11:43:19 +01:00
@@ -30,7 +30,7 @@
 
 #include <myisampack.h>
 #include <errno.h>
-  
+
 #ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
 #define NDB_MAX_ATTRIBUTES_IN_TABLE 128
 #include "ha_ndbcluster.h"
@@ -38,6 +38,7 @@
 #ifdef WITH_PARTITION_STORAGE_ENGINE
 #include "ha_partition.h"
 #endif
+
 #ifdef WITH_INNOBASE_STORAGE_ENGINE
 #include "ha_innodb.h"
 #endif
@@ -46,6 +47,8 @@
 
 #define BITMAP_STACKBUF_SIZE (128/8)
 
+/* static functions defined in this file */
+
 static handler *create_default(TABLE_SHARE *table);
 
 const handlerton default_hton =
@@ -63,7 +66,6 @@
   NULL, NULL, NULL, NULL, NULL,
   HTON_NO_FLAGS
 };
->>>>>>>
 
 static SHOW_COMP_OPTION have_yes= SHOW_OPTION_YES;
 
@@ -2726,19 +2728,22 @@
   return &known_extensions;
 }
 
-static bool stat_print(THD *thd, const char *type, const char *file,
-                       const char *status)
+
+static bool stat_print(THD *thd, const char *type, uint type_len,
+                       const char *file, uint file_len,
+                       const char *status, uint status_len)
 {
   Protocol *protocol= thd->protocol;
   protocol->prepare_for_resend();
-  protocol->store(type, system_charset_info);
-  protocol->store(file, system_charset_info);
-  protocol->store(status, system_charset_info);
+  protocol->store(type, type_len, system_charset_info);
+  protocol->store(file, file_len, system_charset_info);
+  protocol->store(status, status_len, system_charset_info);
   if (protocol->write())
     return TRUE;
   return FALSE;
 }
 
+
 static my_bool showstat_handlerton(THD *thd, st_plugin_int *plugin,
                                    void *arg)
 {
@@ -2783,9 +2788,10 @@
     send_eof(thd);
   return result;
 }
+
 /*
   Function to check if the conditions for row-based binlogging is
-  correct for the table. 
+  correct for the table.
 
   A row in the given table should be replicated if:
   - Row-based replication is on
@@ -2793,7 +2799,7 @@
   - The binlog is enabled
   - The table shall be binlogged (binlog_*_db rules) [Seems disabled /Matz]
 */
-  
+
 #ifdef HAVE_ROW_BASED_REPLICATION
 static bool check_table_binlog_row_based(THD *thd, TABLE *table)
 {
@@ -2810,7 +2816,7 @@
   bool error= 0;
   THD *const thd= current_thd;
 
-  if (check_table_binlog_row_based(thd, table)) 
+  if (check_table_binlog_row_based(thd, table))
   {
     MY_BITMAP cols;
     /* Potential buffer on the stack for the bitmap */
@@ -2818,8 +2824,8 @@
     uint n_fields= table->s->fields;
     my_bool use_bitbuf= n_fields <= sizeof(bitbuf)*8;
     if (likely(!(error= bitmap_init(&cols,
-                                    use_bitbuf ? bitbuf : NULL, 
-                                    (n_fields + 7) & ~7UL, 
+                                    use_bitbuf ? bitbuf : NULL,
+                                    (n_fields + 7) & ~7UL,
                                     false))))
     {
       bitmap_set_all(&cols);
@@ -2847,7 +2853,7 @@
 
 #endif /* HAVE_ROW_BASED_REPLICATION */
 
-int handler::ha_write_row(byte *buf) 
+int handler::ha_write_row(byte *buf)
 {
   int error;
   if (likely(!(error= write_row(buf))))
@@ -2858,8 +2864,8 @@
   }
   return error;
 }
-  
-int handler::ha_update_row(const byte *old_data, byte *new_data) 
+
+int handler::ha_update_row(const byte *old_data, byte *new_data)
 {
   int error;
   if (likely(!(error= update_row(old_data, new_data))))
@@ -2870,8 +2876,8 @@
   }
   return error;
 }
-  
-int handler::ha_delete_row(const byte *buf) 
+
+int handler::ha_delete_row(const byte *buf)
 {
   int error;
   if (likely(!(error= delete_row(buf))))
@@ -2881,7 +2887,7 @@
 #endif
   }
   return error;
-}    
+}
 
 
 #ifdef HAVE_REPLICATION

--- 1.213/sql/sql_lex.h	2006-01-05 11:30:57 +01:00
+++ 1.214/sql/sql_lex.h	2006-01-05 11:43:19 +01:00
@@ -93,7 +93,8 @@
   SQLCOM_XA_COMMIT, SQLCOM_XA_ROLLBACK, SQLCOM_XA_RECOVER,
   SQLCOM_SHOW_PROC_CODE, SQLCOM_SHOW_FUNC_CODE,
   SQLCOM_INSTALL_PLUGIN, SQLCOM_UNINSTALL_PLUGIN,
-  SQLCOM_SHOW_AUTHORS, SQLCOM_SHOW_PLUGINS, SQLCOM_BINLOG_BASE64_EVENT,
+  SQLCOM_SHOW_AUTHORS, SQLCOM_BINLOG_BASE64_EVENT,
+  SQLCOM_SHOW_PLUGINS,
   /* This should be the last !!! */
 
   SQLCOM_END

--- 1.1/mysql-test/t/binlog_row_innodb_stat-master.opt	2005-12-01 09:01:20 +01:00
+++ 1.2/mysql-test/t/binlog_row_innodb_stat-master.opt	2006-01-05 11:43:19 +01:00
@@ -0,0 +1 @@
+--binlog_cache_size=32768

--- 1.14/sql/ha_partition.cc	2005-12-21 19:24:56 +01:00
+++ 1.15/sql/ha_partition.cc	2006-01-05 11:43:19 +01:00
@@ -647,7 +647,7 @@
     if (!m_is_sub_partitioned)
     {
       name_buffer_ptr= strmov(name_buffer_ptr, part_elem->partition_name)+1;
-      *engine_array= (uchar) part_elem->engine_type;
+      *engine_array= (uchar) ha_legacy_type(part_elem->engine_type);
       DBUG_PRINT("info", ("engine: %u", *engine_array));
       engine_array++;
     }
@@ -660,7 +660,7 @@
 	name_buffer_ptr+= name_add(name_buffer_ptr,
 				    part_elem->partition_name,
 				    subpart_elem->partition_name);
-	*engine_array= (uchar) part_elem->engine_type;
+	*engine_array= (uchar) ha_legacy_type(part_elem->engine_type);
 	engine_array++;
       }
     }
Thread
bk commit into 5.1 tree (tomas:1.1981)tomas5 Jan