diff options
| author | unknown <cmiller@zippy.(none)> | 2006-07-10 13:38:22 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.(none)> | 2006-07-10 13:38:22 -0400 |
| commit | d6e3a9ddcb6a877feb65a98953b3ec9e6426be47 (patch) | |
| tree | 555b6e52dd857768fcf99821dd6c45b62b80dd30 /include | |
| parent | 9b6a1384114a41beb8b492aed335096ef03c86df (diff) | |
| parent | 8154ca618b68784098dcb8b84ba2cf77707c80e4 (diff) | |
| download | mariadb-git-d6e3a9ddcb6a877feb65a98953b3ec9e6426be47.tar.gz | |
Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/ndb_autodiscover3.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/wait_timeout.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 2 | ||||
| -rw-r--r-- | include/sql_common.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 2dc4053f70d..f2b08e2b372 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -163,7 +163,7 @@ extern gptr my_realloc(gptr oldpoint,uint Size,myf MyFlags); extern void my_no_flags_free(gptr ptr); extern gptr my_memdup(const byte *from,uint length,myf MyFlags); extern char *my_strdup(const char *from,myf MyFlags); -extern char *my_strndup(const byte *from, uint length, +extern char *my_strndup(const char *from, uint length, myf MyFlags); /* we do use FG (as a no-op) in below so that a typo on FG is caught */ #define my_free(PTR,FG) ((void)FG,my_no_flags_free(PTR)) 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); |