summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <magnus@neptunus.(none)>2004-05-05 08:54:12 +0200
committerunknown <magnus@neptunus.(none)>2004-05-05 08:54:12 +0200
commit316c128f9da1c87d4414f8f79419f53d263af8b1 (patch)
tree5d6fdabd3b45f9787db17e00c427184d26f8fa92 /sql
parentd540f0c011ade155ab2c9546f2f6ff65d47791b0 (diff)
downloadmariadb-git-316c128f9da1c87d4414f8f79419f53d263af8b1.tar.gz
Merge fixes
sql/ha_ndbcluster.cc: Updated use of extra ordered index after merge Removed TODO note in swedish
Diffstat (limited to 'sql')
-rw-r--r--sql/ha_ndbcluster.cc20
1 files changed, 11 insertions, 9 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 7a54190b9cb..fc0f92994cd 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -20,12 +20,6 @@
NDB Cluster
*/
-/*
- TODO
- After CREATE DATABASE gör discover på alla tabeller i den databasen
-
-*/
-
#ifdef __GNUC__
#pragma implementation // gcc: Class implementation
@@ -41,7 +35,7 @@
#define USE_DISCOVER_ON_STARTUP
//#define USE_NDB_POOL
-//#define USE_EXTRA_ORDERED_INDEX
+#define USE_EXTRA_ORDERED_INDEX
// Default value for parallelism
static const int parallelism= 240;
@@ -1421,7 +1415,11 @@ int ha_ndbcluster::index_read(byte *buf,
if (key_len < key_info->key_length ||
find_flag != HA_READ_KEY_EXACT)
{
- error= ordered_index_scan(key, key_len, buf, find_flag);
+ key_range start_key;
+ start_key.key= key;
+ start_key.length= key_len;
+ start_key.flag= find_flag;
+ error= ordered_index_scan(&start_key, 0, false, buf);
break;
}
@@ -1435,7 +1433,11 @@ int ha_ndbcluster::index_read(byte *buf,
if (key_len < key_info->key_length ||
find_flag != HA_READ_KEY_EXACT)
{
- error= ordered_index_scan(key, key_len, buf, find_flag);
+ key_range start_key;
+ start_key.key= key;
+ start_key.length= key_len;
+ start_key.flag= find_flag;
+ error= ordered_index_scan(&start_key, 0, false, buf);
break;
}
#endif