MySQL Lists are EOL. Please join:

List:Internals« Previous MessageNext Message »
From:Osku Salerma Date:August 17 2005 8:11am
Subject:bk commit into 5.0 tree (osku:1.1989)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of osku. When osku does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1989 05/08/17 11:11:50 osku@127.(none) +1 -0
  Merge osalerma@stripped:/home/bk/mysql-5.0
  into  127.(none):/home/osku/mysql-5.0

  sql/ha_innodb.cc
    1.246 05/08/17 11:11:46 osku@127.(none) +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	osku
# Host:	127.(none)
# Root:	/home/osku/mysql-5.0/RESYNC

--- 1.245/sql/ha_innodb.cc	2005-08-16 15:32:36 +03:00
+++ 1.246/sql/ha_innodb.cc	2005-08-17 11:11:46 +03:00
@@ -6864,6 +6864,28 @@
 	return((ulonglong) nr);
 }
 
+/* See comment in handler.h */
+int
+ha_innobase::reset_auto_increment()
+{
+	DBUG_ENTER("ha_innobase::reset_auto_increment");
+
+	row_prebuilt_t* prebuilt = (row_prebuilt_t*) innobase_prebuilt;
+  	int     	error;
+
+	error = row_lock_table_autoinc_for_mysql(prebuilt);
+
+	if (error != DB_SUCCESS) {
+		error = convert_error_code_to_mysql(error, user_thd);
+
+		DBUG_RETURN(error);
+	}	
+
+	dict_table_autoinc_initialize(prebuilt->table, 0);
+
+	DBUG_RETURN(0);
+}
+
 /***********************************************************************
 Compares two 'refs'. A 'ref' is the (internal) primary key value of the row.
 If there is no explicitly declared non-null unique key or a primary key, then
Thread
bk commit into 5.0 tree (osku:1.1989)Osku Salerma17 Aug