mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
This is just code style/minor optimizations cleanup changeset
client/mysqldump.c: Changes adviced by Monty include/my_aes.h: Changes adviced by Monty include/rijndael.h: Changes adviced by Monty include/sha1.h: Changes adviced by Monty mysys/my_aes.c: Changes adviced by Monty mysys/rijndael.c: Changes adviced by Monty mysys/sha1.c: Changes adviced by Monty sql/item_strfunc.cc: Changes adviced by Monty
This commit is contained in:
@ -1384,18 +1384,17 @@ int main(int argc, char **argv)
|
||||
return(first_error);
|
||||
}
|
||||
}
|
||||
/* There is no sense to start transaction if all tables are locked */
|
||||
else if (opt_single_transaction)
|
||||
{
|
||||
/* There is no sense to start transaction if all tables are locked */
|
||||
if (mysql_query(sock, "BEGIN"))
|
||||
{
|
||||
if (mysql_query(sock, "BEGIN"))
|
||||
{
|
||||
my_printf_error(0, "Error: Couldn't execute 'BEGIN': %s",
|
||||
my_printf_error(0, "Error: Couldn't execute 'BEGIN': %s",
|
||||
MYF(0), mysql_error(sock));
|
||||
my_end(0);
|
||||
return(first_error);
|
||||
}
|
||||
|
||||
}
|
||||
my_end(0);
|
||||
return(first_error);
|
||||
}
|
||||
}
|
||||
if (opt_alldbs)
|
||||
dump_all_databases();
|
||||
/* Only one database and selected table(s) */
|
||||
@ -1440,12 +1439,13 @@ int main(int argc, char **argv)
|
||||
MYF(0), mysql_error(sock));
|
||||
}
|
||||
}
|
||||
/*
|
||||
In case we were locking all tables, we did not start transaction
|
||||
so there is no need to commit it.
|
||||
*/
|
||||
else if (opt_single_transaction) /* Just to make it beautiful enough */
|
||||
{
|
||||
/*
|
||||
In case we were locking all tables, we did not start transaction
|
||||
so there is no need to commit it.
|
||||
*/
|
||||
|
||||
/* This should just free locks as we did not change anything */
|
||||
if (mysql_query(sock, "COMMIT"))
|
||||
{
|
||||
|
Reference in New Issue
Block a user