Merge

client/mysqldump.c

@@ -599,7 +599,7 @@ static uint getTableStructure(char *table, char* db)
 
   sprintf(insert_pat,"SET OPTION SQL_QUOTE_SHOW_CREATE=%d", opt_quoted);
   table_name=quote_name(table,table_buff);
-  if (mysql_query(sock,insert_pat))
+  if (!mysql_query(sock,insert_pat))
   {
     /* using SHOW CREATE statement */
     if (!tFlag)

mysql-test/mysql-test-run

@@ -321,7 +321,7 @@ start_master()
     	    --server-id=1 \
             --basedir=$MY_BASEDIR \
 	    --port=$MASTER_MYPORT \
-	    --core-file \
+	    --exit-info=256 \
             --datadir=$MASTER_MYDDIR \
 	    --pid-file=$MASTER_MYPID \
 	    --socket=$MASTER_MYSOCK \
@@ -347,7 +347,8 @@ start_slave()
 	    --master-connect-retry=1 \
 	    --master-host=127.0.0.1 \
 	    --master-port=$MASTER_MYPORT \
-	    --core-file --log-bin --log-slave-updates \
+	    --exit-info=256 \
+	    --log-bin --log-slave-updates \
             --basedir=$MY_BASEDIR \
             --datadir=$SLAVE_MYDDIR \
 	    --pid-file=$SLAVE_MYPID \

scripts/mysqld_multi.sh

-#!/usr/bin/perl
+#!@PERL@
 
 use Getopt::Long;
 use POSIX qw(strftime);

scripts/mysqldumpslow.sh

-#@perl@
+#!@PERL@
 # mysqldumpslow - parse and summarize the MySQL slow query log
 
 use strict;