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

3901 Commits

Author SHA1 Message Date
guilhem@gbichot3.local
1cc3c80070 fixes after merge. Updates to test's results.
We now reset the THD members related to auto_increment+binlog in
MYSQL_LOG::write(). This is better than in THD::cleanup_after_query(),
which was not able to distinguish between SELECT myfunc1(),myfunc2()
and INSERT INTO t SELECT myfunc1(),myfunc2() from a binlogging point
of view.
Rows_log_event::exec_event() now calls lex_start() instead of
mysql_init_query() because the latter now does too much (it resets
the binlog format).
2006-07-10 18:41:03 +02:00
unknown
3a3a5622ab Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
into  gbichot3.local:/home/mysql_src/mysql-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
sql/sql_base.cc:
  Auto merged
2006-07-10 13:26:46 +02:00
guilhem@gbichot3.local
93ce19dfb6 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
into  gbichot3.local:/home/mysql_src/mysql-5.1
2006-07-10 13:26:46 +02:00
unknown
00abe21200 Fixing problem where the command line for MYSQL_DUMP_SLAVE was not
set properly.
2006-07-10 12:06:30 +02:00
mats@romeo.(none)
7848edd065 Fixing problem where the command line for MYSQL_DUMP_SLAVE was not
set properly.
2006-07-10 12:06:30 +02:00
unknown
8ceaccb3fa Merge cleanup, with a change of verbose test status to Off.
mysql-test/lib/mtr_process.pl:
  Resolved a previous bad merge of two different attempts at fixing the same problem.
mysql-test/mysql-test-run.pl:
  Default for verbose should be Off.
2006-07-07 10:47:51 -04:00
cmiller@zippy.(none)
a3b2340357 Merge cleanup, with a change of verbose test status to Off. 2006-07-07 10:47:51 -04:00
unknown
94b92361bd Fix for BUG#20349 "mysql-test-run.pl needs to add --debug to
mysql_client_test like mysql-test-run". Nothing to document.


mysql-test/mysql-test-run.pl:
  if --debug, add debugging of mysql_client_test (useful at least to know what
  insert_id values it receives in the ok packets of INSERT).
2006-07-06 18:01:32 +02:00
guilhem@gbichot3.local
a4768e115a Fix for BUG#20349 "mysql-test-run.pl needs to add --debug to
mysql_client_test like mysql-test-run". Nothing to document.
2006-07-06 18:01:32 +02:00
unknown
b5faf11ab6 Merge gbichot3.local:/home/mysql_src/mysql-5.1
into  gbichot3.local:/home/mysql_src/mysql-5.1-new-WL3146-handler


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/rpl_row_create_table.result:
  Auto merged
mysql-test/t/rpl_row_create_table.test:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
2006-07-06 17:56:26 +02:00
guilhem@gbichot3.local
3ce7e9fc0c Merge gbichot3.local:/home/mysql_src/mysql-5.1
into  gbichot3.local:/home/mysql_src/mysql-5.1-new-WL3146-handler
2006-07-06 17:56:26 +02:00
unknown
81bb604c63 Behaviour change of mysql-test-run.pl:
by default we never run disabled tests (even if they're
explicitely listed on the command-line). We add an option --enable-disabled
which will run tests even though they are disabled, and will print, for each
such test, the comment explaining why it was disabled.
The reason for the change is when you want to run "all tests which are about
NDB" for example: mysql-test-run.pl t/*ndb*.test used to run some disabled
NDB tests, causing failures, causing investigations.
Code amended and approved by Kent.


mysql-test/lib/mtr_cases.pl:
  always detect if a test is listed as disabled, and read the comment why is is.
  If it is listed, don't run the test, except if
  --enable-disabled was given, then mark the test as to-run-even-
  though-it-is-listed-as-disabled.
mysql-test/lib/mtr_report.pl:
  Report tests which will run though they are listed as disabled
  (does something only if --enable-disabled).
mysql-test/mysql-test-run.pl:
  New behaviour: by default we never run disabled tests (even if they're
  explicitely listed on the command-line). We add an option --enable-disabled
  which will run tests even though they are disabled, and will print, for each
  such test, the comment explaining why it was disabled.
2006-07-06 17:40:36 +02:00
guilhem@gbichot3.local
fd520be817 Behaviour change of mysql-test-run.pl:
by default we never run disabled tests (even if they're
explicitely listed on the command-line). We add an option --enable-disabled
which will run tests even though they are disabled, and will print, for each
such test, the comment explaining why it was disabled.
The reason for the change is when you want to run "all tests which are about
NDB" for example: mysql-test-run.pl t/*ndb*.test used to run some disabled
NDB tests, causing failures, causing investigations.
Code amended and approved by Kent.
2006-07-06 17:40:36 +02: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
joerg@trift2.
a873811ae8 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into trift2.:/M50/merge-5.0
2006-07-06 16:03:02 +02:00
unknown
30de4903ae Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new-maint


BUILD/compile-dist:
  Auto merged
BitKeeper/deleted/.del-partition_innodb.result:
  Auto merged
BitKeeper/deleted/.del-partition_innodb.test:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/create_not_windows.result:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/innodb_mysql.test:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/wait_timeout.test:
  Auto merged
mysys/my_lib.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/unireg.cc:
  Auto merged
mysql-test/extra/rpl_tests/rpl_log.test:
  manuakl merge
mysql-test/lib/mtr_process.pl:
  manuakl merge
mysql-test/mysql-test-run.pl:
  manuakl merge
mysql-test/r/type_newdecimal.result:
  manuakl merge
mysql-test/t/create.test:
  manuakl merge
mysql-test/t/func_group.test:
  manuakl merge
mysql-test/t/type_newdecimal.test:
  manuakl merge
2006-07-05 16:16:09 -04:00
cmiller@zippy.(none)
91b8b26411 Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
2006-07-05 16:16:09 -04:00
unknown
066cac122d Merge mysql.com:/M50/merge-5.0 into mysql.com:/M51/merge-5.1
mysql-test/mysql-test-run.pl:
  Auto merged
2006-07-05 21:47:09 +02:00
joerg@trift2.
bf3f0b3806 Merge mysql.com:/M50/merge-5.0 into mysql.com:/M51/merge-5.1 2006-07-05 21:47:09 +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
joerg@mysql.com
c9dc1184fd Extend the Perl script running the test suite to produce a "Logging:" line (like the shell script does). 2006-07-05 20:17:04 +02:00
unknown
508e370433 Merge mysql.com:/users/lthalmann/bk/mysql-5.0-rpl
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-rpl


BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822:
  Auto merged
mysql-test/t/rpl_openssl.test:
  Auto merged
sql/log.cc:
  Auto merged
BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
  Deleted file in 5.1 (removed)
BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
  Deleted file in 5.1 (removed)
include/my_sys.h:
  Manual merge
mysql-test/mysql-test-run.pl:
  Manual merge
2006-06-28 15:27:25 +02:00
lars@mysql.com
c75584d8d9 Merge mysql.com:/users/lthalmann/bk/mysql-5.0-rpl
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-rpl
2006-06-28 15:27:25 +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
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