From dbd56fcdc575d522e8cac6046b85e29d496a37e9 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 25 Apr 2001 01:11:29 +0300 Subject: Fixes for embedded MySQL Some limit optimization BitKeeper/deleted/.del-ib_config.h.in~9e57db8504e55b7: Delete: innobase/ib_config.h.in BitKeeper/deleted/.del-ib_config.h~7539e26ffc614439: Delete: innobase/ib_config.h client/errmsg.c: Moved error messages from libmysqld/ client/mysql.cc: Removed warnings include/errmsg.h: New info for embedded versions include/mysql_com.h: Fixes for embedded MySQL libmysql/errmsg.c: Fixes for embedded MySQL libmysqld/Makefile.am: Added HANDLER code libmysqld/lib_sql.cc: Fixes for embedded MySQL libmysqld/lib_vio.c: Fixes for embedded MySQL BitKeeper/etc/ignore: Added libmysqld/sql_handler.cc to the ignore list libmysqld/libmysqld.c: Fixes for embedded MySQL mysql-test/r/null_key.result: Fixed result for 4.0 sql/net_serv.cc: Fixes for embedded MySQL sql/sql_parse.cc: Fixes for embedded MySQL where the query could be a const char* sql/sql_select.cc: Added limit optimization sql/sql_select.h: Added limit optimization --- include/errmsg.h | 1 + include/mysql_com.h | 8 ++++++++ 2 files changed, 9 insertions(+) (limited to 'include') diff --git a/include/errmsg.h b/include/errmsg.h index b7afe11b615..12a3ee5557a 100644 --- a/include/errmsg.h +++ b/include/errmsg.h @@ -53,3 +53,4 @@ extern const char *client_errors[]; /* Error messages */ #define CR_NAMEDPIPESETSTATE_ERROR 2018 #define CR_CANT_READ_CHARSET 2019 #define CR_NET_PACKET_TOO_LARGE 2020 +#define CR_EMBEDDED_CONNECTION 2021 diff --git a/include/mysql_com.h b/include/mysql_com.h index 15a14a508e5..874430910ef 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -157,6 +157,10 @@ extern unsigned long net_buffer_length; #define net_new_transaction(net) ((net)->pkt_nr=0) +#ifdef __cplusplus +extern "C" { +#endif + int my_net_init(NET *net, Vio* vio); void net_end(NET *net); void net_clear(NET *net); @@ -172,6 +176,10 @@ struct rand_struct { double max_value_dbl; }; +#ifdef __cplusplus +} +#endif + /* The following is for user defined functions */ enum Item_result {STRING_RESULT,REAL_RESULT,INT_RESULT}; -- cgit v1.2.1