holyfoot/hf@mysql.com/hfmain.(none)
bd461b01f0
Merge bk@192.168.21.1:mysql-5.0-opt
...
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-04-09 11:45:14 +05:00
holyfoot/hf@hfmain.(none)
33ed2ead2a
Merge bk@192.168.21.1:mysql-5.1
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-04-09 11:07:20 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
65535824ba
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-04-09 11:06:28 +05:00
kent@kent-amd64.(none)
a16289d550
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/kent/bk/tmp4/mysql-5.1-engines
2007-04-08 20:48:07 +02:00
kent@mysql.com/kent-amd64.(none)
c282dd3715
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kent/bk/tmp4/mysql-5.0-engines
2007-04-08 20:46:40 +02:00
evgen@moonbone.local
d8e6b38ec1
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/mnt/gentoo64/work/27586-bug-5.0-opt-mysql
2007-04-07 23:09:09 +04:00
holyfoot/hf@hfmain.(none)
6ffa4b9c84
Merge mysql.com:/home/hf/work/26074/my51-26074
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-04-07 16:36:50 +05:00
holyfoot/hf@hfmain.(none)
ce426dd622
Merge bk@192.168.21.1:mysql-5.1-opt
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-04-07 14:59:53 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
2a5bcc3f3e
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-04-07 11:36:02 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
df913ae06a
Merge bk@192.168.21.1:mysql-4.1
...
into mysql.com:/d2/hf/mrg/mysql-4.1-opt
2007-04-07 11:35:14 +05:00
tomas@whalegate.ndb.mysql.com
254ad34300
disabled test and feature
2007-04-07 00:28:09 +02:00
evgen@moonbone.local
c3d9eeb25c
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/mnt/gentoo64/work/27586-bug-5.0-opt-mysql
2007-04-07 00:56:35 +04:00
evgen@moonbone.local
93c29c10b1
Bug#27586: Wrong autoinc value assigned by LOAD DATA in the
...
NO_AUTO_VALUE_ON_ZERO mode.
The table->auto_increment_field_not_null variable wasn't reset after
reading a row which may lead to inserting a wrong value to the auto-increment
field to the following row.
The table->auto_increment_field_not_null variable is reset now right after a
row is being written in the read_fixed_length() and the read_sep_field()
functions.
Removed wrong setting of the table->auto_increment_field_not_null variable in
the read_sep_field() function.
2007-04-07 00:13:27 +04:00
tomas@whalegate.ndb.mysql.com
d62346a45f
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-06 20:47:40 +02:00
tomas@whalegate.ndb.mysql.com
35223ca35c
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-04-06 20:47:28 +02:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
d0e79056b1
Merge acurtis@bk-internal:/home/bk/mysql-5.0-engines
...
into xiphis.org:/home/antony/work2/mysql-5.0-engines.merge
2007-04-06 18:07:02 +00:00
acurtis/antony@ltamd64.xiphis.org
78734f145d
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into xiphis.org:/home/antony/work2/mysql-5.1-engines.merge
2007-04-06 17:18:26 +00:00
kostja@vajra.(none)
1de28a11ea
Merge vajra.(none):/opt/local/work/mysql-5.0-runtime
...
into vajra.(none):/opt/local/work/mysql-5.1-runtime
2007-04-06 21:18:25 +04:00
anozdrin/alik@ibm.
09cfc052f7
Polishing: note added.
2007-04-06 20:21:30 +04:00
kostja@vajra.(none)
e974ea5ec9
Remove a race between Event Scheduler shutdown and SHOW PROCESSLIST.
...
This will hopefully fix events.test failure on vmware-win32,
where scheduling is very primitive.
2007-04-06 19:44:14 +04:00
anozdrin/alik@ibm.
08b8639361
Polishing: add comments.
2007-04-06 18:56:39 +04:00
tomas@whalegate.ndb.mysql.com
fa23f7e021
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-06 13:55:20 +02:00
tomas@whalegate.ndb.mysql.com
41907655a9
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-runtime
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-06 13:53:05 +02:00
holyfoot/hf@hfmain.(none)
d08216f1b7
Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-04-06 12:45:07 +05:00
kostja@vajra.(none)
4ab558359a
Fix events.test failure on manu pushbuild hosts (5.1-runtime).
2007-04-06 02:57:38 +04:00
kostja@vajra.(none)
b1b0d8d355
A fix for events_trans.test failure on many hosts (5.1-runtime)
2007-04-06 01:53:15 +04:00
jani@ua141d10.elisa.omakaista.fi
386ad0f1f7
Fixes for tests after merge from 5.0
2007-04-05 22:34:33 +03:00
kostja@vajra.(none)
07daf69954
Fix a compile failure on Windows.
2007-04-05 23:22:33 +04:00
kostja@vajra.(none)
9c6e4c8615
Fix a compile error with LINT enabled builds.
2007-04-05 21:46:25 +04:00
kostja@vajra.(none)
cef9331d7d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into vajra.(none):/opt/local/work/mysql-5.1-c1
2007-04-05 20:50:28 +04:00
kostja@vajra.(none)
00b85c49da
Post-merge and post-review fixes for the patch for
...
Bug#23631 "Events: SHOW VARIABLES doesn't work when mysql.event
is damaged:
2007-04-05 20:47:22 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
aef5543019
bug #26074 Mysql crash creating partition
...
As we have unified paths inside partition engine, we should look for '/'
as a path separator
2007-04-05 20:26:18 +05:00
mskold/marty@mysql.com/linux.site
5d622943e8
ha_ndbcluster.cc:
...
Bug #26591 Cluster handler does not set bits in null bytes correctly: Improved comments
ha_ndbcluster_binlog.cc:
Bug #26591 Cluster handler does not set bits in null bytes correctly: Using empty_record() instead of bzero
2007-04-05 15:59:42 +02:00
kostja@vajra.(none)
701ed297d0
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into vajra.(none):/opt/local/work/mysql-5.1-c1
2007-04-05 15:49:46 +04:00
kostja@vajra.(none)
98db230086
A set of changes aiming to make the Event Scheduler more user-friendly
...
when there are no up-to-date system tables to support it:
- initialize the scheduler before reporting "Ready for connections".
This ensures that warnings, if any, are printed before "Ready for
connections", and this message is not mangled.
- do not abort the scheduler if there are no system tables
- check the tables once at start up, remember the status and disable
the scheduler if the tables are not up to date.
If one attempts to use the scheduler with bad tables,
issue an error message.
- clean up the behaviour of the module under LOCK TABLES and pre-locking
mode
- make sure implicit commit of Events DDL works as expected.
- add more tests
Collateral clean ups in the events code.
This patch fixes Bug#23631 Events: SHOW VARIABLES doesn't work
when mysql.event is damaged
2007-04-05 15:24:34 +04:00
tomas@whalegate.ndb.mysql.com
970e6bc7e5
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-05 11:21:25 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
96d012bc2b
aftermerging fix
2007-04-05 13:25:39 +05:00
tomas@whalegate.ndb.mysql.com
77a1d31fbc
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-04-05 10:24:37 +02:00
tomas@whalegate.ndb.mysql.com
d04730c06d
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-05 10:21:41 +02:00
tomas@whalegate.ndb.mysql.com
a858e44a9d
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-04-05 10:20:56 +02:00
mskold/marty@mysql.com/linux.site
bcac914163
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-04-05 09:18:37 +02:00
mskold/marty@mysql.com/linux.site
3e8cf5958b
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-04-05 08:39:12 +02:00
mskold/marty@mysql.com/linux.site
b3ce01771a
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-04-05 08:24:03 +02:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
0011750d9b
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge
2007-04-05 13:42:53 +08:00
mskold/marty@linux.site
2e27f2ce27
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-04-05 07:34:36 +02:00
mskold/marty@linux.site
c5210c0b59
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2007-04-05 07:29:38 +02:00
mskold/marty@mysql.com/linux.site
ee034c0e59
Removed compiler warnings
2007-04-05 07:28:09 +02:00
mskold/marty@linux.site
edadf1144c
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-04-05 06:59:47 +02:00
mskold/marty@linux.site
2e7255aee5
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2007-04-05 06:52:25 +02:00
mskold/marty@mysql.com/linux.site
84eb172c1a
Fixed compilation error on Windows
2007-04-05 06:49:43 +02:00