tsmith/tim@siva.hindu.god
93bbb19fc1
Merge siva.hindu.god:/usr/home/tim/m/bk/g41
...
into siva.hindu.god:/usr/home/tim/m/bk/41
2006-12-21 18:18:27 -07:00
msvensson@pilot.mysql.com
e1fcd181ef
Merge neptunus:mysql/mysql-4.1-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
2006-12-22 00:58:32 +01:00
msvensson@neptunus.(none)
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
msvensson@neptunus.(none)
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
msvensson@neptunus.(none)
be0368c230
Add possibility to activate --mark-progress of mysqltest
2006-12-20 16:53:06 +01:00
mtaylor@qualinost.(none)
09591de344
Search through options to find where the slow query log actually is.
2006-12-18 21:12:01 -08:00
mtaylor@qualinost.(none)
373e280eb3
support /etc/mysql/my.cnf in mysqld_multi as well.
2006-12-15 16:17:10 -08:00
mtaylor@qualinost.(none)
57baef9584
Added support for /etc/mysql after /etc in the search path for my.cnf
...
bug #25104
2006-12-15 12:25:09 -08:00
mtaylor@qualinost.(none)
e03a6b86d8
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
2006-12-15 11:38:41 -08:00
mtaylor@qualinost.(none)
3da37d3fa2
Added support for sensible-editor from Debian, instead of emacs.
2006-12-15 10:57:58 -08:00
thek@kpdesk.mysql.com
158ee61fe0
Merge kpettersson@bk-internal:/home/bk/mysql-4.1-maint
...
into kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
2006-12-15 07:59:09 +01:00
thek@kpdesk.mysql.com
24dfe0b0b4
Bug#17498 failed to put data file in custom directory use "data directory" option
...
- Result file was not properly committed.
- Update result file to match the new test case.
2006-12-15 07:56:01 +01:00
tsmith/tim@siva.hindu.god
8e5be1ad97
myisam.result: a test was moved from the .test file, but the results were not updated.
2006-12-14 16:23:54 -07:00
joerg@trift2.
9b8c7ffc19
Merge trift2.:/MySQL/M41/spec-4.1
...
into trift2.:/MySQL/M41/push-4.1
2006-12-14 22:57:33 +01:00
joerg@trift2.
5582d60177
support-files/mysql.spec.sh
...
The Docs team has two new manpages for the "server" RPM: "my_print_defaults" and "mysql_tzinfo_to_sql".
2006-12-14 22:30:32 +01:00
mtaylor@qualinost.(none)
54e7d71477
Change permissions on $mysql_unix_port_dir if we create it so that everyone can access it.
2006-12-14 12:18:36 -08:00
thek@kpdesk.mysql.com
165ae199ab
Merge kpettersson@bk-internal:/home/bk/mysql-4.1-maint
...
into kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
2006-12-14 16:09:15 +01:00
Kristofer.Pettersson@naruto.
e09e2694d6
Merge kpettersson@bk-internal:/home/bk/mysql-4.1-maint
...
into naruto.:C:/cpp/mysql-4.1-maint
2006-12-14 16:02:43 +01:00
thek@kpdesk.mysql.com
1d14b89871
Merge kpdesk.mysql.com:/home/thek/dev/bug17489/my41-bug17498
...
into kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
2006-12-14 15:30:00 +01:00
thek@kpdesk.mysql.com
29f72a0ba1
Bug#17498 failed to put data file in custom directory use "data directory" option
...
- When this bug was corrected it changed the behavior
for data/index directory in the myisam test case.
- This patch moves the OS depending tests to a non-windows
test file.
2006-12-14 13:23:31 +01:00
df@kahlann.erinye.com
9497df0b86
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
2006-12-14 09:34:24 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
46e07cc9d2
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into mysql.com:/usr/home/ram/work/bug22377/my41-bug22377
2006-12-13 14:05:29 +04:00
msvensson@neptunus.(none)
8bc9d6dd41
Improve error message that describes waitpid($pid) returned unexpected result
2006-12-12 12:28:02 +01:00
msvensson@neptunus.(none)
8a7ea3c744
Bug#20225 mysqltest runs in an endless loop when trying to start rpl_sys test suite
...
- Add printout in safe_connect indicating that mysqltest is in a loop waiting for
connection to mysqld. Will be printed when --verbose is passed as argument to
mysqltest
2006-12-11 15:39:15 +01:00
msvensson@neptunus.(none)
1bdceff9be
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-12-11 13:08:05 +01:00
Kristofer.Pettersson@naruto.
119afb19c3
Merge naruto.:C:/cpp/bug17489/my41-bug17489
...
into naruto.:C:/cpp/mysql-4.1-maint
2006-12-11 13:06:59 +01:00
gluh@mysql.com/gluh.(none)
f0f4d3c0bd
Merge mysql.com:/home/gluh/MySQL/Merge/4.1
...
into mysql.com:/home/gluh/MySQL/Merge/4.1-opt
2006-12-11 15:32:07 +04:00
msvensson@neptunus.(none)
ba6d2bbf64
Pass --no-defaults to embedded server to avoid that it reads any defaults file
2006-12-11 12:16:20 +01:00
df@kahlann.erinye.com
78e1df3e9f
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
2006-12-11 10:51:29 +01:00
tsmith/tim@siva.hindu.god
a58d08513b
Makefile.am
...
- test* targets are identical (as much as possible) to 5.0 & 5.1 versions
- use @PERL@ ./mysql-test-run.pl, instead of depending on /usr/bin/perl location
- PHONY: target includes all test targets
2006-12-08 16:17:46 -07:00
msvensson@neptunus.(none)
9636ead18d
Bug#19410 Test 'kill' fails on Windows + SCO
2006-12-08 17:09:07 +01:00
msvensson@neptunus.(none)
3e43b86329
Add missing space
2006-12-08 16:48:49 +01:00
msvensson@neptunus.(none)
9064723d1b
Bug#19410 Test 'kill' fails on Windows + SCO
...
- Use "mysql_field_count" to determine if there is a need to
call "mysql_store_result"
2006-12-08 16:43:50 +01:00
msvensson@neptunus.(none)
40927c0cb2
Bug#24498 Stack overflow in mysqltest
...
- Thanks to Vasil Dimov for the patch!
2006-12-08 16:08:54 +01:00
msvensson@neptunus.(none)
8b6e5d4dfa
Backport fix for mysqladmin on windows test failure
2006-12-08 13:37:40 +01:00
Kristofer.Pettersson@naruto.
ecbb4eb987
Bug#17498 failed to put data file in custom directory use "data directory" option
...
- Using DATA/INDEX DIRECTORY option on Windows put data/index file into
default directory because the OS doesn't support readlink().
- The procedure for changing data/index file directory is
different under Windows.
- With this fix we report a warning if DATA/INDEX option is used,
but OS doesn't support readlink().
2006-12-07 17:01:00 +01:00
df@kahlann.erinye.com
19ec379b15
do not autorelease build ids when a child of mysql-test-run.pl dies
2006-12-07 16:06:29 +01:00
df@kahlann.erinye.com
77965c013c
BUG#24780 use --sysconfdir in scripts
2006-12-07 15:02:32 +01:00
holyfoot/hf@mysql.com/deer.(none)
f404488d29
bug #22372
...
datafile added to be used in gis.test
2006-12-06 21:47:29 +04:00
holyfoot/hf@mysql.com/deer.(none)
e83c682fb7
bug #22372 (LOAD DATA crashes the table with the geometry field)
...
The problem is that the GEOMETRY NOT NULL can't automatically set
any value as a default one. We always tried to complete LOAD DATA
command even if there's not enough data in file. That doesn't work
for GEOMETRY NOT NULL. Now Field_*::reset() returns an error sign
and it's checked in mysql_load()
2006-12-06 21:45:57 +04:00
msvensson@neptunus.(none)
b9a4ae9909
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-12-05 19:47:24 +01:00
msvensson@neptunus.(none)
be212d3486
Remove hack that removes vardir
2006-12-05 19:13:31 +01:00
msvensson@neptunus.(none)
a507459762
Merge bk-internal:/home/bk/mysql-4.1-build
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-12-05 19:12:12 +01:00
iggy@rolltop.ignatz42.dyndns.org
40aba03eda
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my41-bug20836
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
2006-12-05 10:33:11 -05:00
iggy@rolltop.ignatz42.dyndns.org
71970547da
Bug#20836 Selecting into variables results in wrong results being returned
...
- Comment Cleanup.
2006-12-05 09:29:32 -05:00
df@kahlann.erinye.com
6541302bb2
re-enable multiple test runs in sequence for 4.1 on non-windows
2006-12-05 10:03:24 +01:00
iggy@rolltop.ignatz42.dyndns.org
e0eed3a34b
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my41-bug20836
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
2006-12-04 15:33:53 -05:00
msvensson@neptunus.(none)
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
msvensson@neptunus.(none)
a9f4f4ed11
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-12-04 19:01:31 +01:00
msvensson@neptunus.(none)
c2488ba10f
Bug#24389 mysqltest: Could not open connection 'default': 2013 Lost connection to MySQL
...
- Add CR_CONN_HOST_ERROR to list of errorcode that trigger another connection
attempt in mysqltest
2006-12-04 15:48:34 +01:00