Commit graph

731 commits

Author SHA1 Message Date
joreland@mysql.com
85f8ad7bd1 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-5.0
2004-11-30 07:45:49 +01:00
joreland@mysql.com
e86ce67ea5 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-30 07:43:19 +01:00
joreland@mysql.com
474f23a402 ndb - fixed long overdue problems with unique indexes and null values 2004-11-30 07:41:26 +01:00
joreland@mysql.com
d22ab3f7b3 wl2126 ndb read_multi_range - bugfixes + more tests 2004-11-29 13:50:13 +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
a90335e912 sql/ha_ndbcluster.cc
added missing DBUG_RETURN's
mysql-test/r/ndb_read_multi_range.result@1.0
    BitKeeper file /home/tomas/wl2126/mysql-test/r/ndb_read_multi_range.result
mysql-test/r/ndb_read_multi_range.result@1.1
    (NO COMMENTS AVAILABLE)
mysql-test/t/ndb_read_multi_range.test@1.0
    BitKeeper file /home/tomas/wl2126/mysql-test/t/ndb_read_multi_range.test
mysql-test/t/ndb_read_multi_range.test@1.1
    (NO COMMENTS AVAILABLE)
2004-11-25 18:12:05 +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
tomas@poseidon.ndb.mysql.com
33c05ce98d enabling control of query cache for ndb 2004-11-23 09:50:33 +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
joreland@mysql.com
145761883d Merge mysql.com:/home/jonas/src/mysql-5.0-ndb
into mysql.com:/home/jonas/src/wl2126
2004-11-19 15:09:49 +01:00
tomas@poseidon.ndb.mysql.com
fdfc731155 ha_ndbcluster.cc:
merge error
2004-11-19 09:27:16 +00:00
tomas@poseidon.ndb.mysql.com
2ec794a970 Merge 2004-11-18 21:54:53 +00:00
mskold@mysql.com
7bbee8c95d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-11-18 15:55:18 +01: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
pekka@mysql.com
bc31325180 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2004-11-18 11:55:53 +01:00
serg@serg.mylan
e68bd85b77 merged 2004-11-17 18:04:36 +01:00
joreland@mysql.com
8b1527c6b7 wl#2126 ndb blobs can't be batched 2004-11-17 14:21: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
tomas@poseidon.ndb.mysql.com
a69ddb033d ha_ndbcluster.cc:
reverting previous patch
2004-11-16 13:56:25 +00:00
tomas@poseidon.ndb.mysql.com
8ee2a1836e Also print warning if there is an ndb->mysql errorcode mapping, this since the warning provides valuable info to the user 2004-11-16 12:10:44 +00:00
pekka@mysql.com
52e05dadac ndb: fix bug-4644 Err Out of fragment operations 2004-11-13 17:34:34 +01:00
brian@avenger.(none)
f05daf02ba Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump) 2004-11-11 18:58:57 -08:00
joreland@mysql.com
b2ff852c62 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/wl1744
2004-11-10 21:53:21 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
dd1cd8aa46 Bug#6031 - To drop database you have to execute DROP DATABASE command twice.
DROP DATABASE failed because of file ext not in TYPELIB of known extensions.
  General solution - construct a TYPELIB at runtime instead of a static list.
2004-11-10 15:07:11 +00:00
Administrator@w2k.
414298f38b Merge joreland@bk-internal.mysql.com:wl1744 into w2k.:C:/mysql-4.1 2004-11-10 14:02:59 +01:00
joreland@mysql.com
aeafd88e19 bug#6538
ndb: Fix return value in index_last wo/ rows
2004-11-10 11:02:51 +01:00
joreland@mysql.com
31303bd0de wl1744 - win compile fixes 2004-11-10 00:39:12 +01:00
monty@mysql.com
1087186657 Merge with 4.1 to get new thd->mem_root handling 2004-11-08 17:53:32 +02:00
joreland@mysql.com
9d8dcdcf72 Merge mysql.com:/home/jonas/src/new-fix
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-08 11:26:34 +01:00
joreland@mysql.com
3821a8dfca ndb: bug#6435
fix null handling in ha_ndbcluster when using ordered index
2004-11-08 11:11:49 +01:00
joreland@mysql.com
8acbd6a2ba ndb: bug#6451
1) fix so that missing blob tables don't prevent table from being
    dropped
2) decrease size of blob part if record length exceeds max length
3) add test case for table wo/ corresponding blob table
4) init scan counters when sending scan_tabreq
2004-11-08 11:06:36 +01: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
0bd6fd7875 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-11-04 10:43:52 +01: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
47bbf768d4 Fixes after merge with 4.1
FOUND is not a reserved keyword anymore
Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted
Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT
Note that the 5.0 tree is not yet up to date: Sanja will have to fix multi-update-locks for this merge to be complete
2004-11-03 12:39:38 +02:00
ram@gw.mysql.r18.ru
86b33f360b A fix (bug #6331: INSERT IGNORE .. SELECT breaks subsequent inserts). 2004-11-02 19:48:37 +04:00
monty@mysql.com
afbe601302 merge with 4.1 2004-10-29 19:26:52 +03:00