Merge lp:~stewart/drizzle/embedded-innodb-sec-index-prev into lp:~drizzle-trunk/drizzle/development

[Stewart Smith]

Fix index_prev and index_last for secondary indexes in embedded_innodb

http://hudson.drizzle.org/view/Drizzle-param/job/drizzle-embedded-innodb-param/42/

=== modified file 'plugin/embedded_innodb/embedded_innodb_engine.cc'
--- plugin/embedded_innodb/embedded_innodb_engine.cc	2010-08-12 03:55:57 +0000
+++ plugin/embedded_innodb/embedded_innodb_engine.cc	2010-08-12 03:55:57 +0000
@@ -2418,16 +2418,22 @@
   ib_err_t err;
 
   if (advance_cursor)
+  {
     err= ib_cursor_prev(cursor);
-
-  if (active_index == 0)
-  {
-    tuple= ib_tuple_clear(tuple);
-    ret= read_row_from_innodb(buf, cursor, tuple, table,
-                              share->has_hidden_primary_key,
-                              &hidden_autoinc_pkey_position);
+    if (err != DB_SUCCESS)
+    {
+      if (err == DB_END_OF_INDEX)
+        return HA_ERR_END_OF_FILE;
+      else
+        return -1; // FIXME
+    }
   }
 
+  tuple= ib_tuple_clear(tuple);
+  ret= read_row_from_innodb(buf, cursor, tuple, table,
+                            share->has_hidden_primary_key,
+                            &hidden_autoinc_pkey_position);
+
   advance_cursor= true;
 
   return ret;
@@ -2473,14 +2479,11 @@
       return -1; // FIXME
   }
 
-  if (active_index == 0)
-  {
-    tuple= ib_tuple_clear(tuple);
-    ret= read_row_from_innodb(buf, cursor, tuple, table,
-                              share->has_hidden_primary_key,
-                              &hidden_autoinc_pkey_position);
-    advance_cursor= true;
-  }
+  tuple= ib_tuple_clear(tuple);
+  ret= read_row_from_innodb(buf, cursor, tuple, table,
+                            share->has_hidden_primary_key,
+                            &hidden_autoinc_pkey_position);
+  advance_cursor= true;
 
   return ret;
 }

=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/basic_sec_index_prev.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/basic_sec_index_prev.result	1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/basic_sec_index_prev.result	2010-08-12 03:55:57 +0000
@@ -0,0 +1,13 @@
+create table t1 (a int auto_increment primary key, b int, key(b));
+insert into t1 (b) values (2),(3),(100),(40),(400), (301), (56), (22);
+select b from t1 order by b desc;
+b
+400
+301
+100
+56
+40
+22
+3
+2
+drop table t1;

=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_sec_index_prev-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_sec_index_prev-master.opt	1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_sec_index_prev-master.opt	2010-08-12 03:55:57 +0000
@@ -0,0 +1,1 @@
+--plugin_add=embedded_innodb --plugin_remove=innobase

=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_sec_index_prev.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_sec_index_prev.test	1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_sec_index_prev.test	2010-08-12 03:55:57 +0000
@@ -0,0 +1,4 @@
+create table t1 (a int auto_increment primary key, b int, key(b));
+insert into t1 (b) values (2),(3),(100),(40),(400), (301), (56), (22);
+select b from t1 order by b desc;
+drop table t1;