Commit graph

398 commits

Author SHA1 Message Date
msvensson@neptunus.homeip.net
558af8e2ea Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0
2005-02-07 13:48:02 +01:00
msvensson@neptunus.homeip.net
28b21534bb Small changes after Tomas review 2005-02-07 13:46:13 +01:00
tomas@poseidon.ndb.mysql.com
a5ba7db771 Merge 2005-02-07 10:13:07 +01:00
tomas@poseidon.ndb.mysql.com
6bbaeed5b9 ha_ndbcluster.cc:
corrected typo in previous changeset
2005-02-07 09:58:37 +01:00
tomas@poseidon.ndb.mysql.com
0da4ee9131 Merge 2005-02-07 08:54:35 +01:00
tomas@poseidon.ndb.mysql.com
4873adace0 Corrected fragmentation calculation to take into account that LQH creates "2 fragments per fragment" in 4.1 and 5.0
+added some comments to ndb fragmentation calulation
2005-02-07 08:51:27 +01:00
tulin@mysql.com
d017a604fe Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-04 17:32:18 +01:00
msvensson@neptunus.homeip.net
94978c214a Updated after review. 2005-02-04 15:08:08 +01:00
tulin@mysql.com
2339b328fc ha_ndbcluster.cc:
fixed change in struct in 4.1->5.0 merge
2005-02-04 14:33:08 +01:00
mysqldev@mysql.com
abf7837fbb resolved merge conflict 2005-02-04 14:27:09 +01:00
tomas@poseidon.ndb.mysql.com
7fd685ffe8 added test to trigger drifferent fragmentations in ndb
corrected documentation on fragmentation
    set "fragmentation medium" to mean 2 fragments per node instead of 1
    set default fragmentation to small instead of medium
    bug#8284 adjust fragmentation to max_rows
2005-02-04 14:25:08 +01:00
msvensson@neptunus.homeip.net
e54ea9189d Merge of query cache from 4.1 to 5.0 2005-02-04 10:56:53 +01:00
msvensson@neptunus.homeip.net
3181f5d2b6 Merged "query cache for ndb" to 5.0 2005-02-03 09:33:48 +01:00
msvensson@neptunus.homeip.net
efd5ed2f9e WL#2269 Enable query cache for NDB
- Added a thread that fetches commit_count for open tables. This
will mean that NDB will not have to be contacted for every use of a cached query.
2005-02-01 15:43:08 +01:00
mskold@mysql.com
f21a737197 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
2005-02-01 10:05:22 +01:00
pekka@mysql.com
8480b22122 Merge 2005-01-27 18:41:23 +01:00
pekka@mysql.com
5cbadf4358 ndb - make YEAR and TIMESTAMP into ndb types 2005-01-27 17:33:35 +01:00
tomas@poseidon.ndb.mysql.com
f9d0512fc3 Merge 2005-01-26 13:22:07 +01:00
tomas@poseidon.ndb.mysql.com
5779a6a576 Bug#8101 unique indexes which attribute are _not_ specified in the order of the table does not work 2005-01-26 11:31:46 +01:00
tomas@poseidon.ndb.mysql.com
b4eebbc0b6 changed from using column names to column id in ndb setBound in ha_ndbcluster 2005-01-25 13:46:40 +01:00
mskold@mysql.com
7c07a2e725 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
2005-01-21 08:43:41 +01:00
tomas@poseidon.ndb.mysql.com
3dfcf07cc9 ha_ndbcluster.cc:
read row size with wrong type
2005-01-20 22:28:08 +01:00
mskold@mysql.com
d959e2ab40 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-01-20 16:41:08 +01:00
mskold@mysql.com
44a511a191 Fix for Bug #7988 Bitfield test fails 2005-01-20 15:50:56 +01:00
joreland@mysql.com
2af06e0b32 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-19 07:37:42 +01:00
joreland@mysql.com
18bd4a2513 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-19 07:34:57 +01:00
joreland@mysql.com
b0b8f9115a bug#7693 - ndb
when using shm transporter, set sigmask on each thread using pthread_sigmask
2005-01-19 07:23:20 +01:00
tomas@poseidon.ndb.mysql.com
61f63776db compile error: moved inline
compile warning: changed eq_range -> eq_r
2005-01-18 16:31:05 +01:00
mskold@mysql.com
6bb027a97c Merge 2005-01-17 09:44:34 +01:00
mskold@mysql.com
74f883ad02 Added better printout for condition pushdown 2005-01-17 08:08:51 +01:00
msvensson@neptunus.homeip.net
cb7524e103 Merge problem
FC3 fix
2005-01-14 14:33:26 +01:00
tomas@poseidon.ndb.mysql.com
fa57a72b9b added support for 'show status like 'Ndb%''
added number_of_replicas printout in show table status
2005-01-14 12:32:33 +01:00
tomas@poseidon.ndb.mysql.com
9f606fcfd8 To get correct values in SHOW TABLE STATUS
Added pseudo column fragment memory
    changed ndb_get_table_statistics to take struct 
    and read row_size and fragment_memory
2005-01-13 18:24:19 +01:00
mskold@mysql.com
27c13fa33f Merge 2005-01-11 17:29:46 +01:00
mskold@mysql.com
e43047d793 Condition pushdown, support for more types 2005-01-11 17:26:19 +01:00
joreland@mysql.com
c9502b5567 merge 2005-01-11 17:02:30 +01:00
joreland@mysql.com
7f287d963c removed compiler warnings from ha_ndbcluster 2005-01-11 17:00:31 +01:00
mskold@mysql.com
e72f9108ef Removed compiler warnings 2005-01-11 14:06:44 +01:00
mskold@mysql.com
4f60ac4c8b 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
2005-01-09 15:41:54 +01:00
pekka@mysql.com
51adbae299 Merge 2005-01-09 00:45:06 +01:00
pekka@mysql.com
195f7bda02 Merge 2005-01-08 22:34:16 +01:00
pekka@mysql.com
50c3a883b2 ndb - wl-1442 fix Time ordering 2005-01-08 19:28:44 +01:00
pekka@mysql.com
0462ccfe3c ndb - wl-1442 fix Date ordering 2005-01-08 16:57:51 +01:00
mskold@mysql.com
25100d3309 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
2005-01-08 08:11:12 +01:00
pekka@mysql.com
7043c9d4aa ndb - wl-1442 minor 2005-01-08 00:03:19 +01:00
mskold@mysql.com
346aeda888 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
2005-01-07 15:34:25 +01:00
mskold@mysql.com
b441ace700 Fixed nested conditions for condition pushdown to storage engine 2005-01-07 15:33:24 +01:00
pekka@mysql.com
f3103c489c ndb - wl-1442 new varchar 2005-01-07 11:55:20 +01:00
joreland@mysql.com
013f9bbfb5 merge 2005-01-07 07:15:08 +01:00
joreland@mysql.com
f3baf38dbc merge 2005-01-07 06:47:41 +01:00
monty@mysql.com
d35140a851 First stage of table definition cache
Split TABLE to TABLE and TABLE_SHARE (TABLE_SHARE is still allocated as part of table, will be fixed soon)
Created Field::make_field() and made Field_num::make_field() to call this
Added 'TABLE_SHARE->db' that points to database name; Changed all usage of table_cache_key as database name to use this instead
Changed field->table_name to point to pointer to alias. This allows us to change alias for a table by just updating one pointer.
Renamed TABLE_SHARE->real_name to table_name
Renamed TABLE->table_name to alias
Renamed TABLE_LIST->real_name to table_name
2005-01-06 13:00:13 +02:00
joreland@mysql.com
c39db2febf Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-05 21:22:38 +01:00
tomas@poseidon.ndb.mysql.com
79fb236b0a changed to using NdbTransaction scoped enums
and removed usage of Ndb::waitUntilReady()
2005-01-05 17:59:24 +01:00
tulin@build.mysql.com
cee870e9b5 Merge bk-internal:/home/bk/mysql-4.1
into build.mysql.com:/users/tulin/mysql-4.1-cluster-extra
2005-01-05 15:55:26 +01:00
mskold@mysql.com
0d72625cd0 Added support for different int sizes in condition pushdown 2005-01-04 20:56:04 +01:00
joreland@mysql.com
597ecc8e05 merge failure 2005-01-04 20:39:07 +01:00
joreland@mysql.com
c62ed85054 Merge 2005-01-04 19:12:01 +01:00
mskold@mysql.com
646f10030b Added support for different int sizes in condition pushdown 2005-01-04 16:01:24 +01:00
mskold@mysql.com
d3b643d71f 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
2005-01-04 14:21:13 +01:00
mskold@mysql.com
4351480898 Added support for different int sizes in condition pushdown 2005-01-04 14:20:18 +01:00
tomas@poseidon.ndb.mysql.com
53acd15667 changed some NdbConnection to NdbTransaction 2005-01-04 13:47:16 +01:00
monty@mysql.com
7cf8285b3f After merge fixes
Add support for warnings for prepare of prepared statements
Fixed test to work with --ps-protocol
Fixed some test results
2005-01-04 13:46:53 +02:00
monty@mysql.com
309b1a2b6c Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY 2005-01-03 23:04:52 +02:00
mskold@mysql.com
881b3a023f Merge 2005-01-03 15:20:06 +01:00
mskold@mysql.com
f304790638 Merge fix for condition pushdown to storage engine 2005-01-03 15:10:32 +01:00
mskold@mysql.com
9647a076a6 Merge 2005-01-03 14:33:00 +01:00
mskold@mysql.com
31360fb01a Merge for WL#2290 Add support for bit field in ndbcluster handler 2005-01-03 14:29:27 +01:00
mskold@mysql.com
ce103eeff7 Merge 2005-01-03 13:52:17 +01:00
mskold@mysql.com
8edd9baa2c Fixed failed merge 2005-01-03 11:56:51 +01:00
mskold@mysql.com
689748b548 Merge from fix for Bug #7480 Mysqld crash in ha_ndbcluster using Query Browser 2005-01-03 09:46:59 +01:00
mskold@mysql.com
3d50cc0457 Fixed failed merge 2005-01-01 22:47:50 +01:00
mskold@mysql.com
94845764ca Fixed failed merge 2005-01-01 22:40:40 +01:00
joreland@mysql.com
8f2d0ec1a1 merge 2004-12-31 06:36:32 +01:00
monty@mysql.com
d71c030587 After merge fixes 2004-12-31 00:44:00 +02: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
ed25dfe2c3 wl1804 - ndb - types in tup, fix dummy usage in handler 2004-12-29 08:39:11 +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
bcf8a34448 Added bit field support for ndbcluster 2004-12-23 15:28:41 +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
mysqldev@bk-internal.mysql.com
2370f9da7f Merge bk-internal.mysql.com:/data0/bk/mysql-4.1
into bk-internal.mysql.com:/data0/bk/mysql-4.1-cluster-extra
2004-12-20 13:34:25 +01:00
tomas@poseidon.ndb.mysql.com
7b47be8990 added config parameter Group on connection
moved NdbWaiter, m_ndb_cluster_connection, to impl class
    moved node selection things to cluster connection
    moved all private things to impl class
    added opts for shared memory and node selection
    changed opts handling somewhat; introduced enum for options and common handling of option variables
    added checks for transporter support
    automatic addition of shared mem transporters
    moved wait_until_ready code to cluster connection
    added control of usage of new node selection method
2004-12-20 12:36:14 +01:00
mskold@mysql.com
dac1551a2b Condition pushdown to storage engine, optimizations 2004-12-20 10:58:00 +01:00
mskold@mysql.com
2836376a18 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-17 21:16:29 +01:00
mskold@mysql.com
3edf243875 Condition pushdown to storage engine 2004-12-17 21:13:22 +01:00
mysqldev@bk-internal.mysql.com
e4da7f4a40 Merge bk-internal.mysql.com:/data0/bk/mysql-4.1
into bk-internal.mysql.com:/data0/bk/mysql-4.1-cluster-extra
2004-12-17 11:46:44 +01:00
joreland@mysql.com
cfa20fbaa6 merge 2004-12-17 10:36:14 +01:00
pekka@mysql.com
b2f164b4b4 ndb: wl-1893: range scanning backwards, ndb kernel 2004-12-17 10:20:18 +01:00
pekka@mysql.com
4ef4272e2c ndb: small fixes (error codes, debug stuff) 2004-12-17 09:01:54 +01:00
joreland@mysql.com
5fe332db5e merge 2004-12-16 22:42:27 +01:00
mysqldev@mysql.com
e127fc34c3 Merge 2004-12-16 09:37:29 +01:00
joreland@mysql.com
6105fa4dba wl2240 - ndb partitioning bug fixes for range scans 2004-12-15 15:13:11 +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
4115519537 Merge 2004-12-15 13:12:54 +01:00
tomas@poseidon.ndb.mysql.com
cb4db54b50 fix char(0) to use ndb bit format 2004-12-10 16:55:04 +01:00
tomas@poseidon.ndb.mysql.com
34970647bb add debug print for bit field 2004-12-09 15:31:51 +01:00