bzr commit into mysql-5.1-telco-7.0 branch (jonas:2888)

[Jonas Oreland]

#At file:///home/jonas/src/telco-6.4/ based on revid:jonas@stripped

 2888 Jonas Oreland	2009-05-10 [merge]
      merge 63 to 64

    M  mysql-test/include/ndb_backup.inc
    M  sql/handler.cc
    M  sql/sql_partition.cc
    M  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
     2585.89.12 Jonas Oreland	2009-05-10
                ndb - fix permissions on tmp-file so that load-data-infile doesnt barf

        M  mysql-test/include/ndb_backup.inc
     2585.89.11 Jonas Oreland	2009-05-09 [merge]
                merge 62 to 63

        M  sql/handler.cc
        M  sql/sql_partition.cc
        M  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
     2572.56.16 Jonas Oreland	2009-05-09
                fix warnings introduced by not declaring (un)likely
                when compiling debug

        M  sql/handler.cc
        M  sql/sql_partition.cc
        M  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
=== modified file 'mysql-test/include/ndb_backup.inc'
--- a/mysql-test/include/ndb_backup.inc	2009-05-09 15:49:27 +0000
+++ b/mysql-test/include/ndb_backup.inc	2009-05-10 17:12:10 +0000
@@ -22,6 +22,7 @@ let $ndb_backup_file2= $MYSQLTEST_VARDIR
 --remove_file $ndb_backup_file1
 --exec $NDB_SELECT_ALL --ndb-connectstring="$NDB_CONNECTSTRING" -d sys --delimiter=',' SYSTAB_0 > $ndb_backup_file1
 # load the table from the raw data file
+--exec chmod 0777 $ndb_backup_file1
 eval LOAD DATA INFILE '$ndb_backup_file1' INTO TABLE helper1;
 --remove_file $ndb_backup_file1
 # output what we need
@@ -34,6 +35,7 @@ DROP TABLE helper1;
 CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info
 (id INT, backup_id INT) ENGINE = MEMORY;
 
+--exec chmod 0777 $ndb_backup_file2
 --replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
 eval LOAD DATA INFILE '$ndb_backup_file2' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';
 --remove_file $ndb_backup_file2

=== modified file 'sql/handler.cc'
--- a/sql/handler.cc	2009-05-09 06:31:38 +0000
+++ b/sql/handler.cc	2009-05-09 16:02:45 +0000
@@ -4637,9 +4637,9 @@ int handler::ha_write_row(uchar *buf)
 
   mark_trx_read_write();
 
-  if (unlikely(error= write_row(buf)))
+  if (unlikely((error= write_row(buf)) != 0))
     DBUG_RETURN(error);
-  if (unlikely(error= binlog_log_row(table, 0, buf, log_func)))
+  if (unlikely((error= binlog_log_row(table, 0, buf, log_func)) != 0))
     DBUG_RETURN(error); /* purecov: inspected */
   DBUG_RETURN(0);
 }
@@ -4658,9 +4658,9 @@ int handler::ha_update_row(const uchar *
 
   mark_trx_read_write();
 
-  if (unlikely(error= update_row(old_data, new_data)))
+  if (unlikely((error= update_row(old_data, new_data)) != 0))
     return error;
-  if (unlikely(error= binlog_log_row(table, old_data, new_data, log_func)))
+  if (unlikely((error= binlog_log_row(table, old_data, new_data, log_func))!=0))
     return error;
   return 0;
 }
@@ -4672,14 +4672,14 @@ int handler::ha_delete_row(const uchar *
 
   mark_trx_read_write();
 
-    if (will_batch)
+  if (will_batch)
   {
-    if (unlikely(error= bulk_delete_row(buf)))
+    if (unlikely((error= bulk_delete_row(buf)) != 0))
       return error;
   }
-  else if (unlikely(error= delete_row(buf)))
+  else if (unlikely((error= delete_row(buf)) != 0))
     return error;
-  if (unlikely(error= binlog_log_row(table, buf, 0, log_func)))
+  if (unlikely((error= binlog_log_row(table, buf, 0, log_func)) != 0))
     return error;
   return 0;
 }

=== modified file 'sql/sql_partition.cc'
--- a/sql/sql_partition.cc	2009-02-03 14:25:31 +0000
+++ b/sql/sql_partition.cc	2009-05-10 17:12:10 +0000
@@ -320,9 +320,9 @@ int get_parts_for_update(const uchar *ol
   if (new_data == rec0)
 #endif
   {
-    if (unlikely(error= part_info->get_partition_id(part_info,
+    if (unlikely((error= part_info->get_partition_id(part_info,
                                                     new_part_id,
-                                                    new_func_value)))
+                                                     new_func_value)) != 0))
     {
       DBUG_RETURN(error);
     }

=== modified file 'storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2009-05-04 10:09:39 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2009-05-10 17:12:10 +0000
@@ -1535,11 +1535,11 @@ int Dbtup::handleInsertReq(Signal* signa
 
     if (regTabPtr->need_shrink() && cmp[0] != cmp[1] &&
 	unlikely(handle_size_change_after_update(req_struct,
-						       base,
-						       regOperPtr.p,
-						       regFragPtr,
-						       regTabPtr,
-						       sizes)))
+                                                 base,
+                                                 regOperPtr.p,
+                                                 regFragPtr,
+                                                 regTabPtr,
+                                                 sizes) != 0))
     {
       goto size_change_error;
     }


Attachment: [text/bzr-bundle] bzr/[e-mail]