diff options
| author | unknown <ingo/mydev@chilla.local> | 2006-07-08 10:54:54 +0200 |
|---|---|---|
| committer | unknown <ingo/mydev@chilla.local> | 2006-07-08 10:54:54 +0200 |
| commit | 619d8b2c6500b4d213d7d2f1d8cb0df9bce145a5 (patch) | |
| tree | d9a03e26a9b3e468f84781258b965941aa4c6e90 /include | |
| parent | d0baba61141c6581f661459636c29b90c4f66eac (diff) | |
| parent | 4298f45d01f24fecff23c599336df838aedc454e (diff) | |
| download | mariadb-git-619d8b2c6500b4d213d7d2f1d8cb0df9bce145a5.tar.gz | |
Merge chilla.local:/home/mydev/mysql-5.1--main
into chilla.local:/home/mydev/mysql-5.1-amerge
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_trigger.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); |