database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

compilation fixes

Browse Source 
BitKeeper/etc/ignore:
  Added include/openssl to the ignore list
This commit is contained in:
unknown
2006-03-06 22:08:29 +01:00
parent cf4c785c62
commit 502b307358
2 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.bzrignore
View File

@@ -1274,3 +1274,4 @@ vio/viotest.cpp
zlib/*.ds? zlib/*.ds?
zlib/*.vcproj zlib/*.vcproj
scripts/mysql_upgrade scripts/mysql_upgrade
include/openssl

51
libmysqld/lib_sql.cc
View File

@@ -38,6 +38,7 @@ int check_user(THD *thd, enum enum_server_command command,
const char *passwd, uint passwd_len, const char *db, const char *passwd, uint passwd_len, const char *db,
bool check_count); bool check_count);
C_MODE_START C_MODE_START
#include <mysql.h> #include <mysql.h>
#undef ER #undef ER
#include "errmsg.h" #include "errmsg.h"
@@ -46,19 +47,6 @@ C_MODE_START
static my_bool emb_read_query_result(MYSQL *mysql); static my_bool emb_read_query_result(MYSQL *mysql);
void THD::clear_data_list()
{
while (first_data)
{
MYSQL_DATA *data= first_data;
first_data= data->embedded_info->next;
free_rows(data);
}
data_tail= &first_data;
free_rows(cur_data);
cur_data= 0;
}
/* /*
Reads error information from the MYSQL_DATA and puts Reads error information from the MYSQL_DATA and puts
@@ -423,15 +411,6 @@ MYSQL_METHODS embedded_methods=
emb_read_rows_from_cursor emb_read_rows_from_cursor
}; };
C_MODE_END
void THD::clear_error()
{
net.last_error[0]= 0;
net.last_errno= 0;
net.report_error= 0;
}
/* /*
Make a copy of array and the strings array points to Make a copy of array and the strings array points to
*/ */
@@ -458,11 +437,7 @@ char **copy_arguments(int argc, char **argv)
return res; return res;
} }
char ** copy_arguments_ptr= 0;
extern "C"
{
char ** copy_arguments_ptr= 0;
int init_embedded_server(int argc, char **argv, char **groups) int init_embedded_server(int argc, char **argv, char **groups)
{ {
@@ -571,9 +546,7 @@ void end_embedded_server()
clean_up(0); clean_up(0);
} }
} /* extern "C" */
C_MODE_START
void init_embedded_mysql(MYSQL *mysql, int client_flag, char *db) void init_embedded_mysql(MYSQL *mysql, int client_flag, char *db)
{ {
THD *thd = (THD *)mysql->thd; THD *thd = (THD *)mysql->thd;
@@ -693,6 +666,26 @@ err:
C_MODE_END C_MODE_END
void THD::clear_data_list()
{
while (first_data)
{
MYSQL_DATA *data= first_data;
first_data= data->embedded_info->next;
free_rows(data);
}
data_tail= &first_data;
free_rows(cur_data);
cur_data= 0;
}
void THD::clear_error()
{
net.last_error[0]= 0;
net.last_errno= 0;
net.report_error= 0;
}
static char *dup_str_aux(MEM_ROOT *root, const char *from, uint length, static char *dup_str_aux(MEM_ROOT *root, const char *from, uint length,
CHARSET_INFO *fromcs, CHARSET_INFO *tocs) CHARSET_INFO *fromcs, CHARSET_INFO *tocs)
{ {