diff options
| author | unknown <serg@serg.mylan> | 2006-03-06 22:08:29 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2006-03-06 22:08:29 +0100 |
| commit | 502b30735857df97a3ca2e652b3a32375d122507 (patch) | |
| tree | e2d47ab6bad920b661057cda712710c8495136e9 /libmysqld | |
| parent | cf4c785c62d1766ec46adc34a9989f87d94a8ab5 (diff) | |
| download | mariadb-git-502b30735857df97a3ca2e652b3a32375d122507.tar.gz | |
compilation fixes
BitKeeper/etc/ignore:
Added include/openssl to the ignore list
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 51 |
1 files changed, 22 insertions, 29 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index e4c9d8cb4e9..a2fdae994b1 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -38,6 +38,7 @@ int check_user(THD *thd, enum enum_server_command command, const char *passwd, uint passwd_len, const char *db, bool check_count); C_MODE_START + #include <mysql.h> #undef ER #include "errmsg.h" @@ -46,19 +47,6 @@ C_MODE_START 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 @@ -423,15 +411,6 @@ MYSQL_METHODS embedded_methods= 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 */ @@ -458,11 +437,7 @@ char **copy_arguments(int argc, char **argv) return res; } - -extern "C" -{ - -char ** copy_arguments_ptr= 0; +char ** copy_arguments_ptr= 0; int init_embedded_server(int argc, char **argv, char **groups) { @@ -571,9 +546,7 @@ void end_embedded_server() clean_up(0); } -} /* extern "C" */ -C_MODE_START void init_embedded_mysql(MYSQL *mysql, int client_flag, char *db) { THD *thd = (THD *)mysql->thd; @@ -693,6 +666,26 @@ err: 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, CHARSET_INFO *fromcs, CHARSET_INFO *tocs) { |