bzr push into mysql-trunk branch (marko.makela:4722 to 4723)

[marko.makela]

 4723 Marko Mäkelä	2012-10-15 [merge]
      Merge mysql-5.6 to mysql-trunk.

    modified:
      storage/innobase/include/dict0load.h
      storage/innobase/row/row0log.cc
 4722 Tatjana Azundris Nuernberg	2012-10-15 [merge]
      Bug#11764559: UMASK IS IGNORED BY ERROR LOG
      
      mysqld_safe script did not heed MySQL specific environment variable
      $UMASK, leading to divergent behavior between mysqld and mysqld_safe.
      
      Patch adds an approximation of mysqld's behavior to mysqld_safe,
      within the bounds dictated by attempt to have mysqld_safe run on
      even the most basic of shells (proper '70s sh, not just bash
      with a fancy symlink).
      
      Patch also adds approximation of said behavior to mysqld_multi
      (in perl).

    modified:
      scripts/mysqld_multi.sh
      scripts/mysqld_safe.sh
=== modified file 'storage/innobase/include/dict0load.h'
--- a/storage/innobase/include/dict0load.h	revid:[e-mail]-20121015071134-f1w9f9o1cgzr3wel
+++ b/storage/innobase/include/dict0load.h	revid:marko.makela@strippedm-20121015074859-9vwb8bqvbckslxby
@@ -54,7 +54,7 @@ enum dict_table_info_t {
 	DICT_TABLE_LOAD_FROM_RECORD = 0,/*!< Directly populate a dict_table_t
 					structure with information from
 					a SYS_TABLES record */
-	DICT_TABLE_LOAD_FROM_CACHE = 1,	/*!< Check first whether dict_table_t
+	DICT_TABLE_LOAD_FROM_CACHE = 1	/*!< Check first whether dict_table_t
 					is in the cache, if so, return it */
 };
 

=== modified file 'storage/innobase/row/row0log.cc'
--- a/storage/innobase/row/row0log.cc	revid:tatjana.nuernberg@stripped
+++ b/storage/innobase/row/row0log.cc	revid:[e-mail]-20121015074859-9vwb8bqvbckslxby
@@ -1229,8 +1229,9 @@ row_log_table_apply_insert_low(
 
 #ifdef ROW_LOG_APPLY_PRINT
 	if (row_log_apply_print) {
-		fprintf(stderr, "table apply insert " IB_ID_FMT,
-			dup->index->id);
+		fprintf(stderr, "table apply insert "
+			IB_ID_FMT " " IB_ID_FMT "\n",
+			index->table->id, index->id);
 		dtuple_print(stderr, row);
 	}
 #endif /* ROW_LOG_APPLY_PRINT */
@@ -1345,6 +1346,14 @@ row_log_table_apply_delete_low(
 
 	ut_ad(dict_index_is_clust(index));
 
+#ifdef ROW_LOG_APPLY_PRINT
+	if (row_log_apply_print) {
+		fprintf(stderr, "table apply delete "
+			IB_ID_FMT " " IB_ID_FMT "\n",
+			index->table->id, index->id);
+		rec_print_new(stderr, btr_pcur_get_rec(pcur), offsets);
+	}
+#endif /* ROW_LOG_APPLY_PRINT */
 	if (dict_table_get_next_index(index)) {
 		/* Build a row template for purging secondary index entries. */
 		row = row_build(
@@ -1694,6 +1703,15 @@ delete_insert:
 			ROW_COPY_DATA, index, btr_pcur_get_rec(&pcur),
 			cur_offsets, NULL, NULL, NULL, &old_ext, heap);
 		ut_ad(old_row);
+#ifdef ROW_LOG_APPLY_PRINT
+		if (row_log_apply_print) {
+			fprintf(stderr, "table apply update "
+				IB_ID_FMT " " IB_ID_FMT "\n",
+				index->table->id, index->id);
+			dtuple_print(stderr, old_row);
+			dtuple_print(stderr, row);
+		}
+#endif /* ROW_LOG_APPLY_PRINT */
 	} else {
 		old_row = NULL;
 		old_ext = NULL;
@@ -1730,7 +1748,7 @@ delete_insert:
 		}
 
 		if (!row_upd_changes_ord_field_binary(
-			    index, update, thr, row, NULL)) {
+			    index, update, thr, old_row, NULL)) {
 			continue;
 		}
 
@@ -1753,9 +1771,7 @@ delete_insert:
 
 		btr_cur_pessimistic_delete(
 			&error, FALSE, btr_pcur_get_btr_cur(&pcur),
-			BTR_CREATE_FLAG | BTR_NO_LOCKING_FLAG
-			| BTR_NO_UNDO_LOG_FLAG | BTR_KEEP_SYS_FLAG,
-			RB_NONE, &mtr);
+			BTR_CREATE_FLAG, RB_NONE, &mtr);
 
 		if (error != DB_SUCCESS) {
 			break;

No bundle (reason: useless for push emails).