bk commit into 5.1 tree (petr:1.2317)

[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@stripped, 2006-09-15 17:24:13+04:00, petr@stripped +5 -0
  Merge pchardin@stripped:/home/bk/mysql-5.1-runtime
  into  mysql.com:/home/cps/mysql/trees/5.1-runtime-new
  MERGE: 1.2302.13.1

  sql/handler.h@stripped, 2006-09-15 17:24:04+04:00, petr@stripped +0 -0
    Auto merged
    MERGE: 1.235.1.1

  sql/share/errmsg.txt@stripped, 2006-09-15 17:24:04+04:00, petr@stripped +0 -0
    Auto merged
    MERGE: 1.110.7.1

  sql/sql_table.cc@stripped, 2006-09-15 17:24:04+04:00, petr@stripped +0 -0
    Auto merged
    MERGE: 1.366.1.1

  storage/csv/ha_tina.cc@stripped, 2006-09-15 17:24:04+04:00, petr@stripped +0 -0
    Auto merged
    MERGE: 1.57.2.1

  storage/myisam/ha_myisam.cc@stripped, 2006-09-15 17:24:05+04:00, petr@stripped +0 -0
    Auto merged
    MERGE: 1.190.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:	petr
# Host:	owlet.local
# Root:	/home/cps/mysql/trees/5.1-runtime-new/RESYNC

--- 1.191/storage/myisam/ha_myisam.cc	2006-09-15 17:24:26 +04:00
+++ 1.192/storage/myisam/ha_myisam.cc	2006-09-15 17:24:26 +04:00
@@ -1783,7 +1783,7 @@ static int myisam_init()
   myisam_hton.db_type=DB_TYPE_MYISAM;
   myisam_hton.create=myisam_create_handler;
   myisam_hton.panic=mi_panic;
-  myisam_hton.flags=HTON_CAN_RECREATE;
+  myisam_hton.flags= HTON_CAN_RECREATE | HTON_SUPPORT_LOG_TABLES;
   return 0;
 }
 

--- 1.238/sql/handler.h	2006-09-15 17:24:26 +04:00
+++ 1.239/sql/handler.h	2006-09-15 17:24:26 +04:00
@@ -690,6 +690,7 @@ struct handlerton
 #define HTON_FLUSH_AFTER_RENAME      (1 << 4)
 #define HTON_NOT_USER_SELECTABLE     (1 << 5)
 #define HTON_TEMPORARY_NOT_SUPPORTED (1 << 6) //Having temporary tables not
supported
+#define HTON_SUPPORT_LOG_TABLES      (1 << 7) //Engine supports log tables
 
 typedef struct st_thd_trans
 {

--- 1.368/sql/sql_table.cc	2006-09-15 17:24:26 +04:00
+++ 1.369/sql/sql_table.cc	2006-09-15 17:24:26 +04:00
@@ -1628,7 +1628,7 @@ int mysql_rm_table_part2(THD *thd, TABLE
          (!my_strcasecmp(system_charset_info, table->table_name, "slow_log")
           && opt_slow_log && logger.is_slow_log_table_enabled())))
     {
-      my_error(ER_CANT_DROP_LOG_TABLE, MYF(0));
+      my_error(ER_BAD_LOG_STATEMENT, MYF(0), "drop");
       DBUG_RETURN(1);
     }
   }
@@ -5179,7 +5179,7 @@ bool mysql_alter_table(THD *thd,char *ne
        (table_kind == SLOW_LOG && opt_slow_log &&
          logger.is_slow_log_table_enabled()))
     {
-      my_error(ER_CANT_ALTER_LOG_TABLE, MYF(0));
+      my_error(ER_BAD_LOG_STATEMENT, MYF(0), "alter");
       DBUG_RETURN(TRUE);
     }
 
@@ -5187,10 +5187,9 @@ bool mysql_alter_table(THD *thd,char *ne
     if ((table_kind == GENERAL_LOG || table_kind == SLOW_LOG) &&
         (lex_create_info->used_fields & HA_CREATE_USED_ENGINE) &&
         (!lex_create_info->db_type || /* unknown engine */
-        !(lex_create_info->db_type->db_type == DB_TYPE_MYISAM ||
-          lex_create_info->db_type->db_type == DB_TYPE_CSV_DB)))
+        !(lex_create_info->db_type->flags & HTON_SUPPORT_LOG_TABLES)))
     {
-      my_error(ER_BAD_LOG_ENGINE, MYF(0));
+      my_error(ER_UNSUPORTED_LOG_ENGINE, MYF(0));
       DBUG_RETURN(TRUE);
     }
   }

--- 1.122/sql/share/errmsg.txt	2006-09-15 17:24:26 +04:00
+++ 1.123/sql/share/errmsg.txt	2006-09-15 17:24:26 +04:00
@@ -5990,3 +5990,7 @@ ER_HOSTNAME
 	eng "host name"
 ER_WRONG_STRING_LENGTH
 	eng "String '%-.70s' is too long for %s (should be no longer than %d)"
+ER_UNSUPORTED_LOG_ENGINE
+        eng "This storage engine cannot be used for log tables""
+ER_BAD_LOG_STATEMENT
+        eng "You cannot %s a log table if logging is enabled"

--- 1.60/storage/csv/ha_tina.cc	2006-09-15 17:24:26 +04:00
+++ 1.61/storage/csv/ha_tina.cc	2006-09-15 17:24:26 +04:00
@@ -162,7 +162,7 @@ static int tina_init_func()
     tina_hton.db_type= DB_TYPE_CSV_DB;
     tina_hton.create= tina_create_handler;
     tina_hton.panic= tina_end;
-    tina_hton.flags= HTON_CAN_RECREATE;
+    tina_hton.flags= HTON_CAN_RECREATE | HTON_SUPPORT_LOG_TABLES;
   }
   return 0;
 }