msvensson@pilot.blaudden
4367b151c2
Switch back to master before cleanup of the created tables
...
That causes test case for bug#6880 to be run on the master
instead of the slave and thus the result files need to be updated
2007-03-01 15:25:42 +01:00
msvensson@pilot.blaudden
51a71fb667
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-01 14:53:32 +01:00
msvensson@pilot.blaudden
6b4a71659e
Make sure tests drops objects created and restore variables to default
2007-03-01 14:16:38 +01:00
msvensson@pilot.blaudden
a49d6c5f51
There is no .sql files in mysql-test/lib/ anymore, don't try to copy from there
2007-03-01 07:23:37 +01:00
msvensson@pilot.blaudden
3110418d6f
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-02-28 22:27:17 +01:00
msvensson@pilot.blaudden
45fde92fb3
Bug #25074 mysql_upgrade test can't give consistent results
...
- Remove from disabled list
- Update test result
2007-02-28 21:29:14 +01:00
msvensson@pilot.blaudden
ab61d07a30
Merge pilot.blaudden:/home/msvensson/mysql/bug25074/my50-bug25074
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-28 21:21:37 +01:00
msvensson@pilot.blaudden
dd710c17ec
Merge pilot.blaudden:/home/msvensson/mysql/bug25074/my50-bug25074
...
into pilot.blaudden:/home/msvensson/mysql/bug25074/my51-bug25074-new
2007-02-28 21:19:12 +01:00
msvensson@pilot.blaudden
cc7e77c5fd
Bug #25074 mysql_upgrade test can't give consistent results
...
- Tell the programs executed by mysql_upgrade to only read
from the defaults file generated by msyql_upgrade
- Fix memory leaks
2007-02-28 21:05:39 +01:00
msvensson@pilot.blaudden
d56d34805c
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-02-28 20:45:07 +01:00
msvensson@pilot.blaudden
0b4598a4b3
Bug #20166 mysql-test-run.pl does not test system privilege tables creation
...
- No .sql files in mysql-test/lib/ anymore, don't copy them
2007-02-28 20:44:49 +01:00
msvensson@pilot.blaudden
bfb417533a
Bug#20166 mysql-test-run.pl does not test system privilege tables creation
...
- Additional fixes caused by running without anonymous users
2007-02-28 20:33:59 +01:00
msvensson@pilot.blaudden
400a58e9c8
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-02-28 16:46:30 +01:00
msvensson@pilot.blaudden
bb88d4a2b1
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-02-28 16:45:54 +01:00
msvensson@pilot.blaudden
3648941ecc
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-28 16:45:41 +01:00
msvensson@pilot.blaudden
9591b9e922
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-02-28 16:41:30 +01:00
msvensson@pilot.blaudden
162f0803bb
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint-bug20166
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-02-28 16:40:50 +01:00
msvensson@pilot.blaudden
6fac51be9f
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-28 16:40:03 +01:00
msvensson@pilot.blaudden
b0ab925389
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-28 16:39:26 +01:00
msvensson@pilot.blaudden
b6fd729beb
Merge pilot.blaudden:/home/msvensson/mysql/bug24878/my41-bug24878
...
into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-02-28 16:38:31 +01:00
msvensson@pilot.blaudden
6ca22c6672
Bug#24878 mysql server doesn't log incident time in "mysqld got signal 11" error messages
...
- Add printout of current time when mysqld is killed by an
unhandled signal
2007-02-28 16:37:50 +01:00
msvensson@pilot.blaudden
fb36bf9562
Bug#20166 mysql-test-run.pl does not test system privilege tables creation
...
- Null merge 4.1 patch
2007-02-28 15:15:38 +01:00
msvensson@pilot.blaudden
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
msvensson@pilot.blaudden
3fc549d430
Bug#20166 mysql-test-run.pl does not test system privilege tables creation
...
- Build lib/init-db.sql from the output of mysql_create_system_tables
- Remove mysql-test/init_db.sql and mysql-test/lib/init_db.sql
- Leave netware/init_db.sql until 5.0 where we should soon have possibility
to test with mysql-test-run.pl
2007-02-28 15:03:47 +01:00
msvensson@pilot.blaudden
3fc963f169
Bug#20166 mysql-test-run.pl does not test system privilege tables creation
2007-02-28 14:58:19 +01:00
msvensson@pilot.blaudden
9cfd569174
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-28 14:41:57 +01:00
msvensson@pilot.blaudden
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
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
d966a8ebd4
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b25834/b25834.5.0
2007-02-28 17:18:19 +04:00
msvensson@pilot.blaudden
f63240f901
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-02-28 13:48:43 +01:00
msvensson@pilot.blaudden
6ea41f355c
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-28 13:47:59 +01:00
msvensson@pilot.blaudden
c0da93cd97
When using a --mem=<dir> the memdir must be removed to assure
...
afresh start
2007-02-28 13:47:41 +01:00
gluh@mysql.com/eagle.(none)
2baf35b4fa
added initialization of 'cmp_type' variable(to remove compiler warning)
2007-02-28 15:44:57 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
1b83d62f41
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/home/ram/work/b25834/b25834.5.1
2007-02-28 14:57:05 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
ae7d65569d
Merge mysql.com:/home/ram/work/b25834/b25834.5.0
...
into mysql.com:/home/ram/work/b25834/b25834.5.1
2007-02-28 14:37:09 +04:00
msvensson@pilot.blaudden
d3a12073f9
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-02-28 11:21:54 +01:00
msvensson@pilot.blaudden
44c56e35b6
Merge pilot.blaudden:/home/msvensson/mysql/bug25197/my50-bug25197
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-28 11:21:29 +01:00
msvensson@pilot.blaudden
a3317f8554
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-02-28 10:53:34 +01:00
msvensson@pilot.blaudden
3a11b2be7e
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-28 10:53:06 +01:00
msvensson@pilot.blaudden
44959af241
Bug#26416 mysql-test-run exits with "Hangup" when piped to grep
...
- Thanks to Christian for the patch!
2007-02-28 10:52:51 +01:00
msvensson@pilot.blaudden
258fbc3a1e
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-02-28 10:39:47 +01:00
msvensson@pilot.blaudden
0df3d939b1
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-28 10:39:12 +01:00
msvensson@pilot.blaudden
3393c1e489
Bug#26686 mysql-test-run.pl aborts when waitpid returns -1
...
- Add error handling for waitpid returns -1 for "simple run of command"
2007-02-28 10:37:32 +01:00
gluh@eagle.(none)
be248ad0e0
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-02-28 13:26:20 +04:00
gluh@mysql.com/eagle.(none)
f1f0de8419
valgrind error fix
2007-02-28 13:25:49 +04:00
msvensson@pilot.blaudden
780d434cb5
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-02-28 10:07:37 +01:00
msvensson@pilot.blaudden
c2ed99e78c
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-28 10:07:04 +01:00
msvensson@pilot.blaudden
548112ce36
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint-without-cygwin
...
into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-02-28 10:06:21 +01:00
msvensson@pilot.blaudden
ed61e4868d
Use cygwin for --exec and --system in mysqltest for MySQL before 5.0
2007-02-28 10:05:51 +01:00
msvensson@pilot.blaudden
eac47a8670
Merge pilot.blaudden:/home/msvensson/mysql/bug19410/my50-bug19410
...
into pilot.blaudden:/home/msvensson/mysql/bug19410/my51-bug19410
2007-02-28 09:11:56 +01:00
msvensson@pilot.blaudden
dd59e181ae
Merge pilot.blaudden:/home/msvensson/mysql/bug19410/my50-bug19410
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-28 09:11:39 +01:00