Commit graph

466 commits

Author SHA1 Message Date
unknown
0d087e0558 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-10 16:07:49 +01:00
unknown
68ae8da64c Look for "mysqlmanager" also in "bin" directory
Improve log message
2006-11-10 15:58:38 +01:00
unknown
744aadbef9 Merge trift2.:/MySQL/M41/clone-4.1
into  trift2.:/MySQL/M41/push-4.1


myisam/sort.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/mysql-test-run.pl:
  Manual merge.
2006-11-10 15:52:53 +01:00
unknown
694227c08a Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0


mysql-test/mysql-test-run.pl:
  merge
2006-11-10 14:44:01 +01:00
unknown
fbd4378b85 Bug#10608 mysqladmin breaks on "database" variable in my.cnf
- Add printout of "Warning" or "Note" for non error messages in default_reporter
 - Add test for the above in new mysqladmin.test


mysql-test/mysql-test-run.pl:
  Add support for mysqladmin to mysql-test-run.pl
mysys/my_getopt.c:
  Add printout of Warning: or Info: in 'default_reporter', this
  will make the user aware of the problem but can filter it
  as a warning or note.
mysql-test/r/mysqladmin.result:
  New BitKeeper file ``mysql-test/r/mysqladmin.result''
mysql-test/t/mysqladmin.test:
  New BitKeeper file ``mysql-test/t/mysqladmin.test''
2006-11-10 13:25:10 +01:00
unknown
0f8e62b492 Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-10 13:14:21 +01:00
unknown
df1b6ae6e1 add --report-features to mysql-test-run.pl
mysql-test/mysql-test-run.pl:
  add --report-features
mysql-test/include/report-features.test:
  test file showing server features for mysql-test-run.pl --report-features
2006-11-10 13:12:08 +01:00
unknown
1707d5e6e0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-09 15:36:13 -05:00
unknown
2eeb38ac7d Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Merge
2006-11-09 11:01:37 +01:00
unknown
fc449ac174 Fix problem when running mysql_client_test in "binary dist", path should include the binary name 2006-11-09 09:48:50 +01:00
unknown
b1520eb3e2 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-08 23:17:09 +01:00
unknown
d3b049a6bf Update of --mem flag after comments
mysql-test/mysql-test-run.pl:
  Allow --mem to be specified as a flag or --mem=<dir>
  Add /tmp to locations to search
  Update comments and usage description
2006-11-08 23:16:44 +01:00
unknown
26e6d78845 No need to pass an additional arg to to mtr_add_arg when there is no % sign 2006-11-08 22:56:06 +01:00
unknown
39c8672fb6 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-08 22:54:22 +01:00
unknown
427f1acaaa Pass location of charsets dir to mysqltest to avoid using the charsetdir locally installed on machine.
client/mysqltest.c:
  Add new option --character-sets-dir to mysqltest
  Set MYSQL_SET_CHRSET_DIR before connecting to mysqld if the above variable is set
mysql-test/mysql-test-run.pl:
  Pass $path_charsetsdir to mysqltest
2006-11-08 22:53:40 +01:00
unknown
c98a6dc8af Don't run mysqltest with both --silent and --verbose 2006-11-08 22:45:52 +01:00
unknown
143b0e4fb7 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-07 16:17:04 +01:00
unknown
a797e75a3e Bug#23981 memory leaks from yassl code + other
- Readd --skip-bdb when valgrinding


mysql-test/mysql-test-run.pl:
  Readd --skip-bdb when valgrinding
2006-11-07 16:09:32 +01:00
unknown
5320e2eaee Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-07 13:01:56 +01:00
unknown
a10cfc6a0c Don't allow path to be passed to --mem 2006-11-07 13:01:32 +01:00
unknown
7a7e4d5d69 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-07 12:57:30 +01:00
unknown
3893f90764 Correct faulty commit, the opt_tastcase_timeout value is in minutes, to it need to be multiplied with 60 before ping passed to mtr_timer_start 2006-11-07 12:56:55 +01:00
unknown
434192fe54 Make --mem settable with environment variable MTR_MEM and make it possible to pass the directory to use. I.e --mem=<directory>
include/abi_check.ic:
  Ignore file
include/abi_check:
  Ignore file
2006-11-07 11:07:27 +01:00
unknown
024a1781a6 Remove old comments 2006-11-04 13:06:19 +01:00
unknown
d7d0568236 Fix mysql-test-run.pl for "bin dist" look in "bin" directory for client binaries as well.
mysql-test/lib/mtr_misc.pl:
  Update comments
mysql-test/mysql-test-run.pl:
  Also need to look in "$glob_basedir/bin"
2006-11-03 12:32:05 +01:00
unknown
6bc475c5e3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-02 20:43:48 -05:00
unknown
f0364b7b84 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint


mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged
mysql-test/t/innodb_mysql.test:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Manual merge.
mysql-test/r/ps.result:
  Manual merge.
mysql-test/t/ps.test:
  Manual merge.
2006-11-02 17:39:52 -05:00
unknown
a04d382796 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my50-mtr_vs_config
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-02 15:16:33 -05:00
unknown
8e6b1e3849 Bug#23865 mysql-test-run.pl on Windows only supports debug and release configurations
Visual Studio builds each configuration in a different sub-directory.  Only the sub-
directories for release and debug are currently searched.


mysql-test/lib/mtr_misc.pl:
  Bug#23865 mysql-test-run.pl on Windows only supports debug and release configurations
  - Added usage comments.
mysql-test/mysql-test-run.pl:
  Bug#23865 mysql-test-run.pl on Windows only supports debug and release configurations
  - Moved Initial_Setup function to the command_line_setup function.
  - Defined new argument vs-config which can be used to inidicate the VS Configuration
  used to create the test executables. Argument can also be controlled with
  MTR_VS_CONFIG environment variable.
2006-11-02 15:05:20 -05:00
unknown
25b72e97d2 mysql-test/mysql-test-run.pl + mysql-test/mysql-test-run.sh
Necessary changes if one of the test scripts is to be used with a RPM installation (bug#17194).

This change handles finding the server and the other programs,
but it does not solve the problem to get a writable "var" directory.
If we want to avoid world-writable directories below "/usr/share/mysql-test" (and we do!), 
any automatic solution would require fixed decisions which may not match the local installation.

For the Perl script, use "--vardir"; for the shell script, create "mysql-test/var" manually.


mysql-test/mysql-test-run.pl:
  Modifications to use this script in a RPM installation (bug#17194):
  - The tests are one level further down, "/usr/share/mysqltest" (vs. "/usr/bin").
  - A "mysql-bench" might not exist.
  - "mysql-test" is owned by root and not world-writable, so "var" must be put somewhere else.
  - The server, "mysqld", is in a different location, "/usr/sbin".
  
  Note that the "--vardir" option must be used in a RPM installation,
  unless "mysql-test" is made writable for the user who runs the tests (not done automatically).
mysql-test/mysql-test-run.sh:
  Necessary changes if this script is to be used with a RPM installation (bug#17194):
  - The tests are one level further down, "/usr/share/mysqltest" (vs. "/usr/bin").
  - The server, "mysqld", is in a different location, "/usr/sbin".
  
  Note that these changes are not sufficient, as the user needs a writable "mysql-test/var" subdirectory.
  Either this is created manually, or the script can not be used.
  An alternative is the corresponding Perl script which supports a "--vardir" option.
2006-11-01 20:17:10 +01:00
unknown
c54f778e96 Remove warning, exe_mysql_fix_system_tables are not available on windows 2006-10-31 17:16:07 +01:00
unknown
7596e12bbe Update the binlog format parse routine to only be avaliable in 5.1 and allow for any binlog_format to be specified 2006-10-25 14:56:36 +02:00
unknown
870ed0c3f5 Add valgrinding support for mysql_client_test
Fix two memory leaks in mysql_client_test


mysql-test/mysql-test-run.pl:
  Add valgrinding support for mysql_client_test
tests/mysql_client_test.c:
  Fix two memory leaks
2006-10-25 14:34:18 +02:00
unknown
379809f40e Set flag opt_skip_ndbcluster_slave if no slaves are being used.
Add comments
Deperlify
2006-10-25 12:40:33 +02:00
unknown
4da54b4769 Adapt mysql-test-run.pl to mysqld in 5.1 using "mixed" binlog format by default 2006-10-24 23:39:46 +02:00
unknown
f89efeb5f6 Pass --core-file option to mysqld when bootstrapping
BitKeeper/etc/ignore:
  Added mysql-test/r/blackhole.log to the ignore list
2006-10-24 21:02:04 +02:00
unknown
c7cedcd645 Remove debug printout 2006-10-24 19:22:27 +02:00
unknown
297d968a8c Run mysql_client_test without --silent
Flush both stdout and stderr before abort'ing mysql_client_test


mysql-test/mysql-test-run.pl:
  Run mysql_client_test wihtout --silent flag
tests/mysql_client_test.c:
  Before aborting mysql_client_test in die, make sure
  to first flush stdout and finally after the error message 
  has been printed also fflush stderr
2006-10-24 18:49:19 +02:00
unknown
e3936b1065 Add analyze_testcase_failure which is called when mysqltest has failed
with error 1 and we are running with --force
The specific "analyze" code is enclosed in a .test file fwich can easily
be modified to be more advanced 


mysql-test/mysql-test-run.pl:
  Attempt to run some quick queries to analyze the failure when mysqltest returns 1 indicating test has failed
  Initially only code to analyze "could not sync with master" is added as that is a blackbox
  and all problems looks the same
mysql-test/include/analyze_failure_sync_with_master.test:
  New BitKeeper file ``mysql-test/include/analyze_failure_sync_with_master.test''
2006-10-24 17:36:46 +02:00
unknown
f9ff7472a2 Avoid matching the trailing carriage return when parsing the mysqld.spec file
This fixes problem where --replace_result failed in rpl000015 because the MYSQL_TCP_PORT variable was "3306\r"


mysql-test/mysql-test-run.pl:
  Avoid matching the trailing carriage return when parsing the mysqld.spec file
2006-10-23 20:36:44 +02:00
unknown
13c55f3c17 The vardir trick can only bge used on platforms with native symlinks - otherwise opt_vardir need to be set to default value. 2006-10-23 16:51:48 +02:00
unknown
edf668e8fa Don't use the "4.1 vardir trick" on OS that does not have native symlink(i.e windows) 2006-10-23 13:32:20 +02:00
unknown
788968a61b If "var" is a symlink which does not point to anything, remove it before creating real var
mysql-test/mysql-test-run.pl:
  If "var" is a symlink which does not point to anything, remove it
2006-10-23 12:16:40 +02:00
unknown
e78a193179 As both ndb and im are components that may be disabled as well as the binaries may not exist. Look for
their binaries in a separate function and produce test casea failures for the test thet needs these components
2006-10-23 12:02:56 +02:00
unknown
12c43f4f15 Init some variables that changes between test cases direclty in run_testcase
This can not be done in run_testcase_start_servers as embedded never starts a server
Add error if mysqld_start is called in embedded mode
2006-10-20 17:09:07 +02:00
unknown
fc9cf7f45d Adapt to running from "binary dist"
Add function mtr_exe_maybe_exists to look for binaries that is optional
Skip ndb support if it's a binary dist where mysqld supports ndb but there is no ndbd


mysql-test/lib/mtr_misc.pl:
  Add function mtr_exe_maybe_exists
mysql-test/mysql-test-run.pl:
  Adapt to running from binary dist
  Add function mtr_exe_maybe_exists to look for binaries that is optional
  Skip ndb support if it's a binary dist where mysqld supports ndb but there is no ndbd
2006-10-19 20:33:32 +02:00
unknown
8e5b64ae0a Stop all timers before exiting when --start-and-exit 2006-10-18 16:39:00 +02:00
unknown
85cfdc5bcc Make --with-ndbcluster only be valid together with --bench
Improve code that detects if ndb shuold be installed
Remove call to stop_all_servers after install db, if any servers are still running 
and need to be stopped they will be stopped atuomatically


mysql-test/lib/mtr_cases.pl:
  All tests that have "source include/have_ndb.inc" are ndb tests
mysql-test/mysql-test-run.pl:
  Set --with-ndbcluster to only be valid together with --bench
  Rename opt_ndbcluster_supported to glob_ndbcluster_supported it's not an option
  Fix warnings
2006-10-18 13:24:06 +02:00
unknown
40ac968926 Remove warnings
Set comment properly before calling mtr_report_test failed and report_failure_restart 


mysql-test/lib/mtr_report.pl:
  Remove warnings
  No need to check ndb installed ok here, when that is detected comment is set to indicate the problem
2006-10-17 10:31:06 +02:00
unknown
dd5edc0aaa When calculating what features to use for _this_ test run, don't look at test that already are deterined to be skipped 2006-10-17 08:10:51 +02:00
unknown
8ec4020e25 Use char as datatype for the byte that are read with my_fgetc, fixes problem with
mysqltest.test on Solaris and Mac. write_file produced nice files with all zeroes.


client/mysqltest.c:
  Use char as datatype for the byte that are read with my_fgetc
mysql-test/mysql-test-run.pl:
  Fix typo, add missing $
2006-10-14 17:09:06 +02:00
unknown
0d9e6366a8 Skip looking for mysql_client_test in 4.1 on windows as it's not built by default 2006-10-14 16:31:20 +02:00
unknown
00e327ed88 Look for client bindirs client_release and client_debug before other directories. 2006-10-13 20:29:27 +02:00
unknown
a4c972bcf7 Improve function that finds the reason why test was skipped, the old version only looked at the ast line, but there might be some additional debug info there so it's better to scan the whole file.
There should be only one line that says "reason: <reason>"
2006-10-13 10:41:40 +02:00
unknown
7a9085c68b Skip looking for ndbapi-examples in 4.1, not part of dist 2006-10-12 20:52:53 +02:00
unknown
e203f0e578 Add missing semicolon 2006-10-12 16:17:09 +02:00
unknown
8461716962 Add win paths for mysql_client_test 2006-10-12 13:49:12 +02:00
unknown
1bb09d53ad Look for mysql_client_test in $path_client_bindir 2006-10-12 12:19:23 +02:00
unknown
00f420db13 Fix unhandled exception in mysql-test-run.pl, creating a dir that already exist
mysql-test/lib/mtr_process.pl:
  Remove junk code/comments
  Moved the creation of var/log out of function mtr_kill_leftovers
mysql-test/mysql-test-run.pl:
  Rename 'kill_running_server' to more appropriate name 'kill_running_servers'
  If no var/log dir exists when mtr_kill_leftovers is started it should be created
  Remove "unless" syntax, too perlish
  Fix typo
2006-10-12 11:29:13 +02:00
unknown
d6d4692372 Fixes for embedded server test
client/mysqltest.c:
  Fix typo
2006-10-11 21:53:43 +02:00
unknown
6c0ad74127 mtr_im_stop returns 1 if all is well 2006-10-11 15:45:35 +02:00
unknown
a008137880 Improve restart logic all code to detect restart is now in the functions
'run_testcase_need_master/slave_restart'
Remove the faulty qw
Only look for mysql_fix_privilege_tables if not windows


mysql-test/lib/mtr_cases.pl:
  Move all code to determine when to restart into 'run_testcase_need_master/slave_restart' 
  Add possibility to wite --force-restart in -master.opt file, this will force a restart and
  since master is not started with any special options there is no need to restart
  again afterwards.
mysql-test/mysql-test-run.pl:
  Remove the qw surrounding ENV{'LD_LIBRARY_PATH'}
  Only look for the sh script mysql_fix_privileges when not on windows
  Remove warnings about using unitialized variables
  Improve the restart logic, eall code to determine when to restart is
  now in run_testcase_need_master_restart and run_testcase_need_slave_restart
mysql-test/t/bdb-alter-table-2-master.opt:
  Use --force-restart
mysql-test/t/not_embedded_server-master.opt:
  Use --force-restart
2006-10-11 14:50:19 +02:00
unknown
f20d34f422 Merge bodhi.local:/opt/local/work/mysql-5.0-root
into  bodhi.local:/opt/local/work/mysql-5.0-runtime


mysql-test/mysql-test-run.pl:
  Auto merged
2006-10-09 18:04:09 -07:00
unknown
eab94fd0ba Print names of testcases that failed check_testcase, this makes it easier
to run the whole testcase to find wich testcases need to be checked more carefully
and the just "copy and paste" the suspicious test case names to 
a new mysql-test-run.pl command. 


mysql-test/mysql-test-run.pl:
  Mark test cases that fails "check_testcase"
  Make run_check_testcase return  value indicating if check failed
mysql-test/include/check-testcase.test:
  New BitKeeper file ``mysql-test/include/check-testcase.test''
2006-10-08 17:48:01 +02:00
unknown
ddf7e2a5f0 Do the check of special mysqld exe for master or slave after command line args have been parsed 2006-10-08 17:08:24 +02:00
unknown
127e401185 Move list of mysqls src dirs into lib/mtr_gcov.pl as it's only used from there 2006-10-08 17:05:17 +02:00
unknown
4404ea6418 When looking for client binary directories it necessary to look for the one s that are "deep down" first. 2006-10-08 16:11:55 +02:00
unknown
96c801f1a7 Reorder the order of feature checks a bit
Make the mysqld_variables hash global so it can be used throughout the program
2006-10-08 15:50:16 +02:00
unknown
64329b16ec Add error handling of failure to start server to "run_testcase_start_servers"
mysql-test/lib/mtr_report.pl:
  Use tinfo's comment as primary place to look for error message
2006-10-06 17:15:26 +02:00
unknown
e16d985171 Fix problem with specifying vardir, mysql_version_id was not yet available when vardir arguments is checked
Move the code to look for exe_mysqld earlier => to initial_setup
Fix warnings detected by running with "diagnostics"
Remove unused option "opt_result_ext"
Init "path_ndb_examples_dir"


mysql-test/lib/mtr_cases.pl:
  Set default number of slave to 0
  Remove unused/uninitialized "$opt_result_ext"
mysql-test/lib/mtr_report.pl:
  Remove unused/uninitialized "$opt_result_ext"
2006-10-06 16:26:17 +02:00
unknown
7d3887563c Modify regex for parsing mysqld version as the mysqld is sometimes a libtool wrapper and
the "mysqld --version" command will print "/path/.libs/lt-mysqld  Ver x.x.x"


mysql-test/mysql-test-run.pl:
  Modify regex for parsing mysqld version as the mysqld is sometimes a libtool wrapper and
  the "mysqld --version" command will print "/path/.libs/lt-mysqld"
2006-10-06 13:33:12 +02:00
unknown
81d423334e Always need restart for im_* tests 2006-10-06 12:46:21 +02:00
unknown
9350dbc4f9 Improve 'run_testcase_need_master_restart' to require restart if master is not already started
Improve 'run_testcase_need_slave_restart' to detect if a slave restart really is necessary. 
So far all rpl test requires a slave restart, but for all other tests it can be skipped
Improve the sort order used by --reorder


mysql-test/lib/mtr_cases.pl:
  Improve the sort order used by reorder
mysql-test/mysql-test-run.pl:
  Improve 'run_testcase_need_master_restart' to require restart if master is not already started
  Improve 'run_testcase_need_slave_restart' to detect if a slave restart really is necessary. 
  So far all rpl test requires a slave restart, but for all other tests it can be skipped
2006-10-06 11:23:19 +02:00
unknown
1822065d12 Rename "snapshot_setup" to "datadir_setup" as that is what is done by it.
Move call f dunction into "initialize_servers" so it's called also
in stress and bench mode
2006-10-06 01:22:33 +02:00
unknown
78c5bc62c5 Add printout of file in which warning was detected
Cleanup .progress, .reject, .log and .warnings files produced by mysqltest


client/mysqltest.c:
  Add printout of file in which warning was detected
mysql-test/include/ctype_like_escape.inc:
  Remove warnings, convert -- comments to # comments
mysql-test/mysql-test-run.pl:
  Cleanup all files produced by mysqltest before starting mysqltest again
2006-10-06 00:57:10 +02:00
unknown
7ec1a292a1 Print the newly found version number in human readable format 2006-10-05 22:29:16 +02:00
unknown
93a9883bed Add policy directive about keeping mysqltest framework tools identical in all versions
mysql-test/mysql-test-run.pl:
  Add policy directive about keeping mysqltest framework tools identical in all versions
  Cleanup the initial comment to reflect current state
2006-10-05 22:05:42 +02:00
unknown
16b9d8d15a No need to pass --valgrind to mysqltest anymore, the simple task of
creating an environment variable is handled directly from the perl code.
2006-10-05 20:45:16 +02:00
unknown
2430d73ce6 Make use of $opt_mem" and let 4.1 allow --vardir to be set. Still relies on the var/ directory
but having it on tmpfs gives a big speedup. 


mysql-test/mysql-test-run.pl:
  Make use of opt_mem and let 4.1 allow vardir to be set. Still relies on the var/ directory
  but having it on tmpfs gives a big speedup.
2006-10-05 20:21:11 +02:00
unknown
9ba3b3f2ef Use same --slave-load-tmpdir in all versions(backport from 5.0)
mysql-test/mysql-test-run.pl:
  Use same location for slave-load-tmpdir in all versions
mysql-test/mysql-test-run.sh:
  Use same location for slave-load-tmpdir in all versions
mysql-test/r/rpl_loaddata.result:
  Update result after changing slave-load-tmpdir to use a shorter path
mysql-test/r/rpl_loaddatalocal.result:
  Update result after changing slave-load-tmpdir to use a shorter path
mysql-test/r/rpl_log.result:
  Update result after changing slave-load-tmpdir to use a shorter path
mysql-test/t/rpl_loaddatalocal.test:
  Use MYSQLTEST_VARDIR when specifying path to load from(backport from 5.0)
  Use new command "remove_file" instead of s"ystem rm"
2006-10-05 18:29:59 +02:00
unknown
068641aa53 Add new option --mem to mysql-test-run.pl. It will automatically setup a symlink
from var/ to a tmpfs area and thereby speed up the execution of the testsuite
 significantly


mysql-test/mysql-test-run.pl:
  Add new option --mem to mysql-test-run.pl. It will automatically setup a symlink
  from var/ to a tmpfs area and thereby speed up the execution of the testsuite
  significantly
2006-10-05 14:37:46 +02:00
unknown
2317c0cf59 5.0 is also using the somewhat larger config for cluster 2006-10-05 13:45:50 +02:00
unknown
9674059f68 Add regex to detect the empty line that end the variable list.
Some variable names in 5.1 is soo long that there is no space inbetween 
name and value. Outputing a warning about it, as that should probably be fixed.
At least one space should be put between the name and value.
2006-10-05 13:38:08 +02:00
unknown
ddf0fa97b5 Print warning message if test was failed becuase of cluster install failure
Improve check of wheter test case need slave cluster
2006-10-05 13:09:06 +02:00
unknown
c3e8fb57a0 Set the environment variable NDB_STATUS_OK to indicate that cluster is installed ok. This is actually not needed for this script as it will
skip ndb tests if cluster install failed. But provided for compatibility


mysql-test/include/have_ndb.inc:
  Revert
2006-10-05 12:28:23 +02:00
unknown
95e329152f Fix detection of debug binaries. If mysqld ouputs "debug xx" in the variable list it's a debug binary 2006-10-05 00:19:24 +02:00
unknown
08ef106201 Set the small configuration a little bit larger for 4.1 2006-10-05 00:12:54 +02:00
unknown
bd1f1d9841 Add skip-bdb to im defaults file in 5.0 2006-10-04 23:57:31 +02:00
unknown
395a16482d Only setup cmdline_myslslap if exe_mysqlslap defined 2006-10-04 23:19:06 +02:00
unknown
693465a66a Look for mysqlslap from 5.1, it's also available on windows 2006-10-04 23:15:04 +02:00
unknown
4e75b44749 Use switch --old-log-format to mysqld started by im only in 5.1 and up 2006-10-04 23:07:49 +02:00
unknown
d7b6fdcd6c Clean up de_before_start_master/slave 2006-10-04 23:05:12 +02:00
unknown
fe8d349ad9 Set slave_load_path to ../../var/tmp in version prior to 5.0 to be compatible with mysql-test-run.sh 2006-10-04 22:50:34 +02:00
unknown
3f45e43c06 Create the mysqld.spec file with a unique name in mysql-test dir, $opt_var_dir haven't been created yet 2006-10-04 19:21:22 +02:00
unknown
091de56e60 --ndb-extra-logging option to mysqld is not available until 5.1 2006-10-04 18:48:22 +02:00
unknown
e5d14529bc Fixup the regex's parsing the mysqld's version and variables
Add paths for ndb binaries
Some more backport issues


mysql-test/include/have_ndb.inc:
  Remove the check for NDB_STATUS_OK, handled by mysql-test-run.pl
2006-10-04 16:28:23 +02:00
unknown
dccc6b10c3 Backport from 5.1
-Add support for detecting version and features from mysqld binary
 - Autodetect netware
 - Disable some features not available below 5.0
 - Cleanup executable_setup to look for one executable at a time, only llok for the ones that are needed based on the selected testcases and settings


mysql-test/lib/mtr_cases.pl:
  Backport from 5.1
mysql-test/lib/mtr_io.pl:
  Backport from 5.1
  Add new function mtr_appendfile_to_file
mysql-test/lib/mtr_misc.pl:
  Backport from 5.1
mysql-test/lib/mtr_process.pl:
  Backport from 5.1
mysql-test/lib/mtr_report.pl:
  Backport from 5.1
mysql-test/mysql-test-run.pl:
  Add support for detecting version and features from mysqld binary
  Autodetect netware
  Disable some features not available below 5.0
  Cleanup executable_setup to look for one executable at a time, only llok for the ones that are needed based on the selected testcases and settings
mysql-test/r/mysqltest.result:
  Update result
mysql-test/lib/mtr_im.pl:
  New BitKeeper file ``mysql-test/lib/mtr_im.pl''
mysql-test/lib/mtr_stress.pl:
  New BitKeeper file ``mysql-test/lib/mtr_stress.pl''
2006-10-04 12:47:32 +02:00
unknown
afdae2f3b7 Patch for BUG#15934: im_daemon_life_cycle fails sporadically.
The problem was a race condition in a test case.

The fix eliminates the race condition by explicit
wait on UNIX socket to start accepting connections.

The patch affects only test suite (i.e. does not touch
server codebase).


mysql-test/mysql-test-run.pl:
  Expose necessary environment variables.
mysql-test/r/im_daemon_life_cycle.result:
  Update result file.
mysql-test/t/im_daemon_life_cycle.imtest:
  Wait for Instance Manager to start accepting connections
  after restart.
mysql-test/t/wait_for_socket.sh:
  Helper script: waits for UNIX socket to start accepting connections.
2006-10-03 18:42:59 +04:00
unknown
1535da6592 Merge bk-internal:/home/bk/mysql-5.0-runtime
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


BitKeeper/etc/collapsed:
  auto-union
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
2006-10-03 14:26:11 +02:00
unknown
10c66c6ac7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mockturtle.local:/home/dlenev/src/mysql-5.0-rt-merge


BitKeeper/etc/collapsed:
  auto-union
mysql-test/mysql-test-run.pl:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
mysql-test/r/sp.result:
  Manual merge.
mysql-test/t/sp.test:
  Manual merge.
2006-09-29 10:55:03 +04:00
unknown
b7fcc913b4 Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-09-28 09:32:49 +02:00
unknown
3f01b5df81 Increase test suite timeout to 3 hours 2006-09-28 09:30:24 +02:00
unknown
9f9e8dc660 Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-09-27 14:41:29 +02:00
unknown
9a00f96f21 When valgrinding add /usr/lib/debug" to LD_LIBRARY_PATH if available
mysql-test/mysql-test-run.pl:
  Rewrite the setup of LD_LIBRARY_PATH and DYLD_LIBRARY_PATH to make it easier to modify
  Valgrind need to be run with debug libraries  otherwise it's almost impossible to add
  correct supressions, that means if "/usr/lib/debug" is available, it should be added to
  LD_LIBRARY_PATH
2006-09-27 13:42:16 +02:00
unknown
7bf40904e7 Merge neptunus.(none):/home/msvensson/mysql/bug18969/my50-bug18969
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-09-26 15:07:00 +02:00
unknown
e9a84303c0 Bug#18969 race condition involving slave and mysqltest. was rpl_insert_id test case fails
- As the slaves are restarted for each testcase, take the opportunity to restore their databases to a known state with the help of the snapshot(s)
 - Count max number of slaves used in testcases
 - Use copy_install_db to speed up "Installing db" phase


mysql-test/mysql-test-run.pl:
  Count max number of slaves used for a test run and use that when installing slave databases etc.
  Use "copy_install_db" for all but the first db to install
  After having stopped the slave database, restore it's database files from the snapshot.
2006-09-26 13:49:42 +02:00
unknown
7732a5901f Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
2006-09-23 09:48:43 -04:00
unknown
0c5d362750 Fix for bug #19121: Windows incompatible udf_example
mysql-test/mysql-test-run.pl:
  fixed path for udf_example.so when running testsuite on Windows
sql/CMakeLists.txt:
  Added missing udf_example
sql/Makefile.am:
  Added udf_example files for make dist
sql/udf_example.c:
  fix for Windows: Windows doesn't have socket.h and friends
  
  Added replacements for strmov,bzero and memcpy_fixed when compiling standalone.
sql/udf_example.def:
  BitKeeper file /home/georg/work/mysql/prod/mysql-5.0-win/sql/udf_example.def
2006-09-22 14:42:43 +02:00
unknown
50756812cb Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-09-20 18:02:42 +02:00
unknown
25fa9d266a Fix problem with testcase timeouts not working. The timeout value was always multiplied with 10
since the $opt_valgrind variable was initialised to 0, thus being "defined"


mysql-test/mysql-test-run.pl:
  Increase the timeout values if $opt_valgrind are greater than 0. By default $opt_valgrind is set to 0.
2006-09-20 15:41:46 +02:00
unknown
8776c21f65 Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-09-19 20:00:01 +02:00
unknown
a4b1695376 Increase suite timeout even more - 6 times - when running with valgrind
mysql-test/mysql-test-run.pl:
  Increase suite timeout even more when running with  valgrind
2006-09-19 19:41:41 +02:00
unknown
d1ec10fbbe Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-09-19 19:11:41 +02:00
unknown
dbe820a0b6 Pass --debug arguments to mysqld also when bootstrapping if --debug is tunrned on 2006-09-19 18:39:04 +02:00
unknown
3b32e5dbb0 Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-09-19 17:40:49 +02:00
unknown
0dc08b9040 Fix warnings in mysql-test-run.pl
mysql-test/lib/mtr_stress.pl:
  Remove duplicate definition of variable
mysql-test/mysql-test-run.pl:
  Fix spelling error
  Fix warning about uninitialised warning
2006-09-19 16:43:42 +02:00
unknown
cbafa0c6bc Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-09-18 17:47:26 +02:00
unknown
a5576da753 Add character-sets-dir argument to "mysql". That avoids a local
installed charset dir being used.


mysql-test/mysql-test-run.pl:
  Add character-sets-dir argument to "mysql". That avoids a local
  installed charset dir being used.
2006-09-18 17:46:36 +02:00
unknown
2e48f71759 Merge neptunus.(none):/home/msvensson/mysql/my50-netware-mtr
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-09-14 11:01:23 +02:00
unknown
026737aa75 Fix for BUG#22074: mysql-test-run.pl abort test run if it fails
to start instance manager.

The problem was that if IM failed to start, test suite aborts.

The fix is to mark current test as failed, and continue running
test suite.

The fix affects only test suite.


mysql-test/mysql-test-run.pl:
  Report IM-test as failed if IM failed to start.
2006-09-08 16:41:35 +04:00
unknown
e701346dcf This is another patch for test suite to make IM tests work smoothly.
The patch affects only test suite and has the following changes:

1. On starting Instance Manager -- added code for waiting for guarded
mysqld instances to create PID files;
2. Polishing;
3. Move IM-related operations out of mtr_process.pl into new dedicated
for IM file -- mtr_im.pl


mysql-test/mysql-test-run.pl:
  1. Require new file with IM-related operations;
  2. Added timeout to wait for PID files of guarded instances;
  3. Polishing.
mysql-test/lib/mtr_process.pl:
  Move IM-related operations to new file.
mysql-test/lib/mtr_im.pl:
  File for IM-related operations.
2006-09-08 16:19:19 +04:00
unknown
9a204629f9 Removed unused variable "glob_cygwin_shell" 2006-09-06 15:06:22 +02:00
unknown
5d3e6c2758 Fixes for crashes and test failures
scripts/make_win_bin_dist:
  BitKeeper file /home/georg/work/mysql/prod/mysql-5.0-win/scripts/make_win_bin_dist
client/mysqlbinlog.cc:
  Fix for cmake build: Cmake doesn't use the VC++ files
extra/comp_err.c:
  fixed windows crash (debug): We can't call DBUG_RETURN after my_end.
include/my_dbug.h:
  added missing empty define for DBUG_LEAVE to prevent precompiler errors when
  compiling in non_debug mode
mysql-test/mysql-test-run.pl:
  Added support for new cmake release and debug paths.
mysql-test/t/system_mysql_db_fix.test:
  This test requires unix shell script mysql_fix_previleges_tables -> skip under windows
mysys/my_seek.c:
  Fix for windows debug crash. However this solution is bad: we should never
  call lseek with an invalid file pointer.
sql/ha_archive.cc:
  Fixed windows crash: We need dup in gzdopen to keep the filehandle open,
  otherwise subsequent calls to mysql_close will fail/crash.
2006-09-01 14:34:37 +02:00
unknown
8ea5f31a46 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  bodhi.local:/opt/local/work/mysql-5.0-14897


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/im_life_cycle.result:
  Auto merged
mysql-test/t/im_life_cycle.imtest:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
mysql-test/r/grant.result:
  Manual merge.
mysql-test/r/view.result:
  Manual merge.
mysql-test/t/grant.test:
  Manual merge.
mysql-test/t/view.test:
  Manual merge.
2006-08-30 00:45:33 +04:00
unknown
33294b1b50 Preliminary patch for the following bugs:
- BUG#15934: Instance manager fails to work;
  - BUG#18020: IM connect problem;
  - BUG#18027: IM: Server_ID differs;
  - BUG#18033: IM: Server_ID not reported;
  - BUG#21331: Instance Manager: Connect problems in tests;

The only test suite has been changed
(server codebase has not been modified).


BitKeeper/deleted/.del-im_check_os.inc:
  Rename: mysql-test/include/im_check_os.inc -> BitKeeper/deleted/.del-im_check_os.inc
mysql-test/include/im_check_env.inc:
  Include only this file from all IM-tests.
mysql-test/lib/mtr_io.pl:
  Update mtr_get_pid_from_file() to workaround race,
  described in BUG#21884.
mysql-test/lib/mtr_process.pl:
  Refactor im_start()/im_stop() so that they will be more
  reliable. There are the following user-visible changes:
    - if one of these functions fails, the test suite
      is aborted;
    - mtr_im_stop() now determines whether the component is
      alive or not not only by checking PID, but also by trying
      to connect to the component;
    - after starting IM, the test suite waits for it to start
      accepting client connections and to start all its guarded
      mysqld instances;
    - a lot of debug-logs have been added in order to simplify
      investigation of future failures.
mysql-test/mysql-test-run.pl:
  1. Get rid of kill_and_cleanup();
  2. Move im_start()/im_stop() to mtr_process.pl;
  3. Change default IM port to 9311 so that it does not interfere
     with default slave port;
mysql-test/r/im_daemon_life_cycle.result:
  Updated result file.
mysql-test/r/im_life_cycle.result:
  Updated result file.
mysql-test/r/im_options_set.result:
  Updated result file.
mysql-test/r/im_options_unset.result:
  Updated result file.
mysql-test/r/im_utils.result:
  Updated result file.
mysql-test/t/im_daemon_life_cycle.imtest:
  Updated IM-test.
mysql-test/t/im_life_cycle.imtest:
  Updated IM-test.
mysql-test/t/im_options_set.imtest:
  Updated IM-test.
mysql-test/t/im_options_unset.imtest:
  Updated IM-test.
mysql-test/t/im_utils.imtest:
  Updated IM-test.
2006-08-29 15:46:40 +04:00
unknown
9aa12815b3 Dont' ever use cluster for slave in 4.1 2006-08-26 18:38:42 +02:00
unknown
48966da630 Ignore --skip-im if specified on command line
Null merge to 5.0


mysql-test/mysql-test-run.pl:
  Ignore --skip-im if specified on command line
2006-08-25 17:01:04 +02:00
unknown
30031bbf37 Add mysqld-max-nt to list of mysqld executales to look for on windows 2006-08-25 15:23:42 +02:00
unknown
28db55a795 Backport from 5.0 a fix that will start ndb only for tests that needs it
mysql-test/lib/mtr_cases.pl:
  Detect which tests that need ndb
mysql-test/lib/mtr_match.pl:
  Add function mtr_match_substring
mysql-test/mysql-test-run.pl:
  Only start cluster for test cases that need it
2006-08-25 15:17:03 +02:00
unknown
f5358d906e Bug#20219 make bin-dist produces unportable for testing tarball
- Setup LD_LIBRARY_PATH to favor local libs


mysql-test/mysql-test-run.pl:
  Setup LD_LIBRARY_PATH so the libraries from this distro/clone are
  used in favor of the system installed ones
2006-08-16 15:25:30 +02:00
unknown
ed44a2ee51 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/func_group.result:
  Merge manually
mysql-test/t/func_group.test:
  Merge manually
2006-08-03 09:32:58 +02:00
unknown
f3919e9284 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge


include/mysql.h:
  Auto merged
include/sql_common.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
mysql-test/r/ps.result:
  Manual merge.
mysql-test/r/sp.result:
  Manual merge.
mysql-test/t/ps.test:
  Manual merge.
mysql-test/t/sp.test:
  Manual merge.
sql/sql_prepare.cc:
  Manual merge.
sql/table.cc:
  Manual merge.
tests/mysql_client_test.c:
  Manual merge.
2006-08-02 14:13:01 +04:00
unknown
de99af6901 Add missing $ 2006-08-01 15:21:09 +02:00
unknown
938d305627 Bug#21367 IM tests do not recognize "win2003-amd64" as Windows
- Disable Instance manager on Windows


mysql-test/mysql-test-run.pl:
  Disable Instance manager on Windows.
2006-08-01 11:35:37 +02:00
unknown
49d721d7cf Don't complain in the error log about IM shutdown unless
BUG#20761 is fixed.
2006-07-27 15:19:13 +04:00
unknown
0227a7b066 Bug#20145 perror segfault when call it with error nr
- Add test case(execute perror)
  - Check if strerror has returned NULL and set msg to "Unknown Error" in that case
  - Thanks to Steven Xie for pointing out how to fix. 


extra/perror.c:
  strerror might return NULL on Solaris 2.8
mysql-test/mysql-test-run.pl:
  Add possibility to execute perror from test case
mysql-test/r/have_perror.require:
  New BitKeeper file ``mysql-test/r/have_perror.require''
mysql-test/r/perror.result:
  New BitKeeper file ``mysql-test/r/perror.result''
mysql-test/t/perror.test:
  New BitKeeper file ``mysql-test/t/perror.test''
2006-07-24 18:05:00 +02:00
unknown
d8180d44b8 Fix for BUG#20716: SHOW INSTANCES statement causes races in IM tests.
Fix for the bug in mysql-test-run.pl which prevents other tests succeed
after IM-test failure.
  
The idea of the fix of BUG#20716 is to:
  1. Check each SHOW INSTANCES statement, add necessary "sleep" instruction before;
  2. Move all environment checkings into the one file and include it everywhere.


mysql-test/mysql-test-run.pl:
  Fix bug in mysql-test-run.pl -- kill leftovers if some
  guarded mysqld-instance is still alive after IM shutdown.
mysql-test/r/im_daemon_life_cycle.result:
  Updated result file.
mysql-test/r/im_life_cycle.result:
  Updated result file.
mysql-test/r/im_options_set.result:
  Updated result file.
mysql-test/r/im_options_unset.result:
  Updated result file.
mysql-test/r/im_utils.result:
  Updated result file.
mysql-test/t/im_daemon_life_cycle.imtest:
  Include im_check_env.inc for the checking of environment.
mysql-test/t/im_life_cycle.imtest:
  Include im_check_env.inc for the checking of environment.
mysql-test/t/im_options_set.imtest:
  Include im_check_env.inc for the checking of environment.
mysql-test/t/im_options_unset.imtest:
  Include im_check_env.inc for the checking of environment.
mysql-test/t/im_utils.imtest:
  Include im_check_env.inc for the checking of environment.
mysql-test/include/im_check_env.inc:
  A new file to be included in each IM-test.
  The statements in the file ensure that starting
  conditions (environment) are as expected.
2006-07-20 13:24:12 +04:00
unknown
3ff8200ac1 Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0
into  zippy.(none):/home/cmiller/work/mysql/m50-maint--07C2P


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
tests/mysql_client_test.c:
  manual merge
2006-07-13 11:11:20 -04:00
unknown
019e221ca1 A patch to Bug#17667 didn't take into consideration that the vardir, which contains
the server's binlog file, might be set to a different directory.  This adds a new
"vardir" parameter, which takes the name of the directory as a value, so that the 
test_bug17667() test can find the binlog.  


mysql-test/mysql-test-run.pl:
  Add the "vardir" to the options passed to "mysql_test_client", so we know 
  where to find the binlog file.
tests/mysql_client_test.c:
  Receive a new option, "vardir".
  
  Use the vardir option to find the binlog file in test_bug17667() .
2006-07-10 16:38:03 -04:00
unknown
8cb6392c9f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into trift2.:/M50/merge-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
2006-07-06 16:03:02 +02:00
unknown
f0e2be1382 Extend the Perl script running the test suite to produce a "Logging:" line (like the shell script does).
mysql-test/mysql-test-run.pl:
  Now that the RPM spec files use the Perl script to run the tests, we also need the "Logging:"
  line in its output, because otherwise we lack the information how the test suite was run.
  Add the line.
2006-07-05 20:17:04 +02:00
unknown
f659c1b740 BUG#20739: __NT__ not probably defined for mysys project.
Make sure for the mysys project that __NT__ is defined in *nt solution
configurations (but not in other configurations).


VC++Files/mysql.sln:
  Define __NT__ in mysys for *nt configurations.
VC++Files/mysys/mysys.vcproj:
  Add configurations with __NT__ defined.
mysql-test/mysql-test-run.pl:
  Also allow testing a "Max nt" build.
2006-06-28 12:30:14 +02:00
unknown
74cabf4ec2 Merge mysql.com:/home/alik/MySQL/devel/5.0-tree
into  mysql.com:/home/alik/MySQL/devel/5.0-rt


mysql-test/mysql-test-run.pl:
  Auto merged
sql/sql_insert.cc:
  Auto merged
2006-06-19 16:57:46 +04:00
unknown
799c5935f0 Small fix for test suite:
- fix for IM stopping routine;
  - polishing.


mysql-test/lib/mtr_process.pl:
  Polishing: make mtr_kill_process() more verbose in debug mode.
mysql-test/mysql-test-run.pl:
  1. Fix stopping of IM running as a daemon -- after death of the main IM
  process, we should wait for the IM angel to die.
  2. Polishing -- be more verbose in debug mode.
2006-06-19 14:15:26 +04:00
unknown
4ef7be4c32 Set default valgrind options to "-v --show-reachable=yes" and make it possible to override that with --valgrind-options
mysql-test/mysql-test-run.pl:
  Make --valgrind-all a synonym for --valgrind.
  Set "-v --show-reachable=yes" as our default valgrind options. 
  Make --valgrind-options override the default options
  Update usage.
  Turn on valgrinding also when user specified --valgrind-path or --valgrind-options without --valgrind
2006-06-16 15:56:08 +02:00
unknown
a6042ffbe9 Merge trift2.mysql.com:/M41/bug20303-4.1
into trift2.mysql.com:/M41/mysql-4.1


mysql-test/mysql-test-run.pl:
  Auto merged
2006-06-09 14:37:24 +02:00
unknown
4f0935c4cb Merge mysql.com:/M41/bug20303-4.1 into mysql.com:/M50/bug20303-5.0
mysql-test/mysql-test-run.pl:
  Auto merged
2006-06-08 19:57:26 +02:00
unknown
f32d05f516 mysql-test/mysql-test-run.pl : Output the usage error if one is given. (Found when fixing bug#20303)
mysql-test/mysql-test-run.pl:
  Found when fixing bug#20303: The "usage()" function ignored the message it was given,
  so we got no real indication about the problem. Print it if one is given.
2006-06-08 19:55:22 +02:00
unknown
4f192a1e9e Merge mysql.com:/M41/bug20303-4.1 into mysql.com:/M50/bug20303-5.0
mysql-test/mysql-test-run.pl:
  Auto merged
2006-06-08 19:32:25 +02:00
unknown
d0d69b7676 mysql-test/mysql-test-run.pl : A fix for bug#20303 "mysql-test-run.pl: Does not recognize -- argument"
mysql-test/mysql-test-run.pl:
  A fix for bug#20303 "mysql-test-run.pl: Does not recognize -- argument":
  Due to the use of 'pass_through' in option processing this lone '--' will remain
  as an argument, it must be ignored explicitly.
2006-06-08 14:52:33 +02:00