Commit graph

110 commits

Author SHA1 Message Date
unknown
0ae18e4899 Merge neptunus.(none):/home/msvensson/mysql/ssl_test/my50-ssl_test
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/sp-security.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/structs.h:
  Auto merged
2005-10-28 11:00:54 +02:00
unknown
7911c50718 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp


heap/_check.c:
  Auto merged
heap/hp_create.c:
  Auto merged
include/config-netware.h:
  Auto merged
include/my_base.h:
  Auto merged
include/my_handler.h:
  Auto merged
include/myisam.h:
  Auto merged
innobase/include/Makefile.am:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_delete.c:
  Auto merged
myisam/mi_rnext_same.c:
  Auto merged
myisam/mi_search.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/update.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysql-test/t/update.test:
  Auto merged
mysys/my_getopt.c:
  Auto merged
mysys/my_handler.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/structs.h:
  Auto merged
strings/conf_to_src.c:
  Auto merged
strings/ctype-win1250ch.c:
  Auto merged
Makefile.am:
  Merged from 4.1
myisam/myisamchk.c:
  Merged from 4.1
mysql-test/mysql-test-run.pl:
  Merged from 4.1
mysql-test/r/insert_select.result:
  Merged from 4.1
mysql-test/r/myisam.result:
  Merged from 4.1
mysql-test/r/select.result:
  Merged from 4.1
mysql-test/t/insert_select.test:
  Merged from 4.1
mysql-test/t/myisam.test:
  Merged from 4.1
netware/mysql_test_run.c:
  Merged from 4.1
sql/item.cc:
  Merged from 4.1
sql/mysqld.cc:
  Merged from 4.1
sql/sql_update.cc:
  Merged from 4.1
tests/mysql_client_test.c:
  Merged from 4.1
2005-10-27 23:43:20 +03:00
unknown
dd1dc7def9 mysql-test-run.pl:
Added MTR_BUILD_THREAD to control the port range


mysql-test/mysql-test-run.pl:
  Added MTR_BUILD_THREAD to control the port range
2005-10-26 01:24:03 +02:00
unknown
9e23aa1126 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.0


client/mysql.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2005-10-20 23:23:33 +02:00
unknown
a43ec392af mysql.spec.sh:
Enabled yaSSL
mysql-test-run.pl:
  Increased test case timeout from 15 min


mysql-test/mysql-test-run.pl:
  Increased test case timeout from 15 min
support-files/mysql.spec.sh:
  Enabled yaSSL
2005-10-19 02:53:03 +02:00
unknown
12dd0baa42 Fix for bug#13783 mysqlcheck tries to optimize and analyze information_schema
'information_schema' is excluded from list of databases for mysqlcheck command


mysql-test/mysql-test-run.pl:
  dded support for 'mysqlcheck'
mysql-test/mysql-test-run.sh:
  dded support for 'mysqlcheck'
2005-10-18 14:25:03 +05:00
unknown
cced6ea2e2 mysql-test-run.pl:
Added --skip-im option handling
  Don't terminate script if IM fails to create PID file
mtr_cases.pl:
  Added --skip-im option handling
mtr_process.pl:
  Kill left over 'mysqld' processes started by IM


mysql-test/lib/mtr_process.pl:
  Kill left over 'mysqld' processes started by IM
mysql-test/lib/mtr_cases.pl:
  Added --skip-im option handling
mysql-test/mysql-test-run.pl:
  Added --skip-im option handling
  Don't terminate script if IM fails to create PID file
2005-10-16 20:51:19 +02:00
unknown
4c4c0f87ca mysql-test-run.pl:
Put socket files into $opt_tmpdir, to avoid problems
  with platforms that can't handle long socket paths.


mysql-test/mysql-test-run.pl:
  Put socket files into $opt_tmpdir, to avoid problems
  with platforms that can't handle long socket paths.
2005-10-16 17:05:14 +02:00
unknown
c7ff3bdb98 Updated after testing
mysql-test/mysql-test-run.pl:
  Improved printouts
mysql-test/r/compress.result:
  Updated test result
mysql-test/r/ssl.result:
  Updated test result
mysql-test/r/ssl_compress.result:
  Updated test result
mysql-test/t/compress.test:
  Use new connection
  Use common include file 
  Test feature is turned on both before and after tests
mysql-test/t/ssl.test:
  Use new connection
  Use common include file 
  Test feature is turned on both before and after tests
mysql-test/t/ssl_compress.test:
  Use new connection
  Use common include file 
  Test feature is turned on both before and after tests
2005-10-13 11:28:06 +02:00
unknown
efc190e7d9 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/ssl_test/my50-ssl_test


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/rpl_openssl.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
mysql-test/t/sp-security.test:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/structs.h:
  Auto merged
mysql-test/r/mysqltest.result:
  SCCS merged
2005-10-12 13:59:00 +02:00
unknown
2bb0501d65 Always test ssl and compress
- Updated after review


client/mysqltest.c:
  Updated after review.
  Fix "connect" command to take SSL and/or COMPRESS as options instead of enable/disable_ssl and enable/disable_compress
  Commented do_connect, added test cases etc.
  Fix safe_get_param to make it possible to call it once for every argument without having any checks inbetween.
  Make a copy for query->first_argument  since safe_get_param will modify query string. Now connect works inside a while loop as well.
mysql-test/mysql-test-run.pl:
  Updated after review
mysql-test/r/connect.result:
  Enable test that was previolsy disabled because of "no error handling" in connect
mysql-test/r/mysqltest.result:
  Added tests for "connect"
mysql-test/t/compress.test:
  Updated after review, use the option argument to connect
mysql-test/t/connect.test:
  Enable test that was previolsy disabled because of "no error handling" in connect
  Now it's possible to use "--error" before connect, so let's use it.
mysql-test/t/information_schema.test:
  Connection user4 was already used
mysql-test/t/myisam.test:
  Disconnect con1 so the name can be reused
mysql-test/t/mysqltest.test:
  Added tests for "connect"
mysql-test/t/openssl_1.test:
  Updated after review, use the option argument to connect
mysql-test/t/sp-security.test:
  Disconnect user1 connection so the name can be reused
mysql-test/t/ssl.test:
  Updated after review, use the option argument to connect
mysql-test/t/ssl_compress.test:
  Updated after review, use the option argument to connect
sql/mysqld.cc:
  Updated after review, Compression variable is always available
sql/sql_show.cc:
  Updated after review, Compression variable is always available
sql/structs.h:
  Updated after review, Compression variable is always available
2005-10-12 13:56:07 +02:00
unknown
20fdedb756 Improved testing of ssl and compression
- Added show status variable "compression" for checking that compression is turned on.
 - Updated show status variable "have_openssl" to be set to DISABLED if server supports ssl but it's not turned on to accept incoming ssl connections.  
 - Setup server to accept ssl connections from clients ig that is supported by server
 - New tests 
   - ssl - Run with ssl turned on
   - ssl_compress - Run with ssl and compression turned on
   - compress - Run with compression turned in 
 - Updated test 
   - openssl_1, rpl_openssl1 - Changed to run if server supports ssl


BitKeeper/deleted/.del-have_openssl_1.inc~55590efedeec9ee0:
  Delete: mysql-test/include/have_openssl_1.inc
BitKeeper/deleted/.del-have_openssl_1.require~e8cdeb0adba99ac5:
  Delete: mysql-test/r/have_openssl_1.require
client/mysqltest.c:
  Add commands to enable/disable ssl for the follwing connect's
  Add commands to enable/disable compression for the  following connect's
mysql-test/mysql-test-run.pl:
  Test if ssl is supported by the server
  If ssl is supported by the server, start server with ability to accept ssl connections from clients
  Cleanup check of supported features check_ssl_support, check_ndbcluster_support
  Flags and helptext for mysl-test-run.pl updated 
    --ssl, turn on ssl encryption between server and client
    --skip-ssl, don'r turn on ssl or setup ssl even if it's supported
    --with-openssl, deprecated, synonym with --ssl
mysql-test/r/openssl_1.result:
  Update test results
mysql-test/t/openssl_1.test:
  Run this if server reports it has support for ssl
  Enable ssl before connecting
  Check that ssl encryption has been turned on
mysql-test/t/rpl_openssl.test:
  Run this if server reports it supports ssl
sql-common/client.c:
  Add DBUG_PRINT's
sql/mysqld.cc:
  If server can't accept ssl connection set have_openssl to SHOW_OPTION_DISABLED
  Add status variable to show if connection with server is using compressed protocol
sql/sql_show.cc:
  Add status variable to show if connection with server is using compressed protocol
sql/structs.h:
  Add status variable to show if connection with server is using compressed protocol
mysql-test/r/compress.result:
  New BitKeeper file ``mysql-test/r/compress.result''
mysql-test/r/ssl.result:
  New BitKeeper file ``mysql-test/r/ssl.result''
mysql-test/r/ssl_compress.result:
  New BitKeeper file ``mysql-test/r/ssl_compress.result''
mysql-test/t/compress.test:
  New BitKeeper file ``mysql-test/t/compress.test''
mysql-test/t/ssl.test:
  New BitKeeper file ``mysql-test/t/ssl.test''
mysql-test/t/ssl_compress.test:
  New BitKeeper file ``mysql-test/t/ssl_compress.test''
2005-10-04 15:43:55 +02:00
unknown
46d8163b1b WL#2789 "Instance Manager: test using mysql-test-run testing framework"
1) Add support to testing Instance Manager in daemon mode;
2) Don't run Instance Manager tests when running with --ps-protocol option;


mysql-test/lib/mtr_cases.pl:
  WL#2789 "Instance Manager: test using mysql-test-run testing framework"
  Skip/disable Instance Manager tests in the following cases:
    - we are testing embedded server;
    - we are running with --ps-protocol;
    - Instance Manager executable does not exist;
  Report about the reason in the standard way.
mysql-test/lib/mtr_process.pl:
  WL#2789 "Instance Manager: test using mysql-test-run testing framework"
  Make several attempts (i.e. send several signals to process) while trying to kill it.
mysql-test/mysql-test-run.pl:
  WL#2789 "Instance Manager: test using mysql-test-run testing framework"
  Add support for testing Instance Manager in daemon mode.
2005-10-01 01:12:14 +04:00
unknown
01db6cc24c Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0


mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
2005-09-30 02:15:36 +02:00
unknown
3dd066e843 mtr_report.pl:
Text formatting, adjust table header
mysql-test-run.pl:
  Remove requirement for source tree to run embedded server test
mysqldump.test:
  Removed ending ';' from --exec line


mysql-test/t/mysqldump.test:
  Removed ending ';' from --exec line
mysql-test/mysql-test-run.pl:
  Remove requirement for source tree to run embedded server test
mysql-test/lib/mtr_report.pl:
  Text formatting, adjust table header
2005-09-30 00:52:18 +02:00
unknown
14650d4f66 Merge
client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
os2/MySQL-Source.icc:
  Auto merged
regex/Makefile.am:
  Auto merged
regex/engine.c:
  Auto merged
regex/main.c:
  Auto merged
regex/regerror.c:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-09-29 03:20:31 +02:00
unknown
5e26e3f429 mysql-test-run.pl:
Append to some of the log files, not overwrite.
  Changed introduction text to reflect the current
  status of the Perl version of mysql-test-run.
  Some code cleanup.


mysql-test/mysql-test-run.pl:
  Append to some of the log files, not overwrite.
  Changed introduction text to reflect the current
  status of the Perl version of mysql-test-run.
  Some code cleanup.
2005-09-28 23:52:10 +02:00
unknown
21f6b1a10c mysql-test-run.pl:
Pass on all --skip-* to mysqld


mysql-test/mysql-test-run.pl:
  Pass on all --skip-* to mysqld
2005-09-28 23:24:44 +02:00
unknown
69bfcd9c40 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysys/my_init.c:
  Auto merged
sql/sql_update.cc:
  Auto merged
Makefile.am:
  Manual merge
mysql-test/r/cast.result:
  Manual merge
mysql-test/t/cast.test:
  Manual merge
ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
  Manual merge
sql/ha_ndbcluster.cc:
  Manual merge
sql/item.h:
  Manual merge
sql/opt_sum.cc:
  Manual merge
sql/sql_delete.cc:
  Manual merge
sql/sql_lex.cc:
  Manual merge
sql/sql_load.cc:
  Manual merge
sql/sql_prepare.cc:
  Manual merge
2005-09-28 11:34:53 +02:00
unknown
b09b762f86 Fix for BUG#13527 "mysql-test-run.pl truncates var/log/*.err several times during one testsuit run"
mysql-test/mysql-test-run.pl:
  .err files of the mysqld servers should be appended to, not reset every time we restart
  the mysqlds during the testsuite.
2005-09-27 16:55:23 +02:00
unknown
e4fe90bfa7 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/fix_mysqltest/my41-fix_mysqltest


client/mysqltest.c:
  Manual merge
mysql-test/mysql-test-run.pl:
  patch alredy commited
2005-09-27 16:48:41 +02:00
unknown
aa7bc459f7 merged
VC++Files/mysys/mysys.dsp:
  Auto merged
VC++Files/mysys/mysys_ia64.dsp:
  Auto merged
client/mysql.cc:
  Auto merged
include/my_sys.h:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/rpl_multi_delete2.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/rpl_multi_delete2-slave.opt:
  Auto merged
mysql-test/t/rpl_multi_delete2.test:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-09-21 13:53:22 +02:00
unknown
30681cf509 Don't add all args to mysqltest to MYSQL_TEST env var
mysql-test/mysql-test-run.pl:
  Not all args to mysqltest should be added to the MYSQL_TEST environment variable. The MYSQL_TEST var is used when testing mysqltest and --record and result_file should not be set.
2005-09-21 10:24:46 +02:00
unknown
0aee9b2c19 BUG#12959 mysqltest crashes if testcase passed with -x option
- Enable testcases after help from Serg 


client/mysqltest.c:
  Dump output to stdout if no result file is specified
  Don't print verbose_msg when command fails whith expected error
mysql-test/mysql-test-run.pl:
  Don't add all args to the MYSQL_TEST environment variable.
mysql-test/r/mysqltest.result:
  Add test for mysqltest -x
mysql-test/t/mysqltest.test:
  Add test for mysqltest -x
2005-09-20 14:11:58 +02:00
unknown
730fc4156d Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
2005-09-19 15:31:09 +02:00
unknown
5df7f93ddf mysql-test-run.pl:
Added flag --valgrind-mysqltest


mysql-test/mysql-test-run.pl:
  Added flag --valgrind-mysqltest
2005-09-19 14:58:06 +02:00
unknown
a615084fa4 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
2005-09-19 12:31:22 +02:00
unknown
d6afdcb77c mysql-test-run.pl:
Enabled --valgrind to work (bug#13280)


mysql-test/mysql-test-run.pl:
  Enabled --valgrind to work (bug#13280)
2005-09-17 01:09:32 +02:00
unknown
74aeffda53 mysql-test-run.pl:
Corrected typo


mysql-test/mysql-test-run.pl:
  Corrected typo
2005-09-13 01:41:15 +02:00
unknown
af05c8d303 A fix (bug #12917: The --defaults-extra-file option is ignored by the 5.0 client binaries).
mysql-test/mysql-test-run.pl:
  A fix (bug #12917: The --defaults-extra-file option is ignored by the 5.0 client binaries).
  MYSQL_MY_PRINT_DEFAULTS added
mysql-test/mysql-test-run.sh:
  A fix (bug #12917: The --defaults-extra-file option is ignored by the 5.0 client binaries).
  MYSQL_MY_PRINT_DEFAULTS added
mysys/default.c:
  A fix (bug #12917: The --defaults-extra-file option is ignored by the 5.0 client binaries).
  Set defaults_extra_file as we use it widely.
2005-09-09 12:51:43 +05:00
unknown
6ee54d733c Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/bug11316/my41-bug11316


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/create_select_tmp.test:
  Auto merged
mysql-test/t/drop.test:
  Auto merged
mysql-test/t/flush.test:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
mysql-test/t/innodb-deadlock.test:
  Auto merged
mysql-test/t/innodb-lock.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/ndb_autodiscover2.test:
  Auto merged
mysql-test/t/rpl000001.test:
  Auto merged
mysql-test/t/rpl_EE_error.test:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysql-test/t/rpl_deadlock.test:
  Auto merged
mysql-test/t/rpl_drop.test:
  Auto merged
mysql-test/t/rpl_drop_temp.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysql-test/t/rpl_flush_log_loop.test:
  Auto merged
mysql-test/t/rpl_insert_id.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/rpl_until.test:
  Auto merged
client/mysqltest.c:
  Manual merge
mysql-test/t/mysqltest.test:
  Manual merge
2005-09-01 17:21:03 +02:00
unknown
4fed177276 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug11316/my50-bug11316


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/r/type_newdecimal.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/create_select_tmp.test:
  Auto merged
mysql-test/t/drop.test:
  Auto merged
mysql-test/t/flush.test:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
mysql-test/t/innodb-deadlock.test:
  Auto merged
mysql-test/t/innodb-lock.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/kill.test:
  Auto merged
mysql-test/t/ndb_autodiscover2.test:
  Auto merged
mysql-test/t/rpl000001.test:
  Auto merged
mysql-test/t/rpl_EE_error.test:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysql-test/t/rpl_deadlock.test:
  Auto merged
mysql-test/t/rpl_drop.test:
  Auto merged
mysql-test/t/rpl_drop_temp.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysql-test/t/rpl_flush_log_loop.test:
  Auto merged
mysql-test/t/rpl_insert_id.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/rpl_sp.test:
  Auto merged
mysql-test/t/rpl_until.test:
  Auto merged
mysql-test/t/strict.test:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
client/mysqltest.c:
  Merge with --parsing-disabled
mysql-test/t/mysqltest.test:
  Manual merge
2005-09-01 17:15:37 +02:00
unknown
7bc1d89203 Merge neptunus.(none):/home/msvensson/mysql/bug11316/my41-bug11316
into  neptunus.(none):/home/msvensson/mysql/bug11316/my50-bug11316


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/rpl_flush_log_loop.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/drop.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/rpl000001.test:
  Auto merged
mysql-test/t/rpl_EE_error.test:
  Auto merged
mysql-test/t/rpl_deadlock.test:
  Auto merged
mysql-test/t/rpl_drop_temp.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysql-test/t/rpl_flush_log_loop.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
client/mysqltest.c:
  Manual merge
mysql-test/r/mysqltest.result:
  Manual merge
mysql-test/t/flush.test:
  Manual merge
mysql-test/t/mysqltest.test:
  Manual merge
mysql-test/t/rpl_change_master.test:
  Manual merge
mysql-test/t/rpl_until.test:
  Manual merge
2005-09-01 12:53:23 +02:00
unknown
0caa2a61e0 mtr_timer.pl, mtr_report.pl, mtr_process.pl, mysql-test-run.pl:
Backporting from 5.0


mysql-test/mysql-test-run.pl:
  Backporting from 5.0
mysql-test/lib/mtr_process.pl:
  Backporting from 5.0
mysql-test/lib/mtr_report.pl:
  Backporting from 5.0
mysql-test/lib/mtr_timer.pl:
  Backporting from 5.0
2005-08-31 16:28:47 +02:00
unknown
d6f7c45cf3 mysql-test-run.pl:
Put back unused old manager dummy arguments, some scripts use them


mysql-test/mysql-test-run.pl:
  Put back unused old manager dummy arguments, some scripts use them
2005-08-31 03:38:33 +02:00
unknown
d99d05e987 Implement WL#2789 "Instance Manager: test using mysql-test-run testing framework"
mysql-test/Makefile.am:
  Make installation procedure aware of the Instance Manager tests.
mysql-test/lib/mtr_cases.pl:
  Make collect_one_test_case() aware of the Instance Manager tests.
mysql-test/lib/mtr_process.pl:
  Minor changes:
    - open log files for append, not for overwrite. Append mode is very
      useful for debugging of several tests;
    - extract the code for killing processes into a separate function:
      mtr_kill_processes(). The function is used to stop IM-related processes.
mysql-test/mysql-test-run.pl:
  Added support for the Instance Manager tests.
2005-08-29 22:28:42 +04:00
unknown
d45a682895 mtr_process.pl:
Call mtr_timer_stop_all() at exit
mtr_report.pl, mysql-test-run.pl:
  Added default/ps-protocol/embedded to abort and summary line
mtr_timer.pl:
  Added function mtr_timer_stop_all()


mysql-test/mysql-test-run.pl:
  Added default/ps-protocol/embedded to abort and summary line
mysql-test/lib/mtr_timer.pl:
  Added function mtr_timer_stop_all()
mysql-test/lib/mtr_report.pl:
  Added default/ps-protocol/embedded to abort and summary line
mysql-test/lib/mtr_process.pl:
  Call mtr_timer_stop_all() at exit
2005-08-25 16:25:54 +02:00
unknown
173e5df37f Merge mishka.local:/home/my/mysql-4.1
into  mishka.local:/home/my/mysql-5.0


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-Grep.cpp~ad798e9ae519d667:
  Auto merged
BitKeeper/deleted/.del-Grep.hpp~b05e3af6cfabe387:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.result:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
  Auto merged
BitKeeper/deleted/.del-have_lowercase0.inc:
  Delete: mysql-test/include/have_lowercase0.inc
VC++Files/mysql-test/mysql_test_run_new.dsp:
  Auto merged
configure.in:
  Auto merged
mysql-test/include/ps_conv.inc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/examples/ha_example.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
VC++Files/client/mysqltest.dsp:
  manual merge
VC++Files/sql/mysqld.dsp:
  manual merge
mysql-test/r/grant2.result:
  patch merge
mysql-test/r/subselect2.result:
  manual merge
mysql-test/t/grant2.test:
  patch merge
mysys/charset.c:
  Remove already deleted function
sql/examples/ha_archive.h:
  Manual merge
sql/sql_acl.cc:
  manual merge
sql/sql_db.cc:
  merge (no differences)
sql/sql_select.cc:
  manual merge
sql/table.h:
  merge (no differences)
tests/mysql_client_test.c:
  patch merge
2005-08-25 06:55:48 +03:00
unknown
e9c420ccf1 Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1
into  mysql.com:/home/emurphy/src/work/mysql-5.0


BitKeeper/deleted/.del-ctype-cp932.c:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.result:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
  Auto merged
include/m_ctype.h:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysys/charset.c:
  Auto merged
netware/BUILD/nwbootstrap:
  Auto merged
sql/item.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-czech.c:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-extra.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-latin1.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
strings/ctype-uca.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-ujis.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
strings/ctype-win1250ch.c:
  Auto merged
configure.in:
  Manual merge from 4.1
include/config-netware.h:
  Manual merge from 4.1
sql/item.cc:
  Manual merge from 4.1
sql/mysqld.cc:
  Manual merge from 4.1
2005-08-19 15:29:30 -04:00
unknown
13c347e7e7 ps_conv.inc:
Adjustment of float results for Windows
mysql-test-run.pl:
  Added --port to make MYSQL_DUMP and MYSQL_SHOW work on windows
have_lowercase0.inc:
  new file


mysql-test/mysql-test-run.pl:
  Added --port to make MYSQL_DUMP and MYSQL_SHOW work on windows
mysql-test/include/ps_conv.inc:
  Adjustment of float results for Windows
2005-08-18 22:27:12 +02:00
unknown
d1bdd18eb4 mtr_timer.pl, mysql-test-run.pl, mtr_report.pl, mtr_process.pl:
Added suite and test case timeout
mtr_timer.pl:
  new file


mysql-test/lib/mtr_process.pl:
  Added suite and test case timeout
mysql-test/lib/mtr_report.pl:
  Added suite and test case timeout
mysql-test/mysql-test-run.pl:
  Added suite and test case timeout
mysql-test/lib/mtr_timer.pl:
  Added suite and test case timeout
2005-08-18 00:16:44 +02:00
unknown
a80110f7f2 mysql-test-run.pl, mtr_misc.pl:
Bug#12615: Host name might not resolve, use short host name


mysql-test/lib/mtr_misc.pl:
  Bug#12615: Host name might not resolve, use short host name
mysql-test/mysql-test-run.pl:
  Bug#12615: Host name might not resolve, use short host name
2005-08-17 14:40:23 +02:00
unknown
dd6943e9e8 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
2005-08-17 03:39:15 +02:00
unknown
0f7bb92df9 mysql-test-run.pl:
Bug#11884: Corrected --start-and-exit, start the server
  as if the default/specified test case would have been run


mysql-test/mysql-test-run.pl:
  Bug#11884: Corrected --start-and-exit, start the server
  as if the default/specified test case would have been run
2005-08-17 03:35:50 +02:00
unknown
2747666df8 mysql-test-run.pl:
Back ported ndbcluster_support() from 5.0
  Corrected the server id handling


mysql-test/mysql-test-run.pl:
  Back ported ndbcluster_support() from 5.0
  Corrected the server id handling
2005-08-04 13:54:39 +02:00
unknown
d57a0e52ac BUG#11316 mysqltest, problems when assigning value with '#' to $variable
- Fixed problem, only detect comment if the # is on start of line AND starting line of the current command.
 - Wrote tests for most of the mysqltest commands, added stricter checking of correct syntax.


client/mysqltest.c:
  Updated mysql test to do stricter checking of syntax. For example when the number 
  of arguments to a command is known, everything else is "junk" => die. 
  Better checking of argument types.
  Added better debug printouts.
  Added improved printouts when wrong syntax is detected.
  Fix two bugs where mysqltest could not detect end of comamnd properly, as described in bug#11316
  Fix segfault when performing too many source commands.
  Fix segfault when doing too many while loop levels.
  Add printout of line number in die
  Remove lineno and \n in all strings passed to die function.
  Decrese BLOCK_STACK_DEPTH from 32 to 16, does any test use more than 1 level?
mysql-test/mysql-test-run.pl:
  export MYSQL_TEST environment variable, used from msyqltest.test
mysql-test/mysql-test-run.sh:
  export MYSQL_TEST environment variable, used from msyqltest.test
mysql-test/r/mysqltest.result:
  Updated test results
mysql-test/r/rpl_flush_log_loop.result:
  Updated test result.
  Approved by lars
mysql-test/t/innodb-deadlock.test:
  Correct wrong syntax
  Superfluos ;
mysql-test/t/innodb-lock.test:
  Correct wrong syntax
  Superfluos ;
mysql-test/t/mysqltest.test:
  Add several new tests  for mysqltest.
  Foxus on detecting wrong syntax in test files.
  Use exec with expected error to execute test scripts that will kill mysqltest
  Change some negative test that were previously commented out to use the above method.
mysql-test/t/ndb_autodiscover2.test:
  Correct wrong syntax
  Superfluos ;
mysql-test/t/rpl_change_master.test:
  Correct wrong syntax
  Superfluos ;
mysql-test/t/rpl_deadlock.test:
  Correct wrong syntax
  Superfluos ;
mysql-test/t/rpl_drop_temp.test:
  Correct wrong syntax
  Superfluos ;
mysql-test/t/rpl_flush_log_loop.test:
  Fix after detecting wrong syntax, missing ;
  Discussed with lars.
mysql-test/t/rpl_insert_id.test:
  Missing ;
mysql-test/t/rpl_rotate_logs.test:
  Correct wrong syntax
  Superfluos ;
mysql-test/t/rpl_until.test:
  Missing delimiter
mysql-test/include/mysqltest_while.inc:
  New file to test too many while levels
2005-07-15 17:51:43 +02:00
unknown
942dfcd4d8 Bug #11903, make perl test script run ndbcluster tests by default 2005-07-13 13:07:09 +02:00
unknown
376a50e638 Merge 2005-07-06 22:29:28 +02:00
unknown
0f06342304 mtr_misc.pl:
Corrected appending of .exe to Windows executables
  Don't alter read only @_ in foreach loop
mysql-test-run.pl:
  Improved cleanup of binlogs
  Use separate log file for second master
  Corrected Windows paths to executables


mysql-test/mysql-test-run.pl:
  Improved cleanup of binlogs
  Use separate log file for second master
  Corrected Windows paths to executables
mysql-test/lib/mtr_misc.pl:
  Corrected appending of .exe to Windows executables
  Don't alter read only @_ in foreach loop
2005-07-06 22:21:35 +02:00
unknown
f3a84063a1 Merge
mysql-test/mysql-test-run.pl:
  Auto merged
2005-07-06 16:42:16 +02:00