gkodinov/kgeorge@macbook.gmz
6909ab2627
serg's MacOSX-intel portability diff
2006-08-01 11:34:11 +03:00
tsmith/tim@siva.hindu.god
6971ddee1a
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into siva.hindu.god:/usr/home/tim/m/bk/merge-51
(which is mysql-5.1-new-maint team tree)
2006-07-15 00:33:24 -06:00
kostja@bodhi.local
d7845b74db
Merge bodhi.local:/opt/local/work/tmp_merge
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
2006-07-13 22:09:36 +04:00
mkindahl@dl145k.mysql.com
9415b24139
Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.1-new-rpl
...
into dl145k.mysql.com:/data0/mkindahl/bk/MERGE/mysql-5.1-merge
2006-07-11 12:17:19 +02:00
cmiller@zippy.(none)
9be1c70404
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-10 13:38:22 -04:00
mats@romeo.(none)
b6384f46f1
Fixing the prototype for my_strndup() to compile on Windows.
2006-07-07 22:38:57 +02:00
mats@romeo.(none)
fe4a22f36b
Correcting signature for my_strndup to be able to build on Windows
...
in pushbuild on Replication/Backup team tree.
2006-07-07 15:59:17 +02:00
konstantin@bodhi.netgear
01bc761690
Merge bodhi.netgear:/opt/local/work/tmp_merge
...
into bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge-with-5.0
2006-07-06 22:55:48 +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
ingo@mysql.com
d8546d07f8
Merge mysql.com:/home/mydev/mysql-5.0-tmp_merge
...
into mysql.com:/home/mydev/mysql-5.1-amerge
2006-07-04 10:02:11 +02:00
cmiller@zippy.(none)
6110a83a0e
Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0
...
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1
2006-07-03 11:35:58 -04:00
petr@owlet.
b655968123
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/cps/mysql/trees/5.1-team
2006-06-30 11:17:53 +04:00
petr@mysql.com
c95ad6158a
cleanup
2006-06-30 08:11:51 +04:00
monty@mysql.com
d76830faa5
Merge mysql.com:/home/my/mysql-4.1
...
into mysql.com:/home/my/mysql-5.0
2006-06-30 02:35:52 +03:00
petr@mysql.com
157cc569a8
fix test failures
2006-06-30 03:28:58 +04:00
monty@mysql.com
8e2099295d
Fixed include file usage
...
hp_test2 now works again
Fixed wrong cast, which caused problems with gcc 4.0 and floats in prepared statements (Bug #19694 )
2006-06-30 02:25:35 +03:00
monty@hasky.mysql.fi
0b00ae6bc5
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-06-29 23:41:33 +03:00
petr@owlet.
35b7eb7e22
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into mysql.com:/home/cps/mysql/trees/5.1-team
2006-06-29 21:48:53 +04:00
petr@mysql.com
4d76c28caa
Fix Bug#20692 rpl_* tests failure on hpux
2006-06-29 21:43:52 +04:00
serg@serg.mylan
5e2777b445
support for xadd emulation, workaround for Darwin
2006-06-29 15:39:53 +02:00
lars@mysql.com
0e45d26993
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-06-29 14:14:08 +02:00
monty@narttu.mysql.fi
91c3e28d77
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-06-28 20:03:46 +03:00
lars@dl145k.mysql.com
d4f7943594
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-06-28 16:44:54 +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
monty@mysql.com
31fdcd3be0
Added purecov comment for new, not executed code for my recent changeset
...
(Found by dgcov)
2006-06-28 14:03:08 +03:00
gluh@mysql.com
e5dbc49bb0
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-kt
2006-06-28 14:23:33 +05:00
aivanov@mysql.com
7dc30c68f4
Fixing BUG#17719 "Delete of binlog files fails on Windows"
...
and BUG#19208 "Test 'rpl000017' hangs on Windows".
Both bugs are caused by attempting to delete an opened
file and to create immediatedly a new one with the same
name. On Windows it can be supported only on NT-platforms
(by using FILE_SHARE_DELETE mode and with renaming the
file before deletion). Because deleting not-closed files
is not supported on all platforms (e.g. Win 98|ME) this
is to be considered harmful and should be eliminated by
a "code redesign".
2006-06-28 10:21:01 +04:00
konstantin@mysql.com
3cf181bb64
Fix compilation failures on Windows caused by the patch for Bug#17199.
...
Fix a minor issue with Bug#16206 (bdb.test failed if the tree is compiled
without blackhole).
2006-06-27 14:56:24 +04:00
holyfoot@deer.(none)
1530106bac
Merge mysql.com:/home/hf/work/mysql-5.0.19672
...
into mysql.com:/home/hf/work/mysql-5.1.clean
2006-06-27 15:22:43 +05:00
ingo@mysql.com
50477229b4
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/nfstmp1/ingo/autopush-75/mysql-5.0
2006-06-26 22:23:04 +02:00
anozdrin@mysql.com
8f4582db27
Merge mysql.com:/home/alik/MySQL/devel/5.0-tree
...
into mysql.com:/home/alik/MySQL/devel/5.0-rt
2006-06-26 21:58:55 +04:00
ingo@mysql.com
0acdd0f773
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug16986-main
2006-06-26 19:43:28 +02:00
ingo@mysql.com
d27a15a81c
Bug#16986 - Deadlock condition with MyISAM tables
...
Addendum fixes after changing the condition variable
for the global read lock.
The stress test suite revealed some deadlocks. Some were
related to the new condition variable (COND_global_read_lock)
and some were general problems with the global read lock.
It is now necessary to signal COND_global_read_lock whenever
COND_refresh is signalled.
We need to wait for the release of a global read lock if one
is set before every operation that requires a write lock.
But we must not wait if we have locked tables by LOCK TABLES.
After setting a global read lock a thread waits until all
write locks are released.
2006-06-26 19:14:35 +02:00
rburnett@bk-internal.mysql.com
3c6a8146be
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-06-26 16:56:28 +02:00
elliot@mysql.com
374495ffd1
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/data0/bk/mysql-5.0-maint
2006-06-26 04:48:16 +02:00
elliot@mysql.com
bc2b96fee3
Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge
...
into mysql.com:/home/emurphy/src/bk-clean/mysql-5.1
2006-06-25 09:59:34 -04:00
elliot@mysql.com
d11c890bf1
BUG#20528 Added missing parenthesis to DBUG_PRINT statement
2006-06-23 11:21:57 -04:00
knielsen@rt.int.sifira.dk
4966090d3f
Merge mysql.com:/usr/local/mysql/mysql-5.1-vg-apr2
...
into mysql.com:/usr/local/mysql/tmp-5.1
2006-06-23 15:05:15 +02:00
knielsen@mysql.com
af9e69b512
Merge mysql.com:/usr/local/mysql/mysql-5.0-bug20622
...
into mysql.com:/usr/local/mysql/mysql-5.1-vg-apr2
2006-06-23 14:59:40 +02:00
knielsen@mysql.com
d74a0457b6
Merge mysql.com:/usr/local/mysql/mysql-5.0-bug20622
...
into mysql.com:/usr/local/mysql/tmp-5.0
2006-06-23 14:52:04 +02:00
knielsen@mysql.com
98a5cdfe4c
BUG#20622: Fix one-byte buffer overrun in IM directory string handling.
...
The problem was a call to convert_dirname() with a destination buffer
that did not have room for the trailing slash added by that function.
This could cause the instance manager to crash in some cases.
2006-06-23 14:50:02 +02:00
monty@mysql.com
4697deb436
Remove compiler warnings
...
Fixed wrong table flags type in ndbcluster that caused previous commit to fail
2006-06-23 02:49:19 +03:00
jani@ua141d10.elisa.omakaista.fi
f57cf654f4
Cleanup to patch for Bug#18246, "compilation error with tcp_wrapper"
2006-06-21 18:35:19 +03:00
jani@ua141d10.elisa.omakaista.fi
c22e7f2dfd
Fix for Bug#18246 "compilation error with tcp_wrapper"
2006-06-21 02:23:18 +03:00
monty@mysql.com
49a3334889
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-06-19 13:00:36 +03:00
monty@mysql.com
860661a2dc
unsigned char -> uchar
...
Added missing copyright
Indentation and prototype fixes
Fixed compiler warning
2006-06-19 12:45:34 +03:00
brian@zim.(none)
f41c001bef
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
...
into zim.(none):/home/brian/mysql/cleanup-5.1
2006-06-15 15:08:58 -07:00
cmiller@zippy.(none)
00243ac847
Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
2006-06-13 16:06:35 -04:00
msvensson@neptunus.(none)
2c538f6cde
Merge bk-internal:/home/bk/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-06-10 20:33:50 +02:00
msvensson@neptunus.(none)
27ec02b216
Merge neptunus.(none):/home/msvensson/mysql/my51-bug15936
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-06-07 12:05:42 +02:00