Commit graph

216 commits

Author SHA1 Message Date
joreland@mysql.com
29c270c13e Bug#6020, any lock >= write_allow_write is a write lock 2004-10-13 10:08:18 +02:00
pekka@mysql.com
fabf791061 Merge 2004-10-10 18:55:05 +02:00
tomas@poseidon.ndb.mysql.com
252c14049e Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
2004-10-10 10:03:10 +00:00
magnus@neptunus.(none)
01c29fc921 BUG#5973 ndb table belonging to different database shows up in SHOW TABLES 2004-10-08 13:37:13 +02:00
pekka@mysql.com
8920cff4e9 NDB wl-2151 Fix bounds setting table handler vs TUX 2004-10-08 10:50:50 +02:00
tomas@poseidon.ndb.mysql.com
9035aab33c fixed bug where scan is not closed as it should 2004-10-07 16:01:41 +00:00
magnus@neptunus.(none)
d55efe332d Sned original NDB error as warning to client 2004-10-07 14:19:46 +02:00
magnus@neptunus.(none)
ac9016df91 Initialise "sorted" variable in constructor of QUICK_SELECT. The variable is set to 1 in test_if_skip_sort_order if we decide to optimize "order by" by uinsg index_read. 2004-10-07 11:57:48 +02:00
magnus@neptunus.(none)
6985bcd59d Don't show NDB$BLOB tables in SHOW TABLES 2004-10-07 09:16:46 +02:00
tomas@poseidon.ndb.mysql.com
884892a650 bug#5736, subqueries and not in
and testcases
2004-10-06 13:18:55 +00:00
joreland@mysql.com
a716d2c4cf bug#5367
subqueries with "not in" and ndb
2004-10-06 08:48:26 +02:00
joreland@mysql.com
9d6cb54bce Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-10-05 14:04:33 +02:00
joreland@mysql.com
ac7771becd Don't need to scan exclusive since keyinfo is sent anyway 2004-10-05 13:51:32 +02:00
joreland@mysql.com
0a8bbe4d85 wl2135 - index restart 2004-10-05 12:17:42 +02:00
tomas@poseidon.ndb.mysql.com
d60ba54d1c moved code out of DBUG_ASSERT 2004-10-05 10:04:09 +00:00
tomas@poseidon.ndb.mysql.com
bc5ca3a1ce Merge 2004-10-04 12:36:25 +00:00
tomas@poseidon.ndb.mysql.com
e13b136c9a bug #5872, transactions should only be restarted with transaction.on flag off if execute_commit has been performed
added testcase for this
use force send for all executes
2004-10-04 12:26:26 +00:00
tomas@poseidon.ndb.mysql.com
65949b5eb0 merge error 2004-10-03 23:20:05 +00:00
tomas@poseidon.ndb.mysql.com
b17bcca66f merge error 2004-10-03 22:27:04 +00:00
tomas@poseidon.ndb.mysql.com
f6ad058388 Merge 2004-10-03 21:39:04 +00:00
tomas@poseidon.ndb.mysql.com
5745223a90 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-01 21:35:50 +00:00
tomas@poseidon.ndb.mysql.com
929e98b45b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-01 16:17:04 +00:00
dlenev@mysql.com
53209cc4fc Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-ryan
2004-10-01 18:55:17 +04:00
dlenev@brandersnatch.localdomain
2511990c97 Support for TIMESTAMP columns holding NULL values. Unlike all other
column types TIMESTAMP is NOT NULL by default, so in order to have 
TIMESTAMP column holding NULL valaues you have to specify NULL as
one of its attributes (this needed for backward compatibility).

Main changes:
Replaced TABLE::timestamp_default_now/on_update_now members with
TABLE::timestamp_auto_set_type flag which is used everywhere
for determining if we should auto-set value of TIMESTAMP field 
during this operation or not. We are also use Field_timestamp::set_time()
instead of handler::update_timestamp() in handlers.
2004-10-01 18:54:06 +04:00
tomas@poseidon.ndb.mysql.com
5e8ce3841a bug#5349 ALTER TABLE corrupts TEXT (and blob?) 2004-10-01 11:16:49 +00:00
mskold@mysql.com
53d77cfcb3 Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-10-01 12:08:04 +02:00
magnus@neptunus.(none)
673dc109b4 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into neptunus.(none):/home/magnus/mysql/mysql-4.1-ndb
2004-09-30 17:15:28 +02:00
magnus@neptunus.(none)
6469a109da Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into neptunus.(none):/home/magnus/mysql/mysql-4.1-ndb
2004-09-30 17:08:49 +02:00
magnus@neptunus.(none)
4faaed98ed Merge fixes 2004-09-30 16:12:28 +02:00
tomas@poseidon.ndb.mysql.com
caa8bbaeec cosmetic 2004-09-28 23:42:34 +00:00
tomas@poseidon.ndb.mysql.com
03e0606b66 Merge 2004-09-28 19:22:04 +00:00
tomas@poseidon.ndb.mysql.com
d5b47c7933 ha_ndbcluster.cc:
testing foce send
2004-09-28 19:11:50 +00:00
tomas@poseidon.ndb.mysql.com
1568b72d9c ha_ndbcluster.cc:
typo
2004-09-28 17:41:58 +00:00
tomas@poseidon.ndb.mysql.com
0a9730beb4 set correct lockmode in all reads...
move lockmode from scan operation to operation
    added read tuple with lock mode
2004-09-28 17:35:07 +00:00
mskold@mysql.com
18d5e9b45c 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-09-28 10:34:26 +02:00
mskold@mysql.com
1b9d0b340d Adjusted so auto_increment value after bulk insert will be exactly +1 after last (if no parallel inserts) 2004-09-28 09:53:14 +02:00
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