Commit c8a5b35d authored by unknown's avatar unknown
Browse files

Merge monty@192.168.0.9:/home/my/mysql-4.1 

into  mysql.com:/home/my/mysql-4.1
parents 6946f03e c5ed64a4

heap/hp_test1.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ int main(int argc, char **argv) 
  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;

mysql-test/mysql-test-run.sh

+7 −13
Original line number Diff line number Diff line
@@ -1252,16 +1252,16 @@ start_master() 


  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 @@ disa 1 
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 @@ then 
  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

  $ECHO  "Loading Standard Test Databases"

  mysql_loadstd

fi

mysql-test/t/mysqldump.test

+1 −1
Original line number Diff line number Diff line
@@ -652,7 +652,7 @@ drop table t1; 
# 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]"

sql/ha_ndbcluster.cc

+4 −2
Original line number Diff line number Diff line
@@ -2300,12 +2300,14 @@ void ha_ndbcluster::unpack_record(byte* buf) 
  {

    // 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