kostja@bodhi.(none)
b9a41928e6
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-12-19 22:52:31 +03:00
kostja@bodhi.(none)
15c04b2db8
Make handler::{write,delete,update}_row private. It's critical
...
that the entire server uses their public ha_* counterparts instead,
since only then we can ensure proper tracing of these calls that
is necessary for Bug#12713.
A pre-requisite for Bug#12713 "Error in a stored function called from
a SELECT doesn't cause ROLLBACK of statem"
2007-12-19 22:15:02 +03:00
serg@janus.mylan
1a5b69ec58
SHOW_VAR arrays are null-terminated :-[]
2007-12-19 14:16:10 +01:00
serg@janus.mylan
3bd3bd1e30
Followup for bug#30252.
...
Ensure that all SQLCOM_ constants have corresponding Com_ variables.
2007-12-19 01:27:15 +01:00
serg@janus.mylan
87a84dbdc0
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-12-19 01:14:11 +01:00
kostja@bodhi.(none)
9d48e76b20
Sort class handler public declarations.
2007-12-19 00:36:20 +03:00
serg@janus.mylan
e97f18135c
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-12-18 20:27:23 +01:00
dkatz@damien-katzs-computer.local
6b2815bedc
Merge damien-katzs-computer.local:/Users/dkatz/mysql-5.1-runtime
...
into damien-katzs-computer.local:/Users/dkatz/Com_create_function
2007-12-18 13:52:26 -05:00
kostja@vajra.(none)
ef4295af44
Consistently use doxygen comments in class handler.
2007-12-18 15:47:22 +03:00
serg@janus.mylan
a2eb9e01ed
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-12-17 14:28:10 +01:00
kostja@bodhi.(none)
16f0bd712e
Try to fix assertion failures at slave shutdown when running
...
rpl_ndb tests on sapsrv1.
2007-12-15 22:24:01 +03:00
kostja@bodhi.(none)
2e82e66677
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-12-15 17:05:39 +03:00
kostja@bodhi.(none)
4bb503568d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.(none):/opt/local/work/mysql-5.0-runtime
2007-12-15 17:00:18 +03:00
kostja@bodhi.(none)
bffc615e6c
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-12-15 16:59:43 +03:00
malff@lambda.hsd1.co.comcast.net.
0488056ca8
WL#4165 (Prepared statements: validation)
...
Adding the tests cases alone for WL#4165, disabled
2007-12-14 17:46:24 -07:00
dkatz@damien-katzs-computer.local
4b5f344416
Bug #30252 Com_create_function is not incremented.
...
Added Com_create_spfunction and all other commands previously missing to the global status variables.
2007-12-14 18:27:40 -05:00
serg@janus.mylan
b28b65ef38
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-12-14 20:46:39 +01:00
tomas@whalegate.ndb.mysql.com
2db742573d
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-12-14 18:05:15 +01:00
tomas@whalegate.ndb.mysql.com
1a3bf7333e
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
2007-12-14 18:03:44 +01:00
tomas@whalegate.ndb.mysql.com
d2a93fd60b
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2007-12-14 17:49:58 +01:00
kent/mysqldev@mysql.com/production.mysql.com
028ed33610
Raise version number after cloning 5.0.54
2007-12-14 16:58:12 +01:00
anozdrin/alik@station.
6ebedc8635
Merge station.:/mnt/raid/alik/MySQL/devel/5.0-rt
...
into station.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-5.0-rt
2007-12-14 16:45:17 +03:00
anozdrin/alik@station.
151444c626
Merge station.:/mnt/raid/alik/MySQL/devel/5.1
...
into station.:/mnt/raid/alik/MySQL/devel/5.1-rt
2007-12-14 16:30:22 +03:00
anozdrin/alik@station.
61b903f896
Merge station.:/mnt/raid/alik/MySQL/devel/5.0
...
into station.:/mnt/raid/alik/MySQL/devel/5.0-rt
2007-12-14 15:57:36 +03:00
tomas@whalegate.ndb.mysql.com
0f58ed97c1
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-12-14 08:20:07 +01:00
tomas@whalegate.ndb.mysql.com
0bd2a86e90
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-12-14 06:55:44 +01:00
tomas@whalegate.ndb.mysql.com
70902cdd86
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2007-12-14 06:53:55 +01:00
kostja@bodhi.(none)
614b0f6884
Remove an unused argument of sql_update::do_updates().
2007-12-14 02:23:42 +03:00
kostja@bodhi.(none)
7c8fe302c3
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-12-13 23:59:47 +03:00
kostja@bodhi.(none)
5b80d6a11b
Fix broken embedded build (broken by the patch for Bug#12713, first part).
2007-12-13 23:58:55 +03:00
tomas@whalegate.ndb.mysql.com
a2486e0d14
Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-12-13 21:51:03 +01:00
tomas@whalegate.ndb.mysql.com
4bc90fe469
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2007-12-13 21:50:17 +01:00
tomas@whalegate.ndb.mysql.com
e9466462e8
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/cge-5.1
2007-12-13 21:32:45 +01:00
tomas@whalegate.ndb.mysql.com
3a89198273
Bug #33168 Incorrectly handled parameters can make the TC crash during node failure
...
- during commit deadlock timeout needs to be at least 5 times db hearbeat
2007-12-13 21:31:38 +01:00
gluh@eagle.(none)
27dcbc2577
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-12-13 23:48:13 +04:00
gluh@mysql.com/eagle.(none)
8be07b88df
additional fix
2007-12-13 23:46:29 +04:00
dkatz@damien-katzs-computer.local
af6db482d5
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into damien-katzs-computer.local:/Users/dkatz/51runtime
2007-12-13 14:31:20 -05:00
davi@endora.local
d099e6a257
Merge mysql.com:/Users/davi/mysql/bugs/32395-5.1
...
into mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2007-12-13 16:33:04 -02:00
gluh@eagle.(none)
b98f95274c
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-12-13 21:34:50 +04:00
gluh@mysql.com/eagle.(none)
b371f6385d
additional after merge fix
2007-12-13 21:34:05 +04:00
gluh@mysql.com/eagle.(none)
2627f775be
valgrind error fix
2007-12-13 21:13:08 +04:00
gluh@mysql.com/eagle.(none)
5244d7dcf6
after merge fix
2007-12-13 18:26:27 +04:00
tomas@whalegate.ndb.mysql.com
6821f36837
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2007-12-13 15:02:10 +01:00
tomas@whalegate.ndb.mysql.com
4b5e9edd69
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-12-13 14:26:57 +01:00
tomas@whalegate.ndb.mysql.com
f84b45244d
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2007-12-13 14:25:16 +01:00
gluh@mysql.com/eagle.(none)
3b227392c9
after merge fix
2007-12-13 16:43:38 +04:00
gluh@eagle.(none)
d504588e79
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-12-13 16:10:57 +04:00
gluh@eagle.(none)
4f5868114a
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-12-13 15:56:04 +04:00
gluh@mysql.com/eagle.(none)
9df070ed7c
after merge fix
2007-12-13 15:47:23 +04:00
tomas@whalegate.ndb.mysql.com
6bc455e353
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/cge-5.1
2007-12-13 12:04:00 +01:00
