summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_class.h5
-rw-r--r--sql/unireg.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h
index bb9ff766050..b88ef0a6bc8 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -4163,6 +4163,11 @@ public:
{
parse_error(ER_SYNTAX_ERROR);
}
+#ifdef mysqld_error_find_printf_error_used
+ void parse_error(const char *t)
+ {
+ }
+#endif
private:
/*
Only the implementation of the SIGNAL and RESIGNAL statements
diff --git a/sql/unireg.h b/sql/unireg.h
index dfabc71aa0f..277a1e3fb40 100644
--- a/sql/unireg.h
+++ b/sql/unireg.h
@@ -56,6 +56,7 @@
#endif
#define ER_THD_OR_DEFAULT(thd,X) ((thd) ? ER_THD(thd, (X)) : ER_DEFAULT(X))
+
#define ME_INFO (ME_HOLDTANG | ME_NOREFRESH)
#define ME_ERROR (ME_BELL | ME_NOREFRESH)
#define MYF_RW MYF(MY_WME+MY_NABP) /* Vid my_read & my_write */