dict0dict.h InnoDB now tries to provide autoinc column value from a counter table in data dict

dict0mem.h	InnoDB now tries to provide autoinc column value from a counter table in data dict
sync0sync.h	InnoDB now tries to provide autoinc column value from a counter table in data dict
univ.i  	InnoDB now tries to provide autoinc column value from a counter table in data dict
dict0dict.c	InnoDB now tries to provide autoinc column value from a counter table in data dict
dict0mem.c	InnoDB now tries to provide autoinc column value from a counter table in data dict
sync0sync.c	InnoDB now tries to provide autoinc column value from a counter table in data dict
ha_innobase.cc	InnoDB now tries to provide autoinc column value from a counter table in data dict


sql/ha_innobase.cc:
  InnoDB now tries to provide autoinc column value from a counter table in data dict
innobase/sync/sync0sync.c:
  InnoDB now tries to provide autoinc column value from a counter table in data dict
innobase/dict/dict0mem.c:
  InnoDB now tries to provide autoinc column value from a counter table in data dict
innobase/dict/dict0dict.c:
  InnoDB now tries to provide autoinc column value from a counter table in data dict
innobase/include/dict0dict.h:
  InnoDB now tries to provide autoinc column value from a counter table in data dict
innobase/include/dict0mem.h:
  InnoDB now tries to provide autoinc column value from a counter table in data dict
innobase/include/sync0sync.h:
  InnoDB now tries to provide autoinc column value from a counter table in data dict
innobase/include/univ.i:
  InnoDB now tries to provide autoinc column value from a counter table in data dict

2 files changed, 72 insertions, 0 deletions

diff --git a/innobase/dict/dict0dict.c b/innobase/dict/dict0dict.c
index 27c5c0d3edd..10d93fc6ecf 100644
--- a/innobase/dict/dict0dict.c
+++ b/innobase/dict/dict0dict.c
@@ -236,6 +236,71 @@ dict_table_get_index_noninline(
 }
 	
 /************************************************************************
+Initializes the autoinc counter. It is not an error to initialize already
+initialized counter. */
+
+void
+dict_table_autoinc_initialize(
+/*==========================*/
+	dict_table_t*	table,	/* in: table */
+	ib_longlong	value)	/* in: value which was assigned to a row */
+{
+	mutex_enter(&(table->autoinc_mutex));
+
+	table->autoinc_inited = TRUE;
+	table->autoinc = value;
+
+	mutex_exit(&(table->autoinc_mutex));
+}
+
+/************************************************************************
+Gets the next autoinc value, 0 if not yet initialized. */
+
+ib_longlong
+dict_table_autoinc_get(
+/*===================*/
+				/* out: value for a new row, or 0 */
+	dict_table_t*	table)	/* in: table */
+{
+	ib_longlong	value;
+
+	mutex_enter(&(table->autoinc_mutex));
+
+	if (!table->autoinc_inited) {
+
+		value = 0;
+	} else {
+		table->autoinc = table->autoinc + 1;
+		value = table->autoinc;
+	}
+	
+	mutex_exit(&(table->autoinc_mutex));
+
+	return(value);
+}
+
+/************************************************************************
+Updates the autoinc counter if the value supplied is bigger than the
+current value. If not inited, does nothing. */
+
+void
+dict_table_autoinc_update(
+/*======================*/
+	dict_table_t*	table,	/* in: table */
+	ib_longlong	value)	/* in: value which was assigned to a row */
+{
+	mutex_enter(&(table->autoinc_mutex));
+
+	if (table->autoinc_inited) {
+		if (value > table->autoinc) {
+			table->autoinc = value;
+		}
+	}	
+
+	mutex_exit(&(table->autoinc_mutex));
+}
+
+/************************************************************************
 Looks for column n in an index. */
 
 ulint
@@ -568,6 +633,8 @@ dict_table_remove_from_cache(
 	/* Remove table from LRU list of tables */
 	UT_LIST_REMOVE(table_LRU, dict_sys->table_LRU, table);
 
+	mutex_free(&(table->autoinc_mutex));
+
 	size = mem_heap_get_size(table->heap);
 
 	ut_ad(dict_sys->size >= size);
diff --git a/innobase/dict/dict0mem.c b/innobase/dict/dict0mem.c
index 17bc1828388..6947db11aea 100644
--- a/innobase/dict/dict0mem.c
+++ b/innobase/dict/dict0mem.c
@@ -71,6 +71,11 @@ dict_mem_table_create(
 
 	table->stat_modif_counter = 0;
 	
+	mutex_create(&(table->autoinc_mutex));
+	mutex_set_level(&(table->autoinc_mutex), SYNC_DICT_AUTOINC_MUTEX);
+
+	table->autoinc_inited = FALSE;
+
 	table->magic_n = DICT_TABLE_MAGIC_N;
 	
 	return(table);