Commit 86cec4fd authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
parents 9c9a27d9 30eaa0b1

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -671,6 +671,7 @@ mysql-test/*.ds? 
mysql-test/*.vcproj

mysql-test/gmon.out

mysql-test/install_test_db

mysql-test/mtr

mysql-test/mysql-test-run

mysql-test/mysql-test-run.log

mysql-test/mysql_test_run_new

client/mysqldump.c

+1 −0
Original line number Diff line number Diff line
@@ -852,6 +852,7 @@ static void DB_error(MYSQL *mysql, const char *when) 
  DBUG_ENTER("DB_error");

  fprintf(stderr, "%s: Got error: %d: %s %s\n", my_progname,

          mysql_errno(mysql), mysql_error(mysql), when);

  fflush(stderr);

  safe_exit(EX_MYSQLERR);

  DBUG_VOID_RETURN;

} /* DB_error */

mysql-test/Makefile.am

+6 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ benchdir_root= $(prefix) 
testdir =	        $(benchdir_root)/mysql-test

EXTRA_SCRIPTS = 	mysql-test-run.sh install_test_db.sh valgrind.supp $(PRESCRIPTS)

EXTRA_DIST = 		$(EXTRA_SCRIPTS) 

GENSCRIPTS =		mysql-test-run install_test_db

GENSCRIPTS =		mysql-test-run install_test_db mtr

PRESCRIPTS =		mysql-test-run.pl

test_SCRIPTS = 		$(GENSCRIPTS) $(PRESCRIPTS)

test_DATA = std_data/client-key.pem std_data/client-cert.pem std_data/cacert.pem \
@@ -112,6 +112,11 @@ std_data/server-cert.pem: $(top_srcdir)/SSL/$(@F) 
std_data/server-key.pem: $(top_srcdir)/SSL/$(@F)

	@RM@ -f $@; @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data



# mtr - a shortcut for executing mysql-test-run.pl

mtr:

	$(RM) -f mtr

	$(LN_S) mysql-test-run.pl mtr



SUFFIXES = .sh



.sh: