Merge lp:~stewart/drizzle/seapitester-state-history into lp:drizzle/7.0

[Stewart Smith]

track what is being called in the Storage Engine in storage_engine_api_tester.

this means that if we start frakking around with things like TransactionServices we can check that we're not suddenly changing how the engines are being called without intending to.

http://hudson.drizzle.org/view/Drizzle-param/job/drizzle-param/705/

[lp:~stewart/drizzle/seapitester-state-history]

2080. By Stewart Smith on 2011-01-13

cpplint fix for header guard

[Stewart Smith (stewart)]

http://hudson.drizzle.org/view/Drizzle-param/job/drizzle-param/706/ (with cpplint fixes)

=== added file 'plugin/storage_engine_api_tester/engine_state_history.cc'
--- plugin/storage_engine_api_tester/engine_state_history.cc	1970-01-01 00:00:00 +0000
+++ plugin/storage_engine_api_tester/engine_state_history.cc	2011-01-13 06:17:20 +0000
@@ -0,0 +1,135 @@
+/*
+  Copyright (C) 2011 Stewart Smith
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License
+  as published by the Free Software Foundation; either version 2
+  of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+#include "config.h"
+#include "drizzled/plugin/table_function.h"
+#include <drizzled/plugin/function.h>
+#include <drizzled/item/func.h>
+#include <drizzled/algorithm/crc32.h>
+
+#include "engine_state_history.h"
+
+#include <string>
+#include <vector>
+
+using namespace std;
+using namespace drizzled;
+
+std::vector<std::string> engine_state_history;
+
+class EngineStateHistory : public drizzled::plugin::TableFunction
+{
+public:
+
+  EngineStateHistory();
+
+  EngineStateHistory(const char *table_arg) :
+    drizzled::plugin::TableFunction("data_dictionary", table_arg)
+  { }
+
+  ~EngineStateHistory() {}
+
+  class Generator : public drizzled::plugin::TableFunction::Generator
+  {
+  private:
+    std::vector<std::string>::iterator it;
+  public:
+    Generator(drizzled::Field **arg);
+    ~Generator();
+
+    bool populate();
+  };
+
+  EngineStateHistory::Generator *generator(drizzled::Field **arg)
+  {
+    return new Generator(arg);
+  }
+};
+
+EngineStateHistory::EngineStateHistory() :
+  plugin::TableFunction("DATA_DICTIONARY", "SEAPITESTER_ENGINE_STATE_HISTORY")
+{
+  add_field("STATE");
+}
+
+EngineStateHistory::Generator::Generator(Field **arg) :
+  plugin::TableFunction::Generator(arg)
+{
+  it= engine_state_history.begin();
+}
+
+EngineStateHistory::Generator::~Generator()
+{
+}
+
+bool EngineStateHistory::Generator::populate()
+{
+  if (engine_state_history.empty())
+    return false;
+
+  if (it == engine_state_history.end())
+    return false; // No more rows
+
+  push(*it);
+  it++;
+
+
+  return true;
+}
+
+class ClearEngineStateHistoryFunction :public Item_int_func
+{
+public:
+  int64_t val_int();
+
+  ClearEngineStateHistoryFunction() :Item_int_func()
+  {
+    unsigned_flag= true;
+  }
+
+  const char *func_name() const
+  {
+    return "seapitester_clear_engine_state_history";
+  }
+
+  void fix_length_and_dec()
+  {
+    max_length= 10;
+  }
+
+  bool check_argument_count(int n)
+  {
+    return (n == 0);
+  }
+};
+
+int64_t ClearEngineStateHistoryFunction::val_int()
+{
+  engine_state_history.clear();
+  null_value= false;
+  return 0;
+}
+
+
+int engine_state_history_table_initialize(drizzled::module::Context &context)
+{
+  context.add(new(std::nothrow)EngineStateHistory());
+  context.add(new plugin::Create_function<ClearEngineStateHistoryFunction>("SEAPITESTER_CLEAR_ENGINE_STATE_HISTORY"));
+
+  return 0;
+}

=== added file 'plugin/storage_engine_api_tester/engine_state_history.h'
--- plugin/storage_engine_api_tester/engine_state_history.h	1970-01-01 00:00:00 +0000
+++ plugin/storage_engine_api_tester/engine_state_history.h	2011-01-13 06:17:20 +0000
@@ -0,0 +1,26 @@
+/*
+  Copyright (C) 2011 Stewart Smith
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License
+  as published by the Free Software Foundation; either version 2
+  of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+#ifndef PLUGIN_STORAGE_ENGINE_API_TESTER_ENGINE_STATE_HISTORY_H
+#define PLUGIN_STORAGE_ENGINE_API_TESTER_ENGINE_STATE_HISTORY_H
+
+extern std::vector<std::string> engine_state_history;
+
+int engine_state_history_table_initialize(drizzled::module::Context &context);
+
+#endif /* PLUGIN_STORAGE_ENGINE_API_TESTER_ENGINE_STATE_HISTORY_H */

=== modified file 'plugin/storage_engine_api_tester/plugin.ini'
--- plugin/storage_engine_api_tester/plugin.ini	2010-10-25 14:11:22 +0000
+++ plugin/storage_engine_api_tester/plugin.ini	2011-01-13 06:17:20 +0000
@@ -1,6 +1,7 @@
 [plugin]
 title=Storage Engine API Tester
 description=Test engine that enforces SE API calling conventions very strictly
-sources=storage_engine_api_tester.cc engine_states.cc cursor_states.cc
+sources=storage_engine_api_tester.cc engine_states.cc cursor_states.cc engine_state_history.cc
+headers=engine_state_history.h
 load_by_default=no
-static=no
\ No newline at end of file
+static=no

=== modified file 'plugin/storage_engine_api_tester/storage_engine_api_tester.cc'
--- plugin/storage_engine_api_tester/storage_engine_api_tester.cc	2010-12-08 04:51:43 +0000
+++ plugin/storage_engine_api_tester/storage_engine_api_tester.cc	2011-01-13 06:17:20 +0000
@@ -31,10 +31,13 @@
 
 #include <boost/unordered_map.hpp>
 
+#include "engine_state_history.h"
+
 using namespace std;
 using namespace drizzled;
 
 string engine_state;
+
 typedef multimap<string, string> state_multimap;
 typedef multimap<string, string>::value_type state_pair;
 typedef multimap<string, string>::iterator state_multimap_iter;
@@ -131,6 +134,7 @@
   }
 
   engine_state= new_state;
+  engine_state_history.push_back(new_state);
 
   cerr << "\tENGINE STATE : " << engine_state << endl;
 }
@@ -529,6 +533,8 @@
 
   context.add(new plugin::Create_function<SEAPITesterErrorInjectFunc>("seapitester_error_inject"));
 
+  engine_state_history_table_initialize(context);
+
   return 0;
 }
 

=== modified file 'plugin/storage_engine_api_tester/tests/r/create_table.result'
--- plugin/storage_engine_api_tester/tests/r/create_table.result	2010-10-25 12:46:17 +0000
+++ plugin/storage_engine_api_tester/tests/r/create_table.result	2011-01-13 06:17:20 +0000
@@ -1,2 +1,14 @@
+select seapitester_clear_engine_state_history();
+seapitester_clear_engine_state_history()
+0
 CREATE TABLE t1 (a int) ENGINE=STORAGE_ENGINE_API_TESTER;
+select * from data_dictionary.seapitester_engine_state_history;
+STATE
+::max_supported_key_length()
+::max_supported_keys()
+::doCreateTable()
+::SEAPITester()
+select seapitester_clear_engine_state_history();
+seapitester_clear_engine_state_history()
+0
 drop table t1;

=== modified file 'plugin/storage_engine_api_tester/tests/r/multi_stmt_txn.result'
--- plugin/storage_engine_api_tester/tests/r/multi_stmt_txn.result	2010-11-26 05:19:00 +0000
+++ plugin/storage_engine_api_tester/tests/r/multi_stmt_txn.result	2011-01-13 06:17:20 +0000
@@ -1,29 +1,100 @@
-create table t1 (a int) engine=storage_engine_api_tester;
-begin;
-select * from t1;
-a
-select * from t1;
-a
-commit;
-drop table t1;
-create table t1 (a int) engine=storage_engine_api_tester;
-begin;
-select * from t1;
-a
-insert into t1 values (1);
-insert into t1 values (1);
-insert into t1 values (1);
-select * from t1;
-a
-1
-1
-1
-insert into t1 values (1);
-select * from t1;
-a
-1
-1
-1
-1
-commit;
-drop table t1;
+select seapitester_clear_engine_state_history();
+seapitester_clear_engine_state_history()
+0
+create table t1 (a int) engine=storage_engine_api_tester;
+begin;
+select * from t1;
+a
+select * from t1;
+a
+commit;
+select * from data_dictionary.seapitester_engine_state_history;
+STATE
+::max_supported_key_length()
+::max_supported_keys()
+::doCreateTable()
+::SEAPITester()
+BEGIN
+In Transaction
+END STATEMENT
+COMMIT STATEMENT
+In Transaction
+START STATEMENT
+END STATEMENT
+COMMIT STATEMENT
+In Transaction
+START STATEMENT
+END STATEMENT
+COMMIT STATEMENT
+In Transaction
+COMMIT
+::SEAPITester()
+select seapitester_clear_engine_state_history();
+seapitester_clear_engine_state_history()
+0
+drop table t1;
+create table t1 (a int) engine=storage_engine_api_tester;
+begin;
+select * from t1;
+a
+insert into t1 values (1);
+insert into t1 values (1);
+insert into t1 values (1);
+select * from t1;
+a
+1
+1
+1
+insert into t1 values (1);
+select * from t1;
+a
+1
+1
+1
+1
+commit;
+drop table t1;
+select * from data_dictionary.seapitester_engine_state_history;
+STATE
+::max_supported_key_length()
+::max_supported_keys()
+::doCreateTable()
+::SEAPITester()
+BEGIN
+In Transaction
+END STATEMENT
+COMMIT STATEMENT
+In Transaction
+START STATEMENT
+END STATEMENT
+COMMIT STATEMENT
+In Transaction
+START STATEMENT
+END STATEMENT
+COMMIT STATEMENT
+In Transaction
+START STATEMENT
+END STATEMENT
+COMMIT STATEMENT
+In Transaction
+START STATEMENT
+END STATEMENT
+COMMIT STATEMENT
+In Transaction
+START STATEMENT
+END STATEMENT
+COMMIT STATEMENT
+In Transaction
+START STATEMENT
+END STATEMENT
+COMMIT STATEMENT
+In Transaction
+START STATEMENT
+END STATEMENT
+COMMIT STATEMENT
+In Transaction
+COMMIT
+::SEAPITester()
+select seapitester_clear_engine_state_history();
+seapitester_clear_engine_state_history()
+0

=== modified file 'plugin/storage_engine_api_tester/tests/r/rnd_pos.result'
--- plugin/storage_engine_api_tester/tests/r/rnd_pos.result	2010-11-29 02:36:55 +0000
+++ plugin/storage_engine_api_tester/tests/r/rnd_pos.result	2011-01-13 06:17:20 +0000
@@ -1,4 +1,7 @@
 set storage_engine=storage_engine_api_tester;
+select seapitester_clear_engine_state_history();
+seapitester_clear_engine_state_history()
+0
 CREATE TABLE t1 (
 aufnr varchar(12) NOT NULL default '',
 plnfl varchar(6) NOT NULL default '',
@@ -11,6 +14,27 @@
 "40004712" AND t1.plnfl = "000001" AND t1.vornr > "0010" ORDER BY t1.vornr
 ASC LIMIT 1;
 drop table t1;
+select * from data_dictionary.seapitester_engine_state_history;
+STATE
+::max_supported_key_length()
+::max_supported_keys()
+::doCreateTable()
+::SEAPITester()
+START STATEMENT
+END STATEMENT
+COMMIT
+::SEAPITester()
+START STATEMENT
+END STATEMENT
+COMMIT
+::SEAPITester()
+START STATEMENT
+END STATEMENT
+COMMIT
+::SEAPITester()
+select seapitester_clear_engine_state_history();
+seapitester_clear_engine_state_history()
+0
 CREATE TABLE t1 (
 aufnr varchar(12) NOT NULL default '',
 plnfl varchar(6) NOT NULL default '',
@@ -23,6 +47,50 @@
 "40004712" AND t1.plnfl = "000001" AND t1.vornr > "0010" ORDER BY t1.vornr
 ASC LIMIT 1;
 drop table t1;
+select * from data_dictionary.seapitester_engine_state_history;
+STATE
+::max_supported_key_length()
+::max_supported_key_parts()
+::max_supported_keys()
+::max_supported_key_part_length()
+::doCreateTable()
+::SEAPITester()
+START STATEMENT
+END STATEMENT
+COMMIT
+::SEAPITester()
+START STATEMENT
+END STATEMENT
+COMMIT
+::SEAPITester()
+START STATEMENT
+END STATEMENT
+COMMIT
+::SEAPITester()
+select seapitester_clear_engine_state_history();
+seapitester_clear_engine_state_history()
+0
 create table t1 (a int, b int, c int);
 alter table t1 add unique(a,b);
 drop table t1;
+select * from data_dictionary.seapitester_engine_state_history;
+STATE
+::max_supported_key_length()
+::max_supported_keys()
+::doCreateTable()
+::SEAPITester()
+START STATEMENT
+::max_supported_key_length()
+::max_supported_key_parts()
+::max_supported_keys()
+::max_supported_key_part_length()
+::max_supported_key_part_length()
+::doCreateTable()
+::SEAPITester()
+START STATEMENT
+END STATEMENT
+COMMIT
+::SEAPITester()
+select seapitester_clear_engine_state_history();
+seapitester_clear_engine_state_history()
+0

=== modified file 'plugin/storage_engine_api_tester/tests/r/rollback_statement.result'
--- plugin/storage_engine_api_tester/tests/r/rollback_statement.result	2010-10-25 12:45:29 +0000
+++ plugin/storage_engine_api_tester/tests/r/rollback_statement.result	2011-01-13 06:17:20 +0000
@@ -1,4 +1,20 @@
+select seapitester_clear_engine_state_history();
+seapitester_clear_engine_state_history()
+0
 create table t1 (a int not null) engine=storage_engine_api_tester;
 insert into t1 values (1), (NULL), (2);
 ERROR 23000: Column 'a' cannot be null
 drop table t1;
+select * from data_dictionary.seapitester_engine_state_history;
+STATE
+::max_supported_key_length()
+::max_supported_keys()
+::doCreateTable()
+::SEAPITester()
+START STATEMENT
+END STATEMENT
+ROLLBACK
+::SEAPITester()
+select seapitester_clear_engine_state_history();
+seapitester_clear_engine_state_history()
+0

=== modified file 'plugin/storage_engine_api_tester/tests/r/select.result'
--- plugin/storage_engine_api_tester/tests/r/select.result	2010-12-12 00:13:57 +0000
+++ plugin/storage_engine_api_tester/tests/r/select.result	2011-01-13 06:17:20 +0000
@@ -1,6 +1,34 @@
+select seapitester_clear_engine_state_history();
+seapitester_clear_engine_state_history()
+0
 CREATE TABLE t2 (a int) ENGINE=STORAGE_ENGINE_API_TESTER;
 start transaction with consistent snapshot;
+select * from data_dictionary.seapitester_engine_state_history;
+STATE
+::max_supported_key_length()
+::max_supported_keys()
+::doCreateTable()
+::SEAPITester()
+BEGIN
+In Transaction
+END STATEMENT
+COMMIT STATEMENT
+In Transaction
+select seapitester_clear_engine_state_history();
+seapitester_clear_engine_state_history()
+0
 select * from t2;
 a
 commit;
 drop table t2;
+select * from data_dictionary.seapitester_engine_state_history;
+STATE
+START STATEMENT
+END STATEMENT
+COMMIT STATEMENT
+In Transaction
+COMMIT
+::SEAPITester()
+select seapitester_clear_engine_state_history();
+seapitester_clear_engine_state_history()
+0

=== modified file 'plugin/storage_engine_api_tester/tests/r/transaction.result'
--- plugin/storage_engine_api_tester/tests/r/transaction.result	2010-11-29 07:03:38 +0000
+++ plugin/storage_engine_api_tester/tests/r/transaction.result	2011-01-13 06:17:20 +0000
@@ -1,3 +1,6 @@
+select seapitester_clear_engine_state_history();
+seapitester_clear_engine_state_history()
+0
 DROP TABLE IF EXISTS t1_trx, t1_non_trx;
 SET AUTOCOMMIT= 0;
 CREATE TABLE t1_trx (
@@ -18,6 +21,32 @@
 ROLLBACK;
 Warnings:
 Warning	1196	Some non-transactional changed tables couldn't be rolled back
+select * from data_dictionary.seapitester_engine_state_history;
+STATE
+::max_supported_key_length()
+::max_supported_key_parts()
+::max_supported_keys()
+::max_supported_key_part_length()
+::doCreateTable()
+::SEAPITester()
+BEGIN
+In Transaction
+END STATEMENT
+COMMIT STATEMENT
+In Transaction
+START STATEMENT
+END STATEMENT
+COMMIT STATEMENT
+In Transaction
+START STATEMENT
+END STATEMENT
+COMMIT STATEMENT
+In Transaction
+ROLLBACK
+::SEAPITester()
+select seapitester_clear_engine_state_history();
+seapitester_clear_engine_state_history()
+0
 Expected warning about non-trx data changes not being rolled back
 SELECT * FROM t1_trx;
 k	v
@@ -25,6 +54,15 @@
 k	v
 key1	value1
 key2	value2
+select * from data_dictionary.seapitester_engine_state_history;
+STATE
+START STATEMENT
+END STATEMENT
+COMMIT STATEMENT
+In Transaction
+select seapitester_clear_engine_state_history();
+seapitester_clear_engine_state_history()
+0
 START TRANSACTION;
 INSERT INTO t1_trx VALUES ('key1','value1');
 INSERT INTO t1_trx VALUES ('key2','value2');
@@ -35,9 +73,46 @@
 key1	value1
 key2	value2
 ROLLBACK;
+select * from data_dictionary.seapitester_engine_state_history;
+STATE
+COMMIT
+::SEAPITester()
+BEGIN
+In Transaction
+END STATEMENT
+COMMIT STATEMENT
+In Transaction
+START STATEMENT
+END STATEMENT
+COMMIT STATEMENT
+In Transaction
+START STATEMENT
+END STATEMENT
+COMMIT STATEMENT
+In Transaction
+START STATEMENT
+END STATEMENT
+COMMIT STATEMENT
+In Transaction
+ROLLBACK
+::SEAPITester()
+select seapitester_clear_engine_state_history();
+seapitester_clear_engine_state_history()
+0
 SELECT t1_trx.k, t1_trx.v
 FROM t1_trx
 INNER JOIN t1_non_trx ON t1_trx.k = t1_non_trx.k;
 k	v
 DROP TABLE t1_trx;
 DROP TABLE t1_non_trx;
+select * from data_dictionary.seapitester_engine_state_history;
+STATE
+START STATEMENT
+END STATEMENT
+COMMIT STATEMENT
+In Transaction
+COMMIT
+::SEAPITester()
+select seapitester_clear_engine_state_history();
+seapitester_clear_engine_state_history()
+0

=== modified file 'plugin/storage_engine_api_tester/tests/r/txn_log_insert.result'
--- plugin/storage_engine_api_tester/tests/r/txn_log_insert.result	2010-12-30 18:07:58 +0000
+++ plugin/storage_engine_api_tester/tests/r/txn_log_insert.result	2011-01-13 06:17:20 +0000
@@ -1,3 +1,6 @@
+select seapitester_clear_engine_state_history();
+seapitester_clear_engine_state_history()
+0
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (
 pk int auto_increment primary key,
@@ -27,6 +30,52 @@
 select seapitester_error_inject(0);
 seapitester_error_inject(0)
 0
+select * from data_dictionary.seapitester_engine_state_history;
+STATE
+::max_supported_key_length()
+::max_supported_key_parts()
+::max_supported_keys()
+::max_supported_key_part_length()
+::doCreateTable()
+::SEAPITester()
+START STATEMENT
+END STATEMENT
+ROLLBACK
+::SEAPITester()
+BEGIN
+In Transaction
+END STATEMENT
+COMMIT STATEMENT
+In Transaction
+START STATEMENT
+END STATEMENT
+COMMIT STATEMENT
+In Transaction
+START STATEMENT
+END STATEMENT
+ROLLBACK STATEMENT
+In Transaction
+START STATEMENT
+END STATEMENT
+COMMIT STATEMENT
+In Transaction
+COMMIT
+::SEAPITester()
+START STATEMENT
+END STATEMENT
+COMMIT
+::SEAPITester()
+START STATEMENT
+END STATEMENT
+ROLLBACK
+::SEAPITester()
+START STATEMENT
+END STATEMENT
+COMMIT
+::SEAPITester()
+select seapitester_clear_engine_state_history();
+seapitester_clear_engine_state_history()
+0
 START TRANSACTION;
 CREATE TABLE `test`.`t1` (   `pk` INT NOT NULL AUTO_INCREMENT,   `id` INT NOT NULL,   `padding` VARCHAR(200) COLLATE utf8_general_ci NOT NULL,   PRIMARY KEY (`pk`) ) ENGINE=STORAGE_ENGINE_API_TESTER COLLATE = utf8_general_ci;
 COMMIT;
@@ -41,3 +90,5 @@
 DROP TABLE `test`.`t1`;
 COMMIT;
 SET GLOBAL transaction_log_truncate_debug= true;
+select * from data_dictionary.seapitester_engine_state_history;
+STATE

=== modified file 'plugin/storage_engine_api_tester/tests/r/txn_log_rollback_large_stmt.result'
--- plugin/storage_engine_api_tester/tests/r/txn_log_rollback_large_stmt.result	2010-12-23 19:23:22 +0000
+++ plugin/storage_engine_api_tester/tests/r/txn_log_rollback_large_stmt.result	2011-01-13 06:17:20 +0000
@@ -1,3 +1,6 @@
+select seapitester_clear_engine_state_history();
+seapitester_clear_engine_state_history()
+0
 DROP TABLE IF EXISTS t1;
 CREATE TABLE source (
 pk int auto_increment primary key,
@@ -22,6 +25,47 @@
 select seapitester_error_inject(0);
 seapitester_error_inject(0)
 0
+select * from data_dictionary.seapitester_engine_state_history;
+STATE
+::max_supported_key_length()
+::max_supported_key_parts()
+::max_supported_keys()
+::max_supported_key_part_length()
+::doCreateTable()
+::SEAPITester()
+::max_supported_key_length()
+::max_supported_key_parts()
+::max_supported_keys()
+::max_supported_key_part_length()
+::doCreateTable()
+::SEAPITester()
+START STATEMENT
+END STATEMENT
+COMMIT
+::SEAPITester()
+START STATEMENT
+END STATEMENT
+COMMIT
+::SEAPITester()
+START STATEMENT
+END STATEMENT
+COMMIT
+::SEAPITester()
+START STATEMENT
+END STATEMENT
+COMMIT
+::SEAPITester()
+START STATEMENT
+END STATEMENT
+COMMIT
+::SEAPITester()
+START STATEMENT
+END STATEMENT
+ROLLBACK
+::SEAPITester()
+select seapitester_clear_engine_state_history();
+seapitester_clear_engine_state_history()
+0
 START TRANSACTION;
 CREATE TABLE `test`.`source` (   `pk` INT NOT NULL AUTO_INCREMENT,   `d` VARCHAR(16000) COLLATE utf8_general_ci DEFAULT NULL,   PRIMARY KEY (`pk`) ) ENGINE=STORAGE_ENGINE_API_TESTER COLLATE = utf8_general_ci;
 COMMIT;

=== modified file 'plugin/storage_engine_api_tester/tests/t/create_table.test'
--- plugin/storage_engine_api_tester/tests/t/create_table.test	2010-10-25 12:46:17 +0000
+++ plugin/storage_engine_api_tester/tests/t/create_table.test	2011-01-13 06:17:20 +0000
@@ -1,2 +1,5 @@
+select seapitester_clear_engine_state_history();
 CREATE TABLE t1 (a int) ENGINE=STORAGE_ENGINE_API_TESTER;
+select * from data_dictionary.seapitester_engine_state_history;
+select seapitester_clear_engine_state_history();
 drop table t1;

=== modified file 'plugin/storage_engine_api_tester/tests/t/multi_stmt_txn.test'
--- plugin/storage_engine_api_tester/tests/t/multi_stmt_txn.test	2010-11-23 13:19:53 +0000
+++ plugin/storage_engine_api_tester/tests/t/multi_stmt_txn.test	2011-01-13 06:17:20 +0000
@@ -1,18 +1,24 @@
-create table t1 (a int) engine=storage_engine_api_tester;
-begin;
-select * from t1;
-select * from t1;
-commit;
-drop table t1;
-
-create table t1 (a int) engine=storage_engine_api_tester;
-begin;
-select * from t1;
-insert into t1 values (1);
-insert into t1 values (1);
-insert into t1 values (1);
-select * from t1;
-insert into t1 values (1);
-select * from t1;
-commit;
-drop table t1;
+select seapitester_clear_engine_state_history();
+create table t1 (a int) engine=storage_engine_api_tester;
+begin;
+select * from t1;
+select * from t1;
+commit;
+select * from data_dictionary.seapitester_engine_state_history;
+select seapitester_clear_engine_state_history();
+drop table t1;
+
+create table t1 (a int) engine=storage_engine_api_tester;
+begin;
+select * from t1;
+insert into t1 values (1);
+insert into t1 values (1);
+insert into t1 values (1);
+select * from t1;
+insert into t1 values (1);
+select * from t1;
+commit;
+drop table t1;
+select * from data_dictionary.seapitester_engine_state_history;
+select seapitester_clear_engine_state_history();
+

=== modified file 'plugin/storage_engine_api_tester/tests/t/rnd_pos.test'
--- plugin/storage_engine_api_tester/tests/t/rnd_pos.test	2010-11-29 02:36:55 +0000
+++ plugin/storage_engine_api_tester/tests/t/rnd_pos.test	2011-01-13 06:17:20 +0000
@@ -4,6 +4,8 @@
 #
 set storage_engine=storage_engine_api_tester;
 
+select seapitester_clear_engine_state_history();
+
 # This failed because of syntax. Changed int(5) to int.
 CREATE TABLE t1 (
   aufnr varchar(12) NOT NULL default '',
@@ -21,6 +23,9 @@
 
 drop table t1;
 
+select * from data_dictionary.seapitester_engine_state_history;
+select seapitester_clear_engine_state_history();
+
 # and again with a primary key
 
 CREATE TABLE t1 (
@@ -39,6 +44,9 @@
 
 drop table t1;
 
+select * from data_dictionary.seapitester_engine_state_history;
+select seapitester_clear_engine_state_history();
+
 # and again with a unique key that becomes the clustered key
 
 create table t1 (a int, b int, c int);
@@ -46,3 +54,7 @@
 alter table t1 add unique(a,b);
 
 drop table t1;
+
+select * from data_dictionary.seapitester_engine_state_history;
+select seapitester_clear_engine_state_history();
+

=== modified file 'plugin/storage_engine_api_tester/tests/t/rollback_statement.test'
--- plugin/storage_engine_api_tester/tests/t/rollback_statement.test	2010-10-25 12:45:29 +0000
+++ plugin/storage_engine_api_tester/tests/t/rollback_statement.test	2011-01-13 06:17:20 +0000
@@ -1,4 +1,7 @@
+select seapitester_clear_engine_state_history();
 create table t1 (a int not null) engine=storage_engine_api_tester;
 --error 1048
 insert into t1 values (1), (NULL), (2);
 drop table t1;
+select * from data_dictionary.seapitester_engine_state_history;
+select seapitester_clear_engine_state_history();

=== modified file 'plugin/storage_engine_api_tester/tests/t/select.test'
--- plugin/storage_engine_api_tester/tests/t/select.test	2010-12-12 00:13:57 +0000
+++ plugin/storage_engine_api_tester/tests/t/select.test	2011-01-13 06:17:20 +0000
@@ -1,6 +1,12 @@
+select seapitester_clear_engine_state_history();
 CREATE TABLE t2 (a int) ENGINE=STORAGE_ENGINE_API_TESTER;
 start transaction with consistent snapshot;
+select * from data_dictionary.seapitester_engine_state_history;
+select seapitester_clear_engine_state_history();
 #--error 1146
 select * from t2;
 commit;
 drop table t2;
+select * from data_dictionary.seapitester_engine_state_history;
+select seapitester_clear_engine_state_history();
+

=== modified file 'plugin/storage_engine_api_tester/tests/t/transaction.test'
--- plugin/storage_engine_api_tester/tests/t/transaction.test	2010-11-29 07:03:38 +0000
+++ plugin/storage_engine_api_tester/tests/t/transaction.test	2011-01-13 06:17:20 +0000
@@ -4,6 +4,9 @@
 # 2. Correct commit and rollback behaviour
 # 3. XA protocol communication and recovery
 
+select seapitester_clear_engine_state_history();
+
+
 --disable_warnings
 DROP TABLE IF EXISTS t1_trx, t1_non_trx;
 --enable_warnings
@@ -32,11 +35,17 @@
 
 ROLLBACK;
 
+select * from data_dictionary.seapitester_engine_state_history;
+select seapitester_clear_engine_state_history();
+
 --echo Expected warning about non-trx data changes not being rolled back
 
 SELECT * FROM t1_trx;
 SELECT * FROM t1_non_trx;
 
+select * from data_dictionary.seapitester_engine_state_history;
+select seapitester_clear_engine_state_history();
+
 START TRANSACTION;
 
 INSERT INTO t1_trx VALUES ('key1','value1');
@@ -47,6 +56,8 @@
 INNER JOIN t1_non_trx ON t1_trx.k = t1_non_trx.k;
 
 ROLLBACK;
+select * from data_dictionary.seapitester_engine_state_history;
+select seapitester_clear_engine_state_history();
 
 SELECT t1_trx.k, t1_trx.v
 FROM t1_trx
@@ -54,3 +65,7 @@
 
 DROP TABLE t1_trx;
 DROP TABLE t1_non_trx;
+
+select * from data_dictionary.seapitester_engine_state_history;
+select seapitester_clear_engine_state_history();
+

=== modified file 'plugin/storage_engine_api_tester/tests/t/txn_log_insert.test'
--- plugin/storage_engine_api_tester/tests/t/txn_log_insert.test	2010-12-30 18:07:58 +0000
+++ plugin/storage_engine_api_tester/tests/t/txn_log_insert.test	2011-01-13 06:17:20 +0000
@@ -19,6 +19,8 @@
 # We then use the transaction_reader in plugin/transaction_log/utilities to read the events.
 #
 
+select seapitester_clear_engine_state_history();
+
 --disable_warnings
 DROP TABLE IF EXISTS t1;
 --enable_warnings
@@ -48,8 +50,14 @@
 select seapitester_error_inject(0);
 # Read in the transaction.log.
 
+select * from data_dictionary.seapitester_engine_state_history;
+select seapitester_clear_engine_state_history();
+
+
 --exec ../plugin/transaction_log/utilities/transaction_reader var/master-data/local/transaction.log
 
 # Truncate the log file to reset for the next test
 --source ../plugin/transaction_log/tests/t/truncate_log.inc
 
+select * from data_dictionary.seapitester_engine_state_history;
+

=== modified file 'plugin/storage_engine_api_tester/tests/t/txn_log_rollback_large_stmt.test'
--- plugin/storage_engine_api_tester/tests/t/txn_log_rollback_large_stmt.test	2010-12-01 11:16:06 +0000
+++ plugin/storage_engine_api_tester/tests/t/txn_log_rollback_large_stmt.test	2011-01-13 06:17:20 +0000
@@ -19,6 +19,8 @@
 # We then use the transaction_reader in plugin/transaction_log/utilities to read the events.
 #
 
+select seapitester_clear_engine_state_history();
+
 --disable_warnings
 DROP TABLE IF EXISTS t1;
 --enable_warnings
@@ -46,6 +48,9 @@
 select seapitester_error_inject(0);
 # Read in the transaction.log.
 
+select * from data_dictionary.seapitester_engine_state_history;
+select seapitester_clear_engine_state_history();
+
 --exec ../plugin/transaction_log/utilities/transaction_reader var/master-data/local/transaction.log
 
 # Truncate the log file to reset for the next test