diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-11-30 22:37:27 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-11-30 22:37:27 +0100 |
| commit | db260b19e3edb9e153abf784711a3ae13e40db4a (patch) | |
| tree | 4a9d9e50072d36ee917a570f8bf83a0117e971db /libmysql | |
| parent | 0df8279c468235f4feaf9eb25aa2beb5032ee1dc (diff) | |
| parent | 4a458290441937661136c73afa61393a6634f7b0 (diff) | |
| download | mariadb-git-db260b19e3edb9e153abf784711a3ae13e40db4a.tar.gz | |
Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.
Also merge charset patch.
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 14 | ||||
| -rw-r--r-- | libmysql/libmysql.def | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 3a62208fd92..768a62ea8b8 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1642,6 +1642,20 @@ mysql_real_escape_string(MYSQL *mysql, char *to,const char *from, return (uint) escape_string_for_mysql(mysql->charset, to, 0, from, length); } + +char * STDCALL +mysql_odbc_escape_string(MYSQL *mysql __attribute__((unused)), + char *to __attribute__((unused)), + ulong to_length __attribute__((unused)), + const char *from __attribute__((unused)), + ulong from_length __attribute__((unused)), + void *param __attribute__((unused)), + char * (*extend_buffer)(void *, char *, ulong *) + __attribute__((unused))) +{ + return NULL; +} + void STDCALL myodbc_remove_escape(MYSQL *mysql,char *name) { diff --git a/libmysql/libmysql.def b/libmysql/libmysql.def index 45e85b15120..5c05bff8242 100644 --- a/libmysql/libmysql.def +++ b/libmysql/libmysql.def @@ -78,6 +78,7 @@ EXPORTS mysql_next_result mysql_num_fields mysql_num_rows + mysql_odbc_escape_string mysql_options mysql_stmt_param_count mysql_stmt_param_metadata |