1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-18 23:03:28 +03:00
Commit Graph

840 Commits

Author SHA1 Message Date
d8870f2bb3 Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into  shellback.(none):/home/msvensson/mysql/work/my51-work
2006-09-19 18:41:48 +02:00
883a3809c9 Pass --debug arguments to mysqld also when bootstrapping if --debug is tunrned on 2006-09-19 18:39:04 +02:00
ee5ca6e231 Merge shellback.(none):/home/msvensson/mysql/work/my51-work
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-09-19 17:47:53 +02:00
1b3094187a Fix warnings in mysql-test-run.pl 2006-09-19 17:45:27 +02:00
1515818276 Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-19 17:40:49 +02:00
0e7d18d8e4 Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into  shellback.(none):/home/msvensson/mysql/work/my51-work
2006-09-19 17:08:07 +02:00
fa26e83fd2 Fix warnings in mysql-test-run.pl 2006-09-19 16:43:42 +02:00
db1adb2234 Fix merge error, path_mysock has been renamed to path_sock 2006-09-18 19:38:59 +02:00
7dabd8c683 Merge shellback.(none):/home/msvensson/mysql/work/my51-work
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-09-18 18:06:10 +02:00
8244e4fb73 Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into  shellback.(none):/home/msvensson/mysql/work/my51-work
2006-09-18 18:04:47 +02:00
781aaaba66 Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-18 17:47:26 +02:00
dafb50055f Add character-sets-dir argument to "mysql". That avoids a local
installed charset dir being used.
2006-09-18 17:46:36 +02:00
16c07bd02c No need to use environment variable NDB_STATUS_OK and NDB_SLAVE_STATUS_OK anymore
when mysql-test-run.pl has full control of all ndb processes. It will now know if
install has failed.
2006-09-18 12:45:04 +02:00
60b395a950 Remove extra semicolon 2006-09-18 12:24:10 +02:00
f415523c17 Merge bk-internal:/home/bk/mysql-5.1-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-09-18 11:34:07 +02:00
dedcdda5df BUG#22396 crash_commit_before
- Disable generation of core file and stacktrace when running this testcase, which would
   otherwise mark the whole testsuite as failed.
2006-09-17 20:54:06 +02:00
66808ead4e Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-09-15 18:18:18 -04:00
5ba1b83c98 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
2006-09-14 23:53:35 +04:00
fd15a84c55 Merge neptunus.(none):/home/msvensson/mysql/my50-netware-mtr
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-14 11:01:23 +02:00
53e2342246 Merge neptunus.(none):/home/msvensson/mysql/my50-netware-mtr
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-09-14 10:59:49 +02:00
a1810201f6 Use the mtr_file_exists function to detect if ndbapi_example is available 2006-09-11 12:15:04 +02:00
e03a0617a0 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-09-08 16:01:51 +02:00
8ce37febef Fix problem running mysql-test-run.pl when running in a clone not compiled with ndb support 2006-09-08 15:55:11 +02:00
c9e76d514a 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.
2006-09-08 16:41:35 +04:00
f564e7f8a5 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
2006-09-08 16:19:19 +04:00
41001755f2 Removed unused variable "glob_cygwin_shell" 2006-09-06 15:06:22 +02:00
75eeececb1 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-runtime
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-wl3337
2006-09-06 14:35:27 +02:00
5f5cb7d1f6 Merge maint2.mysql.com:/data/localhome/tsmith/bk/g51
into  maint2.mysql.com:/data/localhome/tsmith/bk/51
2006-09-04 23:05:17 +02:00
51e4432b79 mysql-test-run.pl:
'reorder' default off until test cases fixed.
2006-09-02 13:30:37 +02:00
906d17779b Turn on reorder as default. 2006-09-01 16:56:46 +02:00
04a62eb684 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-09-01 15:26:03 +02:00
8fdc781d39 Fixed ndbapi-examples, and added tests for mysql-test-run.pl 2006-09-01 15:14:50 +02:00
5686da41ac Fixes for crashes and test failures 2006-09-01 14:34:37 +02:00
4d359b80c6 Turn off reorder as default 2006-09-01 12:27:28 +02:00
9bdc99f130 Use "--skip-innodb" if running with testcases that does not need innodb
Decreases test time when running a selected number of tests
2006-09-01 10:01:47 +02:00
7f243b8d19 Only install the first masters db and copy it for the other
Gives slightly faster startup
2006-08-31 20:58:00 +02:00
31df5d1d0d Merge bk-internal:/home/bk/mysql-5.1-new-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-08-31 10:33:35 +02:00
71450a865f Bug#21721 Test suite does not start with NDB, hangs forever; problem around "ndb_mgmd"
- Wait for ndb_mgmd with timeout
2006-08-31 10:28:48 +02:00
7290fa2fb7 Post-merge fixes. 2006-08-30 23:09:47 +04:00
f8d34e1030 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  bodhi.local:/opt/local/work/mysql-5.0-14897
2006-08-30 00:45:33 +04:00
1a7cb4153c 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).
2006-08-29 15:46:40 +04:00
4703f302fe Dont' ever use cluster for slave in 4.1 2006-08-26 18:38:42 +02:00
5abbe9eb00 Ignore --skip-im if specified on command line
Null merge to 5.0
2006-08-25 17:01:04 +02:00
7e8f06c46f Add mysqld-max-nt to list of mysqld executales to look for on windows 2006-08-25 15:23:42 +02:00
f0c4aba723 Backport from 5.0 a fix that will start ndb only for tests that needs it 2006-08-25 15:17:03 +02:00
030cbd2f73 Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1
into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint
2006-08-24 19:11:51 +02:00
01412f2bd9 Break out functions do_before_run_mysqltest and do_after_run_mysqltest 2006-08-23 15:35:24 +02:00
f2f90320de Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
2006-08-21 12:59:46 -04:00
f5ffa66c6e Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1
into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1
2006-08-21 17:16:27 +02:00
47d6296bc7 mysql-test/mysql-test-run.pl : Use fixed path names for all NDB binaries,
because searching for them makes the script abort with all non-NDB builds.
2006-08-21 16:19:29 +02:00