Merge

BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  SCCS merged

BUILD/compile-hpux11-parisc2-aCC

@@ -13,7 +13,7 @@ fi
 #               Also sends +Oprocelim and +Ofastaccess to the linker
 #               (see ld(1)).
 
-release_flags="-fast +O4"
+release_flags="-fast +O3"
 
 # -z             Do not bind anything to address zero.  This option
 #                allows runtime detection of null pointers.  See the

BitKeeper/etc/logging_ok

@@ -84,6 +84,7 @@ joreland@mysql.com
 jorge@linux.jorge.mysql.com
 jplindst@t41.(none)
 kaj@work.mysql.com
+kent@mysql.com
 konstantin@mysql.com
 kostja@oak.local
 lenz@kallisto.mysql.com
@@ -97,6 +98,7 @@ miguel@hegel.txg
 miguel@light.
 miguel@light.local
 miguel@sartre.local
+mikron@c-fb0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
 mikron@mikael-ronstr-ms-dator.local
 mmatthew@markslaptop.
 monty@bitch.mysql.fi

configure.in

@@ -2961,10 +2961,10 @@ then
   if test "$with_debug" = "yes"
   then
     # Medium debug.
-    NDB_DEFS="-DVM_TRACE -DERROR_INSERT -DARRAY_GUARD"
+    NDB_DEFS="-DNDB_DEBUG -DVM_TRACE -DERROR_INSERT -DARRAY_GUARD"
   elif test "$with_debug" = "full"
   then
-    NDB_DEFS="-DVM_TRACE -DERROR_INSERT -DARRAY_GUARD"
+    NDB_DEFS="-DNDB_DEBUG_FULL -DVM_TRACE -DERROR_INSERT -DARRAY_GUARD"
   else
     NDB_DEFS="-DNDEBUG"
   fi

ndb/include/kernel/kernel_config_parameters.h

@@ -14,10 +14,7 @@
 #define CFG_ACC_SCAN          (PRIVATE_BASE +  9)
 
 #define CFG_DICT_ATTRIBUTE    (PRIVATE_BASE + 10)
-#define CFG_DICT_CONNECT      (PRIVATE_BASE + 11)
-#define CFG_DICT_FRAG_CONNECT (PRIVATE_BASE + 12)
 #define CFG_DICT_TABLE        (PRIVATE_BASE + 13)
-#define CFG_DICT_TC_CONNECT   (PRIVATE_BASE + 14)
 
 #define CFG_DIH_API_CONNECT   (PRIVATE_BASE + 15)
 #define CFG_DIH_CONNECT       (PRIVATE_BASE + 16)
@@ -27,10 +24,8 @@
 #define CFG_DIH_TABLE         (PRIVATE_BASE + 20)
 
 #define CFG_LQH_FRAG          (PRIVATE_BASE + 21)
-#define CFG_LQH_CONNECT       (PRIVATE_BASE + 22)
 #define CFG_LQH_TABLE         (PRIVATE_BASE + 23)
 #define CFG_LQH_TC_CONNECT    (PRIVATE_BASE + 24)
-#define CFG_LQH_REPLICAS      (PRIVATE_BASE + 25)
 #define CFG_LQH_LOG_FILES     (PRIVATE_BASE + 26)
 #define CFG_LQH_SCAN          (PRIVATE_BASE + 27)
 

ndb/src/kernel/vm/Configuration.cpp

@@ -510,7 +510,7 @@ Configuration::calcSizeAlt(ConfigValues * ownConfig){
     // The remainder are allowed for use by the scan processes.
     /*-----------------------------------------------------------------------*/
     cfg.put(CFG_ACC_OP_RECS,
-	    noOfReplicas*((16 * noOfOperations) / 10 + 50) + 
+	    ((11 * noOfOperations) / 10 + 50) + 
 	    (noOfLocalScanRecords * MAX_PARALLEL_SCANS_PER_FRAG) +
 	    NODE_RECOVERY_SCAN_OP_RECORDS);
     
@@ -535,18 +535,9 @@ Configuration::calcSizeAlt(ConfigValues * ownConfig){
      */
     cfg.put(CFG_DICT_ATTRIBUTE, 
 	    noOfAttributes);
-    
-    cfg.put(CFG_DICT_CONNECT, 
-	    noOfOperations + 32);   
-    
-    cfg.put(CFG_DICT_FRAG_CONNECT, 
-	    NO_OF_FRAG_PER_NODE * noOfDBNodes * noOfReplicas);
 
     cfg.put(CFG_DICT_TABLE, 
 	    noOfTables);
-    
-    cfg.put(CFG_DICT_TC_CONNECT, 
-	    2* noOfOperations);
   }
   
   {
@@ -557,7 +548,7 @@ Configuration::calcSizeAlt(ConfigValues * ownConfig){
 	    2 * noOfTransactions);
     
     cfg.put(CFG_DIH_CONNECT, 
-	    noOfOperations + 46);
+	    noOfOperations + noOfTransactions + 46);
     
     cfg.put(CFG_DIH_FRAG_CONNECT, 
 	    NO_OF_FRAG_PER_NODE *  noOfTables *  noOfDBNodes);
@@ -587,18 +578,12 @@ Configuration::calcSizeAlt(ConfigValues * ownConfig){
     cfg.put(CFG_LQH_FRAG, 
 	    NO_OF_FRAG_PER_NODE * noOfTables * noOfReplicas);
     
-    cfg.put(CFG_LQH_CONNECT, 
-	    noOfReplicas*((11 * noOfOperations) / 10 + 50));
-    
     cfg.put(CFG_LQH_TABLE, 
 	    noOfTables);
 
     cfg.put(CFG_LQH_TC_CONNECT, 
-	    noOfReplicas*((16 * noOfOperations) / 10 + 50));
+	    (11 * noOfOperations) / 10 + 50);
     
-    cfg.put(CFG_LQH_REPLICAS, 
-	    noOfReplicas);
-
     cfg.put(CFG_LQH_SCAN, 
 	    noOfLocalScanRecords);
   }
@@ -611,7 +596,7 @@ Configuration::calcSizeAlt(ConfigValues * ownConfig){
 	    3 * noOfTransactions);
     
     cfg.put(CFG_TC_TC_CONNECT, 
-	    noOfOperations + 16 + noOfTransactions);
+	    (2 * noOfOperations) + 16 + noOfTransactions);
     
     cfg.put(CFG_TC_TABLE, 
 	    noOfTables);
@@ -631,7 +616,7 @@ Configuration::calcSizeAlt(ConfigValues * ownConfig){
 	    2 * NO_OF_FRAG_PER_NODE * noOfTables* noOfReplicas);
     
     cfg.put(CFG_TUP_OP_RECS, 
-	    noOfReplicas*((16 * noOfOperations) / 10 + 50));
+	    (11 * noOfOperations) / 10 + 50);
     
     cfg.put(CFG_TUP_PAGE, 
 	    noOfDataPages);

netware/mysql_test_run.c

@@ -170,7 +170,7 @@ void report_stats()
 		log_msg("\nThe .out and .err files in %s may give you some\n", result_dir);
 		log_msg("hint of what when wrong.\n");
 		log_msg("\nIf you want to report this error, please first read the documentation\n");
-		log_msg("at: http://www.mysql.com/doc/M/y/MySQL_test_suite.html\n");
+		log_msg("at: http://www.mysql.com/doc/en/MySQL_test_suite.html\n");
   }
 
   log_msg("\n%.02f total minutes elapsed in the test cases\n\n", total_time / 60);

sql/mysqld.cc

@@ -1788,7 +1788,7 @@ bytes of memory\n", ((ulong) sql_key_cache->key_cache_mem_size +
 You seem to be running 32-bit Linux and have %d concurrent connections.\n\
 If you have not changed STACK_SIZE in LinuxThreads and built the binary \n\
 yourself, LinuxThreads is quite likely to steal a part of the global heap for\n\
-the thread stack. Please read http://www.mysql.com/doc/L/i/Linux.html\n\n",
+the thread stack. Please read http://www.mysql.com/doc/en/Linux.html\n\n",
 	    thread_count);
   }
 #endif /* HAVE_LINUXTHREADS */

tests/client_test.c

@@ -9862,11 +9862,17 @@ static void test_bug4026()
   time_in.minute= 59;
   time_in.second= 59;
   time_in.second_part= 123456;
+  /*
+    This is not necessary, just to make assert below work: this field
+    is filled in when time is received from server
+  */
+  time_in.time_type= MYSQL_TIMESTAMP_TIME;
 
   datetime_in= time_in;
   datetime_in.year= 2003;
   datetime_in.month= 12;
   datetime_in.day= 31;
+  datetime_in.time_type= MYSQL_TIMESTAMP_DATETIME;
 
   mysql_stmt_bind_param(stmt, bind);