diff --git a/mysql-test/suite/tokudb.bugs/r/3518.result b/mysql-test/suite/tokudb.bugs/r/3518.result
new file mode 100644
index 00000000000..2081ad06f42
--- /dev/null
+++ b/mysql-test/suite/tokudb.bugs/r/3518.result
@@ -0,0 +1,36 @@
+SET STORAGE_ENGINE = 'tokudb';
+DROP TABLE IF EXISTS foo;
+set session tokudb_prelock_empty=off;
+create table foo (a int, b bigint, primary key (a))engine=TokuDB;
+insert into foo values (1,10),(2,20);
+select * from foo;
+a	b
+1	10
+2	20
+alter table foo add clustering index (b);
+insert into foo values (3,30);
+select * from foo where b >=10;
+a	b
+1	10
+2	20
+3	30
+drop table foo;
+create table foo (a int, b bigint)engine=TokuDB;
+insert into foo values (1,10),(2,20);
+select * from foo;
+a	b
+1	10
+2	20
+alter table foo add clustering index (b);
+insert into foo values (3,30);
+select * from foo where b >=10;
+a	b
+1	10
+2	20
+3	30
+drop table foo;
+create table foo (a int, b longblob, clustering key (a));
+insert into foo values (1,"aa");
+insert into foo values (2,repeat('b', 100000));
+insert into foo values (3,"bbb");
+DROP TABLE foo;
diff --git a/mysql-test/suite/tokudb.bugs/t/3518.test b/mysql-test/suite/tokudb.bugs/t/3518.test
new file mode 100644
index 00000000000..e4ef645e8d7
--- /dev/null
+++ b/mysql-test/suite/tokudb.bugs/t/3518.test
@@ -0,0 +1,38 @@
+--source include/have_tokudb.inc
+#
+# Record inconsistency.
+#
+#
+SET STORAGE_ENGINE = 'tokudb';
+
+--disable_warnings
+DROP TABLE IF EXISTS foo;
+--enable_warnings
+set session tokudb_prelock_empty=off;
+
+create table foo (a int, b bigint, primary key (a))engine=TokuDB;
+insert into foo values (1,10),(2,20);
+select * from foo;
+alter table foo add clustering index (b);
+insert into foo values (3,30);
+select * from foo where b >=10;
+drop table foo;
+
+create table foo (a int, b bigint)engine=TokuDB;
+insert into foo values (1,10),(2,20);
+select * from foo;
+alter table foo add clustering index (b);
+insert into foo values (3,30);
+select * from foo where b >=10;
+drop table foo;
+
+
+# just make sure nothing crashes
+create table foo (a int, b longblob, clustering key (a));
+insert into foo values (1,"aa");
+insert into foo values (2,repeat('b', 100000)); 
+insert into foo values (3,"bbb");
+
+# Final cleanup.
+DROP TABLE foo;
+