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@mysql.com/hfmain.(none)
acb0a7e08a
merging fix
2007-04-06 16:06:10 +05:00
kostja@vajra.(none)
14de569dc3
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into vajra.(none):/opt/local/work/mysql-5.1-runtime
2007-04-06 14:15:29 +04: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
kostja@vajra.(none)
3ef7bdd9b9
3d attempt to fix information_schema.test failure on HP-UX.
...
Apparently it's the only platform in pushbuild where we
compile without openssl.
2007-04-06 00:38:57 +04:00
kostja@vajra.(none)
07daf69954
Fix a compile failure on Windows.
2007-04-05 23:22:33 +04:00
msvensson@shellback.(none)
2df8524391
Add "query_sorted" command to mysqltest
...
Usage:
query_sorted <query>;
2007-04-05 20:12:56 +02:00
kostja@vajra.(none)
9c6e4c8615
Fix a compile error with LINT enabled builds.
2007-04-05 21:46:25 +04:00
kostja@vajra.(none)
7d463c1e85
Remove a dead file.
2007-04-05 21:01:09 +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
tsmith@siva.hindu.god
5c95c63193
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into siva.hindu.god:/home/tsmith/m/bk/maint/51
2007-04-05 10:17:32 -06: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
msvensson@pilot.blaudden
dec5334a2b
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-05 14:51:49 +02:00
msvensson@pilot.blaudden
c3dc142df5
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-05 13:54:24 +02:00
msvensson@pilot.blaudden
9cd8b2b8fb
Protect against dying twice
...
Cleanup exit handling
2007-04-05 13:53:44 +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
70fa6a4e5d
ndb: change attribute id for ANY_VALUE as id was already reserved for upcoming read pached patch
2007-04-05 12:01:01 +02: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
30a48b7191
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 10:22:46 +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
tomas@whalegate.ndb.mysql.com
b07ef92dda
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-05 09:18:52 +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
tomas@whalegate.ndb.mysql.com
ffba52433c
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 09:18:36 +02:00
tomas@whalegate.ndb.mysql.com
764ac49ebc
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 09:16:42 +02:00
tomas@whalegate.ndb.mysql.com
ee57ca9db0
set name for ndb tools
2007-04-05 09:16:16 +02:00
tomas@whalegate.ndb.mysql.com
a36cb8c56a
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 09:13:20 +02:00
tomas@whalegate.ndb.mysql.com
292929bc26
Bug#27644 ndb: connecting api node/mysqld may "steal" node_id from running mysqld
...
- test case workaround to avoid random failures
2007-04-05 09:12:30 +02:00
msvensson@pilot.blaudden
bc5462fb44
Add extra INSERT to make usre sync_slave_with_master has job to do
2007-04-05 09:10:22 +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
Justin.He/justin.he@dev3-240.dev.cn.tlan
10dffc5a19
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 12:26:01 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
c7da27b5b2
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb-bj.merge
2007-04-05 11:30:19 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
fdf57c7ac2
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 10:47:40 +08:00