diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-11-21 10:11:45 -0200 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-11-21 10:11:45 -0200 |
| commit | 64f097dc8021ac810ac1fcaba3d341bb610e8204 (patch) | |
| tree | f579b91624e023fda303d3e12e0a3d8af58d3c5c | |
| parent | c70a9fa1e3c459e030546b0ca1ac916970bb489b (diff) | |
| download | mariadb-git-64f097dc8021ac810ac1fcaba3d341bb610e8204.tar.gz | |
Post-merge fixes: fix typo and remove unused variables.
| -rw-r--r-- | client/mysqltest.cc | 5 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | vio/viosslfactories.c | 1 |
3 files changed, 2 insertions, 6 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index cb1d21ebe8a..e0cdec42a60 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -6827,10 +6827,8 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command, MYSQL_STMT *stmt; DYNAMIC_STRING ds_prepare_warnings; DYNAMIC_STRING ds_execute_warnings; - ulonglong affected_rows; DBUG_ENTER("run_query_stmt"); DBUG_PRINT("query", ("'%-.60s'", query)); - LINT_INIT(affected_rows); /* 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 */ { - ulonglong affected_rows; - LINT_INIT(affected_rows); + ulonglong UNINIT_VAR(affected_rows); if (!disable_info) affected_rows= mysql_affected_rows(mysql); diff --git a/configure.in b/configure.in index a32956858f4..79138561dcb 100644 --- a/configure.in +++ b/configure.in @@ -15,7 +15,7 @@ AM_CONFIG_HEADER([include/config.h:config.h.in]) # Request support for automake silent-rules if available. # 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. m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])]) diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c index 51d049b18b9..d0a0a69f70b 100644 --- a/vio/viosslfactories.c +++ b/vio/viosslfactories.c @@ -19,7 +19,6 @@ static my_bool ssl_algorithms_added = FALSE; static my_bool ssl_error_strings_loaded= FALSE; -static int verify_depth = 0; static unsigned char dh512_p[]= { |