mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 03:17:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fixed error when copying mysqld_multi

Browse source 
Fixes for mysql-test
Fixed race condition in SHOW LOGS
This commit is contained in:
monty@donna.mysql.com 2000-12-16 23:41:45 +02:00
commit 5cce198b69
8 changed files with 44 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

35
sql/ha_berkeley.cc
View file

@ -93,7 +93,6 @@ u_int32_t berkeley_lock_types[]=
{ DB_LOCK_DEFAULT, DB_LOCK_OLDEST, DB_LOCK_RANDOM };
TYPELIB berkeley_lock_typelib= {array_elements(berkeley_lock_names),"",
berkeley_lock_names};
static MEM_ROOT show_logs_root;
static void berkeley_print_error(const char *db_errpfx, char *buffer);
static byte* bdb_get_key(BDB_SHARE *share,uint *length,
@ -211,45 +210,51 @@ int berkeley_rollback(THD *thd, void *trans)
DBUG_RETURN(error);
}
static void *show_logs_alloc(size_t size)
{
return alloc_root(&show_logs_root, size);
}
int berkeley_show_logs(THD *thd)
{
char **all_logs, **free_logs;
char **all_logs, **free_logs, **a, **f;
String *packet= &thd->packet;
int error;
int error=1;
MEM_ROOT show_logs_root;
MEM_ROOT *old_root=my_pthread_getspecific_ptr(MEM_ROOT*,THR_MALLOC);
DBUG_ENTER("berkeley_show_logs");
init_alloc_root(&show_logs_root, 1024, 1024);
if ((error= log_archive(db_env, &all_logs, DB_ARCH_ABS|DB_ARCH_LOG, show_logs_alloc)) ||
(error= log_archive(db_env, &free_logs, DB_ARCH_ABS, show_logs_alloc)))
my_pthread_setspecific_ptr(THR_MALLOC,&show_logs_root);
if ((error= log_archive(db_env, &all_logs, DB_ARCH_ABS | DB_ARCH_LOG,
(void* (*)(unsigned int)) sql_alloc)) ||
(error= log_archive(db_env, &free_logs, DB_ARCH_ABS,
(void* (*)(unsigned int)) sql_alloc)))
{
DBUG_PRINT("error", ("log_archive failed (error %d)", error));
db_env->err(db_env, error, "log_archive: DB_ARCH_ABS");
DBUG_RETURN(1);
goto err;
}
for (char **a = all_logs, **f = free_logs; *a; ++a)
for (a = all_logs, f = free_logs; *a; ++a)
{
packet->length(0);
net_store_data(packet,*a);
net_store_data(packet,"BDB");
if (f && *f && strcmp(*a, *f) == 0)
if (*f && strcmp(*a, *f) == 0)
{
net_store_data(packet, SHOW_LOG_STATUS_FREE);
++f;
net_store_data(packet, SHOW_LOG_STATUS_FREE);
}
else
net_store_data(packet, SHOW_LOG_STATUS_INUSE);
if (my_net_write(&thd->net,(char*) packet->ptr(),packet->length()))
DBUG_RETURN(1); /* purecov: inspected */
goto err;
}
error=0;
err:
free_root(&show_logs_root,MYF(0));
DBUG_RETURN(0);
my_pthread_setspecific_ptr(THR_MALLOC,old_root);
DBUG_RETURN(error);
}
static void berkeley_print_error(const char *db_errpfx, char *buffer)