Commit 42f6fd5f authored by unknown's avatar unknown
Browse files

Added some missing DBUG_RETURN 

Fixed that --valgrind works again with mysql-test-run.sh
Extended error messages when loosing connection during mysql_real_connect()


client/mysqldump.c:
  Added some missing DBUG_RETURN
include/errmsg.h:
  Extended error messages when loosing connection during mysql_real_connect()
libmysql/errmsg.c:
  Extended error messages when loosing connection during mysql_real_connect()
mysql-test/mysql-test-run.pl:
  Don't remove .reject files at startup
mysql-test/mysql-test-run.sh:
  Fixed that --valgrind works again
  Don't give warnings for directores in var/tmp
sql-common/client.c:
  Extended error messages when loosing connection during mysql_real_connect()
parent 88696530

client/mysqldump.c

+3 −3
Original line number Diff line number Diff line
@@ -2203,7 +2203,7 @@ static void dump_table(char *table, char *db) 
    The "table" could be a view.  If so, we don't do anything here.

  */

  if (strcmp (table_type, "VIEW") == 0)

    return;

    DBUG_VOID_RETURN;



  /* Check --no-data flag */

  if (opt_no_data)
@@ -2869,7 +2869,7 @@ static int dump_all_tables_in_db(char *database) 
  *afterdot++= '.';



  if (init_dumping(database, init_dumping_tables))

    return 1;

    DBUG_RETURN(1);

  if (opt_xml)

    print_xml_tag(md_result_file, "", "\n", "database", "name=", database, NullS);

  if (lock_tables)
@@ -2923,7 +2923,7 @@ static int dump_all_tables_in_db(char *database) 
    fprintf(md_result_file,"\n--\n-- Flush Grant Tables \n--\n");

    fprintf(md_result_file,"\n/*! FLUSH PRIVILEGES */;\n");

  }

  return 0;

  DBUG_RETURN(0);

} /* dump_all_tables_in_db */

include/errmsg.h

+2 −1
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ extern const char *client_errors[]; /* Error messages */ 
#define CR_NO_STMT_METADATA                     2052

#define CR_NO_RESULT_SET                        2053

#define CR_NOT_IMPLEMENTED                      2054

#define CR_ERROR_LAST  /*Copy last error nr:*/  2054

#define CR_SERVER_LOST_EXTENDED			2055

#define CR_ERROR_LAST  /*Copy last error nr:*/  2055

/* Add error numbers before CR_ERROR_LAST and change it accordingly. */

libmysql/errmsg.c

+3 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ const char *client_errors[]= 
  "Prepared statement contains no metadata",

  "Attempt to read a row while there is no result set associated with the statement",

  "This feature is not implemented yet",

  "Lost connection to MySQL server at '%s', system error: %d",

  ""

};
@@ -145,6 +146,7 @@ const char *client_errors[]= 
  "Prepared statement contains no metadata",

  "Attempt to read a row while there is no result set associated with the statement",

  "This feature is not implemented yet",

  "Lost connection to MySQL server at '%s', system error: %d",

  ""

};
@@ -206,6 +208,7 @@ const char *client_errors[]= 
  "Prepared statement contains no metadata",

  "Attempt to read a row while there is no result set associated with the statement",

  "This feature is not implemented yet",

  "Lost connection to MySQL server at '%s', system error: %d",

  ""

};

#endif

mysql-test/mysql-test-run.pl

+3 −3
Original line number Diff line number Diff line
@@ -2047,7 +2047,7 @@ sub cleanup_stale_files () { 
  }



  # Remove old log files

  foreach my $name (glob("r/*.reject r/*.progress r/*.log r/*.warnings"))

  foreach my $name (glob("r/*.progress r/*.log r/*.warnings"))

  {

    unlink($name);

  }
@@ -2995,14 +2995,14 @@ sub find_testcase_skipped_reason($) 
{

  my ($tinfo)= @_;



  # Open mysqltest.log

  # Open mysqltest-time

  my $F= IO::File->new($path_timefile) or

    mtr_error("can't open file \"$path_timefile\": $!");

  my $reason;



  while ( my $line= <$F> )

  {

    # Look for "reason: <reason fo skiping test>"

    # Look for "reason: <reason for skipping test>"

    if ( $line =~ /reason: (.*)/ )

    {

      $reason= $1;

mysql-test/mysql-test-run.sh

+2 −2
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ find_valgrind() 
  fi

  # >=2.1.2 requires the --tool option, some versions write to stdout, some to stderr

  valgrind --help 2>&1 | grep "\-\-tool" > /dev/null && FIND_VALGRIND="$FIND_VALGRIND --tool=memcheck"

  FIND_VALGRIND="$FIND_VALGRIND --alignment=8 --leak-check=yes --num-callers=16 --suppressions=$CWD/valgrind.supp"

  FIND_VALGRIND="$FIND_VALGRIND --alignment=8 --leak-check=yes --num-callers=16 --suppressions=$MYSQL_TEST_DIR/valgrind.supp"

}



# No paths below as we can't be sure where the program is!
@@ -2087,7 +2087,7 @@ then 


  # Remove files that can cause problems

  $RM -rf $MYSQL_TEST_DIR/var/ndbcluster

  $RM -f $MYSQL_TEST_DIR/var/run/* $MYSQL_TEST_DIR/var/tmp/*

  $RM -rf $MYSQL_TEST_DIR/var/run/* $MYSQL_TEST_DIR/var/tmp/*



  # Remove old berkeley db log files that can confuse the server

  $RM -f $MASTER_MYDDIR/log.*