bk commit into 5.1 tree (joerg:1.2575)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
5.1 repository of joerg. When joerg 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-04-23 11:21:15+02:00, joerg@debian.(none) +5 -0
  Merge debian.(none):/M51/mysql-5.1
  into  debian.(none):/M51/push-5.1
  MERGE: 1.2542.1.59

  configure.in@stripped, 2007-04-23 11:17:50+02:00, joerg@debian.(none) +0 -0
    Auto merged
    MERGE: 1.451.1.2

  mysql-test/t/sp_trans_log.test@stripped, 2007-04-23 11:20:24+02:00, joerg@debian.(none) +0 -3
    Similar changes in different trees - give main tree precedence.
    MERGE: 1.2.1.1

  sql/ha_ndbcluster.cc@stripped, 2007-04-23 11:17:51+02:00, joerg@debian.(none) +0 -0
    Auto merged
    MERGE: 1.432.1.14

  sql/mysqld.cc@stripped, 2007-04-23 11:17:52+02:00, joerg@debian.(none) +0 -0
    Auto merged
    MERGE: 1.631.1.1

  sql/sql_delete.cc@stripped, 2007-04-23 11:17:52+02:00, joerg@debian.(none) +0 -0
    Auto merged
    MERGE: 1.216.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:	joerg
# Host:	debian.(none)
# Root:	/M51/push-5.1/RESYNC

--- 1.455/configure.in	2007-04-20 12:15:19 +02:00
+++ 1.456/configure.in	2007-04-23 11:17:50 +02:00
@@ -7,6 +7,9 @@
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # remember to also update version.c in ndb
+#
+# When changing major version number please also check switch statement
+# in mysqlbinlog::check_master_version().
 AM_INIT_AUTOMAKE(mysql, 5.1.18-beta)
 AM_CONFIG_HEADER(config.h)
 

--- 1.217/sql/sql_delete.cc	2007-04-20 10:50:46 +02:00
+++ 1.218/sql/sql_delete.cc	2007-04-23 11:17:52 +02:00
@@ -394,8 +394,6 @@
 {
   Item *fake_conds= 0;
   SELECT_LEX *select_lex= &thd->lex->select_lex;
-  const char *operation = thd->lex->sql_command == SQLCOM_TRUNCATE ?
-                          "TRUNCATE" : "DELETE";
   DBUG_ENTER("mysql_prepare_delete");
   List<Item> all_fields;
 
@@ -410,14 +408,14 @@
     DBUG_RETURN(TRUE);
   if (!table_list->updatable || check_key_in_view(thd, table_list))
   {
-    my_error(ER_NON_UPDATABLE_TABLE, MYF(0), table_list->alias, operation);
+    my_error(ER_NON_UPDATABLE_TABLE, MYF(0), table_list->alias, "DELETE");
     DBUG_RETURN(TRUE);
   }
   {
     TABLE_LIST *duplicate;
     if ((duplicate= unique_table(thd, table_list, table_list->next_global, 0)))
     {
-      update_non_unique_table_error(table_list, operation, duplicate);
+      update_non_unique_table_error(table_list, "DELETE", duplicate);
       DBUG_RETURN(TRUE);
     }
   }
@@ -935,8 +933,7 @@
   if (!dont_send_ok)
   {
     enum legacy_db_type table_type;
-    if (mysql_frm_type(thd, path, &table_type) == FRMTYPE_VIEW)
-      goto trunc_by_del;
+    mysql_frm_type(thd, path, &table_type);
     if (table_type == DB_TYPE_UNKNOWN)
     {
       my_error(ER_NO_SUCH_TABLE, MYF(0),

--- 1.3/mysql-test/t/sp_trans_log.test	2007-04-20 16:54:17 +02:00
+++ 1.4/mysql-test/t/sp_trans_log.test	2007-04-23 11:20:24 +02:00
@@ -1,4 +1,4 @@
-# Binlog-related tests should be disabled in the embedded server.
+# binlog disabled in embedded server
 -- source include/not_embedded.inc
 
 # part of sp_trans test that appeared to be sensitive to binlog format

--- 1.438/sql/ha_ndbcluster.cc	2007-04-20 10:50:44 +02:00
+++ 1.439/sql/ha_ndbcluster.cc	2007-04-23 11:17:51 +02:00
@@ -738,8 +738,8 @@
         DBUG_DUMP("value", (char*)&bits, pack_len);
 #ifdef WORDS_BIGENDIAN
         /* store lsw first */
-        bits = ((bits >> 32) & 0x00000000FFFFFFFF)
-          |    ((bits << 32) & 0xFFFFFFFF00000000);
+        bits = ((bits >> 32) & 0x00000000FFFFFFFFLL)
+          |    ((bits << 32) & 0xFFFFFFFF00000000LL);
 #endif
         DBUG_RETURN(ndb_op->setValue(fieldnr, (char*)&bits) != 0);
       }
@@ -3222,10 +3222,10 @@
             /* lsw is stored first */
             Uint32 *buf= (Uint32 *)(*value).rec->aRef();
             field_bit->Field_bit::store((((longlong)*buf)
-                                         & 0x000000000FFFFFFFF)
+                                         & 0x000000000FFFFFFFFLL)
                                         |
                                         ((((longlong)*(buf+1)) << 32)
-                                         & 0xFFFFFFFF00000000),
+                                         & 0xFFFFFFFF00000000LL),
                                         TRUE);
 #else
             field_bit->Field_bit::store((longlong)