summaryrefslogtreecommitdiff
path: root/sql/mysql_priv.h
diff options
context:
space:
mode:
authorunknown <bar@bar.mysql.r18.ru>2003-03-21 11:21:01 +0400
committerunknown <bar@bar.mysql.r18.ru>2003-03-21 11:21:01 +0400
commit2dc27531c8952c00133440d54f60dd2030361080 (patch)
tree91a1c3ec185a2c02cea750090603b6f8cf2776ee /sql/mysql_priv.h
parentd7bccdbe817be53d38cba08648998ad24626aa9b (diff)
downloadmariadb-git-2dc27531c8952c00133440d54f60dd2030361080.tar.gz
A separate variable national_charset_info
Fixes according coercibility tables, p162, SQL Complete include/my_sys.h: Declaration has been moved to /sql directory sql/item.cc: Fixes acording SQL complete, page 162 sql/item_cmpfunc.cc: Fixes acording SQL complete, page 162 sql/mysql_priv.h: Declaration has been moved here from /include sql/sql_string.cc: A separate variable national_charset_info sql/sql_yacc.yy: A separate variable national_charset_info
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r--sql/mysql_priv.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 61c5d308b4e..f68de23034a 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -62,7 +62,9 @@ char* query_table_status(THD *thd,const char *db,const char *table_name);
#endif
#endif
-#define files_charset_info system_charset_info
+extern CHARSET_INFO *system_charset_info;
+extern CHARSET_INFO *files_charset_info;
+extern CHARSET_INFO *national_charset_info;
/***************************************************************************
Configuration parameters