List:Commits« Previous MessageNext Message »
From:Sergey Vojtovich Date:November 27 2007 10:13am
Subject:bk commit into 5.1 tree (svoj:1.2654) BUG#32050
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of svoj. When svoj 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, 2007-11-27 14:01:11+04:00, svoj@stripped +2 -0
  BUG#32050 - table logging gone wrong.
  
  INSERT/UPDATE against CSV table created by MySQL earlier than 5.1.23
  with NULL-able column results in server crash in debug builds.
  
  Starting with 5.1.23 CSV doesn't permit creation of NULL-able columns,
  but it is still possible to get such table from older MySQL versions.
  
  Fixed by removing excessive DBUG_ASSERT().

  scripts/mysql_system_tables_fix.sql@stripped, 2007-11-27 14:01:02+04:00, svoj@stripped +16 -0
    Starting with 5.1.23 CSV doesn't permit creation of NULL-able columns.
    Alter system CSV tables structure so that all columns are NOT NULL.

  storage/csv/ha_tina.cc@stripped, 2007-11-27 14:01:02+04:00, svoj@stripped +0 -8
    Starting with 5.1.23 CSV doesn't permit creation of NULL-able columns,
    but it is still possible to get such table from older MySQL versions.
    
    Removed excessive DBUG_ASSERT().

diff -Nrup a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql
--- a/scripts/mysql_system_tables_fix.sql	2007-10-17 13:13:53 +05:00
+++ b/scripts/mysql_system_tables_fix.sql	2007-11-27 14:01:02 +04:00
@@ -513,6 +513,22 @@ ALTER TABLE tables_priv MODIFY Table_pri
 
 UPDATE user SET Trigger_priv=Super_priv WHERE @hadTriggerPriv = 0;
 
+#
+# Log Table
+#
+
+ALTER TABLE general_log 
+  MODIFY COLUMN user_host MEDIUMTEXT NOT NULL,
+  MODIFY COLUMN thread_id INTEGER NOT NULL,
+  MODIFY COLUMN server_id INTEGER NOT NULL,
+  MODIFY COLUMN command_type VARCHAR(64) NOT NULL,
+  MODIFY COLUMN argument MEDIUMTEXT NOT NULL;
+ALTER TABLE slow_log
+  MODIFY COLUMN db VARCHAR(512) NOT NULL,
+  MODIFY COLUMN last_insert_id INTEGER NOT NULL,
+  MODIFY COLUMN insert_id INTEGER NOT NULL,
+  MODIFY COLUMN server_id INTEGER NOT NULL;
+
 # Activate the new, possible modified privilege tables
 # This should not be needed, but gives us some extra testing that the above
 # changes was correct
diff -Nrup a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc
--- a/storage/csv/ha_tina.cc	2007-10-19 02:48:00 +05:00
+++ b/storage/csv/ha_tina.cc	2007-11-27 14:01:02 +04:00
@@ -472,14 +472,6 @@ int ha_tina::encode_quote(uchar *buf)
     const char *ptr;
     const char *end_ptr;
     const bool was_null= (*field)->is_null();
-
-    /*
-      CSV does not support nulls. ::create() prevents creation of a table
-      with nullable columns so if we encounter them here, there is a bug.
-      This may only occur if the frm was created by an older version of
-      mysqld which permitted table creation with nullable columns.
-    */
-    DBUG_ASSERT(!(*field)->maybe_null());
     
     /*
       assistance for backwards compatibility in production builds.
Thread
bk commit into 5.1 tree (svoj:1.2654) BUG#32050Sergey Vojtovich27 Nov
  • Re: bk commit into 5.1 tree (svoj:1.2654) BUG#32050Sergei Golubchik29 Nov