List:Commits« Previous MessageNext Message »
From:Mats Kindahl Date:January 9 2006 8:47am
Subject:bk commit into 5.1 tree (mats:1.2024)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of mkindahl. When mkindahl 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.2024 06/01/09 09:47:23 mats@stripped +2 -0
  Merge mkindahl@stripped:/home/bk/mysql-5.1-new
  into  mysql.com:/users/mkindahl/bk/b15923-mysql-5.1-new

  sql/sql_delete.cc
    1.169 06/01/09 09:47:02 mats@stripped +0 -0
    Auto merged

  mysql-test/t/disabled.def
    1.34 06/01/09 09:47:00 mats@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:	mats
# Host:	dl145k.mysql.com
# Root:	/users/mkindahl/bk/b15923-mysql-5.1-new/RESYNC

--- 1.168/sql/sql_delete.cc	2006-01-09 09:37:12 +01:00
+++ 1.169/sql/sql_delete.cc	2006-01-09 09:47:02 +01:00
@@ -910,7 +910,9 @@
   }
 
   // Remove the .frm extension
-  *(path + path_length - reg_ext_length)= '\0';
+  // AIX 5.2 64-bit compiler bug (BUG#16155): this crashes, replacement works.
+  //   *(path + path_length - reg_ext_length)= '\0';
+  path[path_length - reg_ext_length] = 0;
   error= ha_create_table(thd, path, table_list->db, table_list->table_name,
                          &create_info, 1);
   query_cache_invalidate3(thd, table_list, 0);

--- 1.33/mysql-test/t/disabled.def	2006-01-06 19:34:55 +01:00
+++ 1.34/mysql-test/t/disabled.def	2006-01-09 09:47:00 +01:00
@@ -21,6 +21,6 @@
 subselect       : Bug#15706
 type_time       : Bug#15805
 #rpl000002       : Bug#15920 Temporary tables are not binlogged in SBR
-ps_7ndb         : Bug#15923 Core dump in RBR mode when executing test suite
+#ps_7ndb         : Bug#15923 Core dump in RBR mode when executing test suite
 rpl_ddl         : Bug#15963 SBR does not show "Definer" correctly
 mysqlslap       : Bug#16167
Thread
bk commit into 5.1 tree (mats:1.2024)Mats Kindahl9 Jan