jonas@perch.ndb.mysql.com
470e4daa14
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2006-10-19 09:38:37 +02:00
jonas@perch.ndb.mysql.com
2b04fb22be
ndb - bug#23200
...
this changes lock taken during peek, to decrease likelyhood of transaction abort
2006-10-19 09:27:58 +02:00
mskold/marty@mysql.com/linux.site
0522b11066
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-10-18 16:41:17 +02:00
mskold/marty@linux.site
f56e4579ab
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-10-18 15:17:47 +02:00
mskold/marty@mysql.com/linux.site
b381ed95d9
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-10-18 14:28:18 +02:00
mskold/marty@linux.site
3d8a932029
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-10-18 14:06:32 +02:00
stewart@willster.(none)
71636edc16
Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge
...
into willster.(none):/home/stewart/Documents/MySQL/5.1/bug19914-mk2-merge
2006-10-18 18:51:39 +10:00
mskold/marty@linux.site
ad7f7feea9
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-10-17 15:20:09 +02:00
stewart@willster.(none)
4de3c4bf1e
Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
...
into willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-is_files_refactor
2006-10-17 14:27:26 +10:00
mikael/pappa@dator5.(none)
4a7cd3a1cb
Merge dator5.(none):/home/pappa/clean-mysql-5.1
...
into dator5.(none):/home/pappa/bug18198
2006-10-16 15:40:40 -04:00
mskold/marty@linux.site
2c0208a44b
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-10-16 10:42:04 +02:00
mskold/marty@mysql.com/linux.site
e7f69b424a
Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0
2006-10-16 10:07:19 +02:00
stewart@willster.(none)
c1903d967a
Merge willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2
...
into willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge
2006-10-16 17:39:38 +10:00
mskold/marty@mysql.com/linux.site
aafe6e4663
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0
2006-10-16 08:33:22 +02:00
jonas@perch.ndb.mysql.com
ca4e9be98f
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2006-10-11 14:02:43 +02:00
jonas@perch.ndb.mysql.com
e600a3d394
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-10-10 11:25:24 +02:00
stewart@willster.(none)
163f272d24
BUG#23013 make INFORMATION_SCHEMA.FILES easily usable by other engines
2006-10-06 00:39:22 +10:00
jonas@perch.ndb.mysql.com
0b5ad7f38b
ndb - bug#17929
...
guess which scan type to use in handler
2006-10-05 14:25:18 +02:00
brian@zim.(none)
faff46eefe
Added license information display to output of plugins schema, and tagged all plugins with GPL flag.
2006-10-05 00:41:29 -07:00
knielsen@bk-internal.mysql.com
a96d7250e8
Merge bk-internal.mysql.com:/dev/shm/knielsen/mysql-5.1-ndb-bj
...
into bk-internal.mysql.com:/dev/shm/knielsen/mysql-5.1-new-ndb
2006-10-04 11:33:28 +02:00
mikael/pappa@dator5.(none)
1cdf82e012
BUG#18198: Partition function handling
...
Fixes of after review fixes
2006-10-02 15:52:29 -04:00
brian@zim.(none)
8685747f06
This patch makes ndbcluster_hton not static. I have a second patch for ndbcluster_hton to be static, but I want to talk to Jonas first.
2006-10-01 11:17:59 -07:00
brian@zim.(none)
56505c01f9
This patch updates to remove most global hton needs. Cleans up wrong message in partition.
2006-09-30 18:31:13 -07:00
brian@zim.(none)
46ae2113ba
This patch adds handlerton passing to functions. NDB and Innodb still require a global hanlderton in the main code due to the nature of the sql_cache call back function (should be solveable... another patch).
...
Partitioning now has a flag to allow disabling of engines from being compatible with partitioning. Cleaned up heap naming convention on panic call.
2006-09-30 12:49:46 -07:00
brian@zim.(none)
a756fd36ef
This removes the passing of global hton to engine instance.
2006-09-29 17:19:02 -07:00
brian@zim.(none)
f9a02811da
Removed Field (this came in as an idea from a previous patch by Serg)
2006-09-26 21:26:04 -07:00
mskold/marty@linux.site
5e60232da9
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-09-22 21:14:58 +02:00
mskold/marty@mysql.com/linux.site
42d64e4275
Bug #21072 Duplicate key error in NDB references wrong key: use MAX_KEY to signal unknown key
2006-09-21 16:49:07 +02:00
stewart@willster.(none)
0f3874dffa
Merge willster.(none):/home/stewart/Documents/MySQL/4.1/ndb
...
into willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2
2006-09-20 17:09:53 +10:00
stewart@willster.(none)
6ff9664d46
Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into willster.(none):/home/stewart/Documents/MySQL/5.1/bug20073
2006-09-19 18:36:18 +10:00
acurtis/antony@ltamd64.xiphis.org
424857e0e4
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into xiphis.org:/home/antony/work2/engines-merge
2006-09-18 12:16:03 -07:00
stewart@willster.(none)
49eb41e09d
BUG#20073 information_schema.FILES for UNDO LOG give incorrect EXTENT_SIZE, FREE_EXTENTS,
...
Change things around so that we add a row for each log file group that lists
the free space for that log file group.
2006-09-19 01:44:32 +10:00
svoj@april.(none)
f21eadfc74
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into april.(none):/home/svoj/devel/mysql/merge/mysql-5.0-engines
2006-09-18 16:23:45 +05:00
brian@zim.(none)
f79ddec1f2
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zim.(none):/home/brian/mysql/merge-5.1
2006-09-15 10:48:30 -07:00
brian@zim.(none)
7194b6d75a
This changes the order of the universe, black is now the new white.
...
In practice this means that handlerton is now created by the server and is passed to the engine. Plugin startups can now also control how plugins are inited (and can optionally pass values). Bit more flexibility to those who want to write plugin interfaces to the database.
2006-09-15 10:28:00 -07:00
mskold/marty@linux.site
67aeec035b
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-09-15 15:56:20 +02:00
mskold/marty@mysql.com/linux.site
528e8b4c0e
Bug #21056 ndb pushdown equal/setValue error on datetime: post review fixes, use my_bitmap
2006-09-15 15:51:05 +02:00
mskold/marty@linux.site
caeb010e8c
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-09-15 15:45:51 +02:00
mskold/marty@mysql.com/linux.site
9ff78327b9
Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0
2006-09-13 18:50:47 +02:00
mskold/marty@mysql.com/linux.site
4979d1526c
Bug #21378 Alter table from X storage engine to NDB could cause data loss: skip autodiscover of local tables
2006-09-13 18:49:05 +02:00
tsmith@maint2.mysql.com
6a31ec2cad
Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50
...
into maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/51
2006-09-13 09:03:52 +02:00
mskold/marty@linux.site
b767f1a02c
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-09-12 16:35:41 +02:00
mskold/marty@mysql.com/linux.site
bf52d20b4b
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0
2006-09-12 16:24:39 +02:00
mskold/marty@mysql.com/linux.site
125df80e9b
Bug #21378 Alter table from X storage engine to NDB could cause data loss: Added warning if local table shadows ndb table
2006-09-12 16:04:52 +02:00
brian@zim.(none)
1ac47c9513
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zim.(none):/tmp/merge-5.1
2006-09-06 09:23:47 -07:00
mskold/marty@linux.site
d33411e558
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-09-06 11:21:49 +02:00
mskold/marty@mysql.com/linux.site
6752861d1b
Bug #21056 ndb pushdown equal/setValue error on datetime: only pushdown like of string type fields
2006-09-05 17:07:00 +02:00
guilhem@gbichot3.local
e4d3595b18
Fix for BUG#11151 "LOAD DATA INFILE commits transaction in 5.0".
...
In 5.0 we made LOAD DATA INFILE autocommit in all engines, while
only NDB wanted that. Users and trainers complained that it affected
InnoDB and was a change compared to 4.1 where only NDB autocommitted.
To revert to the behaviour of 4.1, we move the autocommit logic out of mysql_load() into
ha_ndbcluster::external_lock().
The result is that LOAD DATA INFILE commits all uncommitted changes
of NDB if this is an NDB table, its own changes if this is an NDB
table, but does not affect other engines.
Note: even though there is no "commit the full transaction at end"
anymore, LOAD DATA INFILE stays disabled in routines (re-entrency
problems per a comment of Pem).
Note: ha_ndbcluster::has_transactions() does not give reliable results
because it says "yes" even if transactions are disabled in this engine...
2006-09-05 16:52:05 +02:00
mskold/marty@linux.site
04a62eb684
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-09-01 15:26:03 +02:00
brian@zim.(none)
b5fdcc2962
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zim.(none):/tmp/mysql-5.1-arch
2006-08-31 16:11:57 -07:00