MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:jani Date:April 30 2006 1:01pm
Subject:bk commit into 4.1 tree (jani:1.2467) BUG#14515
View as plain text  
Below is the list of changes that have just been committed into a local
4.1 repository of jani. When jani 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.2467 06/04/30 16:01:34 jani@stripped +2 -0
  Fix for Bug#14515.

  sql/sql_show.cc
    1.207 06/04/30 16:01:30 jani@stripped +3 -4
    Fix for Bug#14515.

  sql/set_var.cc
    1.180 06/04/30 16:01:30 jani@stripped +0 -4
    Fix for Bug#14515. These modes do not need restrictions, they're handled
    separately in sql_show.cc

# 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:	jani
# Host:	a193-229-222-105.elisa-laajakaista.fi
# Root:	/home/my/bk/mysql-4.1

--- 1.206/sql/sql_show.cc	2005-11-01 21:48:53 +02:00
+++ 1.207/sql/sql_show.cc	2006-04-30 16:01:30 +03:00
@@ -1344,8 +1344,8 @@
     
     has_default= (field->type() != FIELD_TYPE_BLOB &&
 		  field->unireg_check != Field::NEXT_NUMBER &&
-                  !((thd->variables.sql_mode & (MODE_MYSQL323 | MODE_MYSQL40)) &&
-                    has_now_default));
+                  !((thd->variables.sql_mode & (MODE_MYSQL323 | MODE_MYSQL40))
+		    && has_now_default));
 
     if (has_default)
     {
@@ -1374,8 +1374,7 @@
         packet->append(tmp);
     }
 
-    if (!(thd->variables.sql_mode & MODE_NO_FIELD_OPTIONS) &&
-        table->timestamp_field == field && 
+    if (!limited_mysql_mode && table->timestamp_field == field && 
         field->unireg_check != Field::TIMESTAMP_DN_FIELD)
       packet->append(" on update CURRENT_TIMESTAMP",28);
 

--- 1.179/sql/set_var.cc	2006-04-07 22:36:57 +03:00
+++ 1.180/sql/set_var.cc	2006-04-30 16:01:30 +03:00
@@ -3207,10 +3207,6 @@
 		MODE_IGNORE_SPACE |
 		MODE_NO_KEY_OPTIONS | MODE_NO_TABLE_OPTIONS |
 		MODE_NO_FIELD_OPTIONS);
-  if (sql_mode & MODE_MYSQL40)
-    sql_mode|= MODE_NO_FIELD_OPTIONS;
-  if (sql_mode & MODE_MYSQL323)
-    sql_mode|= MODE_NO_FIELD_OPTIONS;
   return sql_mode;
 }
 
Thread
bk commit into 4.1 tree (jani:1.2467) BUG#14515jani30 Apr