database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

changes to make things work in the max version

Browse Source 
acinclude.m4:
  automatically detect installation paths of OpenSSL instead of hard-coding
  automatically enable --with-vio if --with-openssl is enabled
client/mysqltest.c:
  fixes for embedded library
libmysqld/Makefile.am:
  md5 is now in mysys
libmysqld/libmysqld.c:
  added my_connect(), but now can be removed - will do in the next
  changeset
mysql-test/include/have_bdb.inc:
  disable query log so that result file will not have unneeded 
  show variables
mysql-test/include/have_gemini.inc:
  disable query log so that result file will not have unneeded 
  show variables
mysql-test/include/have_innodb.inc:
  disable query log so that result file will not have unneeded 
  show variables
mysql-test/include/have_openssl.inc:
  disable query log so that result file will not have unneeded 
  show variables
mysql-test/include/have_openssl_1.inc:
  disable query log so that result file will not have unneeded 
  show variables
mysql-test/include/have_openssl_2.inc:
  disable query log so that result file will not have unneeded 
  show variables
mysql-test/r/bdb.result:
  fix for new format
mysql-test/r/have_openssl.require:
  ssl->openssl
mysql-test/r/innodb.result:
  fix for query logging
This commit is contained in:
unknown
2001-10-04 15:42:25 -06:00
parent 07ccd64e74
commit 5ee900d38a
13 changed files with 1116 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/mysqltest.c
View File

@ -337,8 +337,10 @@ static void free_used_memory()
{
uint i;
DBUG_ENTER("free_used_memory");
#ifndef EMBEDDED_LIBRARY
if (manager)
mysql_manager_close(manager);
#endif
close_cons();
close_files();
hash_free(&var_hash);
@ -599,6 +601,7 @@ int open_file(const char* name)
return 0;
}
#ifndef EMBEDDED_LIBRARY
int do_server_start(struct st_query* q)
{
return do_server_op(q,"start");
@ -636,6 +639,7 @@ int do_server_op(struct st_query* q,const char* op)
return 0;
}
#endif
int do_source(struct st_query* q)
{
@ -1182,6 +1186,7 @@ char* safe_get_param(char* str, char** arg, const char* msg)
DBUG_RETURN(str);
}
#ifndef EMBEDDED_LIBRARY
void init_manager()
{
if (!(manager=mysql_manager_init(0)))
@ -1192,6 +1197,7 @@ void init_manager()
manager->last_errno);
}
#endif
int safe_connect(MYSQL* con, const char* host, const char* user,
const char* pass,
@ -2101,8 +2107,9 @@ int main(int argc, char** argv)
if (cur_file == file_stack)
*++cur_file = stdin;
*lineno=1;
#ifndef EMBEDDED_LIBRARY
init_manager();
#endif
if (!( mysql_init(&cur_con->mysql)))
die("Failed in mysql_init()");
cur_con->name = my_strdup("default", MYF(MY_WME));
@ -2134,8 +2141,10 @@ int main(int argc, char** argv)
case Q_DISABLE_QUERY_LOG: disable_query_log=1; break;
case Q_SOURCE: do_source(q); break;
case Q_SLEEP: do_sleep(q); break;
#ifndef EMBEDDED_LIBRARY
case Q_SERVER_START: do_server_start(q); break;
case Q_SERVER_STOP: do_server_stop(q); break;
#endif
case Q_INC: do_inc(q); break;
case Q_DEC: do_dec(q); break;
case Q_ECHO: do_echo(q); break;