5.6.20

Author: Sergei Golubchik

CMakeLists.txt

@@ -66,7 +66,6 @@ IF(NOT CMAKE_CROSSCOMPILING)
     long	x;
     long	y;
     long	res;
-    char	c;
 
     x = 10;
     y = 123;
@@ -87,6 +86,16 @@ IF(NOT CMAKE_CROSSCOMPILING)
     if (res != 123 + 10 || x != 123 + 10) {
       return(1);
     }
+    return(0);
+  }"
+  HAVE_IB_GCC_ATOMIC_BUILTINS
+  )
+  CHECK_C_SOURCE_RUNS(
+  "
+  int main()
+  {
+    long	res;
+    char	c;
 
     c = 10;
     res = __sync_lock_test_and_set(&c, 123);
@@ -95,7 +104,7 @@ IF(NOT CMAKE_CROSSCOMPILING)
     }
     return(0);
   }"
-  HAVE_IB_GCC_ATOMIC_BUILTINS
+  HAVE_IB_GCC_ATOMIC_BUILTINS_BYTE
   )
   CHECK_C_SOURCE_RUNS(
   "#include<stdint.h>
@@ -117,16 +126,47 @@ IF(NOT CMAKE_CROSSCOMPILING)
   }"
   HAVE_IB_GCC_ATOMIC_BUILTINS_64
   )
+  CHECK_C_SOURCE_RUNS(
+  "#include<stdint.h>
+  int main()
+  {
+    __sync_synchronize();
+    return(0);
+  }"
+  HAVE_IB_GCC_SYNC_SYNCHRONISE
+  )
+  CHECK_C_SOURCE_RUNS(
+  "#include<stdint.h>
+  int main()
+  {
+    __atomic_thread_fence(__ATOMIC_ACQUIRE);
+    __atomic_thread_fence(__ATOMIC_RELEASE);
+    return(0);
+  }"
+  HAVE_IB_GCC_ATOMIC_THREAD_FENCE
+  )
 ENDIF()
 
 IF(HAVE_IB_GCC_ATOMIC_BUILTINS)
  ADD_DEFINITIONS(-DHAVE_IB_GCC_ATOMIC_BUILTINS=1)
 ENDIF()
 
+IF(HAVE_IB_GCC_ATOMIC_BUILTINS_BYTE)
+ ADD_DEFINITIONS(-DHAVE_IB_GCC_ATOMIC_BUILTINS_BYTE=1)
+ENDIF()
+
 IF(HAVE_IB_GCC_ATOMIC_BUILTINS_64)
  ADD_DEFINITIONS(-DHAVE_IB_GCC_ATOMIC_BUILTINS_64=1)
 ENDIF()
 
+IF(HAVE_IB_GCC_SYNC_SYNCHRONISE)
+ ADD_DEFINITIONS(-DHAVE_IB_GCC_SYNC_SYNCHRONISE=1)
+ENDIF()
+
+IF(HAVE_IB_GCC_ATOMIC_THREAD_FENCE)
+ ADD_DEFINITIONS(-DHAVE_IB_GCC_ATOMIC_THREAD_FENCE=1)
+ENDIF()
+
  # either define HAVE_IB_ATOMIC_PTHREAD_T_GCC or not
 IF(NOT CMAKE_CROSSCOMPILING)
   CHECK_C_SOURCE_RUNS(
@@ -208,10 +248,21 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
       return(0);
     }
   " HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS)
+  CHECK_C_SOURCE_COMPILES(
+  "#include <mbarrier.h>
+  int main() {
+    __machine_r_barrier();
+    __machine_w_barrier();
+    return(0);
+  }"
+  HAVE_IB_MACHINE_BARRIER_SOLARIS)
   ENDIF()
   IF(HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS)
     ADD_DEFINITIONS(-DHAVE_IB_ATOMIC_PTHREAD_T_SOLARIS=1)
   ENDIF()
+  IF(HAVE_IB_MACHINE_BARRIER_SOLARIS)
+    ADD_DEFINITIONS(-DHAVE_IB_MACHINE_BARRIER_SOLARIS=1)
+  ENDIF()
 ENDIF()
 
 
@@ -229,6 +280,7 @@ ENDIF()
 
 IF(MSVC)
   ADD_DEFINITIONS(-DHAVE_WINDOWS_ATOMICS)
+  ADD_DEFINITIONS(-DHAVE_WINDOWS_MM_FENCE)
 ENDIF()
 
 

api/api0api.cc

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2008, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2008, 2014, Oracle and/or its affiliates. All Rights Reserved.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -2044,6 +2044,8 @@ ib_cursor_delete_row(
 		const rec_t*	rec;
 		ib_bool_t	page_format;
 		mtr_t		mtr;
+		rec_t*		copy = NULL;
+	        byte		ptr[UNIV_PAGE_SIZE_MAX];
 
 		page_format = static_cast<ib_bool_t>(
 			dict_table_is_comp(index->table));
@@ -2052,16 +2054,27 @@ ib_cursor_delete_row(
 
 		if (btr_pcur_restore_position(
 			BTR_SEARCH_LEAF, pcur, &mtr)) {
+			mem_heap_t*	heap = NULL;
+			ulint		offsets_[REC_OFFS_NORMAL_SIZE];
+			ulint*		offsets	= offsets_;
+
+			rec_offs_init(offsets_);
 
 			rec = btr_pcur_get_rec(pcur);
-		} else {
-			rec = NULL;
+
+			/* Since mtr will be commited, the rec
+			will not be protected. Make a copy of
+			the rec. */
+			offsets = rec_get_offsets(
+				rec, index, offsets, ULINT_UNDEFINED, &heap);
+			ut_ad(rec_offs_size(offsets) < UNIV_PAGE_SIZE_MAX);
+			copy = rec_copy(ptr, rec, offsets);
 		}
 
 		mtr_commit(&mtr);
 
-		if (rec && !rec_get_deleted_flag(rec, page_format)) {
-			err = ib_delete_row(cursor, pcur, rec);
+		if (copy && !rec_get_deleted_flag(copy, page_format)) {
+			err = ib_delete_row(cursor, pcur, copy);
 		} else {
 			err = DB_RECORD_NOT_FOUND;
 		}

btr/btr0cur.cc

@@ -2556,6 +2556,31 @@ btr_cur_pessimistic_update(
 		ut_ad(flags & BTR_KEEP_POS_FLAG);
 	}
 
+	if (big_rec_vec) {
+		const ulint redo_10p = srv_log_file_size * UNIV_PAGE_SIZE / 10;
+		ulint total_blob_len = 0;
+
+		/* Calculate the total number of bytes for blob data */
+		for (ulint i = 0; i < big_rec_vec->n_fields; i++) {
+			total_blob_len += big_rec_vec->fields[i].len;
+		}
+
+		if (total_blob_len > redo_10p) {
+			ib_logf(IB_LOG_LEVEL_ERROR, "The total blob data"
+				" length (" ULINTPF ") is greater than"
+				" 10%% of the redo log file size (" UINT64PF
+				"). Please increase innodb_log_file_size.",
+				total_blob_len, srv_log_file_size);
+			if (n_reserved > 0) {
+				fil_space_release_free_extents(
+					index->space, n_reserved);
+			}
+
+			err = DB_TOO_BIG_RECORD;
+			goto err_exit;
+		}
+	}
+
 	/* Store state of explicit locks on rec on the page infimum record,
 	before deleting rec. The page infimum acts as a dummy carrier of the
 	locks, taking care also of lock releases, before we can move the locks
@@ -4377,6 +4402,7 @@ btr_store_big_rec_extern_fields(
 	buf_block_t**	freed_pages	= NULL;
 	ulint		n_freed_pages	= 0;
 	dberr_t		error		= DB_SUCCESS;
+	ulint		total_blob_len	= 0;
 
 	ut_ad(rec_offs_validate(rec, index, offsets));
 	ut_ad(rec_offs_any_extern(offsets));
@@ -4396,6 +4422,23 @@ btr_store_big_rec_extern_fields(
 	rec_page_no = buf_block_get_page_no(rec_block);
 	ut_a(fil_page_get_type(page_align(rec)) == FIL_PAGE_INDEX);
 
+	const ulint redo_10p = (srv_log_file_size * UNIV_PAGE_SIZE / 10);
+
+	/* Calculate the total number of bytes for blob data */
+	for (ulint i = 0; i < big_rec_vec->n_fields; i++) {
+		total_blob_len += big_rec_vec->fields[i].len;
+	}
+
+	if (total_blob_len > redo_10p) {
+		ut_ad(op == BTR_STORE_INSERT);
+		ib_logf(IB_LOG_LEVEL_ERROR, "The total blob data length"
+			" (" ULINTPF ") is greater than 10%% of the"
+			" redo log file size (" UINT64PF "). Please"
+			" increase innodb_log_file_size.",
+			total_blob_len, srv_log_file_size);
+		return(DB_TOO_BIG_RECORD);
+	}
+
 	if (page_zip) {
 		int	err;
 

buf/buf0buf.cc

@@ -2882,12 +2882,6 @@ buf_page_get_gen(
 
 	ut_ad(buf_block_get_state(fix_block) == BUF_BLOCK_FILE_PAGE);
 
-#if UNIV_WORD_SIZE == 4
-	/* On 32-bit systems, there is no padding in buf_page_t.  On
-	other systems, Valgrind could complain about uninitialized pad
-	bytes. */
-	UNIV_MEM_ASSERT_RW(&fix_block->page, sizeof(fix_block->page));
-#endif
 #if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG
 
 	if ((mode == BUF_GET_IF_IN_POOL || mode == BUF_GET_IF_IN_POOL_OR_WATCH)
@@ -5401,7 +5395,7 @@ buf_get_free_list_len(void)
 
 #else /* !UNIV_HOTBACKUP */
 /********************************************************************//**
-Inits a page to the buffer buf_pool, for use in ibbackup --restore. */
+Inits a page to the buffer buf_pool, for use in mysqlbackup --restore. */
 UNIV_INTERN
 void
 buf_page_init_for_backup_restore(

buf/buf0lru.cc

@@ -1818,13 +1818,6 @@ buf_LRU_free_page(
 	rw_lock_x_lock(hash_lock);
 	mutex_enter(block_mutex);
 
-#if UNIV_WORD_SIZE == 4
-	/* On 32-bit systems, there is no padding in buf_page_t.  On
-	other systems, Valgrind could complain about uninitialized pad
-	bytes. */
-	UNIV_MEM_ASSERT_RW(bpage, sizeof *bpage);
-#endif
-
 	if (!buf_page_can_relocate(bpage)) {
 
 		/* Do not free buffer fixed or I/O-fixed blocks. */
@@ -1862,12 +1855,6 @@ buf_LRU_free_page(
 	ut_ad(buf_page_in_file(bpage));
 	ut_ad(bpage->in_LRU_list);
 	ut_ad(!bpage->in_flush_list == !bpage->oldest_modification);
-#if UNIV_WORD_SIZE == 4
-	/* On 32-bit systems, there is no padding in buf_page_t.  On
-	other systems, Valgrind could complain about uninitialized pad
-	bytes. */
-	UNIV_MEM_ASSERT_RW(bpage, sizeof *bpage);
-#endif
 
 #ifdef UNIV_DEBUG
 	if (buf_debug_prints) {
@@ -1940,13 +1927,6 @@ buf_LRU_free_page(
 
 			ut_ad(prev_b->in_LRU_list);
 			ut_ad(buf_page_in_file(prev_b));
-#if UNIV_WORD_SIZE == 4
-			/* On 32-bit systems, there is no
-			padding in buf_page_t.  On other
-			systems, Valgrind could complain about
-			uninitialized pad bytes. */
-			UNIV_MEM_ASSERT_RW(prev_b, sizeof *prev_b);
-#endif
 			UT_LIST_INSERT_AFTER(LRU, buf_pool->LRU,
 					     prev_b, b);
 
@@ -2172,13 +2152,6 @@ buf_LRU_block_remove_hashed(
 	ut_a(buf_page_get_io_fix(bpage) == BUF_IO_NONE);
 	ut_a(bpage->buf_fix_count == 0);
 
-#if UNIV_WORD_SIZE == 4
-	/* On 32-bit systems, there is no padding in
-	buf_page_t.  On other systems, Valgrind could complain
-	about uninitialized pad bytes. */
-	UNIV_MEM_ASSERT_RW(bpage, sizeof *bpage);
-#endif
-
 	buf_LRU_remove_block(bpage);
 
 	buf_pool->freed_page_clock += 1;

dict/dict0crea.cc

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2014, Oracle and/or its affiliates. All Rights Reserved.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -1611,26 +1611,25 @@ dict_create_add_foreign_to_dictionary(
 	return(error);
 }
 
-/********************************************************************//**
-Adds foreign key definitions to data dictionary tables in the database.
-@return	error code or DB_SUCCESS */
+/** Adds the given set of foreign key objects to the dictionary tables
+in the database. This function does not modify the dictionary cache. The
+caller must ensure that all foreign key objects contain a valid constraint
+name in foreign->id.
+@param[in]	local_fk_set	set of foreign key objects, to be added to
+the dictionary tables
+@param[in]	table		table to which the foreign key objects in
+local_fk_set belong to
+@param[in,out]	trx		transaction
+@return error code or DB_SUCCESS */
 UNIV_INTERN
 dberr_t
 dict_create_add_foreigns_to_dictionary(
 /*===================================*/
-	ulint		start_id,/*!< in: if we are actually doing ALTER TABLE
-				ADD CONSTRAINT, we want to generate constraint
-				numbers which are bigger than in the table so
-				far; we number the constraints from
-				start_id + 1 up; start_id should be set to 0 if
-				we are creating a new table, or if the table
-				so far has no constraints for which the name
-				was generated here */
-	dict_table_t*	table,	/*!< in: table */
-	trx_t*		trx)	/*!< in: transaction */
+	const dict_foreign_set&	local_fk_set,
+	const dict_table_t*	table,
+	trx_t*			trx)
 {
 	dict_foreign_t*	foreign;
-	ulint		number	= start_id + 1;
 	dberr_t		error;
 
 	ut_ad(mutex_own(&(dict_sys->mutex)));
@@ -1643,17 +1642,12 @@ dict_create_add_foreigns_to_dictionary(
 		return(DB_ERROR);
 	}
 
-	for (foreign = UT_LIST_GET_FIRST(table->foreign_list);
-	     foreign;
-	     foreign = UT_LIST_GET_NEXT(foreign_list, foreign)) {
+	for (dict_foreign_set::const_iterator it = local_fk_set.begin();
+	     it != local_fk_set.end();
+	     ++it) {
 
-		error = dict_create_add_foreign_id(&number, table->name,
-						   foreign);
-
-		if (error != DB_SUCCESS) {
-
-			return(error);
-		}
+		foreign = *it;
+		ut_ad(foreign->id != NULL);
 
 		error = dict_create_add_foreign_to_dictionary(table->name,
 							      foreign, trx);