1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-13 21:42:58 +03:00
Commit Graph

3977 Commits

Author SHA1 Message Date
knielsen@mysql.com
529a2d1291 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).
2006-06-28 12:30:14 +02:00
unknown
46845cf357 Merge mysql.com:/home/alik/MySQL/devel/5.0-to-be-merged
into  mysql.com:/home/alik/MySQL/devel/5.1-merged


BitKeeper/deleted/.del-im_life_cycle-im.opt:
  Delete: mysql-test/t/im_life_cycle-im.opt
BitKeeper/deleted/.del-im_utils-im.opt:
  Delete: mysql-test/t/im_utils-im.opt
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/im_daemon_life_cycle.result:
  Auto merged
mysql-test/r/im_utils.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/im_daemon_life_cycle-im.opt:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
server-tools/instance-manager/instance_map.cc:
  Auto merged
mysql-test/r/im_life_cycle.result:
  Manually merged.
mysql-test/r/insert.result:
  Manually merged.
mysql-test/t/im_daemon_life_cycle.imtest:
  Manually merged.
mysql-test/t/im_life_cycle.imtest:
  Manually merged.
mysql-test/t/im_utils.imtest:
  Manually merged.
mysql-test/t/insert.test:
  Manually merged.
server-tools/instance-manager/guardian.cc:
  Manually merged.
server-tools/instance-manager/manager.cc:
  Manually merged.
sql/sql_insert.cc:
  Manually merged.
2006-06-20 18:28:28 +04:00
anozdrin@mysql.com
42ef881906 Merge mysql.com:/home/alik/MySQL/devel/5.0-to-be-merged
into  mysql.com:/home/alik/MySQL/devel/5.1-merged
2006-06-20 18:28:28 +04:00
unknown
a25fc95dd9 Merge
sql/item_func.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
storage/ndb/Makefile.am:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
BUILD/compile-dist:
  SCCS merged
netware/Makefile.am:
  SCCS merged
netware/BUILD/compile-netware-END:
  SCCS merged
2006-06-20 11:11:18 +02:00
kent@mysql.com
8f0aa436ed Merge 2006-06-20 11:11:18 +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
anozdrin@mysql.com
4afffb40a8 Merge mysql.com:/home/alik/MySQL/devel/5.0-tree
into  mysql.com:/home/alik/MySQL/devel/5.0-rt
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
anozdrin@mysql.com
a142a4d97b Small fix for test suite:
- fix for IM stopping routine;
  - polishing.
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
msvensson@neptunus.(none)
0a15f9d0bf Set default valgrind options to "-v --show-reachable=yes" and make it possible to override that with --valgrind-options 2006-06-16 15:56:08 +02:00
unknown
aace9afb44 Add extra parameter to 'ndbcluster_wait_started' so it can be used to wait until ndb_mgmd has started 2006-06-15 22:12:05 +02:00
msvensson@shellback.(none)
00d7da9177 Add extra parameter to 'ndbcluster_wait_started' so it can be used to wait until ndb_mgmd has started 2006-06-15 22:12:05 +02:00
unknown
0224c9deeb Improved handling of marking processes as dead
Run ndb_mgmd as deamon
Make extra attempt to check if processes are still alive


mysql-test/lib/mtr_process.pl:
  Add common function to mark processes as dead
  When all attempts to kil processes has failed make an extra attempt with ping to check if they really are still alive
mysql-test/mysql-test-run.pl:
  Run ndb_mgmd with --nodaemon
2006-06-15 18:40:18 +02:00
msvensson@shellback.(none)
7007dbdf2c Improved handling of marking processes as dead
Run ndb_mgmd as deamon
Make extra attempt to check if processes are still alive
2006-06-15 18:40:18 +02:00
unknown
50941b923a Remove opt_old_master, using a 4.0 mysqld with mysql-test-run.pl from 5.1 is not supported 2006-06-14 21:46:41 +02:00
msvensson@neptunus.(none)
ec07987651 Remove opt_old_master, using a 4.0 mysqld with mysql-test-run.pl from 5.1 is not supported 2006-06-14 21:46:41 +02:00
unknown
edec3302c8 Cleanup ndb options 2006-06-14 21:45:15 +02:00
msvensson@neptunus.(none)
c7b9472a6d Cleanup ndb options 2006-06-14 21:45:15 +02:00
unknown
9cda709ed6 Remove opt_local, noone knows what it should do
mysql-test/lib/mtr_stress.pl:
  Remove remnant of opt_local_master
2006-06-14 20:36:23 +02:00
msvensson@neptunus.(none)
79bdcc49c9 Remove opt_local, noone knows what it should do 2006-06-14 20:36:23 +02:00
unknown
c91124e267 Print error if using --debug and binaries does not support it 2006-06-14 11:59:04 +02:00
msvensson@neptunus.(none)
dd1ef2d138 Print error if using --debug and binaries does not support it 2006-06-14 11:59:04 +02:00
unknown
bd4c449ff5 Fix warnings
Make list of tags/name/values to simplify adding more tags
Check if debug compiled binaries


mysql-test/lib/mtr_cases.pl:
  Fix warnings
  Use local file handle for recursive "include file" loop
  Make list of tags/name/value to search for in .test files
  Add fileter for "require debug compiled binary"
mysql-test/lib/mtr_process.pl:
  Fix warnings
mysql-test/lib/mtr_report.pl:
  Fix warning, only print total time if "--timer"
mysql-test/mysql-test-run.pl:
  Fix warnings
  Add check of debug compiled binaries
2006-06-11 23:13:32 +02:00
msvensson@neptunus.(none)
f84338557a Fix warnings
Make list of tags/name/values to simplify adding more tags
Check if debug compiled binaries
2006-06-11 23:13:32 +02:00
unknown
36495cba3b Add more checks to determine if test can be skipped becuase the feature it uses are not supported.
Check for big-test, ndb-extra, require_manager and binlog format row/stmt
2006-06-11 15:49:34 +02:00
msvensson@neptunus.(none)
582bf12fd4 Add more checks to determine if test can be skipped becuase the feature it uses are not supported.
Check for big-test, ndb-extra, require_manager and binlog format row/stmt
2006-06-11 15:49:34 +02:00
unknown
312c46933a Change 'mtr_kill_process' to only take three arguments. The last indicating max number of seconds to wait for process to be killed.
Leave it to the implementation of 'mtr_kill_process' how long to wait between each attempt to kill/detect if process has been killed.


mysql-test/lib/mtr_process.pl:
  Change 'mtr_kill_process' to only take three arguments. The last indicating max number of seconds to wait for process to be killed.
mysql-test/mysql-test-run.pl:
  Change 'mtr_kill_process' to only take three arguments. The last indicating max number of seconds to wait for process to be killed.
2006-06-11 11:28:11 +02:00
msvensson@neptunus.(none)
a25cc0b933 Change 'mtr_kill_process' to only take three arguments. The last indicating max number of seconds to wait for process to be killed.
Leave it to the implementation of 'mtr_kill_process' how long to wait between each attempt to kill/detect if process has been killed.
2006-06-11 11:28:11 +02:00
unknown
f29fbcde08 Prepare for selective restart of slaves
Add comment why test is skipped


mysql-test/lib/mtr_cases.pl:
  Add comments why tets is skipped
  Disable the use of --skip-innodb if test does not need it
mysql-test/lib/mtr_report.pl:
  Print commment why test was skipped
2006-06-11 10:10:55 +02:00
msvensson@neptunus.(none)
ade1b6ce11 Prepare for selective restart of slaves
Add comment why test is skipped
2006-06-11 10:10:55 +02:00
unknown
8b909a27d1 Add comment about when ndbcluster tables are removed from mysqld datadir 2006-06-10 22:10:57 +02:00
msvensson@neptunus.(none)
c7bedca12f Add comment about when ndbcluster tables are removed from mysqld datadir 2006-06-10 22:10:57 +02:00
unknown
f8c3312caf Cacluate nodeid and ndb_fs path when initializing ndbds, to be used when defining log files and when removing the ndb_fs after failed test case 2006-06-10 21:47:25 +02:00
msvensson@neptunus.(none)
d13d9dec55 Cacluate nodeid and ndb_fs path when initializing ndbds, to be used when defining log files and when removing the ndb_fs after failed test case 2006-06-10 21:47:25 +02:00
unknown
61a5962640 Use foreach loop to remove fs for ndbd nodes when restoring snapshot 2006-06-10 21:20:14 +02:00
msvensson@neptunus.(none)
da9d2e3270 Use foreach loop to remove fs for ndbd nodes when restoring snapshot 2006-06-10 21:20:14 +02:00
unknown
fd3feec352 Use function 'stop_all_servers' to stop the running servers before restoring snapshot and resuming tests 2006-06-10 20:59:14 +02:00
msvensson@neptunus.(none)
0dc04dd7f1 Use function 'stop_all_servers' to stop the running servers before restoring snapshot and resuming tests 2006-06-10 20:59:14 +02:00
unknown
d889c1a8bd Merge bk-internal:/home/bk/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


BUILD/compile-dist:
  Auto merged
client/mysqltest.c:
  Auto merged
config/ac-macros/ssl.m4:
  Auto merged
include/config-win.h:
  Auto merged
include/my_base.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/group_min_max.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/rpl_insert_id_pk.result:
  Auto merged
mysql-test/r/rpl_ndb_multi_update3.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/r/rpl_ndb_sp006.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysys/my_clock.c:
  Auto merged
mysys/my_copy.c:
  Auto merged
mysys/my_create.c:
  Auto merged
mysys/my_dup.c:
  Auto merged
mysys/my_lib.c:
  Auto merged
mysys/my_open.c:
  Auto merged
mysys/my_redel.c:
  Auto merged
mysql-test/r/create.result:
  Manual merge
mysql-test/r/innodb_mysql.result:
  Manual merge
mysql-test/r/join_outer.result:
  Manual merge
mysql-test/t/func_group.test:
  Manual merge
mysql-test/t/group_min_max.test:
  Manual merge
mysql-test/t/innodb_mysql.test:
  Manual merge
2006-06-10 20:33:50 +02:00
msvensson@neptunus.(none)
2c538f6cde Merge bk-internal:/home/bk/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-06-10 20:33:50 +02:00
unknown
c31ab099b4 Run check testcase for all masters and slaves 2006-06-10 19:33:37 +02:00
msvensson@neptunus.(none)
b24fbccc95 Run check testcase for all masters and slaves 2006-06-10 19:33:37 +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
joerg@trift2.mysql.com
44c0053a44 Merge trift2.mysql.com:/M41/bug20303-4.1
into trift2.mysql.com:/M41/mysql-4.1
2006-06-09 14:37:24 +02:00
unknown
2da24bb6b5 Merge mysql.com:/M51/bug20303-5.1 into mysql.com:/M51/mysql-5.1
mysql-test/mysql-test-run.pl:
  Auto merged
2006-06-09 13:56:29 +02:00
joerg@trift2.
7987ef89fd Merge mysql.com:/M51/bug20303-5.1 into mysql.com:/M51/mysql-5.1 2006-06-09 13:56:29 +02:00
unknown
741edd2e80 Merge mysql.com:/M50/bug20303-5.0 into mysql.com:/M51/bug20303-5.1
mysql-test/mysql-test-run.pl:
  Auto merged
2006-06-09 13:49:10 +02:00
joerg@mysql.com
98b80d12cd Merge mysql.com:/M50/bug20303-5.0 into mysql.com:/M51/bug20303-5.1 2006-06-09 13:49:10 +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