summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <ingo/mydev@chilla.local>2006-07-07 09:14:09 +0200
committerunknown <ingo/mydev@chilla.local>2006-07-07 09:14:09 +0200
commit4298f45d01f24fecff23c599336df838aedc454e (patch)
tree8ae7181a81317ca6ba34bdfa32bb2f33936d91bd /include
parent16c54768ba01d9138043ffa8b426b5d3bd14931b (diff)
parent6e791bb1262b7f4312dce54bfe419c638cc230b8 (diff)
downloadmariadb-git-4298f45d01f24fecff23c599336df838aedc454e.tar.gz
Merge chilla.local:/home/mydev/mysql-5.1--main
into chilla.local:/home/mydev/mysql-5.1-amerge
Diffstat (limited to 'include')
-rw-r--r--include/sql_common.h1
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);