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

Trivial fixes:

Browse source 
- Removed not used variable 'file' from MYSQL_BIN_LOG::open()
- Assigned not initialized variable in connect/tabext.cpp
This commit is contained in:
Monty 2024-01-05 15:29:07 +02:00
parent 3c63e2f890
commit 740d3e7a74
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sql/log.cc
View file

@ -3694,7 +3694,6 @@ bool MYSQL_BIN_LOG::open(const char *log_name,
bool null_created_arg, bool null_created_arg,
bool need_mutex) bool need_mutex)
{ {
File file= -1;
xid_count_per_binlog *new_xid_list_entry= NULL, *b; xid_count_per_binlog *new_xid_list_entry= NULL, *b;
DBUG_ENTER("MYSQL_BIN_LOG::open"); DBUG_ENTER("MYSQL_BIN_LOG::open");
@ -4090,8 +4089,6 @@ err:
sql_print_error(fatal_log_error, (name) ? name : log_name, tmp_errno); sql_print_error(fatal_log_error, (name) ? name : log_name, tmp_errno);
if (new_xid_list_entry) if (new_xid_list_entry)
delete new_xid_list_entry; delete new_xid_list_entry;
if (file >= 0)
mysql_file_close(file, MYF(0));
close(LOG_CLOSE_INDEX); close(LOG_CLOSE_INDEX);
DBUG_RETURN(1); DBUG_RETURN(1);
} }
@ -5363,8 +5360,6 @@ int MYSQL_BIN_LOG::new_file_without_locking()
/** /**
Start writing to a new log file or reopen the old file. Start writing to a new log file or reopen the old file.
@param need_lock Set to 1 if caller has not locked LOCK_log
@retval @retval
nonzero - error nonzero - error

2
storage/connect/tabext.cpp
View file

@ -330,7 +330,7 @@ bool TDBEXT::MakeSrcdef(PGLOBAL g)
char *catp = strstr(Srcdef, "%s"); char *catp = strstr(Srcdef, "%s");
if (catp) { if (catp) {
char *fil1 = 0, *fil2; char *fil1 = 0, *fil2= 0;
PCSZ ph = ((EXTDEF*)To_Def)->Phpos; PCSZ ph = ((EXTDEF*)To_Def)->Phpos;
if (!ph) if (!ph)