433d3e6cf7
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-08 14:55:39 +01:00
a15fe85de2
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/50
2007-03-07 06:54:35 +01:00
94c616d186
Bug #26792 Add DBX debugger support to mysql-test-run.pl
...
- Add --debugger=dbx
- Fix --debugger=devenv, --debugger=DevEnv and --debugger=/path/devenv
2007-03-05 09:52:40 +01:00
df5c5aea23
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base
...
into weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
2007-03-01 14:06:57 -07:00
d1d64ba50f
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-01 19:10:07 +01:00
86625d711f
Fix bug in mtr.pl where slave wes using same query log file as master
2007-03-01 18:31:09 +01:00
f5778fc73e
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-01 18:12:56 +01:00
05ed84a3d2
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166
2007-02-28 15:04:20 +01:00
e391b86fb0
Bug#20166 mysql-test-run.pl does not test system privilege tables creation
...
- Split out initial data in mysql_system_tables.sql to it's own file
- Use file from mysql_install_db and mysql-test-run
2007-02-28 14:26:58 +01:00
c0da93cd97
When using a --mem=<dir> the memdir must be removed to assure
...
afresh start
2007-02-28 13:47:41 +01:00
14cfc7e1ba
Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-27 14:54:33 +01:00
eb135547eb
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-26 14:56:23 +01:00
23b6b4a565
Only allow a version number to be read from "/etc/debian_version"
2007-02-26 14:52:51 +01:00
c550a45522
Bug#20166 mysql-test-run.pl does not test system privilege tables creation
...
- Use mysql_system_tables.sql to create MySQL system tables in
all places where we create them(mysql_install_db, mysql-test-run-pl
and mysql_fix_privilege_tables.sql)
2007-02-26 11:49:24 +01:00
77079d385d
Fix shutdown delay option name according to The Manual.
2007-02-24 13:10:04 +03:00
90115eac42
Fix mysql-test-run.pl: IM in 5.0 uses old incorrect
...
'shutdown_delay' option name.
2007-02-23 21:51:33 +03:00
8f5c21172c
BUG#24415: im_daemon_life_cycle.imtest fails
...
Fix timeouts. Only test suite is changed.
2007-02-23 20:24:32 +03:00
26aa385bc5
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2007-02-21 14:07:08 +02:00
222e128b34
Fixed unsafe define of uint4korr()
...
Fixed that --extern works with mysql-test-run.pl
Small trivial cleanups
2007-02-21 13:02:57 +02:00
bcd368fcfb
Bug#20166 mysql-test-run.pl does not test system privilege tables creation
...
- Add test of bootstrap mode
- Make mysqld return error if bootstrap failed
2007-02-20 12:48:15 +01:00
b57994a7c2
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-16 15:23:27 +01:00
8931166e55
Workaround for problem where cygwin's bash/sh randomly fails with error 128 which
...
mainly occurs on win2003 64bit.
- Execute "exec" commands directly with cmd.exe and replace "--exec echo ..." with "--exec .\echo.exe ..."
2007-02-16 15:19:38 +01:00
24a242bee1
Merge pilot.mysql.com:/home/msvensson/mysql/bug18628/my50-bug18628
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-02-14 14:45:15 +01:00
45fe5879f4
Bug#18628 mysql-test-run: security problem(part1)
...
- Implement --secure-file-priv=<dir> option that limits
"load_file", "LOAD DATA" and "SELECT .. INTO OUTFILE" to work
with files in specified dir.
- Use above option for mysqld in mysql-test-run.pl
2007-02-14 14:44:34 +01:00
b6bd53aa9d
Correct the non working check for --skip-log-bin in "extra_opt"
2007-02-06 16:38:32 +01:00
61686e8556
Merge pilot.mysql.com:/home/msvensson/mysql/bug24805/my50-bug24805
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-02-06 14:30:23 +01:00
958308a5cf
Bug#24805 mtr.pl can't handle test with --disable-log-bin
...
- Don't give mysqld the --log-bin argument if .opt file
contains --skip-log-bin
- Enable flush2 test
2007-02-06 14:19:07 +01:00
a795b7097f
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2007-01-31 16:26:12 -05:00
ad66e7a0dd
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-01-31 16:23:05 -05:00
c5de0332e1
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2007-01-22 16:39:40 +01:00
c124372550
after-merge fix
2007-01-22 16:32:57 +01:00
58bf072264
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work1-testcases-20061
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
2007-01-22 16:30:53 +01:00
854ef6b0a3
Merge ymer.(none):/usr/local/mysql/mysql-4.1-maint
...
into ymer.(none):/usr/local/mysql/x/mysql-5.0-maint
2007-01-22 08:59:26 +01:00
ba6e6d0754
Implement mysql-test-run.pl option to limit the number of saved core
...
files. This helps stability of multiple parallel automated test runs,
avoiding the situation where one bad build fills up disk with 1000s of
core files, causing failures in other test runs.
2007-01-19 09:41:08 +01:00
896e2623eb
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-01-11 09:43:44 -05:00
bac65ee90a
WL #3670 : Compile-time option to remove GRANT-related startup options
...
- configure --disable-grant-options defines DISABLE_GRANT_OPTIONS
- configure.js/cmake also updated
- if DISABLE_GRANT_OPTIONS is defined, mysqld no longer recognizes:
--bootstrap
--init-file
--skip-grant-tables
Scripts which rely on those three options are modified to check the environment for MYSQLD_BOOTSTRAP; it should be set to the full path of a mysqld which does handle those options.
For example:
$ export MYSQLD_BOOTSTRAP
$ MYSQLD_BOOTSTRAP=/path/to/full/MySQL/bin/mysqld
$ mysql_install_db
$ make test
2007-01-09 19:22:01 -07:00
bb108f57c1
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into siva.hindu.god:/usr/home/tim/m/bk/50
2006-12-22 13:41:10 -07:00
b28e8faf23
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2006-12-22 10:00:12 +01:00
73d82523a3
Set default number of masters to 1
2006-12-22 09:59:41 +01:00
f204db4dd1
Merge siva.hindu.god:/usr/home/tim/m/bk/g50
...
into siva.hindu.god:/usr/home/tim/m/bk/50
2006-12-21 18:20:09 -07:00
fe0a11d194
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-20 23:59:34 +01:00
da6773f97b
Count number of masters the test is actually using and only start as
...
many as neeeded
2006-12-20 23:44:53 +01:00
5ccd3608d5
When running with --valgrind and --debug send all the output from
...
mysqld and valgrind to tracefile.
2006-12-20 16:54:37 +01:00
be0368c230
Add possibility to activate --mark-progress of mysqltest
2006-12-20 16:53:06 +01:00
5ad288f18b
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2006-12-18 13:44:57 +01:00
4a98f36e59
Use a temporary directory for sockets if the socket path becomes too long.
2006-12-18 13:44:21 +01:00
fdbc84d27c
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-11 12:33:44 +01:00
ba6d2bbf64
Pass --no-defaults to embedded server to avoid that it reads any defaults file
2006-12-11 12:16:20 +01:00
128b73fc36
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-04 19:28:38 +01:00
33c248eee5
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-12-04 19:06:42 +01:00
