summaryrefslogtreecommitdiff
path: root/libmysqld/embedded_priv.h
diff options
context:
space:
mode:
authormonty@mysql.com <>2006-02-24 18:34:15 +0200
committermonty@mysql.com <>2006-02-24 18:34:15 +0200
commit82b77cdd901bb36d4be23456bc0c5d171a29e3f7 (patch)
tree603ae9081a58d9f7bb204327f65d4a8af4425b28 /libmysqld/embedded_priv.h
parentb11c033f496eccc680c1026a57af836c9a4578f3 (diff)
downloadmariadb-git-82b77cdd901bb36d4be23456bc0c5d171a29e3f7.tar.gz
Fixes to embedded server to be able to run tests with it
(Needed for "list of pushes" web page and autopush)
Diffstat (limited to 'libmysqld/embedded_priv.h')
-rw-r--r--libmysqld/embedded_priv.h21
1 files changed, 14 insertions, 7 deletions
diff --git a/libmysqld/embedded_priv.h b/libmysqld/embedded_priv.h
index d4316dff63f..88015340e8c 100644
--- a/libmysqld/embedded_priv.h
+++ b/libmysqld/embedded_priv.h
@@ -16,18 +16,25 @@
/* Prototypes for the embedded version of MySQL */
-#include <my_global.h>
-#include <mysql.h>
-#include <mysql_embed.h>
-#include <mysqld_error.h>
-#include <my_pthread.h>
-
C_MODE_START
void lib_connection_phase(NET *net, int phase);
void init_embedded_mysql(MYSQL *mysql, int client_flag, char *db);
void *create_embedded_thd(int client_flag, char *db);
int check_embedded_connection(MYSQL *mysql);
void free_old_query(MYSQL *mysql);
-void embedded_get_error(MYSQL *mysql);
extern MYSQL_METHODS embedded_methods;
+
+/* This one is used by embedded library to gather returning data */
+typedef struct embedded_query_result
+{
+ MYSQL_ROWS **prev_ptr;
+ unsigned int warning_count, server_status;
+ struct st_mysql_data *next;
+ my_ulonglong affected_rows, insert_id;
+ char info[MYSQL_ERRMSG_SIZE];
+ MYSQL_FIELD *fields_list;
+ unsigned int last_errno;
+ char sqlstate[SQLSTATE_LENGTH+1];
+} EQR;
+
C_MODE_END