diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 45d47bdb45b..46d85723c84 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -75,3 +75,4 @@ worm@altair.is.lan zak@balfor.local zak@linux.local zgreant@mysql.com +miguel@hegel.br diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 4ecded767d1..1b2a6def5e2 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2749,7 +2749,7 @@ pthread_handler_decl(handle_connections_namedpipes,arg) PIPE_WAIT, PIPE_UNLIMITED_INSTANCES, (int) global_system_variables.net_buffer_length, - (int) global_systenm_ariables.net_buffer_length, + (int) global_system_variables.net_buffer_length, NMPWAIT_USE_DEFAULT_WAIT, &saPipeSecurity )) == INVALID_HANDLE_VALUE ) diff --git a/sql/slave.cc b/sql/slave.cc index 27e9030c000..6173c8ecf4c 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2696,7 +2696,6 @@ Log_event* next_event(RELAY_LOG_INFO* rli) pthread_mutex_t *log_lock = rli->relay_log.get_log_lock(); const char* errmsg=0; THD* thd = rli->sql_thd; - bool was_killed; DBUG_ENTER("next_event"); DBUG_ASSERT(thd != 0);