Commit graph

466 commits

Author SHA1 Message Date
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