From: Date: November 2 2007 7:02pm
Subject: bk commit into 5.1 tree (antony:1.2599) BUG#32050
List-Archive: http://lists.mysql.com/commits/37012
X-Bug: 32050
Message-Id: <20071102180216.5F8F418F49AD@pcg5ppc.xiphis.org>

Below is the list of changes that have just been committed into a local
5.1 repository of antony. When antony 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-02 11:02:07-07:00, antony@stripped +1 -0
  bug#32050
    "table logging gone wrong"
    CSV requires that all columns be NOT NULL, so as part of
    mysql upgrade scripts, we must alter log table definitions so 
    that all columns which are previously nullable are now NOT NULL.

  scripts/mysql_system_tables_fix.sql@stripped, 2007-11-02 11:02:04-07:00, antony@stripped +16 -0
    bug32050
      must alter log table definitions so that all columns are NOT NULL

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 01:13:53 -07:00
+++ b/scripts/mysql_system_tables_fix.sql	2007-11-02 11:02:04 -07: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