jonas@perch.ndb.mysql.com
365b69dc7f
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-29 22:56:23 +02:00
timour/timka@lamia.home
0368914b9a
Merge lamia.home:/home/timka/mysql/src/5.0-bug-21456
...
into lamia.home:/home/timka/mysql/src/5.1-bug-21456
2006-08-29 16:39:09 +03:00
jonas@perch.ndb.mysql.com
7357e431a3
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-29 10:49:05 +02:00
jonas@perch.ndb.mysql.com
3cb9b16e0d
ndb -
...
Add order by in rpl_(ndb)_multi_update3 to make result deterministic
2006-08-29 10:47:28 +02:00
jonas@perch.ndb.mysql.com
853cf3dac4
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-29 09:20:09 +02:00
jonas@perch.ndb.mysql.com
b6e908ca29
ndb -
...
fix backup/lcp race
2006-08-29 09:19:41 +02:00
jonas@perch.ndb.mysql.com
6011ad7868
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-28 16:03:51 +02:00
jonas@perch.ndb.mysql.com
8fb56fbc3a
ndb -
...
Snapup testBackup XXXerror
2006-08-28 15:55:30 +02:00
jonas@perch.ndb.mysql.com
802990e139
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-work
2006-08-28 10:27:02 +02:00
jonas@perch.ndb.mysql.com
67a5d98c1d
ndb - bug#21615
...
Improve error message when detecting corrupted REDO log
2006-08-28 10:26:21 +02:00
jonas@perch.ndb.mysql.com
b3ee645364
ndb - autotest
...
adopt to new error code 755 (invalid tablespace)
2006-08-28 08:32:14 +02:00
brian@zim.(none)
7216b5bc7a
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zim.(none):/home/brian/mysql/arch-5.1
2006-08-25 14:07:30 -07:00
brian@zim.(none)
e831273902
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into zim.(none):/home/brian/mysql/arch-5.1
2006-08-25 13:32:06 -07:00
brian@zim.(none)
baa914e66d
Cleanup of unused variables.
...
Fixed "discover" in the handler API.
Fixed problem where handlerton was not zero'ed. I need to look around, I suspect this problem is more widespread.
2006-08-25 13:31:15 -07:00
jonas@perch.ndb.mysql.com
97a956ca73
ndb - fix some bug in testSRBank
2006-08-25 16:47:31 +02:00
jonas@perch.ndb.mysql.com
e4c3a58134
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-25 11:59:28 +02:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
aeea252b4d
no longer need ifdef as plugin is conditionally compiled
2006-08-25 00:37:01 -07:00
jonas@perch.ndb.mysql.com
c6e8be9808
ndb - bug#21806
...
disable ndb_autodiscover3 (cluster restart (--initial))
2006-08-25 08:57:38 +02:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
b68f0437e7
fix for windows build
2006-08-24 22:10:55 -07:00
jonas@perch.ndb.mysql.com
a7513025c4
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-24 20:31:54 +02:00
jonas@perch.ndb.mysql.com
392b7ea14b
ndb -
...
disable ndb_binlog_discover as it's broken
remove debug printout
2006-08-24 20:31:12 +02:00
jonas@perch.ndb.mysql.com
cac363e69e
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-24 15:23:46 +02:00
jonas@perch.ndb.mysql.com
74defc5737
ndb - fix monster bug in NdbEventOperation->stop where Suma sent uninitialized data
...
affects basically all replication tests
2006-08-24 15:22:07 +02:00
petr/cps@owlet.local
257ce16d58
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
2006-08-24 16:18:58 +04:00
petr/cps@mysql.com/owlet.local
e36be72adb
after merge fix
2006-08-24 16:17:42 +04:00
jonas@perch.ndb.mysql.com
e16c431759
ndb -
...
bug#21800 - 5.0 -> 5.1 merge
2006-08-24 07:25:54 +02:00
jonas@perch.ndb.mysql.com
1659927375
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-work
2006-08-24 07:21:10 +02:00
jonas@perch.ndb.mysql.com
7cb75fc850
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/50-work
2006-08-24 07:18:04 +02:00
jonas@perch.ndb.mysql.com
b60be73461
ndb - bug#21800
...
read TransactionDeadlockTimeout (for scans) to cater for insane settings
2006-08-24 07:14:46 +02:00
brian@zim.(none)
d41188130a
This is a cleanup of warnings that windows is complaining about.
2006-08-23 15:12:42 -07:00
brian@zim.(none)
212ab97668
This patch removes need for a innodb to have its own configure.
2006-08-23 13:59:16 -07:00
timour/timka@lamia.home
70f76e457f
Merge lamia.home:/home/timka/mysql/src/4.1-bug-21456
...
into lamia.home:/home/timka/mysql/src/5.0-bug-21456
2006-08-23 18:22:53 +03:00
andrey@example.com
f41f9bf0d9
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into example.com:/work/mysql-5.1-runtime
2006-08-23 15:51:37 +02:00
andrey@example.com
9c8c1817ce
Fix for bug #20665 All commands supported in Stored Procedures
...
should work in Prepared Statements. Post-review changeset.
Problem: There are some commands which are avaiable to be executed in SP
but cannot be prepared. This patch fixes this and makes it possible
prepare these statements.
Changes: The commands later are made available in PS. RESET has been forbidden
in SF/Trigger.
Solution: All current server commands where checked and those missing (see later)
we added. Tests for all of the commands with repeated executions were
added - testing with SP, SF and PS.
SHOW BINLOG EVENTS
SHOW (MASTER | SLAVE) STATUS
SHOW (MASTER | BINARY) LOGS
SHOW (PROCEDURE | FUNCTION) CODE (parsable only in debug builds)
SHOW CREATE (PROCEDURE | FUNCTION | EVENT | TABLE | VIEW)
SHOW (AUTHORS | CONTRIBUTORS | WARNINGS | ERRORS)
CHANGE MASTER
RESET (MASTER | SLAVE | QUERY CACHE)
SLAVE (START | STOP)
CHECKSUM (TABLE | TABLES)
INSTALL PLUGIN
UNINSTALL PLUGIN
CACHE INDEX
LOAD INDEX INTO CACHE
GRANT
REVOKE
KILL
(CREATE | RENAME | DROP) DATABASE
(CREATE | RENAME | DROP) USER
FLUSH (TABLE | TABLES | TABLES WITH READ LOCK | HOSTS | PRIVILEGES |
LOGS | STATUS | MASTER | SLAVE | DES_KEY_FILE | USER_RESOURCES)
2006-08-23 15:50:06 +02:00
timour/timka@lamia.home
de723f2998
Bug #21456 : SELECT DISTINCT(x) produces incorrect results when using order by
...
GROUP BY/DISTINCT pruning optimization must be done before ORDER BY
optimization because ORDER BY may be removed when GROUP BY/DISTINCT
sorts as a side effect, e.g. in
SELECT DISTINCT <non-key-col>,<pk> FROM t1
ORDER BY <non-key-col> DISTINCT
must be removed before ORDER BY as if done the other way around
it will remove both.
2006-08-23 16:46:57 +03:00
petr/cps@owlet.local
5fae48d9e4
Merge mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
...
into mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
2006-08-23 17:15:24 +04:00
petr/cps@owlet.local
2763504be4
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
2006-08-23 16:48:39 +04:00
jonas@perch.ndb.mysql.com
e5e5d0273b
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-23 12:40:58 +02:00
jonas@perch.ndb.mysql.com
51fc14dd12
ndb - sr -
...
Fix so that expand_check2 is only run per fragment,
as restore now works 1 fragment at a time (again)
2006-08-23 11:22:48 +02:00
jonas@perch.ndb.mysql.com
b1d5f861dd
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-23 11:02:27 +02:00
jonas@perch.ndb.mysql.com
4cab70171e
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2006-08-23 11:00:29 +02:00
brian@zim.(none)
b518763728
This changest:
...
Plugins now when compiled or not compiled work correctly with status variables.
Status variables from plugins now set their own names (removed bit where plugin name was pre-appended this broke Innodb and Cluster)
A few Makefile cleanups.
2006-08-22 16:24:12 -07:00
jonas@perch.ndb.mysql.com
a0bba5faef
correct merge
2006-08-22 22:52:03 +02:00
jonas@perch.ndb.mysql.com
0edae8e98f
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-22 20:59:20 +02:00
jonas@perch.ndb.mysql.com
93a83f3884
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-08-22 20:55:28 +02:00
pekka@orca.ndb.mysql.com
4828d63cda
Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
...
into orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug21017
2006-08-22 15:00:42 +02:00
pekka@orca.ndb.mysql.com
a5b835abbd
Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-ndb
...
into orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-bug21017
2006-08-22 14:58:38 +02:00
pekka@orca.ndb.mysql.com
a75c30c713
Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-ndb
...
into orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
2006-08-22 14:39:58 +02:00
pekka@orca.ndb.mysql.com
9dc6087d4d
ndb - post-merge fix 5.0 to 5.0-ndb: number of frags if --without-big-tables
2006-08-22 14:26:56 +02:00
pekka@orca.ndb.mysql.com
26e5b93203
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
2006-08-22 14:19:10 +02:00