bk commit into 5.1 tree (monty:1.2219)

[monty]

Below is the list of changes that have just been committed into a local
5.1 repository of monty. When monty 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.2219 06/06/28 20:03:46 monty@stripped +5 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.1
  into  mysql.com:/home/my/mysql-5.1

  sql/sql_parse.cc
    1.566 06/06/28 20:03:41 monty@stripped +0 -0
    Auto merged

  sql/mysqld.cc
    1.565 06/06/28 20:03:41 monty@stripped +0 -0
    Auto merged

  sql/log_event.cc
    1.230 06/06/28 20:03:41 monty@stripped +0 -0
    Auto merged

  sql/ha_ndbcluster_binlog.cc
    1.72 06/06/28 20:03:40 monty@stripped +0 -0
    Auto merged

  BitKeeper/etc/ignore
    1.247 06/06/28 20:03:30 monty@stripped +2 -2
    auto-union

# 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:	monty
# Host:	narttu.mysql.fi
# Root:	/home/my/mysql-5.1/RESYNC

--- 1.229/sql/log_event.cc	2006-06-23 11:00:55 +03:00
+++ 1.230/sql/log_event.cc	2006-06-28 20:03:41 +03:00
@@ -5918,6 +5918,7 @@
 
     if (col <= tsh->fields)
     {
+      /* purecov: begin inspected */
       /*
         If we get here, the number of columns in the event didn't
         match the number of columns in the table on the slave, *or*
@@ -5950,6 +5951,7 @@
       thd->query_error= 1;
       error= ERR_BAD_TABLE_DEF;
       goto err;
+      /* purecov: end */
     }
 
     /*

--- 1.564/sql/mysqld.cc	2006-06-26 17:44:37 +03:00
+++ 1.565/sql/mysqld.cc	2006-06-28 20:03:41 +03:00
@@ -3223,9 +3223,11 @@
     /* fall back to the log files if tables are not present */
     if (have_csv_db == SHOW_OPTION_NO)
     {
+      /* purecov: begin inspected */
       sql_print_error("CSV engine is not present, falling back to the "
                       "log files");
       log_output_options= (log_output_options & ~LOG_TABLE) | LOG_FILE;
+      /* purecov: end */
     }
 
     logger.set_handlers(LOG_FILE, opt_slow_log ? log_output_options:LOG_NONE,

--- 1.565/sql/sql_parse.cc	2006-06-26 17:47:24 +03:00
+++ 1.566/sql/sql_parse.cc	2006-06-28 20:03:41 +03:00
@@ -5218,7 +5218,7 @@
         even if the query itself redirects the output.
       */
       if (!(result= new select_send()))
-        return 1;
+        return 1;                               /* purecov: inspected */
       thd->send_explain_fields(result);
       res= mysql_explain_union(thd, &thd->lex->unit, result);
       if (lex->describe & DESCRIBE_EXTENDED)
@@ -5237,7 +5237,7 @@
     else
     {
       if (!result && !(result= new select_send()))
-        return 1;
+        return 1;                               /* purecov: inspected */
       query_cache_store_query(thd, all_tables);
       res= handle_select(thd, lex, result, 0);
       if (result != lex->result)

--- 1.246/BitKeeper/etc/ignore	2006-06-20 18:09:11 +03:00
+++ 1.247/BitKeeper/etc/ignore	2006-06-28 20:03:30 +03:00
@@ -7,6 +7,8 @@
 *.d
 *.da
 *.exe
+*.gcda
+*.gcno
 *.gcov
 *.idb
 *.la

--- 1.71/sql/ha_ndbcluster_binlog.cc	2006-06-28 03:35:04 +03:00
+++ 1.72/sql/ha_ndbcluster_binlog.cc	2006-06-28 20:03:40 +03:00
@@ -125,6 +125,7 @@
 */
 
 #ifndef DBUG_OFF
+/* purecov: begin deadcode */
 static void print_records(TABLE *table, const char *record)
 {
   for (uint j= 0; j < table->s->fields; j++)
@@ -144,6 +145,7 @@
     DBUG_PRINT("info",("[%u]field_ptr[0->%d]: %s", j, n, buf));
   }
 }
+/* purecov: end */
 #else
 #define print_records(a,b)
 #endif