diff options
| author | unknown <holyfoot@mysql.com> | 2006-06-26 22:32:02 +0500 |
|---|---|---|
| committer | unknown <holyfoot@mysql.com> | 2006-06-26 22:32:02 +0500 |
| commit | 87257abe59af21274e6388418567edd6579de0c5 (patch) | |
| tree | d80a7a0f57c15f731dd1554355161803f69d5c95 /include | |
| parent | 80bb69ed8fbfce3659868fc22bce32ac4d034d58 (diff) | |
| parent | 31ffea2a08dee857f930936d4d0e38354065c16e (diff) | |
| download | mariadb-git-87257abe59af21274e6388418567edd6579de0c5.tar.gz | |
merging
libmysqld/libmysqld.c:
Auto merged
sql/item_geofunc.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/sql_common.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sql_common.h b/include/sql_common.h index c07a4a831bb..9fc8d4f457b 100644 --- a/include/sql_common.h +++ b/include/sql_common.h @@ -22,6 +22,7 @@ extern const char *not_error_sqlstate; extern "C" { #endif +extern CHARSET_INFO *default_client_charset_info; MYSQL_FIELD *unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields, my_bool default_value, uint server_capabilities); void free_rows(MYSQL_DATA *cur); |