Commit graph

230 commits

Author SHA1 Message Date
magnus@shellback.(none)
19787199ec Correct merge problem 2004-09-28 08:53:21 +02:00
tomas@poseidon.ndb.mysql.com
1379567be1 removed init on ConfigRetriever
added some debug printouts
    some changes in ndbcluster_init to make start of mysqld first work
2004-09-27 00:24:23 +00:00
magnus@shellback.(none)
e5ff827178 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into shellback.(none):/home/magnus/mysql/mysql-4.1-ndb
2004-09-26 17:49:02 +02:00
magnus@shellback.(none)
94b305b226 Merge 2004-09-26 16:21:15 +02:00
magnus@shellback.(none)
059941db21 WL#1424 Updated after review
* Changed the implementation of ndbcluster_find_files to be more efficient, using only one mutex lock
* Moved ha_find_files to end of mysql_find_files so that it can be passed the list that we are interested to find.
2004-09-26 16:11:24 +02:00
magnus@shellback.(none)
9e359d2397 Clean up of index_name and unique_index_name 2004-09-25 14:35:27 +02:00
tomas@poseidon.ndb.mysql.com
71d5ea8f85 fix for invalidating table if mismatch with frm
removed debug printout
    new test in alter table for dictionay update test with multiple connections
    added coice of setting MaxNoOfOrderedIndexes
    added option to run "--small-bench"
2004-09-24 16:58:25 +00:00
mskold@mysql.com
f06d8027ea Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-09-22 17:30:51 +02:00
tomas@poseidon.ndb.mysql.com
a0317069e5 Merge 2004-09-21 12:56:05 +00:00
tomas@poseidon.ndb.mysql.com
b2c696393d bug#5591 2004-09-21 12:52:56 +00:00
magnus@neptunus.(none)
61be5a9c27 Merge 2004-09-21 14:19:42 +02:00
tomas@poseidon.ndb.mysql.com
b1fa0304e8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
2004-09-21 12:19:41 +00:00
magnus@neptunus.(none)
58899f0137 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into neptunus.(none):/home/magnus/mysql/wl/wl1424_discover_2
2004-09-21 12:23:27 +02:00
magnus@neptunus.(none)
0097c6d9b2 Changed WL#1424 to use the function ha_find_files. This is a simpler implementation and all handler specific code is hidden in the appropriate handler. 2004-09-21 12:13:58 +02:00
mskold@mysql.com
646f1036d4 Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-09-20 21:03:37 +02:00
mskold@mysql.com
f3c68d3831 Added support for calculating index cadinality 2004-09-20 21:03:09 +02:00
joreland@mysql.com
b5fe917271 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-09-20 20:56:16 +02:00
tomas@poseidon.ndb.mysql.com
3473effec4 suggested fix for bug 5591 adn corrct select count() with several clients 2004-09-20 15:52:19 +00:00
magnus@neptunus.(none)
08312bfb32 Merge changes 2004-09-20 17:34:32 +02:00
magnus@neptunus.(none)
cdc7a32f37 Merged Thd_ndb 2004-09-20 14:28:43 +02:00
magnus@neptunus.(none)
9aab724d6c Ues buf pointer in get_ndb_value
Merge fixes
2004-09-20 12:40:53 +02:00
magnus@neptunus.(none)
47168d1219 Merged new ndb_insert.test and .result 2004-09-20 11:14:31 +02:00
tomas@poseidon.ndb.mysql.com
4c45731881 Preparation for batching 2004-09-17 14:58:08 +00:00
tomas@poseidon.(none)
87ba45e99b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
2004-09-16 23:36:48 +00:00
mskold@mysql.com
251fe25bf8 Optimzed handling of NO_AUTO_VALUE_ON_ZERO 2004-09-16 04:55:22 +02:00
mskold@mysql.com
4a9805679e Fixed handling of NO_AUTO_VALUE_ON_ZERO 2004-09-15 18:44:18 +02:00
pekka@mysql.com
0caba84b46 ndb charsets: DICT 2004-09-15 17:44:13 +02:00
mskold@mysql.com
089e0565d1 Added support for auto_increment of partial key 2004-09-15 17:31:15 +02:00
magnus@neptunus.(none)
013486701c BUG#4775 "Duplicate key requires rollback of transaction" - Improved error message telling that transaction is aborted
BUG#4312 "wrong behaviour on insert .. on duplicate key" functionality disabled
2004-09-15 14:44:21 +02:00
mskold@mysql.com
9311c81a55 Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-09-14 18:17:03 +02:00
tomas@poseidon.(none)
db1604a7c7 fix to make transaction failure also affect select count() on other tables in thread 2004-09-14 16:17:01 +00:00
tomas@poseidon.(none)
457dfbe779 Added testcase for select count() during transaction with failures
added fix for keeping "records" up to date when execute() fails
2004-09-14 15:51:57 +00:00
tomas@poseidon.(none)
fc174af248 new method to set size of local table data
clearer configure description texts
changed Ndb_local_table_info to use create, destroy metods and hidden constructor/destructor
move definition if Thd_ndb to .h file and changes seize/release to operate on Thd_ndb instead of Ndb objects
moved allocation/deletion of Ndb objects to Thd_ndb
2004-09-14 12:47:34 +00:00
tomas@poseidon.(none)
aecd1e5d7f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
2004-09-14 08:55:09 +00:00
tomas@poseidon.(none)
21a4b1b4e6 moved all ndb thread specific data into new placeholder
new methods to keep "records" up to date
unset flag HA_NOT_EXACT_COUNT to make handler read "records" field, for count() optim and join optimization
new methods to keep "records" up to datecorrect record field in ndbcluster handler
new method for ndbcluster handler to store/retrieve table and thread specific data
changed local hash to store new table_info object, with placeholders for local data, instead of TableImpl
hanged deleteKey to return ponter to deleted object
moved heavy global cache fetch from inline to separate method
2004-09-14 08:52:21 +00:00
mskold@mysql.com
6370af0bb2 Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-09-13 22:31:16 +02:00
magnus@neptunus.(none)
d41f7af07e Merged 2004-09-13 14:49:50 +02:00
magnus@neptunus.(none)
8abbb28f8b WL1424 Multiple MySQL Servers: SHOW TABLES etc. should detect new and delete old tables. 2004-09-13 14:46:38 +02:00
joreland@mysql.com
f003b3244e Fix dict error code on list tables
Check g_ndb before deleting it
Wait until ready(10) if get mgm connection
2004-09-13 06:40:25 +02:00
mskold@mysql.com
8afda1cb3d Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-09-11 20:56:06 +02:00
tulin@build.mysql.com
c039c35bba Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into build.mysql.com:/users/tulin/mysql-4.1-ndb-merge
2004-09-09 10:41:33 +02:00
joreland@mysql.com
e8566a205a Bug#5429
Use const table * in NDB API
2004-09-07 21:53:59 +02:00
mskold@mysql.com
6fc7cef065 Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-09-07 16:23:17 +02:00
mskold@mysql.com
5827b829b0 Added use of buffer argument in index_read 2004-09-07 16:22:42 +02:00
tomas@poseidon.(none)
7d192fcbd7 fixed NdbConnection::restart and made use of it in ha_ndbcluster
added testcase
2004-09-07 12:30:11 +00:00
tomas@poseidon.(none)
2fdb262c4a fixed and added test case for bug#5431
+ fix for support of multiple mgmt servers
2004-09-07 10:54:31 +00:00
magnus@neptunus.(none)
8788f96ecb Fix for INSERT with multiple values and start/end_bulk_insert 2004-09-07 12:45:19 +02:00
magnus@neptunus.(none)
a9531f60d7 Only include debug print routines in debug mode 2004-09-07 12:23:06 +02:00
tomas@poseidon.(none)
77cd417c7e fixed so that ndbcluster and mysqld can be started independently
fixed some error codes in Ndb so that 4009-cluster failure is returned when cluster is not up
2004-09-06 18:30:57 +00:00
tomas@poseidon.(none)
2192d179d2 added ndb_mgm_destroy_configuration call
fixed memory leak in object map
fixed uninitialized value blobs_pending
2004-09-06 10:46:23 +00:00
magnus@neptunus.(none)
4f655b1c53 Added debug printout's to ha_ndbcluster 2004-09-06 10:33:12 +02:00
tomas@poseidon.(none)
73366eafc5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.(none):/home/tomas/mysql-4.1-ndb
2004-09-03 15:12:34 +00:00
tomas@poseidon.(none)
caf79dacfe renamed ha_recovery_logging to ha_enable_transaction
added tests to alter table for "large" alter tables and truncates in ndbcluster
added debug printout in restart() in ndbcluster
added flag THD::transaction.on to enable/disable transaction
2004-09-03 15:11:09 +00:00
joreland@mysql.com
eff2fa5ee5 Remove usage of row count (as it trashes _all_ explain & table status)
Use order by
2004-09-03 14:46:39 +02:00
joreland@mysql.com
62dae75094 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-09-03 13:56:11 +02:00
joreland@mysql.com
c90fdd44a9 Added support for HA_READ_ORDER +
Added table statistics
2004-09-03 13:55:40 +02:00
tomas@poseidon.(none)
1e6925802a fixed wrong initial auto increment value bug#5369 2004-09-02 15:51:44 +00:00
pekka@mysql.com
9683b335e4 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/space/pekka/ndb/version/my41-blobs
2004-09-02 14:11:47 +02:00
pekka@mysql.com
f01a88dce9 ha_ndbcluster.cc, ndb_blob.test, ndb_blob.result:
bug-5013 fix
2004-09-02 12:42:03 +02:00
joreland@mysql.com
e148567003 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-09-01 04:55:16 +02:00
mskold@mysql.com
84196617c1 Fix for bug#5312 Ndb Cluster returns wrong error code for duplicate key at insert 2004-08-31 12:07:48 +02:00
mskold@mysql.com
4f8a82dbfe Enabled HA_NULL_IN_KEY support 2004-08-31 10:19:10 +02:00
joreland@mysql.com
880b78dc22 ndb table locks
Removed errornous hupp, which made handler commit same transid several times
(which is checked when running in debug mode)
2004-08-30 12:13:10 +02:00
mskold@mysql.com
a2bcb2a558 Cleaned up rnd_init 2004-08-24 23:13:32 +02:00
monty@mysql.com
c44d4debfa Portablity fixes & simple optimizations 2004-08-24 18:00:45 +03:00
tomas@poseidon.(none)
552d841be2 stylistic fixes 2004-08-23 08:42:31 +00:00
tomas@poseidon.(none)
91b352377c added switch to mysqld to specify connectstring 2004-08-20 16:10:47 +00:00
mskold@mysql.com
99eef36f24 Minor typo 2004-08-19 11:51:06 +02:00
mskold@mysql.com
348cff4196 Cleaned up build of index list 2004-08-19 11:10:35 +02:00
mskold@mysql.com
47214454b6 Minor cosmetic fix 2004-08-19 07:33:35 +02:00
mskold@mysql.com
3e1493b84b Fix for WL#1731 Handler: multiple databases 2004-08-18 19:13:39 +02:00
mskold@mysql.com
7c6b884ef5 Added support for NULL in unique index 2004-08-13 13:51:18 +02:00
mskold@mysql.com
c1c3e31fb6 Fix for bug#4730 2004-08-11 15:06:17 +02:00
mskold@mysql.com
0625aef8c0 Bug fix for bug#3912 2004-08-10 14:38:24 +02:00
mskold@mysql.com
a5dd9f8bb4 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
2004-08-10 11:48:43 +02:00
ndbdev@eel.hemma.oreland.se
64618d7fe4 Merge joreland@bk-internal.mysql.com:irix
into eel.hemma.oreland.se:/ndb/clone-mysql-4.1-ndb-daily-2004-08-04
2004-08-05 22:19:52 +02:00
magnus@neptunus.(none)
1c65da2cbc BUG#4818 DELETE FROM tab LIMIT
Check if there are any operations pending that needs to be taken over to the updating/deleting transaction before closing the scan
2004-08-04 10:54:42 +02:00
joreland@mysql.com
20c86363f5 Merge 4.1 with jonas irix clone 2004-08-03 14:16:16 +02:00
mysqldev@o2k.irixworld.net
d861fa8577 Fix duplicate declaration in NDB cluster handler 2004-08-03 13:54:55 +02:00
mskold@mysql.com
4623fb9f48 Fix for bug#3912 Auto increment not correctly initialised when table is altered, completes WL#1911 Extended AUTO_INCREMENT support in NDB 2004-07-29 11:35:38 +02:00
pekka@mysql.com
8bd205c8e2 ha_ndbcluster.h, ha_ndbcluster.cc:
compile fix for gcc-2.95
2004-07-29 10:44:53 +02:00
mskold@mysql.com
345e1dc42a Fixed merge problems, optimized bulk insert 2004-07-23 15:46:56 +02:00
pekka@mysql.com
156bfa48f5 ha_ndbcluster.cc:
merge
2004-07-23 13:41:38 +02:00
pekka@mysql.com
56fa7bfd90 Merge 2004-07-23 13:27:26 +02:00
pekka@mysql.com
f14d9c672b ha_ndbcluster.cc:
ndb_supported_type, include all types in switch
2004-07-23 13:21:39 +02:00
mskold@mysql.com
0d56d7ffdf Changed bulk insert to only be statement wise 2004-07-23 13:13:50 +02:00
mskold@mysql.com
6216a8bf1b Fixes after code review of WL#1791 Handler: support update of primary key 2004-07-23 10:33:51 +02:00
mskold@mysql.com
f08af1382c Cosmetic fix 2004-07-22 19:14:05 +02:00
mskold@mysql.com
217bd8b6bd WL#1791 Handler: support update of primary key 2004-07-22 18:35:51 +02:00
pekka@mysql.com
9c3dd2fb8b ha_ndb blobs 2 2004-07-22 12:38:09 +02:00
mskold@mysql.com
bb61021420 Fix for bug#4669, Scans do not ignore uncommitted inserts (instead hang on lock) 2004-07-21 11:46:14 +02:00
mskold@mysql.com
9311492f1c Fix for bug#4595 2004-07-19 17:28:07 +02:00
mskold@mysql.com
cf87b5b096 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
2004-07-19 09:09:40 +02:00
mskold@mysql.com
bddd075d73 Fixed bug #4106 and removed buggy pk update 2004-07-09 13:18:56 +02:00
monty@mysql.com
db7efa2780 New handler::index_flags() definition to make it easy to check the full used key and a specific key part.
Added key part to optimize_range() to fix problems when using fields in key parts.
2004-07-08 15:45:25 +03:00
joreland@mysql.com
c61d23e0e5 merge 2004-07-06 08:56:05 +02:00
ndbdev@ndbmaster.mysql.com
2f24eec4d2 missing ; 2004-07-06 08:43:57 +02:00
joreland@mysql.com
2a8ea3861c Fixed bugs in ordered scan discovered by mysql-test-run
Enabled ordered scan in handler
2004-07-05 20:41:06 +02:00
mskold@mysql.com
3f20e69c25 Fixed ndbcluster_print_error to use table name from failed NdbOperation 2004-07-02 16:14:08 +02:00
mskold@mysql.com
c708619d0b Added support for update of pk 2004-07-02 11:50:28 +02:00
mskold@mysql.com
146d68871b Merged 2004-06-27 16:56:52 +02:00
mskold@mysql.com
6988615fd8 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1-ndb
2004-06-27 16:00:48 +02:00
mskold@mysql.com
29746be6a8 Cosmetic fixes 2004-06-24 14:49:34 +02:00
mskold@mysql.com
075d71d546 Modified index flags and added ndbcluster_print_error 2004-06-24 12:04:22 +02:00
mskold@mysql.com
432020a18d Modified ndbcluster_print_error to stack allocate table and handler, NOT for review, will make patch instead 2004-06-23 15:34:45 +02:00
mskold@mysql.com
e6391b9493 Added static print error function to be used by handler in ndbcluster_commit and ndbcluster_rollback 2004-06-22 14:24:51 +02:00
mskold@mysql.com
795dfa59e7 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
2004-06-22 09:59:15 +02:00
mskold@mysql.com
da8ab00d12 Added static print error function to be used by handler in ndbcluster_commit and ndbcluster_rollback 2004-06-22 09:54:00 +02:00
joreland@mysql.com
d99c91b63c Fix handler w.r.t scan 2004-06-11 13:49:22 +02:00
mskold@mysql.com
bc0cf2ccff Added missing ; 2004-05-28 11:23:44 +02:00
magnus@neptunus.(none)
2daebc70cc Fix after running on a 4-node system. 2004-05-26 14:22:49 +02:00
magnus@neptunus.(none)
28c8ac884b Corrected index_flags returned when index are created with USING HASH
Updated ndb_ test cases
2004-05-25 14:40:51 +02:00
magnus@neptunus.(none)
15023e1b8f Fixed prototype of get_error_message to use String to return error message
WL#1747 and #1746 allow user to decide if ordered index should be created or not
2004-05-24 12:35:39 +02:00
magnus@neptunus.(none)
1f1b01e028 Merge 2004-05-17 09:57:02 +02:00
magnus@neptunus.(none)
43708207ba Fixes made after running with sql-bench 2004-05-17 09:51:02 +02:00
monty@mishka.local
314a8bf114 key_cmp -> key_cmp_if_same
New records_in_range() interface (similar to read_range())
Macros for faster bitmap handling
Simplify read_range() code (#WL1786)
New general key_cmp() function to compare keys
2004-05-16 14:48:32 +03:00
magnus@neptunus.(none)
97bf111f1d WL #1729 Handler: error text for NDB errors
- New solution after discussions with Sergei, no handler specific code or error messages should be in sql layer.
next_result, only check for error if check is -1
Improved index_read
2004-05-13 11:56:45 +02:00
magnus@neptunus.(none)
02c9f8cfe0 WL# 1729 Handler: error text for NDB errors
- Close an open scan if index_read is called without closing the previous one.
- Removed some errors that occured during previous merge
2004-05-11 13:59:22 +02:00
magnus@neptunus.(none)
787c978673 Merged ha_ndbcluster.cc 2004-05-10 15:06:07 +02:00
magnus@neptunus.(none)
05d83a8998 Use correct access method, found using sql-bench and comparing with other handler. 2004-05-10 14:46:06 +02:00
magnus@neptunus.(none)
86bb6a2b88 WL# 1728 Handler: use scanReadExclusive for scan update and delete 2004-05-10 14:12:28 +02:00
magnus@neptunus.(none)
1d8bf1cb18 BUG# 3658 ALTER TABLE corrupts table
Added  test file for ALTER TABLE, engine = ndbcluster
2004-05-05 16:04:23 +02:00
magnus@neptunus.(none)
89c231ccfa Merge fixes 2004-05-05 08:54:12 +02:00
magnus@neptunus.(none)
970624c207 Merge neptunus.(none):/home/magnus/mysql-4.1
into neptunus.(none):/home/magnus/mysql-4.1-insert
2004-04-30 13:42:47 +02:00
magnus@neptunus.(none)
c3df24362b Merge neptunus.(none):/home/magnus/mysql-4.1
into neptunus.(none):/home/magnus/mysql-4.1-sql-bench
2004-04-30 13:41:19 +02:00
magnus@neptunus.(none)
f91ce9a805 WL#1727 Implement read_range_first and read_range_next 2004-04-30 13:38:41 +02:00
magnus@neptunus.(none)
4f0991a2df Add extra ordered index in when UNIQUE and PRIMARY KEY are specified.
Extra ordered indexes are created primarily 
to support partial key scan/read and range scans of hash indexes.
I.e. the ordered index are used instead of the hash indexes for 
these queries.
2004-04-30 12:25:31 +02:00
magnus@neptunus.(none)
eea0069e6a WL#1737 Removed superfluous "NoCommit" from insert 2004-04-29 14:38:35 +02:00
serg@sergbook.mylan
606073084e symlink, not hardlink
mkdir in Makefile, not in configure
chmod a-x
2004-04-21 14:55:39 -05:00
magnus@neptunus.(none)
7c2c408cb8 Added NDB storage engine 2004-04-15 09:14:14 +02:00