msvensson@neptunus.(none)
da5e006dda
Bug#19209 Test 'rpl_openssl' hangs on Windows
...
- Remove check not to run on windows.
2006-12-15 13:23:45 +01:00
msvensson@neptunus.(none)
45cd2db043
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-14 21:48:58 +01:00
msvensson@neptunus.(none)
110b8af303
Put the DBUG_DUMP inside ifdef DEBUG_DATA_PACKETS
2006-12-14 21:48:08 +01:00
mtaylor@qualinost.(none)
b8542e9cd7
Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
...
into qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
2006-12-14 12:20:31 -08: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
tsmith/tim@siva.hindu.god
8fbfaeb51f
Merge siva.hindu.god:/usr/home/tim/m/bk/41
...
into siva.hindu.god:/usr/home/tim/m/bk/50
2006-12-14 13:01:08 -07: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
thek@kpdesk.mysql.com
b19b9333f0
Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint
...
into kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
2006-12-14 16:04:07 +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
Kristofer.Pettersson@naruto.
aa2c208899
Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint
...
into naruto.:C:/cpp/mysql-5.0-maint
2006-12-14 15:52:06 +01:00
msvensson@shellback.
74e3857b8d
Merge nocona:/data0/msvensson/mysql-5.0-maint
...
into shellback.:C:/mysql/mysql-5.0-maint
2006-12-14 15:40:25 +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
msvensson@shellback.
c41e307d85
BUG#24687 func_misc test fails on win64
...
- Use same precision (milliseconds) for all time functions
used when calculating time for pthread_cond_timedwait
- Use 'GetSystemTimeAsFileTime' for both start and curr time
2006-12-14 15:23:44 +01:00
thek@kpdesk.mysql.com
b7fcaadacf
Merge kpdesk.mysql.com:/home/thek/dev/bug17489/my50-bug17498
...
into kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
2006-12-14 14:50:08 +01:00
thek@kpdesk.mysql.com
7e60087441
Bug#17498 failed to put data file in custom directory use "data directory" option
...
Merged 4.1->5.0. Updated myisam.test
2006-12-14 13:45:17 +01:00
thek@kpdesk.mysql.com
c9622dfb0a
Merge kpdesk.mysql.com:/home/thek/dev/bug17489/my41-bug17498
...
into kpdesk.mysql.com:/home/thek/dev/bug17489/my50-bug17498
2006-12-14 13:38:09 +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
msvensson@neptunus.(none)
9eb8a3fbee
change all auto_ptr in yaSSL to mySTL since some lack reset
2006-12-13 23:30:20 +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
ramil/ram@mysql.com/myoffice.izhnet.ru
5e8e4745d8
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/bug22377/my50-bug22377
2006-12-13 13:19:19 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
b008f24ece
Merge mysql.com:/usr/home/ram/work/bug22377/my41-bug22377
...
into mysql.com:/usr/home/ram/work/bug22377/my50-bug22377
2006-12-13 13:02:11 +04:00
msvensson@neptunus.(none)
b880d8aa05
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-11 17:04:14 +01:00
msvensson@neptunus.(none)
eb1c280142
Wait for INSERT DELAYED to finish i.e sleep in while loop until
...
"select count" is one more.
2006-12-11 16:43:21 +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
Kristofer.Pettersson@naruto.
b7b1aab081
Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint
...
into naruto.:C:/cpp/mysql-5.0-maint
2006-12-11 14:22:56 +01:00
Kristofer.Pettersson@naruto.
0d7f94da7b
Merge naruto.:C:/cpp/bug17489/my50-bug17489
...
into naruto.:C:/cpp/mysql-5.0-maint
2006-12-11 13:13:05 +01:00
msvensson@neptunus.(none)
98e062a9c3
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-11 13:12:54 +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
Kristofer.Pettersson@naruto.
7de635497d
Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint
...
into naruto.:C:/cpp/mysql-5.0-maint
2006-12-11 12:50:40 +01:00
msvensson@neptunus.(none)
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
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
msvensson@neptunus.(none)
510c9627e1
Fix merge error in mysql-test/Makefile.am
2006-12-11 12:06:12 +01:00
msvensson@neptunus.(none)
160a3dce64
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-11 11:28:11 +01:00
msvensson@neptunus.(none)
4e34f77c85
Bug#23735 mysqlbinlog client fails when reading binlog from stdin
...
- Windows opens stdin in text mode by default. Certain characters
such as CTRL-Z are interpeted as events and the read() method
will stop. CTRL-Z is the EOF marker in Windows. to get past this
you have to open stdin in binary mode. Setmode() is used to set
stdin in binary mode. Errors on setting this mode result in
halting the function and printing an error message to stderr.
2006-12-11 11:25:45 +01:00
Kristofer.Pettersson@naruto.
57abd1dc1e
Merge naruto.:C:/cpp/bug17489/my41-bug17489
...
into naruto.:C:/cpp/bug17489/my50-bug17489
2006-12-10 16:40:15 +01:00
tsmith/tim@siva.hindu.god
d54c696c24
Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/41
...
into siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/50
2006-12-08 16:26:41 -07: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
kaa@polly.local
6d1e7bcf7b
Merge polly.local:/tmp/maint/bug24261/my50-bug24261
...
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
2006-12-08 22:38:03 +03:00
msvensson@neptunus.(none)
cb903ec340
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-08 17:09:43 +01:00
msvensson@neptunus.(none)
9636ead18d
Bug#19410 Test 'kill' fails on Windows + SCO
2006-12-08 17:09:07 +01:00
msvensson@neptunus.(none)
3a4491c70a
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-08 16:50:54 +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
msvensson@neptunus.(none)
0b41593db6
Fix problems with "make dist" and running from "binary dist"
2006-12-08 12:13:43 +01:00
cmiller@zippy.cornsilk.net
38346fa9da
Having MYSQL_VERSION_ID defined correctly made this KILL_QUERY enum item visible. This is a
...
forwards-incompatible change.
2006-12-07 12:53:32 -05: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
jpipes@shakedown.(none)
a6ad0c3000
Merge jpipes@bk-internal:/home/bk/mysql-5.0-maint
...
into shakedown.(none):/home/jpipes/dev/mysql-5.0-maint
2006-12-07 08:52:59 -05:00