Commit f3bac9cf authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
Docs/Makefile.am:
  Auto merged
Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
  Auto merged
include/Makefile.am:
  Auto merged
mysql-test/lib/mtr_io.pl:
  Auto merged
mysql-test/lib/mtr_misc.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/rpl_sp.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/rpl_sp.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
parents dea988a0 cd38313c

client/mysqltest.c

+23 −2
Original line number Diff line number Diff line
@@ -725,6 +725,20 @@ void close_connections() 
}





void close_statements()

{

  struct st_connection *con;

  DBUG_ENTER("close_statements");

  for (con= connections; con < next_con; con++)

  {

    if (con->stmt)

      mysql_stmt_close(con->stmt);

    con->stmt= 0;

  }

  DBUG_VOID_RETURN;

}





void close_files()

{

  DBUG_ENTER("close_files");
@@ -2901,6 +2915,10 @@ void do_close_connection(struct st_command *command) 
	}

      }

#endif

      if (next_con->stmt)

        mysql_stmt_close(next_con->stmt);

      next_con->stmt= 0;



      mysql_close(&con->mysql);

      if (con->util_mysql)

	mysql_close(con->util_mysql);
@@ -2962,10 +2980,12 @@ void safe_connect(MYSQL* mysql, const char *name, const char *host, 
      Connect failed



      Only allow retry if this was an error indicating the server

      could not be contacted

      could not be contacted. Error code differs depending

      on protocol/connection type

    */



    if (mysql_errno(mysql) == CR_CONNECTION_ERROR &&

    if ((mysql_errno(mysql) == CR_CONN_HOST_ERROR ||

         mysql_errno(mysql) == CR_CONNECTION_ERROR) &&

        failed_attempts < opt_max_connect_retries)

      my_sleep(connection_retry_sleep);

    else
@@ -5892,6 +5912,7 @@ int main(int argc, char **argv) 
	break;

      case Q_DISABLE_PS_PROTOCOL:

        ps_protocol_enabled= 0;

        close_statements();

        break;

      case Q_ENABLE_PS_PROTOCOL:

        ps_protocol_enabled= ps_protocol;

mysql-test/lib/mtr_misc.pl

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ sub mtr_exe_maybe_exists (@) { 
  my @path= @_;



  map {$_.= ".exe"} @path if $::glob_win32;

  map {$_.= ".nlm"} @path if $::glob_netware;

  foreach my $path ( @path )

  {

    if($::glob_win32)