svoj@april.(none)
dee1baaefd
Fixed heap_btree test failure on 64-bit boxes.
2006-05-04 15:52:09 +05:00
holyfoot@mysql.com
d5c6f594de
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.mrg
2006-05-04 10:13:34 +05:00
holyfoot@mysql.com
540481aef9
Merge mysql.com:/home/hf/work/mysql-4.1.mrg
...
into mysql.com:/home/hf/work/mysql-5.0.mrg
2006-05-04 09:59:32 +05:00
holyfoot@deer.(none)
2f154ab410
test result fixed
2006-05-04 09:58:03 +05:00
svojtovich@production.mysql.com
1890b04e13
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into production.mysql.com:/usersnfs/svojtovich/mysql-5.0
2006-05-03 23:17:17 +02:00
holyfoot@mysql.com
2f7ac18f22
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.mrg
2006-05-04 02:17:17 +05:00
pekka@mysql.com
ec42119233
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/pekka/ndb/version/my50
2006-05-03 23:17:16 +02:00
aivanov@mysql.com
7a74734219
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alexi/innodb/mysql-5.0-ss521
2006-05-04 01:17:15 +04:00
aivanov@mysql.com
4cff042a58
Applied innodb-5.0-ss521 snapshot.
...
Fixed BUG#19366: "consistent_snapshot.test fails".
2006-05-04 00:32:34 +04:00
holyfoot@mysql.com
7d47127e86
Merge bk@192.168.21.1:mysql-4.1
...
into mysql.com:/home/hf/work/mysql-4.1.mrg
2006-05-04 00:45:56 +05:00
aivanov@mysql.com
b695bb4624
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/alexi/innodb/mysql-4.1-ss26
2006-05-03 23:45:55 +04:00
aivanov@mysql.com
a7122276a4
Merge mysql.com:/home/alexi/innodb/mysql-4.1-ss26-work
...
into mysql.com:/home/alexi/innodb/mysql-5.0-ss521-work
Null-merge.
2006-05-03 23:29:27 +04:00
aivanov@mysql.com
d546f0d93e
Applied innodb-4.1-ss26 snapshot.
...
Fixed BUG#19366: "consistent_snapshot.test fails".
2006-05-03 23:25:01 +04:00
holyfoot@mysql.com
e5a22d1bca
Merge bk@192.168.21.1:mysql-4.1
...
into mysql.com:/home/hf/work/mysql-4.1.mrg
2006-05-04 00:03:58 +05:00
holyfoot@deer.(none)
5b5db01a46
merging fix
2006-05-03 19:01:29 +05:00
holyfoot@deer.(none)
81e625ac4a
merging fix
2006-05-03 17:43:32 +05:00
holyfoot@mysql.com
f66bcd2535
Merge mysql.com:/home/hf/work/mysql-5.0.18455
...
into mysql.com:/home/hf/work/mysql-5.0.mrg
2006-05-03 16:48:15 +05:00
holyfoot@mysql.com
86cab8533f
merging
2006-05-03 16:47:05 +05:00
holyfoot@mysql.com
7ee205f67a
merging
2006-05-03 16:42:39 +05:00
svoj@april.(none)
365e38b05c
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into april.(none):/home/svoj/devel/mysql/BUG17810/mysql-5.0
2006-05-03 16:37:42 +05:00
svoj@april.(none)
23d304b312
Merge april.(none):/home/svoj/devel/mysql/BUG18160/mysql-5.0
...
into april.(none):/home/svoj/devel/mysql/BUG17810/mysql-5.0
2006-05-03 16:36:00 +05:00
holyfoot@mysql.com
9de68b8122
merging
2006-05-03 16:33:42 +05:00
holyfoot@mysql.com
8667344572
Merge hf@192.168.21.28:work/mysql-4.1.16892
...
into mysql.com:/home/hf/work/mysql-4.1.mrg
2006-05-03 15:53:36 +05:00
holyfoot@mysql.com
486693e219
Merge mysql.com:/home/hf/work/mysql-4.1.15442
...
into mysql.com:/home/hf/work/mysql-4.1.mrg
2006-05-03 15:52:07 +05:00
holyfoot@mysql.com
0007484c26
Merge mysql.com:/home/hf/work/mysql-4.1.15225
...
into mysql.com:/home/hf/work/mysql-4.1.mrg
2006-05-03 15:51:19 +05:00
pekka@mysql.com
2b25349820
pekka:get - push push push
2006-05-02 21:47:53 +02:00
cmiller@zippy.(none)
d71f198333
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667
2006-05-02 15:08:47 -04:00
cmiller@zippy.(none)
0f63c3d39c
An update to as-yet unused new feature of snprintf, which was added to bring
...
our sprintf()-alike in sync with our fprintf()-alike features.
2006-05-02 13:42:35 -04:00
dlenev@mysql.com
c40f8557dc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/mysql-5.0-bg11081
2006-05-02 17:07:23 +04:00
pekka@mysql.com
5c0012cb98
ndb - bug#19201 (4.1), see comment in NdbBlob.cpp
2006-05-02 14:33:55 +02:00
knielsen@mysql.com
f0341ac431
Fix a bunch of non-Linux compile failures.
2006-05-02 09:19:54 +02:00
ramil@mysql.com
b337e83db2
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b7643
2006-05-02 11:33:26 +05:00
holyfoot@mysql.com
aaf2c26e01
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.clean
2006-05-02 09:01:13 +05:00
holyfoot@deer.(none)
aab0e9c24e
Win build fix
2006-05-02 08:59:49 +05:00
cmiller@zippy.(none)
1205ae8276
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667
2006-05-01 22:50:36 -04:00
cmiller@zippy.(none)
85ffd9640e
SECURITY FIX
...
Bug#17667: An attacker has the opportunity to bypass query logging.
This adds a new, local-only printf format specifier to our *printf functions
that allows us to print known-size buffers that must not be interpreted as
NUL-terminated "strings."
It uses this format-specifier to print to the log, thus fixing this
problem.
2006-05-01 22:10:50 -04:00
kent@mysql.com
715833dbb7
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-05-01 20:23:36 +02:00
kent@mysql.com
e8fb05845b
Merge
2006-05-01 20:16:19 +02:00
jimw@mysql.com
c571f6ff57
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2006-05-01 10:59:14 -07:00
kent@mysql.com
f45d6d3cc6
mysql.spec.sh:
...
Use "./libtool --mode=execute" to find real path to executables
2006-05-01 19:48:31 +02:00
holyfoot@mysql.com
22fc7774d0
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.clean
2006-05-01 22:21:28 +05:00
holyfoot@deer.(none)
9b832153f9
Fix for Win build
2006-05-01 22:16:08 +05:00
jimw@mysql.com
189241b03e
Merge mysql.com:/home/jimw/my/mysql-5.0-18607
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2006-05-01 09:12:36 -07:00
jimw@mysql.com
9ab852bb35
Merge mysql.com:/home/jimw/my/mysql-5.0-18312
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2006-05-01 09:11:57 -07:00
cmiller@zippy.(none)
6af3f88f07
Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0
2006-05-01 09:46:00 -04:00
kent@mysql.com
39bd702756
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
2006-04-29 22:48:22 +02:00
kent@mysql.com
5e717959d0
config-win.h:
...
Fix strange "double" define for popen.
Avoid warnings about sprintf() etc. being unsafe.
Corrected typo "#endfif"
2006-04-29 15:58:02 +02:00
kent@mysql.com
a14f1250d6
configure.in:
...
Changed version to 4.1.20
2006-04-29 07:32:12 +02:00
kent@mysql.com
b714a0cec4
mysql.spec.sh:
...
Backport of changes in 5.0 (bug#18294)
2006-04-29 01:28:04 +02:00
kent@mysql.com
cc6ad16b16
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
2006-04-29 00:52:30 +02:00