bk commit into 5.1 tree (gni:1.2317)

[gni]

Below is the list of changes that have just been committed into a local
5.1 repository of root. When root 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, 2006-11-01 18:44:49+08:00, gni@dev3-127.(none) +6 -0
  Merge gni@stripped:/home/bk/mysql-5.1-new-ndb
  into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/test
  MERGE: 1.2308.1.25

  sql/log.cc@stripped, 2006-11-01 18:44:45+08:00, gni@dev3-127.(none) +0 -0
    Auto merged
    MERGE: 1.237.2.1

  sql/share/errmsg.txt@stripped, 2006-11-01 18:44:45+08:00, gni@dev3-127.(none) +0 -0
    Auto merged
    MERGE: 1.130.1.1

  sql/table.cc@stripped, 2006-11-01 18:44:45+08:00, gni@dev3-127.(none) +0 -0
    Auto merged
    MERGE: 1.243.1.1

  storage/ndb/include/mgmapi/mgmapi.h@stripped, 2006-11-01 18:44:45+08:00, gni@dev3-127.(none)
+0 -0
    Auto merged
    MERGE: 1.57.1.1

  storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp@stripped, 2006-11-01 18:44:46+08:00,
gni@dev3-127.(none) +0 -0
    Auto merged
    MERGE: 1.29.1.1

  storage/ndb/tools/restore/restore_main.cpp@stripped, 2006-11-01 18:44:46+08:00,
gni@dev3-127.(none) +0 -0
    Auto merged
    MERGE: 1.48.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:	gni
# Host:	dev3-127.(none)
# Root:	/mnt/mysql/home/ngb/mysql-5.1/test/RESYNC

--- 1.239/sql/log.cc	2006-11-01 18:45:55 +08:00
+++ 1.240/sql/log.cc	2006-11-01 18:45:55 +08:00
@@ -2885,6 +2885,7 @@
                           ulonglong *decrease_log_space)
 {
   int error;
+  int ret = 0;
   bool exit_loop= 0;
   LOG_INFO log_info;
   DBUG_ENTER("purge_logs");
@@ -2929,6 +2930,14 @@
       *decrease_log_space-= file_size;
 
     ha_binlog_index_purge_file(current_thd, log_info.log_file_name);
+    if (current_thd->query_error) {
+      DBUG_PRINT("info",("query error: %d", current_thd->query_error));
+      if (my_errno == EMFILE) {
+        DBUG_PRINT("info",("my_errno: %d, set ret = LOG_INFO_EMFILE", my_errno));
+        ret = LOG_INFO_EMFILE;
+        break;
+      }
+    }
 
     if (find_next_log(&log_info, 0) || exit_loop)
       break;
@@ -2939,6 +2948,9 @@
     the log index file after restart - otherwise, this should be safe
   */
   error= update_log_index(&log_info, need_update_threads);
+  if (error == 0) {
+    error = ret;
+  }
 
 err:
   if (need_mutex)

--- 1.247/sql/table.cc	2006-11-01 18:45:55 +08:00
+++ 1.248/sql/table.cc	2006-11-01 18:45:55 +08:00
@@ -1576,6 +1576,17 @@
 	error= 1;
 	my_errno= ENOENT;
       }
+      else if (ha_err == EMFILE)
+      {
+	/*
+          Too many files opened, use same error message as if the .frm
+           file can't open
+         */
+        DBUG_PRINT("error", ("open file: %s failed, too many files opened (errno: %d)", 
+		share->normalized_path.str, ha_err));
+	error= 1;
+	my_errno= EMFILE;
+      }
       else
       {
         outparam->file->print_error(ha_err, MYF(0));

--- 1.131/sql/share/errmsg.txt	2006-11-01 18:45:55 +08:00
+++ 1.132/sql/share/errmsg.txt	2006-11-01 18:45:55 +08:00
@@ -6004,4 +6004,5 @@
         ger "Sie können eine Logtabelle nicht '%s', wenn Loggen angeschaltet ist"
 ER_NON_INSERTABLE_TABLE  
         eng "The target table %-.100s of the %s is not insertable-into"
-
+ER_BINLOG_PURGE_EMFILE
+        eng "Too many files opened, please execute the command again"

--- 1.49/storage/ndb/tools/restore/restore_main.cpp	2006-11-01 18:45:55 +08:00
+++ 1.50/storage/ndb/tools/restore/restore_main.cpp	2006-11-01 18:45:55 +08:00
@@ -567,6 +567,15 @@
           err << metaData[i]->getTableName() << " ... Exiting " <<
endl;
 	  exitHandler(NDBT_FAILED);
 	} 
+    } else {
+      for(Uint32 j= 0; j < g_consumers.size(); j++)
+        if (!g_consumers[j]->createSystable(* metaData[i]))
+        {
+          err << "Restore: Failed to restore system table: ";
+          err << metaData[i]->getTableName() << " ... Exiting " <<
endl;
+          exitHandler(NDBT_FAILED);
+        }
+
     }
   }
   debug << "Close tables" << endl; 

--- 1.31/storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp	2006-11-01 18:45:55 +08:00
+++ 1.32/storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp	2006-11-01 18:45:55 +08:00
@@ -311,7 +311,7 @@
 
   c_storedProcPool.setSize(noOfStoredProc);
   c_buildIndexPool.setSize(c_noOfBuildIndexRec);
-  c_triggerPool.setSize(noOfTriggers);
+  c_triggerPool.setSize(noOfTriggers, false, true, true, CFG_DB_NO_TRIGGERS);
 
   c_extent_hash.setSize(1024); // 4k