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

Small fixes.

Browse Source
This commit is contained in:
jani@ua72d24.elisa.omakaista.fi
2004-03-11 15:41:07 +02:00
parent 2083542808
commit 3b5a46939f
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/mysqlbinlog.cc
View File

@ -306,6 +306,7 @@ int process_event(ulonglong *rec_count, char *last_db, Log_event *ev,
my_off_t pos, int old_format)
{
char ll_buff[21];
if ((*rec_count) >= offset)
{
if (!short_form)
@ -566,8 +567,6 @@ static MYSQL* safe_connect()
if(!local_mysql)
die("Failed on mysql_init");
mysql_options(local_mysql, MYSQL_INIT_COMMAND,
"/*!32210 SET @@session.max_insert_delayed_threads=0*/");
if (!mysql_real_connect(local_mysql, host, user, pass, 0, port, sock, 0))
die("failed on connect: %s", mysql_error(local_mysql));
@ -952,6 +951,8 @@ int main(int argc, char** argv)
load_processor.init_by_cur_dir();
exit_value= 0;
fprintf(result_file,
"/*!40001 SET @@session.max_insert_delayed_threads=0*/;\n");
while (--argc >= 0)
{
if (dump_log_entries(*(argv++)))

2
sql/set_var.cc
View File

@ -550,6 +550,8 @@ struct show_var_st init_vars[]= {
{sys_max_connections.name, (char*) &sys_max_connections, SHOW_SYS},
{sys_max_connect_errors.name, (char*) &sys_max_connect_errors, SHOW_SYS},
{sys_max_delayed_threads.name,(char*) &sys_max_delayed_threads, SHOW_SYS},
{sys_max_insert_delayed_threads.name,
(char*) &sys_max_insert_delayed_threads, SHOW_SYS},
{sys_max_heap_table_size.name,(char*) &sys_max_heap_table_size, SHOW_SYS},
{sys_max_join_size.name, (char*) &sys_max_join_size, SHOW_SYS},
{sys_max_relay_log_size.name, (char*) &sys_max_relay_log_size, SHOW_SYS},