Post-merge fixes: fix typo and remove unused variables.
This commit is contained in:
parent
3fe5cd80ae
commit
0b87650887
@ -6827,10 +6827,8 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command,
|
|||||||
MYSQL_STMT *stmt;
|
MYSQL_STMT *stmt;
|
||||||
DYNAMIC_STRING ds_prepare_warnings;
|
DYNAMIC_STRING ds_prepare_warnings;
|
||||||
DYNAMIC_STRING ds_execute_warnings;
|
DYNAMIC_STRING ds_execute_warnings;
|
||||||
ulonglong affected_rows;
|
|
||||||
DBUG_ENTER("run_query_stmt");
|
DBUG_ENTER("run_query_stmt");
|
||||||
DBUG_PRINT("query", ("'%-.60s'", query));
|
DBUG_PRINT("query", ("'%-.60s'", query));
|
||||||
LINT_INIT(affected_rows);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Init a new stmt if it's not already one created for this connection
|
Init a new stmt if it's not already one created for this connection
|
||||||
@ -6966,8 +6964,7 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command,
|
|||||||
warnings here
|
warnings here
|
||||||
*/
|
*/
|
||||||
{
|
{
|
||||||
ulonglong affected_rows;
|
ulonglong UNINIT_VAR(affected_rows);
|
||||||
LINT_INIT(affected_rows);
|
|
||||||
|
|
||||||
if (!disable_info)
|
if (!disable_info)
|
||||||
affected_rows= mysql_affected_rows(mysql);
|
affected_rows= mysql_affected_rows(mysql);
|
||||||
|
@ -15,7 +15,7 @@ AM_CONFIG_HEADER([include/config.h:config.h.in])
|
|||||||
|
|
||||||
# Request support for automake silent-rules if available.
|
# Request support for automake silent-rules if available.
|
||||||
# Default to verbose output. One can use the configure-time
|
# Default to verbose output. One can use the configure-time
|
||||||
# option --enable-silent-rules or make V=1 to activate
|
# option --enable-silent-rules or make V=0 to activate
|
||||||
# silent rules.
|
# silent rules.
|
||||||
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])])
|
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])])
|
||||||
|
|
||||||
|
@ -19,7 +19,6 @@
|
|||||||
|
|
||||||
static my_bool ssl_algorithms_added = FALSE;
|
static my_bool ssl_algorithms_added = FALSE;
|
||||||
static my_bool ssl_error_strings_loaded= FALSE;
|
static my_bool ssl_error_strings_loaded= FALSE;
|
||||||
static int verify_depth = 0;
|
|
||||||
|
|
||||||
static unsigned char dh512_p[]=
|
static unsigned char dh512_p[]=
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user