mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
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
This commit is contained in:
@ -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)
|
||||
|
Reference in New Issue
Block a user