mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Several fixes to make tests working for embedded library

Browse source
This commit is contained in:
hf@deer.(none) 2004-07-23 00:00:50 +05:00
parent 94bfeb8393
commit 50183677cc
3 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
libmysqld/lib_sql.cc
View file

@ -462,14 +462,6 @@ int init_embedded_server(int argc, char **argv, char **groups)
}
}
/*
Update mysqld variables from client variables if set
The client variables are set also by get_one_option() in mysqld.cc
*/
if (max_allowed_packet)
global_system_variables.max_allowed_packet= max_allowed_packet;
if (net_buffer_length)
global_system_variables.net_buffer_length= net_buffer_length;
return 0;
}
@ -498,18 +490,20 @@ void *create_embedded_thd(int client_flag, char *db)
if (thd->store_globals())
{
fprintf(stderr,"store_globals failed.\n");
return NULL;
goto err;
}
thd->mysys_var= my_thread_var;
thd->dbug_thread_id= my_thread_id();
thd->thread_stack= (char*) &thd;
/* TODO - add init_connect command execution */
thd->proc_info=0; // Remove 'login'
thd->command=COM_SLEEP;
thd->version=refresh_version;
thd->set_time();
init_sql_alloc(&thd->mem_root,8192,8192);
thd->init_for_queries();
thd->client_capabilities= client_flag;
thd->db= db;
@ -524,6 +518,9 @@ void *create_embedded_thd(int client_flag, char *db)
thread_count++;
return thd;
err:
delete(thd);
return NULL;
}
#ifdef NO_EMBEDDED_ACCESS_CHECKS
@ -629,7 +626,7 @@ bool Protocol::send_fields(List<Item> *list, uint flag)
client_field->org_table_length= strlen(client_field->org_table);
client_field->charsetnr= server_field.charsetnr;
client_field->catalog= strdup_root(field_alloc, "std");
client_field->catalog= strdup_root(field_alloc, "def");
client_field->catalog_length= 3;
if (INTERNAL_NUM_FIELD(client_field))

2
sql/mysqld.cc
View file

@ -5583,9 +5583,11 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
#ifdef EMBEDDED_LIBRARY
case OPT_MAX_ALLOWED_PACKET:
max_allowed_packet= atoi(argument);
global_system_variables.max_allowed_packet= max_allowed_packet;
break;
case OPT_NET_BUFFER_LENGTH:
net_buffer_length= atoi(argument);
global_system_variables.net_buffer_length= net_buffer_length;
break;
#endif
#include <sslopt-case.h>

2
sql/set_var.cc
View file

@ -1129,8 +1129,10 @@ static int check_max_delayed_threads(THD *thd, set_var *var)
static void fix_max_connections(THD *thd, enum_var_type type)
{
#ifndef EMBEDDED_LIBRARY
resize_thr_alarm(max_connections +
global_system_variables.max_insert_delayed_threads + 10);
#endif
}