After merge fixes

mysql-test/r/repair_part1.result:
  Rename: mysql-test/r/repair.result -> mysql-test/r/repair_part1.result
mysql-test/t/repair_part1.test:
  Rename: mysql-test/t/repair.test -> mysql-test/t/repair_part1.test
include/sql_common.h:
  Declare not_error_sqlstate
scripts/Makefile.am:
  Added back fill_help_tables.sql

1 files changed, 0 insertions, 22 deletions

diff --git a/mysql-test/t/repair.test b/mysql-test/t/repair.test
deleted file mode 100644
index 2657f91cd02..00000000000
--- a/mysql-test/t/repair.test
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Test of repair table
-#
-
---disable_warnings
-drop table if exists t1;
---enable_warnings
-
-create table t1 SELECT 1,"table 1";
-repair table t1 use_frm;
-alter table t1 TYPE=HEAP;
-repair table t1 use_frm;
-drop table t1;
-
-# non-existent table
-repair table t1 use_frm;
-
-#
-# Create test table for repair2
-# The following must be last in this file
-
-create table t1 type=myisam SELECT 1,"table 1";