summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2019-01-26 19:12:26 +0200
committerMonty <monty@mariadb.org>2019-01-26 19:18:22 +0200
commit4007eaba91ace6f10a20df37f8d560c04f544946 (patch)
tree0920b72d0a048fdb8040e29bee33f2586a84db36
parentc0c62196cafb41f5f653ad9d4887ee3af7ffcf10 (diff)
downloadmariadb-git-4007eaba91ace6f10a20df37f8d560c04f544946.tar.gz
Removed declaration of strconvert() from innodb_priv.h
-rw-r--r--sql/innodb_priv.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/innodb_priv.h b/sql/innodb_priv.h
index 7fbaa7cfc2f..b78724d04b0 100644
--- a/sql/innodb_priv.h
+++ b/sql/innodb_priv.h
@@ -19,15 +19,13 @@
/** @file Declaring server-internal functions that are used by InnoDB. */
#include <sql_priv.h>
+#include <strfunc.h> /* strconvert */
class THD;
int get_quote_char_for_identifier(THD *thd, const char *name, size_t length);
bool schema_table_store_record(THD *thd, TABLE *table);
void localtime_to_TIME(MYSQL_TIME *to, struct tm *from);
-uint strconvert(CHARSET_INFO *from_cs, const char *from, size_t from_length,
- CHARSET_INFO *to_cs, char *to, size_t to_length,
- uint *errors);
void sql_print_error(const char *format, ...);