bk commit into 4.1 tree (monty:1.2524)

[monty]

Below is the list of changes that have just been committed into a local
4.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.2524 06/06/30 04:10:27 monty@stripped +4 -0
  Don't read ~/.my.cnf in mysqldump.test

  sql/ha_ndbcluster.cc
    1.189 06/06/30 04:10:24 monty@stripped +4 -2
    Portability fix

  mysql-test/t/mysqldump.test
    1.45 06/06/30 04:10:24 monty@stripped +1 -1
    Don't read ~/.my.cnf

  mysql-test/mysql-test-run.sh
    1.268 06/06/30 04:10:24 monty@stripped +7 -13
    Fixed problem with running with --gdb and two masters
    Don't disable ndb becasue we run gdb

  heap/hp_test1.c
    1.16 06/06/30 04:10:24 monty@stripped +1 -1
    Changed type from last commit

# 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-4.1

--- 1.15/heap/hp_test1.c	2006-06-30 02:25:33 +03:00
+++ 1.16/heap/hp_test1.c	2006-06-30 04:10:24 +03:00
@@ -59,7 +59,7 @@
   bzero((gptr) flags,sizeof(flags));
 
   printf("- Creating heap-file\n");
-  if (heap_create(filename,1,keyinfo,30,(ulong) flag*100000L,101L,
+  if (heap_create(filename,1,keyinfo,30,(ulong) flag*100000L,10L,
 		  &hp_create_info) ||
       !(file= heap_open(filename, 2)))
     goto err;

--- 1.267/mysql-test/mysql-test-run.sh	2006-06-21 17:41:03 +03:00
+++ 1.268/mysql-test/mysql-test-run.sh	2006-06-30 04:10:24 +03:00
@@ -1252,16 +1252,16 @@
 
   if [ x$DO_DDD = x1 ]
   then
-    $ECHO "set args $master_args" > $GDB_MASTER_INIT
+    $ECHO "set args $master_args" > $GDB_MASTER_INIT$1
     manager_launch master ddd -display $DISPLAY --debugger \
-    "gdb -x $GDB_MASTER_INIT" $MASTER_MYSQLD
+    "gdb -x $GDB_MASTER_INIT$1" $MASTER_MYSQLD
   elif [ x$DO_GDB = x1 ]
   then
     if [ x$MANUAL_GDB = x1 ]
     then
-      $ECHO "set args $master_args" > $GDB_MASTER_INIT
+      $ECHO "set args $master_args" > $GDB_MASTER_INIT$1
       $ECHO "To start gdb for the master , type in another window:"
-      $ECHO "cd $CWD ; gdb -x $GDB_MASTER_INIT $MASTER_MYSQLD"
+      $ECHO "cd $CWD ; gdb -x $GDB_MASTER_INIT$1 $MASTER_MYSQLD"
       wait_for_master=1500
     else
       ( $ECHO set args $master_args;
@@ -1273,9 +1273,9 @@
 end
 r
 EOF
-      fi )  > $GDB_MASTER_INIT
+      fi )  > $GDB_MASTER_INIT$1
       manager_launch master $XTERM -display $DISPLAY \
-      -title "Master" -e gdb -x $GDB_MASTER_INIT $MASTER_MYSQLD
+      -title "Master" -e gdb -x $GDB_MASTER_INIT$1 $MASTER_MYSQLD
     fi
   else
     manager_launch master $MASTER_MYSQLD $master_args
@@ -1810,13 +1810,7 @@
   mysql_install_db
 
   start_manager
-
-# Do not automagically start daemons if we are in gdb or running only one test
-# case
-  if [ -z "$DO_GDB" ] && [ -z "$DO_DDD" ]
-  then
-    mysql_start
-  fi
+  mysql_start
   $ECHO  "Loading Standard Test Databases"
   mysql_loadstd
 fi

--- 1.188/sql/ha_ndbcluster.cc	2006-06-29 21:55:14 +03:00
+++ 1.189/sql/ha_ndbcluster.cc	2006-06-30 04:10:24 +03:00
@@ -2300,12 +2300,14 @@
   {
     // Table with hidden primary key
     int hidden_no= table->fields;
+    char buff[22];
     const NDBTAB *tab= (const NDBTAB *) m_table;
     const NDBCOL *hidden_col= tab->getColumn(hidden_no);
     NdbRecAttr* rec= m_value[hidden_no].rec;
     DBUG_ASSERT(rec);
-    DBUG_PRINT("hidden", ("%d: %s \"%llu\"", hidden_no, 
-                          hidden_col->getName(), rec->u_64_value()));
+    DBUG_PRINT("hidden", ("%d: %s \"%s\"", hidden_no, 
+                          hidden_col->getName(), 
+                          llstr(rec->u_64_value(), buff)));
   } 
   print_results();
 #endif

--- 1.44/mysql-test/t/mysqldump.test	2006-05-24 11:16:28 +03:00
+++ 1.45/mysql-test/t/mysqldump.test	2006-06-30 04:10:24 +03:00
@@ -652,7 +652,7 @@
 # BUG#15328 Segmentation fault occured if my.cnf is invalid for escape sequence
 #
 
---exec $MYSQL_MY_PRINT_DEFAULTS --defaults-extra-file=$MYSQL_TEST_DIR/std_data/bug15328.cnf mysqldump
+--exec $MYSQL_MY_PRINT_DEFAULTS --defaults-file=$MYSQL_TEST_DIR/std_data/bug15328.cnf mysqldump
 
 
 # BUG #19025 mysqldump doesn't correctly dump "auto_increment = [int]"