diff options
| author | unknown <tim@threads.polyesthetic.msg> | 2001-06-04 18:34:04 -0400 |
|---|---|---|
| committer | unknown <tim@threads.polyesthetic.msg> | 2001-06-04 18:34:04 -0400 |
| commit | bc0befda9cc4a26deac21cd59cfd96c8d3355edb (patch) | |
| tree | d1a1e436c5691d8f33e00c6966b99fe986110ece /libmysqld/libmysqld.c | |
| parent | 020160f83f62d6171c57a4021e21e68049c2a4e8 (diff) | |
| download | mariadb-git-bc0befda9cc4a26deac21cd59cfd96c8d3355edb.tar.gz | |
Various changes to get libmysqld in sync with latest sources.
BitKeeper/etc/ignore:
Added libmysqld/uniques.cc
client/mysqltest.c:
Don't core dump if --socket isn't specified.
Add --test-file option, to facilitate running mysqltest under debugger.
libmysqld/Makefile.am:
We need uniques.cc
libmysqld/lib_sql.cc:
Tiny cleanup.
libmysqld/libmysqld.c:
Split mysql_real_query() into mysql_send_query() and
mysql_read_query_results().
Diffstat (limited to 'libmysqld/libmysqld.c')
| -rw-r--r-- | libmysqld/libmysqld.c | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c index 732c102c640..fe429c4d54d 100644 --- a/libmysqld/libmysqld.c +++ b/libmysqld/libmysqld.c @@ -1323,22 +1323,26 @@ mysql_query(MYSQL *mysql, const char *query) return mysql_real_query(mysql,query, (uint) strlen(query)); } +int STDCALL +mysql_send_query(MYSQL* mysql, const char* query, uint length) +{ + return simple_command(mysql, COM_QUERY, query, length, 1); +} + int STDCALL -mysql_real_query(MYSQL *mysql, const char *query, uint length) +mysql_read_query_result(MYSQL *mysql) { uchar *pos; ulong field_count; MYSQL_DATA *fields; - DBUG_ENTER("mysql_real_query"); - DBUG_PRINT("enter",("handle: %lx",mysql)); - DBUG_PRINT("query",("Query = \"%s\"",query)); + uint length; + DBUG_ENTER("mysql_read_query_result"); - if (simple_command(mysql,COM_QUERY,query,length,1) || - (length=net_safe_read(mysql)) == packet_error) + if ((length=net_safe_read(mysql)) == packet_error) DBUG_RETURN(-1); free_old_query(mysql); /* Free old result */ - get_info: +get_info: pos=(uchar*) mysql->net.read_pos; if ((field_count= net_field_length(&pos)) == 0) { @@ -1375,6 +1379,17 @@ mysql_real_query(MYSQL *mysql, const char *query, uint length) DBUG_RETURN(0); } +int STDCALL +mysql_real_query(MYSQL *mysql, const char *query, uint length) +{ + DBUG_ENTER("mysql_real_query"); + DBUG_PRINT("enter",("handle: %lx",mysql)); + DBUG_PRINT("query",("Query = \"%s\"",query)); + if (mysql_send_query(mysql, query, length)) + DBUG_RETURN(-1); + DBUG_RETURN(mysql_read_query_result(mysql)); +} + static int send_file_to_server(MYSQL *mysql, const char *filename) |