cmiller@zippy.(none)
7bbd8fb051
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug18078
2006-05-03 18:58:13 -04:00
acurtis@xiphis.org
3954c72207
Merge acurtis@bk-internal:/home/bk/mysql-5.1-new
...
into xiphis.org:/home/antony/work2/wl3201-final
2006-05-03 15:58:12 -07:00
aivanov@mysql.com
2038e05bb4
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/alexi/dev/mysql-5.1-wl3148
2006-05-04 02:58:11 +04:00
aivanov@mysql.com
5b20ee67db
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/alexi/innodb/mysql-5.1
2006-05-04 02:26:57 +04:00
aivanov@mysql.com
ac0ac6a3c9
Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss521-work
...
into mysql.com:/home/alexi/innodb/mysql-5.1
2006-05-04 00:35:45 +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
aivanov@mysql.com
2f190c2c10
Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss521-work
...
into mysql.com:/home/alexi/innodb/mysql-5.1
Null-merge.
2006-05-03 23:31:52 +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
cmiller@zippy.(none)
b07bb71291
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug18078
2006-05-03 10:04:04 -04:00
cmiller@zippy.(none)
a5789854ee
Added code to remove closing comment code from event text, as would be
...
supplied inside a /*!VERSION event-text */ segment. (Fixes Bug#18078
2006-05-03 09:55:34 -04:00
serg@sergbook.mysql.com
375d3e8258
Fixed dependency checking
2006-05-03 09:46:19 -04:00
bar@mysql.com
c51d7419e8
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new.b18170
2006-05-03 12:34:51 +05:00
knielsen@mysql.com
4ba1a4b3cd
Windows build fixes for CMake
2006-05-03 09:06:22 +02:00
bar@mysql.com
467052aa5b
Merge mysql.com:/usr/home/bar/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new.b18170
2006-05-03 09:08:12 +05:00
cmiller@zippy.(none)
9648920963
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug18078
2006-05-02 18:41:42 -04:00
pekka@mysql.com
2b25349820
pekka:get - push push push
2006-05-02 21:47:53 +02:00
dlenev@mysql.com
5cae540501
Merge mysql.com:/home/dlenev/mysql-5.0-bg11081
...
into mysql.com:/home/dlenev/mysql-5.1-merges
2006-05-02 23:16:53 +04:00
cmiller@zippy.(none)
ba0752e125
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug17667
2006-05-02 15:09:35 -04: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
aivanov@mysql.com
f6073b2735
WL#3148: Modifying sizes of i_s.processlist columns ('time', 'info').
2006-05-02 23:08:22 +04:00
cmiller@zippy.(none)
5de7b78bd2
More merging assistence.
...
Logging behavior changed in early 5.1. (The filename was never right, but
the "opt" file is unnecessary in 5.0 anyway.)
2006-05-02 15:07:00 -04:00
acurtis@xiphis.org
20b687ce0d
WL#3201 post-review fixups
2006-05-02 12:04:20 -07:00
cmiller@zippy.(none)
230b52a835
Manually merged
2006-05-02 13:56:43 -04:00
cmiller@zippy.(none)
4d15fc5ee0
Merge zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667
...
into zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug17667
2006-05-02 13:55:03 -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
elliot@mysql.com
c0b5b3cd40
Fix spelling in comments as requested by Osku
...
This will make charset code easier to understand
2006-05-02 09:13:58 -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
gluh@eagle.intranet.mysql.r18.ru
19de86dd63
WL#2257 REFERENTIAL_CONSTRAINTS view
...
added I_S.REFARENTIAL_CONSTRAINTS table
2006-05-02 16:31:39 +05:00
acurtis@xiphis.org
f1d4921139
WL#3201 additional post-review fixes
2006-05-02 04:11:00 -07:00
knielsen@mysql.com
f0341ac431
Fix a bunch of non-Linux compile failures.
2006-05-02 09:19:54 +02:00
acurtis@xiphis.org
09c7374d69
Merge xiphis.org:/home/antony/work2/mysql-5.1
...
into xiphis.org:/home/antony/work2/wl3201-post-review.2
2006-05-01 22:45:31 -07:00
acurtis@xiphis.org
0736d18337
WL#3201 post-review fixups
...
end plugin/module naming schizophrenia
fixup shell code and m4 macro comments
cmakelists.txt included in EXTRA_DIST
2006-05-01 21:33:09 -07: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
b050f975c4
Merge
2006-05-02 02:45:04 +02:00
jimw@mysql.com
44e984276c
Fix name of error in view_grant test
2006-05-01 17:12:51 -07:00
jimw@mysql.com
052b126853
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-05-01 11:38:15 -07: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
jimw@mysql.com
7afa8aa73b
Merge mysql.com:/home/jimw/my/mysql-5.1-18495
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-05-01 11:22:47 -07: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
cmiller@zippy.(none)
21bec19920
Merge zippy.(none):/home/cmiller/work/mysql/mysql-5.0
...
into zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new
2006-05-01 13:41:40 -04: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