Commit 54cbfead authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mydev/mysql-4.1 

into mysql.com:/home/mydev/mysql-4.1-4100
parents a2b18ed0 55ace5fd

scripts/mysqld_safe.sh

+2 −2
Original line number Diff line number Diff line
@@ -322,13 +322,13 @@ do 
    # but should work for the rest of the servers.

    # The only thing is ps x => redhat 5 gives warnings when using ps -x.

    # kill -9 is used or the process won't react on the kill.

    numofproces=`ps xa | grep -v "grep" | grep "$ledir/$MYSQLD\>" | grep -c "pid-file=$pid_file"`

    numofproces=`ps xaww | grep -v "grep" | grep "$ledir/$MYSQLD\>" | grep -c "pid-file=$pid_file"`



    echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log

    I=1

    while test "$I" -le "$numofproces"

    do 

      PROC=`ps xa | grep "$ledir/$MYSQLD\>" | grep -v "grep" | grep "pid-file=$pid_file" | sed -n '$p'` 

      PROC=`ps xaww | grep "$ledir/$MYSQLD\>" | grep -v "grep" | grep "pid-file=$pid_file" | sed -n '$p'` 



      for T in $PROC

      do

sql-bench/crash-me.sh

+1 −1
Original line number Diff line number Diff line
@@ -1039,7 +1039,7 @@ try_and_report("Automatic row id", "automatic_rowid", 
 ["MATCH UNIQUE","match_unique",

   "1 match unique (select a from crash_me)",1,0],

 ["MATCH","match","1 match (select a from crash_me)",1,0],

 ["MATCHES","matches","b matcjhes 'a*'",1,0],

 ["MATCHES","matches","b matches 'a*'",1,0],

 ["NOT BETWEEN","not_between","7 not between 4 and 6",1,0],

 ["NOT EXISTS","not_exists",

   "not exists (select * from crash_me where a = 2)",1,0],

sql-common/client.c

+3 −2
Original line number Diff line number Diff line
@@ -882,7 +882,7 @@ static const char *default_options[]= 
  "connect-timeout", "local-infile", "disable-local-infile",

  "replication-probe", "enable-reads-from-master", "repl-parse-query",

  "ssl-cipher", "max-allowed-packet", "protocol", "shared-memory-base-name",

  "multi-results", "multi-queries", "secure-auth",

  "multi-results", "multi-statements", "multi-queries", "secure-auth",

  NullS

};
@@ -1088,9 +1088,10 @@ void mysql_read_default_options(struct st_mysql_options *options, 
	  options->client_flag|= CLIENT_MULTI_RESULTS;

	  break;

	case 31:

	case 32:

	  options->client_flag|= CLIENT_MULTI_STATEMENTS | CLIENT_MULTI_RESULTS;

	  break;

        case 32: /* secure-auth */

        case 33: /* secure-auth */

          options->secure_auth= TRUE;

          break;

	default: