bk commit into 5.1 tree (cps:1.2069)

[Petr Chardin]

Below is the list of changes that have just been committed into a local
5.1 repository of cps. When cps 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.2069 06/01/18 12:07:36 cps@stripped +6 -0
  Merge outpost.site:/home/cps/mysql/trees/5.1/5.1-virgin-debug
  into  outpost.site:/home/cps/mysql/devel/mysql-5.1-logs-merge

  sql/sql_table.cc
    1.283 06/01/18 12:07:27 cps@stripped +0 -0
    Auto merged

  sql/sql_show.cc
    1.290 06/01/18 12:07:27 cps@stripped +0 -0
    Auto merged

  sql/mysql_priv.h
    1.359 06/01/18 12:07:26 cps@stripped +0 -0
    Auto merged

  sql/handler.h
    1.182 06/01/18 12:07:25 cps@stripped +0 -0
    Auto merged

  sql/mysqld.cc
    1.508 06/01/18 12:07:26 cps@stripped +0 -0
    Auto merged

  sql/log_event.cc
    1.195 06/01/18 12:07:26 cps@stripped +0 -0
    Auto merged

# 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:	cps
# Host:	outpost.site
# Root:	/home/cps/mysql/devel/mysql-5.1-logs-merge/RESYNC

--- 1.181/sql/handler.h	2006-01-17 11:24:49 +03:00
+++ 1.182/sql/handler.h	2006-01-18 12:07:25 +03:00
@@ -1089,6 +1089,30 @@
   {
     /* TODO: DBUG_ASSERT(inited == NONE); */
   }
+  /*
+    Check whether a handler allows to lock the table.
+
+    SYNOPSIS
+      check_if_locking_is_allowed()
+        thd     Handler of the thread, trying to lock the table
+        table   Table handler to check
+        count   Number of locks already granted to the table
+
+    DESCRIPTION
+      Check whether a handler allows to lock the table. For instance,
+      MyISAM does not allow to lock mysql.proc along with other tables.
+      This limitation stems from the fact that MyISAM does not support
+      row-level locking and we have to add this limitation to avoid
+      deadlocks.
+
+    RETURN
+      TRUE      Locking is allowed
+      FALSE     Locking is not allowed. The error was thrown.
+  */
+  virtual bool check_if_locking_is_allowed(THD *thd, TABLE *table, uint count)
+  {
+    return TRUE;
+  }
   virtual int ha_initialise();
   int ha_open(TABLE *table, const char *name, int mode, int test_if_locked);
   bool update_auto_increment();

--- 1.194/sql/log_event.cc	2006-02-05 10:27:29 +03:00
+++ 1.195/sql/log_event.cc	2006-01-18 12:07:26 +03:00
@@ -6172,7 +6172,7 @@
   */
   DBUG_ASSERT(table->s->fields >= m_width);
   DBUG_ASSERT(ptr);
-  ptr= unpack_row(table, table->record[0], ptr, &m_cols);
+  ptr= unpack_row(table, (char*)table->record[0], ptr, &m_cols);
   return ptr;
 }
 

--- 1.358/sql/mysql_priv.h	2006-02-05 11:38:03 +03:00
+++ 1.359/sql/mysql_priv.h	2006-01-18 12:07:26 +03:00
@@ -1086,10 +1086,6 @@
 } ALTER_PARTITION_PARAM_TYPE;
 
 void mem_alloc_error(size_t size);
-int packfrm(const void *data, uint len, 
-            const void **pack_data, uint *pack_len);
-int unpackfrm(const void **unpack_data, uint *unpack_len,
-              const void *pack_data);
 #define WFRM_INITIAL_WRITE 1
 #define WFRM_CREATE_HANDLER_FILES 2
 #define WFRM_PACK_FRM 4

--- 1.507/sql/mysqld.cc	2006-02-05 11:20:45 +03:00
+++ 1.508/sql/mysqld.cc	2006-01-18 12:07:26 +03:00
@@ -411,6 +411,7 @@
 extern long berkeley_lock_scan_time;
 extern TYPELIB berkeley_lock_typelib;
 #endif
+
 #ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
 const char *opt_ndbcluster_connectstring= 0;
 const char *opt_ndb_connectstring= 0;

--- 1.289/sql/sql_show.cc	2006-02-05 11:38:03 +03:00
+++ 1.290/sql/sql_show.cc	2006-01-18 12:07:27 +03:00
@@ -2835,6 +2835,7 @@
     CHARSET_INFO *tmp_cs= cs[0];
     if (tmp_cs && (tmp_cs->state & MY_CS_PRIMARY) && 
         (tmp_cs->state & MY_CS_AVAILABLE) &&
+        !(tmp_cs->state & MY_CS_HIDDEN) &&
         !(wild && wild[0] &&
 	  wild_case_compare(scs, tmp_cs->csname,wild)))
     {
@@ -2904,6 +2905,7 @@
     CHARSET_INFO **cl;
     CHARSET_INFO *tmp_cs= cs[0];
     if (!tmp_cs || !(tmp_cs->state & MY_CS_AVAILABLE) || 
+         (tmp_cs->state & MY_CS_HIDDEN) ||
         !(tmp_cs->state & MY_CS_PRIMARY))
       continue;
     for (cl= all_charsets; cl < all_charsets+255 ;cl ++)

--- 1.282/sql/sql_table.cc	2006-02-05 11:38:03 +03:00
+++ 1.283/sql/sql_table.cc	2006-01-18 12:07:27 +03:00
@@ -3936,7 +3936,9 @@
   if (create_info->row_type == ROW_TYPE_NOT_USED)
     create_info->row_type= table->s->row_type;
 
-  DBUG_PRINT("info", ("old type: %d  new type: %d", old_db_type, new_db_type));
+  DBUG_PRINT("info", ("old type: %s  new type: %s",
+             ha_resolve_storage_engine_name(old_db_type),
+             ha_resolve_storage_engine_name(new_db_type)));
   if (ha_check_storage_engine_flag(old_db_type, HTON_ALTER_NOT_SUPPORTED) ||
       ha_check_storage_engine_flag(new_db_type, HTON_ALTER_NOT_SUPPORTED))
   {