diff options
| author | unknown <hf@deer.(none)> | 2004-02-13 11:56:36 +0400 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-02-13 11:56:36 +0400 |
| commit | cd9551195df621450707f1c3ef17f62806154937 (patch) | |
| tree | f80ed64ab252bd96dc439446b2c7babbb31f4828 /libmysqld | |
| parent | 3ab19c265ae68d2a14e08a564ea96f87a7cf2044 (diff) | |
| download | mariadb-git-cd9551195df621450707f1c3ef17f62806154937.tar.gz | |
Another fix for #2208
previous one had error
libmysqld/lib_sql.cc:
memdup_mysql deleted
sql/sql_class.h:
String instead of char*
sql/sql_parse.cc:
storing of the rest of the query
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 101e129d615..188227c21f9 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -251,7 +251,7 @@ int emb_next_result(MYSQL *mysql) DBUG_ENTER("emb_next_result"); if (emb_advanced_command(mysql, COM_QUERY,0,0, - thd->query_rest,thd->query_rest_length,1) + thd->query_rest.ptr(),thd->query_rest.length(),1) || emb_mysql_read_query_result(mysql)) DBUG_RETURN(1); @@ -765,11 +765,6 @@ bool Protocol::net_store_data(const char *from, uint length) return false; } -char *memdup_mysql(struct st_mysql *mysql, const char*data, int length) -{ - return memdup_root(&mysql->field_alloc, data, length); -} - #if 0 /* The same as Protocol::net_store_data but does the converstion */ |