diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-10-03 16:54:26 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-10-03 16:54:26 +0300 |
| commit | 8f7a2b2785cec83f3c00047b5d3fb76d85ecbe62 (patch) | |
| tree | f4c99a6c2b4ed9003c893e7098a0c957d720e317 /libmysql | |
| parent | 95e772b65678b182bff5b52f3f5386d894419147 (diff) | |
| download | mariadb-git-8f7a2b2785cec83f3c00047b5d3fb76d85ecbe62.tar.gz | |
Update after last merge. Fixes some wrong test results.
libmysql/libmysql.c:
Removed obsolete function (now in strings library)
mysql-test/r/rpl_log.result:
Updated results for 4.1
mysql-test/r/rpl_log_pos.result:
Updated results for 4.1
sql/item_strfunc.cc:
Added missing system_charset_info
sql/log_event.cc:
Portability fixes. More debugging.
sql/net_pkg.cc:
Added back setting of query_error as slave code is depeneding on this.
sql/sql_acl.cc:
Update after last merge
sql/sql_lex.cc:
Update after last merge
sql/sql_parse.cc:
Update after last merge
sql/sql_prepare.cc:
Update after last merge
sql/time.cc:
Update after last merge.
More comments
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 1b5d59807cd..f164582889e 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -3389,19 +3389,6 @@ static my_bool read_prepare_result(MYSQL *mysql, MYSQL_STMT *stmt) metadata information by reading from server */ -/* QQ The follwing function will be removed after next merge */ - -static char *my_strdup_with_length(const byte *from, uint length, myf MyFlags) -{ - gptr ptr; - if ((ptr=my_malloc(length+1,MyFlags)) != 0) - { - memcpy((byte*) ptr, (byte*) from,(size_t) length); - ((char*) ptr)[length]=0; - } - return((char*) ptr); -} - MYSQL_STMT *STDCALL mysql_prepare(MYSQL *mysql, const char *query, ulong length) |