mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
37758 commits 2784 branches 343 tags 1.6 GiB
Commit graph

767 commits

Author SHA1 Message Date
tomas@whalegate.ndb.mysql.com
37b8c96197 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-03-21 09:00:38 +01:00
tomas@whalegate.ndb.mysql.com
5682efdfcf Bug #26825 MySQL Server Crashes in high load 
- initialize to NULL, to avoid call of free on uninitialized variable
 2007-03-21 08:40:24 +01:00
jani@ua141d10.elisa.omakaista.fi
bcbc0031eb Fixed compiler warnings. 2007-02-28 22:23:35 +02:00
monty@mysql.com/narttu.mysql.fi
8f4fef291d Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2007-02-22 20:32:19 +02:00
monty@mysql.com/narttu.mysql.fi
6946fa682f After merge fixes 
This also fixes a bug in counting number of rows that are updated when we have many simultanous queries
 2007-02-21 19:38:40 +02:00
monty@mysql.com/narttu.mysql.fi
26aa385bc5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2007-02-21 14:07:08 +02:00
tomas@poseidon.mysql.com
b7c3aeae2c Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca 
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-02-14 15:18:15 +07:00
tomas@poseidon.mysql.com
120eaec17c Bug #21033 Error 0 in readAutoIncrementValue() 
- do not call function if table has no autoincrement
 2007-02-14 15:16:26 +07:00
mskold/marty@mysql.com/linux.site
6ac9a28ef0 bug #26225 Engine condition pushdown doesn't work with prepare statements (ps_7ndb): ensure that query plan for prepared statement is analyzed correctly 2007-02-09 16:31:12 +01:00
tomas@poseidon.mysql.com
d56756de0a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-02-08 00:00:14 +07:00
mskold/marty@mysql.com/linux.site
5df38bfc3e Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2007-02-07 12:29:34 +01:00
mskold/marty@mysql.com/linux.site
2d0bd82a06 NdbScanOperation.hpp, NdbScanOperation.cpp, ha_ndbcluster.cc: 
bug#25821  Excessive partition pruning for multi-range index scan in NDB API: added multi_range error checking in end_of_bound
ha_ndbcluster.h:
  Removed stray mthod declaration
 2007-02-07 11:36:34 +01:00
mskold/marty@mysql.com/linux.site
0446aa9cbd Fix for bug#25821 Excessive partition pruning for multi-range index scan in NDB API: don't set distribution key if multi_range 2007-02-06 23:06:58 +01:00
mskold/marty@mysql.com/linux.site
0e20ef0ae4 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2007-02-01 13:59:34 +01:00
mskold/marty@mysql.com/linux.site
c16251ad7c Bug #25522 Update with IN syntax Clustertable + Trigger leads to mysqld segfault: moved back assignment 2007-02-01 09:48:45 +01:00
mskold/marty@mysql.com/linux.site
5cd40ad30b Bug #25522 Update with IN syntax Clustertable + Trigger leads to mysqld segfault: in start_stmt, only change query_state if starting a new transactions, in read_multi_range_next, change query state when end is reached 2007-01-31 22:38:06 +01:00
df@kahlann.erinye.com
cb6c5f7ee7 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2007-01-24 09:24:52 +01:00
tomas@poseidon.mysql.com
292ba83f40 Bug#25668 mysqld may core if cluster disconnected 
- recommit in 4.1
 2007-01-24 09:41:40 +07:00
pekka@clam.ndb.mysql.com/clam.(none)
56e2d4ffcb ndb - bug#25562 use byte-size max_data_length() when setting blob part size 2007-01-23 12:58:10 +01:00
tomas@poseidon.mysql.com
12911bb5c0 bug#25746 ndb: 4209 error with 2 VARCHAR primary keys 
- post review changes
 2007-01-23 07:12:03 +07:00
tomas@poseidon.mysql.com
9605aee4fe bug#25746 ndb: 4209 error with 2 VARCHAR primary keys 
- make sure keys are copied correctly when varchar has 2 length bytes
- test case
 2007-01-23 00:34:00 +07:00
monty@mysql.com/narttu.mysql.fi
a04157fbb3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2007-01-22 14:04:40 +02:00
tulin/mysqldev@mysql.com/production.mysql.com
2fed34d7ea ha_ndbcluster.cc: 
Bug #25668    - corrected patch after test failures
 2007-01-17 10:41:52 +01:00
tulin/mysqldev@mysql.com/production.mysql.com
1d6fe0ffaa ha_ndbcluster.cc: 
Bug #25668    ndb: mysqld may core if cluster disconnected
    -- pTrans may be NULL, remove not needed usage of handler::ndb_err
 2007-01-17 10:06:50 +01:00
mskold/marty@mysql.com/linux.site
0627ce96c8 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2007-01-08 11:18:24 +01:00
mskold/marty@mysql.com/linux.site
db0107b801 bug#24820 CREATE INDEX ....USING HASH on NDB table creates ordered index, not HASH index: Added error checking 2007-01-08 10:38:53 +01:00
mskold/marty@mysql.com/linux.site
a4e84daa7f Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2007-01-03 10:04:47 +01:00
kent@mysql.com/kent-amd64.(none)
226a5c833f Many files: 
Changed header to GPL version 2 only
 2006-12-23 20:17:15 +01:00
monty@mysql.com/narttu.mysql.fi
9d3fda77c8 After merge fixes: 
- Remove compiler warnings
- Fix merge errors
- Indentation fixes
 2006-12-15 06:21:15 +02:00
monty@mysql.com/narttu.mysql.fi
a6481aa4c7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-12-15 01:01:52 +02:00
monty@mysql.com/narttu.mysql.fi
88dd873de0 Fixed compiler warnings detected by option -Wshadow and -Wunused: 
- Removed not used variables and functions
- Added #ifdef around code that is not used
- Renamed variables and functions to avoid conflicts
- Removed some not used arguments

Fixed some class/struct warnings in ndb
Added define IS_LONGDATA() to simplify code in libmysql.c

I did run gcov on the changes and added 'purecov' comments on almost all lines that was not just variable name changes
 2006-12-15 00:51:37 +02:00
mskold/marty@mysql.com/linux.site
8d8d063f91 Removed check for impossible error return 2006-12-14 16:27:14 +01:00
mskold/marty@mysql.com/linux.site
6e8f99d29b Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2006-12-04 15:09:47 +01:00
mskold/marty@mysql.com/linux.site
2311316962 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2006-11-30 23:12:33 +01:00
mskold/marty@mysql.com/linux.site
aa03fbcac9 bug#18487 UPDATE IGNORE not supported for unique constraint violation of non-primary key: only check pk if it is updated 2006-11-30 22:52:23 +01:00
monty@mysql.com/narttu.mysql.fi
601e6f4b2a Fixed compiler warnings 
Don't assert if my_thread_end() is called twice (common case)
 2006-11-30 21:56:03 +02:00
mskold/marty@mysql.com/linux.site
e71c09b482 bug#18487 UPDATE IGNORE not supported for unique constraint violation of non-primary key: handle INSERT ... ON DUPLICATE KEY UPDATE 2006-11-30 17:22:04 +01:00
mskold/marty@mysql.com/linux.site
a172df24a9 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2006-11-30 16:04:12 +01:00
mskold/marty@mysql.com/linux.site
af324d9cf0 #18487 UPDATE IGNORE not supported for unique constraint violation of non-primary key: call peek_index_rows 2006-11-30 15:02:33 +01:00
monty@mysql.com/nosik.monty.fi
e825879800 Remove compiler warnings 
(Mostly in DBUG_PRINT() and unused arguments)
Fixed bug in query cache when used with traceing (--with-debug)
Fixed memory leak in mysqldump
Removed warnings from mysqltest scripts (replaced -- with #)
 2006-11-20 22:42:06 +02:00
mskold/marty@mysql.com/linux.site
f293350725 bug#21507 I can't create a unique hash index in NDB: Added possibillity to create hash only indexes with NULL valued attributes, but any NULL valued access will become full table scan with pushed condition on index attribute values 2006-11-07 16:38:37 +01:00
stewart@willster.(none)
a4faddc64f Merge bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into  willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2-merge2
 2006-10-25 17:24:20 +10:00
jonas@perch.ndb.mysql.com
6e4a0ec042 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2006-10-25 08:28:30 +02:00
stewart@willster.(none)
dc38d0249a fix ndb_cache_multi2 
util thread wasn't behaving correctly after 241 error due to get_table_statistics
not properly returning an error code
 2006-10-24 23:26:58 +10:00
mskold/marty@mysql.com/linux.site
8da80dd39d 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-24 08:29:37 +02:00
stewart@willster.(none)
826628c99b post merge fix 2006-10-24 00:18:57 +10:00
stewart@willster.(none)
3c2eeb2c15 Merge willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2-merge2 
into  willster.(none):/home/stewart/Documents/MySQL/5.0/ndb
 2006-10-23 23:57:28 +10:00
stewart@willster.(none)
5926602aa7 Bug #19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables 
fixes for ndb_* tests broken by previous fix

be more careful in ndb about setting errors on failure of info call (especially
in open)
 2006-10-23 23:46:35 +10:00
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@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@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
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
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
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@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
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
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
acurtis/antony@xiphis.org/ltantony.xiphis.org
678e15174e Bug#20573 
"strict mode: inserts autogenerated auto_increment value bigger than max"
  Strict mode should fail if autoincrement value is out of range
 2006-08-30 13:20:39 -07:00
lzhou/root@dev3-138.dev.cn.tlan
3140881459 Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/mysql-5.0-ndb-bj
 2006-08-28 16:18:48 +00: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
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
mskold/marty@mysql.com/linux.site
c8b93da355 Fix for bug #21059 Server crashes on join query with large dataset with NDB tables: do not release operation records for on-going read_multi_range 2006-08-15 14:31:21 +02:00
jonas@perch.ndb.mysql.com
3cd1826ef0 ndb - bug#20708 
init ndb_cache_check_time and honor value in my.cnf
 2006-08-15 14:22:47 +02:00
mskold/marty@mysql.com/linux.site
66e8255491 Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
 2006-08-15 13:37:39 +02:00
mskold/marty@mysql.com/linux.site
6a3143e2a0 ndb_lock.test, ndb_lock.result: 
bug #18184  SELECT ... FOR UPDATE does not work..: New test case
ha_ndbcluster.h, ha_ndbcluster.cc, NdbConnection.hpp:
  Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
 2006-08-15 13:12:27 +02:00
justin.he@qa3-104.qa.cn.tlan
265b9cf6cd BUG#20848 SHOW STATUS LIKE 'NDB%' should be data nodes not storage nodes 
use correct termninology
 2006-08-11 15:10:08 +08:00
stewart@willster.(none)
9d2e6b8d23 BUG#19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables 
allow handler::info to return an error code (that will be returned to the user)
 2006-08-10 22:55:20 +08:00
kostja@bodhi.local
7bf73ac3e5 Merge bodhi.local:/opt/local/work/mysql-5.0-root 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2006-07-07 22:09:43 +04:00
dlenev@mysql.com
b429748fab Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mysql.com:/home/dlenev/mysql-5.0-bg18437-3
 2006-07-06 14:31:32 +04:00
tomas@poseidon.ndb.mysql.com
0b2024ac88 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-07-04 12:47:07 +02:00
tomas@poseidon.ndb.mysql.com
98874725e0 Bug #20784 Uninitialized memory in update on table with PK not on first column 
- partial backport of code from 5.1, do cot compare_record for engines that do not read all columns during update
 2006-07-04 11:43:06 +02:00
dlenev@mysql.com
d4450e6696 Fix for bug#18437 "Wrong values inserted with a before update trigger on 
NDB table".

SQL-layer was not marking fields which were used in triggers as such. As
result these fields were not always properly retrieved/stored by handler
layer. So one might got wrong values or lost changes in triggers for NDB,
Federated and possibly InnoDB tables.
This fix solves the problem by marking fields used in triggers
appropriately.

Also this patch contains the following cleanup of ha_ndbcluster code:

We no longer rely on reading LEX::sql_command value in handler in order
to determine if we can enable optimization which allows us to handle REPLACE
statement in more efficient way by doing replaces directly in write_row()
method without reporting error to SQL-layer.
Instead we rely on SQL-layer informing us whether this optimization
applicable by calling handler::extra() method with
HA_EXTRA_WRITE_CAN_REPLACE flag.
As result we no longer apply this optimzation in cases when it should not
be used (e.g. if we have on delete triggers on table) and use in some
additional cases when it is applicable (e.g. for LOAD DATA REPLACE).

Finally this patch includes fix for bug#20728 "REPLACE does not work
correctly for NDB table with PK and unique index".
  
This was yet another problem which was caused by improper field mark-up.
During row replacement fields which weren't explicity used in REPLACE
statement were not marked as fields to be saved (updated) so they have
retained values from old row version. The fix is to mark all table
fields as set for REPLACE statement. Note that in 5.1 we already solve
this problem by notifying handler that it should save values from all
fields only in case when real replacement happens.
 2006-07-02 01:51:10 +04:00
monty@mysql.com
f62829636b After merge fixes 2006-06-30 20:07:33 +03:00
monty@mysql.com
2f86009c9e Merge mysql.com:/home/my/mysql-4.1 
into  mysql.com:/home/my/mysql-5.0
 2006-06-30 19:15:18 +03:00
tomas@poseidon.ndb.mysql.com
e61bfafaa9 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
 2006-06-30 16:26:33 +02:00
tomas@poseidon.ndb.mysql.com
9f542ef0f4 adopted ndb handler code for tables without primary key and with unique index 
- added missing retrieval of hidden primary key
 2006-06-30 16:25:07 +02:00
monty@mysql.com
a267b8f33c Don't read ~/.my.cnf in mysqldump.test 2006-06-30 04:10:27 +03:00
tomas@poseidon.ndb.mysql.com
5f5c3f9ceb Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main 
into  poseidon.ndb.mysql.com:/home/tomas/5.0-merge
 2006-06-30 00:02:17 +02:00
tomas@poseidon.ndb.mysql.com
97a19c1b9b Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-06-29 22:54:49 +02:00
tomas@poseidon.ndb.mysql.com
5d67b05203 corrected merge error 2006-06-29 22:11:29 +02:00
tomas@poseidon.ndb.mysql.com
65cec4da00 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-06-29 21:07:07 +02:00
tomas@poseidon.ndb.mysql.com
6f318d1658 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-06-29 21:05:43 +02:00
tomas@poseidon.ndb.mysql.com
87460ec76a Bug #19202 Incorrect errorhandling in select count(*) wrt temporary error 2006-06-29 20:55:21 +02:00
stewart@mysql.com
4e59b43512 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
 2006-06-29 22:00:50 +10:00
stewart@mysql.com
11c38b0f9e Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/merge
 2006-06-28 22:25:41 +10:00
tomas@poseidon.ndb.mysql.com
6283d8fd5a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-06-27 14:56:20 +02:00
tomas@poseidon.ndb.mysql.com
18e008a1ba Bug #19852 Restoring backup made from cluster with full data memory fails 
- correction of previous patch
 2006-06-27 11:26:00 +02:00
tomas@poseidon.ndb.mysql.com
95447f9d1a Bug #19852 Restoring backup made from cluster with full data memory fails 
- make sure to allocate just enough pages in the fragments by using the actual
  row count from the backup, to avoid over allocation of pages to fragments, and
  thus avoid the bug
 2006-06-27 10:02:58 +02:00
stewart@mysql.com
78dd9d12bb BUG#11459 ndb status variables not updated 
change names of some undocumented ndb status variables to better reflect what
their values mean
 2006-06-26 23:31:10 +10:00
mskold@mysql.com
f0bd8a7cd9 Merge mysql.com:/home/marty/MySQL/mysql-5.0-backed 
into  mysql.com:/home/marty/MySQL/mysql-5.0
 2006-06-21 09:50:41 +02:00
mskold@mysql.com
e77850e573 Fix for Bug #19906 REPLACE doesn't update TEXT fields correctly 2006-06-21 09:36:50 +02:00