Fix remaining build problems caused by merge from lp:maria/10.0

mysql-test/suite/oqgraph/create_attr.test

@@ -202,6 +202,14 @@ DROP TABLE IF EXISTS oqtable;
 CREATE TABLE oqtable ( latch varchar(32) NULL NULL, origid BIGINT UNSIGNED NULL, destid BIGINT UNSIGNED NULL, weight DOUBLE NULL, seq BIGINT UNSIGNED NULL, linkid BIGINT UNSIGNED NULL, KEY (latch, origid, destid) USING HASH, KEY (latch, destid, origid) USING HASH ) ENGINE=OQGRAPH, DATA_TABLE='backing',ORIGID='id',DESTID='id2',WEIGHT='weight';
 DESCRIBE oqtable;
 
+#-- Expect an error if we attempt to use a view as the backing store
+#-- 'VIEWs are not supported for an OQGRAPH backing store.'
+#-- TODO
+
+#-- TODO - what happens if we make two tables with the same backing store?
+
+#-- TODO - what happens if data_table is a TEMPORARY table?
+
 # cleanup
 --disable_warnings
 DROP TABLE IF EXISTS oqtable;

storage/oqgraph/ha_oqgraph.h

@@ -44,6 +44,7 @@ namespace open_query
 class ha_oqgraph: public handler
 {
   TABLE_SHARE share[1];
+  bool have_table_share;
   TABLE edges[1];
   Field *origid;
   Field *destid;
@@ -62,7 +63,7 @@ class ha_oqgraph: public handler
   ha_oqgraph(TABLE *table);
   Table_flags table_flags() const;
 #endif
-  ~ha_oqgraph();
+  virtual ~ha_oqgraph();
   const char *index_type(uint inx)
   {
     return "HASH";

storage/oqgraph/oqgraph_thunk.cc

@@ -179,7 +179,7 @@ int oqgraph3::cursor::restore_position()
     if (int rc= table.file->ha_index_read_map(
                     table.record[0], (const uchar*) _key.data(),
                     (key_part_map)(1 << _parts) - 1,
-                    table.s->key_info[_index].key_parts == _parts ?
+                    table.s->key_info[_index].user_defined_key_parts == _parts ?
                         HA_READ_KEY_EXACT : HA_READ_KEY_OR_NEXT))
     {
       table.file->ha_index_end();
@@ -439,7 +439,7 @@ int oqgraph3::cursor::seek_to(
                  *key_end= key_info + table.s->keys;
           key_info < key_end; ++key_info, ++i)
       {
-        if (key_info->key_parts < 2)
+        if (key_info->user_defined_key_parts < 2)
           continue;
         if (!((key_info->key_part[0].offset == target_fieldpos &&
                key_info->key_part[1].offset == source_fieldpos) ||
@@ -490,7 +490,7 @@ int oqgraph3::cursor::seek_to(
     if (int rc= table.file->ha_index_read_map(
             table.record[0], (uchar*) _key.data(),
             (key_part_map) ((1U << _parts) - 1),
-            table.s->key_info[_index].key_parts == _parts ?
+            table.s->key_info[_index].user_defined_key_parts == _parts ?
                 HA_READ_KEY_EXACT : HA_READ_KEY_OR_NEXT))
     {
       table.file->ha_index_end();