After merge fixes

1 files changed, 6 insertions, 3 deletions

diff --git a/client/mysqldump.c b/client/mysqldump.c
index f1ecdd71f68..8a5e70649a1 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -79,8 +79,11 @@ static my_bool  verbose=0,tFlag=0,cFlag=0,dFlag=0,quick= 1, extended_insert= 1,
 		ignore=0,opt_drop=1,opt_keywords=0,opt_lock=1,opt_compress=0,
                 opt_delayed=0,create_options=1,opt_quoted=0,opt_databases=0,
 	        opt_alldbs=0,opt_create_db=0,opt_first_slave=0,opt_set_names=0,
-                opt_autocommit=0,opt_master_data,opt_disable_keys=1,opt_xml=0,
-static MYSQL  mysql_connection,*sock=0;
+		opt_autocommit=0,opt_master_data,opt_disable_keys=1,opt_xml=0,
+		opt_delete_master_logs=0, tty_password=0,
+		opt_single_transaction=0, opt_comments= 0, opt_compact= 0;
+
+static MYSQL mysql_connection,*sock=0;
 static char  insert_pat[12 * 1024],*opt_password=0,*current_user=0,
              *current_host=0,*path=0,*fields_terminated=0,
              *lines_terminated=0, *enclosed=0, *opt_enclosed=0, *escaped=0,
@@ -506,7 +509,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
       }
 #if !defined(DBUG_OFF)
       {
-	int size_for_sql_mode= 0;
+	uint size_for_sql_mode= 0;
 	const char **ptr;
 	for (ptr= compatible_mode_names; *ptr; ptr++)
 	  size_for_sql_mode+= strlen(*ptr);