Commit graph

157 commits

Author SHA1 Message Date
joreland@mysql.com
8f2d0ec1a1 merge 2004-12-31 06:36:32 +01:00
mskold@mysql.com
76b2df6043 Merged bugfix 2004-12-30 21:36:16 +01:00
marty@linux.site
1ddb554b8b Fix for bug #7480 Mysqld crash in ha_ndbcluster using Query Browser 2004-12-30 19:56:09 +01:00
mskold@mysql.com
a5204f692b Merge 2004-12-29 10:02:03 +01:00
mskold@mysql.com
00c0a316ad Merge for condition pushdown 2004-12-29 09:54:48 +01:00
joreland@mysql.com
4ed658dee3 wl2126 - fix ndb part of "latest" ingo patch
(hopefully last :-))
2004-12-28 17:01:07 +01:00
mskold@mysql.com
86fda80fc9 Merge 2004-12-28 14:00:00 +01:00
tomas@poseidon.ndb.mysql.com
89c037b2a9 backwards compatible name change NdbConnectionto NdbTransaction
removed friend declarations from doxygen
updated some documentation in mgmapi
2004-12-23 11:21:01 +01:00
monty@mishka.local
4f4bbfc279 Merge with 4.1 2004-12-22 13:54:39 +02:00
mskold@mysql.com
e11647d184 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2004-12-20 16:17:15 +01:00
pekka@mysql.com
6463a6d7cd ndb: wl-1893: range scanning backwards, handler 2004-12-20 15:12:42 +01:00
mskold@mysql.com
3edf243875 Condition pushdown to storage engine 2004-12-17 21:13:22 +01:00
mysqldev@mysql.com
e127fc34c3 Merge 2004-12-16 09:37:29 +01:00
joreland@mysql.com
e36d064a71 wl2126 - ndb - merge and ifdef still waiting for inge 2004-12-15 13:30:45 +01:00
joreland@mysql.com
865eb873c2 wl2126 - ndb - bug fixes 2004-12-08 00:36:40 +01:00
mskold@mysql.com
3791170159 Fix for bug#6935 table rename does not work with ndb tables 2004-12-06 14:51:10 +01:00
joreland@mysql.com
ac9f30df68 wl2126 - ndb - set correct found_p using new pseudo column NDB$RANGE_NO 2004-12-06 09:05:30 +01:00
joreland@mysql.com
5832078015 wl#2126 - ndb - Fix handling of null values wrt read multi range 2004-12-01 12:43:30 +01:00
joreland@mysql.com
dee5a921a8 wl2126 - ndb - for for null in unique index wrt read_multi_range 2004-11-30 13:37:03 +01:00
joreland@mysql.com
6663f82ba9 wl2126 - ndb - Enable read_multi_range batching also for range scan(s)
+fix mysql code style
 +adopt to interface changes by ingo
2004-11-26 15:15:22 +01:00
tomas@poseidon.ndb.mysql.com
e57726b98e removed special ndb query cache variable
ndb will always return query cache type ASKTRANSACT
2004-11-25 18:56:10 +00:00
tomas@poseidon.ndb.mysql.com
68e4a0fe43 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/wl2126
2004-11-25 14:30:15 +00:00
joreland@mysql.com
029df2028d Merge mysql.com:/home/jonas/src/mysql-5.0-ndb
into mysql.com:/home/jonas/src/wl2126
2004-11-25 10:51:57 +01:00
brian@avenger.(none)
2b0b6ec20c Merging 4.1 to 5.0 2004-11-24 12:34:44 -08:00
tomas@poseidon.ndb.mysql.com
b53e083827 Merge 2004-11-24 12:04:17 +00:00
tomas@poseidon.ndb.mysql.com
ae471974ac sql/ha_innodb.cc
enabled query cache for ndb
    modified engine interface somewhat
sql/ha_innodb.h
    enabled query cache for ndb
    modified engine interface somewhat
sql/ha_ndbcluster.cc
    enabled query cache for ndb
    modified engine interface somewhat
    ndb will only allow caching and retrieval if running autocommit
      - return false, but do not invalidate
    commit count is used as engine data, i.e.
      - store commit count before store of cache
      - allow retrieval if commit count has not changed on a table
      - invalidate if commit count has changed
sql/ha_ndbcluster.h
    enabled query cache for ndb
    modified engine interface somewhat
sql/handler.cc
    enabled query cache for ndb
    modified engine interface somewhat
sql/handler.h
    enabled query cache for ndb
    modified engine interface somewhat
    new virtual handler method cached_table_registration called on each table before alowing store in query cache
      - return TRUE - ok to cache, FALSE - not allowed to cache, invalidate queries if engine_data below has changed
      - sets ulonglong (engine_data) that is stored in query cache for each table
      - sets callback to be called for each table before usage of cached query, callback = 0 -> no check later
sql/mysql_priv.h
    enabled query cache for ndb
    modified engine interface somewhat
    callcack prototype for callback to engine before query cache retrieval
sql/sql_cache.cc
    enabled query cache for ndb
    modified engine interface somewhat
    if callback is set on table in cache, do callback to check if allowed to use cache
    if not allowed to use cache, check if engine_data has changed, if so, invalidate all queries with that table
    + changes to store and pass callback and engine_data around
sql/sql_cache.h
    enabled query cache for ndb
    modified engine interface somewhat
    changes to store callback and engine_data
sql/table.h
    enabled query cache for ndb
    modified engine interface somewhat
    changes to store callback and engine_data
2004-11-24 11:56:51 +00:00
tomas@poseidon.ndb.mysql.com
ca61e54cd0 changed query cache type variable for ndb 2004-11-23 16:38:00 +00:00
tomas@poseidon.ndb.mysql.com
49b02a8f21 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-23 09:51:39 +00:00
serg@serg.mylan
ee933cd198 merged 2004-11-22 21:33:15 +01:00
tomas@poseidon.ndb.mysql.com
2e63f22a71 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin
2004-11-22 15:53:06 +00:00
tomas@poseidon.ndb.mysql.com
1d981111e0 added force send interface to scan
prepared for using query cache in ndb
2004-11-22 13:41:46 +00:00
mskold@mysql.com
f0e95c3704 Added checks for NOT NULL for all fields in UNIQUE INDEX (USING HASH) 2004-11-22 10:35:03 +01:00
joreland@mysql.com
74cc4fc06a merge 2004-11-22 08:12:49 +01:00
serg@serg.mylan
2d3dd65cc1 merged 2004-11-20 18:36:41 +01:00
tomas@poseidon.ndb.mysql.com
2ec794a970 Merge 2004-11-18 21:54:53 +00:00
mskold@mysql.com
a4d061a5d9 Fix for bug#4312 ndb table, wrong behaviour on insert .. on duplicate key .. 2004-11-18 12:11:56 +01:00
joreland@mysql.com
1c75becb7c wl#2126 - read_multi_range ndb part 2004-11-17 10:07:52 +01:00
tomas@poseidon.ndb.mysql.com
1700bf3844 Enabled usage of new system variables for ndb
- ndb_use_exact_count
  - ndb_autoincrement_prefetch_sz
  - ndb_use_transactions
  - ndb_force_send
moved "inlined" functions to .cc file since they are virtual anyways
enabled printout od ndb errors in warnings even if mapping existst to mysql error code
2004-11-17 08:15:53 +00:00
monty@mysql.com
1087186657 Merge with 4.1 to get new thd->mem_root handling 2004-11-08 17:53:32 +02:00
monty@mysql.com
071001950e Merge with 4.1 to get in latest bug fixes 2004-11-04 15:06:24 +02:00
mskold@mysql.com
700da57918 Fix for bug#6398 update of primary key fails 2004-11-03 15:53:26 +01:00
monty@mysql.com
afbe601302 merge with 4.1 2004-10-29 19:26:52 +03:00
tomas@poseidon.ndb.mysql.com
19bc50957f Tru64 cxx compiler fix
cxx does not include -I/ust/include.dtk as it should
    removed dependency on ndb_types
2004-10-29 09:49:04 +00:00
monty@mishka.local
7af65592c7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mishka.local:/home/my/mysql-4.1
2004-10-20 02:55:03 +03:00
monty@mishka.local
719c88e38f true,false -> TRUE, FALSE
Simple fixes/optimization of things discovered during review of new pushed code
2004-10-14 18:03:46 +03: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
f6ad058388 Merge 2004-10-03 21:39:04 +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
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@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
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
joreland@mysql.com
ee75c45d9d fix updated signature 2004-09-20 20:50:48 +02:00
magnus@neptunus.(none)
cdc7a32f37 Merged Thd_ndb 2004-09-20 14:28:43 +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
monty@mishka.local
91ff64e107 Added options --auto-increment-increment and --auto-increment-offset.
This allows one to setup a master <-> master replication with non conflicting auto-increment series.
Cleaned up binary log code to make it easyer to add new state variables.
Added simpler 'upper level' logic for artificial events (events that should not cause cleanups on slave).
Simplified binary log handling.
Changed how auto_increment works together with to SET INSERT_ID=# to make it more predictable: Now the inserted rows in a multi-row statement are set independent of the existing rows in the table. (Before only InnoDB did this correctly)
2004-09-15 22:10:31 +03: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)
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
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
mskold@mysql.com
5827b829b0 Added use of buffer argument in index_read 2004-09-07 16:22:42 +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
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
3e1493b84b Fix for WL#1731 Handler: multiple databases 2004-08-18 19:13:39 +02:00
mskold@mysql.com
c1c3e31fb6 Fix for bug#4730 2004-08-11 15:06:17 +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
56fa7bfd90 Merge 2004-07-23 13:27:26 +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
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
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
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
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
monty@mysql.com
f6765146c1 Added missing root user to mysql.user on windows. (Bug #4242)
Set default max_allowed_packet to be able to read help tables even if an my.cnf file with this option is present. (Bug #3938)
Don't use default arguments for ha_rnd_init()
Simple code cleanups since last pull
2004-06-25 18:49:36 +03:00
mskold@mysql.com
075d71d546 Modified index flags and added ndbcluster_print_error 2004-06-24 12:04:22 +02:00
joreland@mysql.com
d99c91b63c Fix handler w.r.t scan 2004-06-11 13:49:22 +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)
86bb6a2b88 WL# 1728 Handler: use scanReadExclusive for scan update and delete 2004-05-10 14:12:28 +02:00
magnus@neptunus.(none)
97ffc1f408 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/magnus/mysql-4.1
2004-05-07 16:21:54 +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
bell@sanja.is.com.ua
e9492cca05 avoid using ndb tables in query cache 2004-05-05 11:22:10 +03:00