After merge fixes

12 files changed, 25 insertions, 19 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);
diff --git a/innobase/dict/dict0dict.c b/innobase/dict/dict0dict.c
index bf60567ceaa..ac79a2f0eb0 100644
--- a/innobase/dict/dict0dict.c
+++ b/innobase/dict/dict0dict.c
@@ -3636,7 +3636,7 @@ dict_tree_free(
 	dict_tree_t*	tree)	/* in, own: index tree */
 {
 	ut_a(tree);
-	ut_a(tree->magic_n == DICT_TREE_MAGIC_N);
+	ut_ad(tree->magic_n == DICT_TREE_MAGIC_N);
 
 	rw_lock_free(&(tree->lock));
 	mem_free(tree);
diff --git a/innobase/fsp/fsp0fsp.c b/innobase/fsp/fsp0fsp.c
index 9be6e1a6e50..77535e4c524 100644
--- a/innobase/fsp/fsp0fsp.c
+++ b/innobase/fsp/fsp0fsp.c
@@ -3004,8 +3004,8 @@ fseg_free_page_low(
 
 	/* If we get here, the page is in some extent of the segment */	
 
-	descr_id = mtr_read_dulint(descr + XDES_ID, MLOG_8BYTES, mtr);
-	seg_id = mtr_read_dulint(seg_inode + FSEG_ID, MLOG_8BYTES, mtr);
+	descr_id = mtr_read_dulint(descr + XDES_ID, mtr);
+	seg_id = mtr_read_dulint(seg_inode + FSEG_ID, mtr);
 /*
 	fprintf(stderr,
 "InnoDB: InnoDB is freeing space %lu page %lu,\n"
diff --git a/innobase/log/log0log.c b/innobase/log/log0log.c
index 095d84f6527..cd6e6e803a7 100644
--- a/innobase/log/log0log.c
+++ b/innobase/log/log0log.c
@@ -2560,7 +2560,7 @@ loop:
 	start_lsn = log_sys->archived_lsn;
 	
 	if (calc_new_limit) {
-		ut_a(log_sys->archive_buf_size % OS_FILE_LOG_BLOCK_SIZE
+	        ut_a(log_sys->archive_buf_size % OS_FILE_LOG_BLOCK_SIZE == 0);
 		limit_lsn = ut_dulint_add(start_lsn,
 						log_sys->archive_buf_size);
 
@@ -2614,6 +2614,7 @@ loop:
 
 	log_sys->next_archived_lsn = limit_lsn;
 
+#ifdef UNIV_LOG_DEBUG
 	if (log_debug_writes) {
 		printf("Archiving from lsn %lu %lu to lsn %lu %lu\n",
 			(ulong) ut_dulint_get_high(log_sys->archived_lsn),
@@ -2621,6 +2622,7 @@ loop:
 			(ulong) ut_dulint_get_high(limit_lsn),
 			(ulong) ut_dulint_get_low(limit_lsn));
 	}
+#endif /* UNIV_LOG_DEBUG */
 
 	/* Read the log segment to the archive buffer */
 	
diff --git a/innobase/que/que0que.c b/innobase/que/que0que.c
index 127e7f84576..d31b4e6813c 100644
--- a/innobase/que/que0que.c
+++ b/innobase/que/que0que.c
@@ -1093,8 +1093,7 @@ que_node_print_info(
 		str = "UNKNOWN NODE TYPE";
 	}
 
-	fprintf(stderr, "Node type %lu: %s, address %lx\n", (unsigned long) type, str,
-	       (unsigned long) addr);
+	fprintf(stderr, "Node type %lu: %s, address %p\n", (ulong) type, str, node);
 }
 
 /**************************************************************************
diff --git a/innobase/row/row0mysql.c b/innobase/row/row0mysql.c
index efcca623a76..49e5aeac2e4 100644
--- a/innobase/row/row0mysql.c
+++ b/innobase/row/row0mysql.c
@@ -1934,7 +1934,7 @@ row_discard_tablespace_for_mysql(
 
 	graph->fork_type = QUE_FORK_MYSQL_INTERFACE;
 
-	ut_a(thr = que_fork_start_command(graph, SESS_COMM_EXECUTE, 0));
+	ut_a(thr = que_fork_start_command(graph));
 
 	que_run_threads(thr);
 
diff --git a/innobase/trx/trx0sys.c b/innobase/trx/trx0sys.c
index e7439935b7e..57cfcef7d6f 100644
--- a/innobase/trx/trx0sys.c
+++ b/innobase/trx/trx0sys.c
@@ -134,7 +134,9 @@ trx_sys_mark_upgraded_to_multiple_tablespaces(void)
 	mtr_start(&mtr);
 
 	page = buf_page_get(TRX_SYS_SPACE, TRX_SYS_PAGE_NO, RW_X_LATCH, &mtr);
+#ifdef UNIV_SYNC_DEBUG
 	buf_page_dbg_add_level(page, SYNC_NO_ORDER_CHECK);
+#endif /* UNIV_SYNC_DEBUG */
 
 	doublewrite = page + TRX_SYS_DOUBLEWRITE;
 
diff --git a/sql/set_var.h b/sql/set_var.h
index 4c5d0a53657..ac20742da8c 100644
--- a/sql/set_var.h
+++ b/sql/set_var.h
@@ -179,7 +179,10 @@ public:
     return 1;
   }
   SHOW_TYPE type() { return SHOW_CHAR; }
-  byte *value_ptr(THD *thd, enum_var_type type) { return (byte*) value; }
+  byte *value_ptr(THD *thd, enum_var_type type, LEX_STRING *base)
+  {
+    return (byte*) value;
+  }
   bool check_update_type(Item_result type)
   {
     return 1;
diff --git a/sql/slave.h b/sql/slave.h
index 033831f8821..549ceb5d42c 100644
--- a/sql/slave.h
+++ b/sql/slave.h
@@ -82,8 +82,7 @@ enum enum_binlog_formats {
   BINLOG_FORMAT_323_LESS_57, 
   BINLOG_FORMAT_323_GEQ_57 };
 
-/*
-/*****************************************************************************
+/****************************************************************************
 
   Replication SQL Thread
 
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 3ddbeacc5df..6eed4298460 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -50,7 +50,7 @@ bool table_cache_init(void)
 {
   mysql_rm_tmp_tables();
   return hash_init(&open_cache, &my_charset_bin, table_cache_size+16,
-		   0, 0,t able_cache_key,
+		   0, 0,table_cache_key,
 		   (hash_free_key) free_cache_entry, 0) != 0;
 }
 
diff --git a/sql/sql_db.cc b/sql/sql_db.cc
index eed6c741f1b..489c8aa425f 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -488,7 +488,8 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db,
 	if ((mysql_rm_known_files(thd, new_dirp, NullS, newpath,1)) < 0)
 	  goto err;
 	if (!(copy_of_path= thd->memdup(newpath, length+1)) ||
-	    !(dir= new (&thd->mem_root) String(copy_of_path, length)) ||
+	    !(dir= new (&thd->mem_root) String(copy_of_path, length,
+					       &my_charset_bin)) ||
 	    raid_dirs.push_back(dir))
 	  goto err;
 	continue;
@@ -529,9 +530,6 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db,
       deleted++;
     }
   }
-  List_iterator<String> it(raid_dirs);
-  String *dir;
-
   if (thd->killed ||
       (tot_list && mysql_rm_table_part2_with_lock(thd, tot_list, 1, 0, 1)))
     goto err;
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index dd59bef1191..690b4133f61 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -120,7 +120,7 @@ static bool end_active_trans(THD *thd)
 inline bool all_tables_not_ok(THD *thd, TABLE_LIST *tables)
 {
   return (table_rules_on && tables && !tables_ok(thd,tables) &&
-          ((thd->lex.sql_command != SQLCOM_DELETE_MULTI) ||
+          ((thd->lex->sql_command != SQLCOM_DELETE_MULTI) ||
            !tables_ok(thd,
 		      (TABLE_LIST *)thd->lex->auxilliary_table_list.first)));
 }