List:Commits« Previous MessageNext Message »
From:Alex Ivanov Date:December 7 2005 1:09pm
Subject:bk commit into 5.0 tree (aivanov:1.1987)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of alexi. When alexi 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.1987 05/12/07 16:08:47 aivanov@stripped +5 -0
  Ignore - not to be pushed

  sql/ha_innodb.h
    1.109 05/12/07 16:08:38 aivanov@stripped +2 -3
    Ignore

  sql/ha_innodb.cc
    1.280 05/12/07 16:08:38 aivanov@stripped +14 -36
    Ignore

  mysql-test/t/innodb_gis.test
    1.3 05/12/07 16:08:38 aivanov@stripped +2 -1
    Ignore

  mysql-test/t/innodb.test
    1.119 05/12/07 16:08:38 aivanov@stripped +0 -19
    Ignore

  mysql-test/r/innodb.result
    1.149 05/12/07 16:08:38 aivanov@stripped +0 -14
    Ignore

# 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:	aivanov
# Host:	mysql.creware.com
# Root:	/home/alexi/innodb-ss/mysql-5.0-xx52

--- 1.2/mysql-test/t/innodb_gis.test	2005-10-27 23:45:06 +04:00
+++ 1.3/mysql-test/t/innodb_gis.test	2005-12-07 16:08:38 +03:00
@@ -1,3 +1,4 @@
---source include/have_innodb.inc
+source include/have_geometry.inc;
+-- source include/have_innodb.inc
 SET storage_engine=innodb;
 --source include/gis_generic.inc

--- 1.148/mysql-test/r/innodb.result	2005-12-07 05:18:13 +03:00
+++ 1.149/mysql-test/r/innodb.result	2005-12-07 16:08:38 +03:00
@@ -2833,17 +2833,3 @@
 ERROR HY000: Error on rename of './test/t3' to './test/t1' (errno: 150)
 set foreign_key_checks=1;
 drop table t2,t3;
-create table t1 (a varchar(255) character set utf8,
-b varchar(255) character set utf8,
-c varchar(255) character set utf8,
-d varchar(255) character set utf8,
-key (a,b,c,d)) engine=innodb;
-drop table t1;
-create table t1 (a varchar(255) character set utf8,
-b varchar(255) character set utf8,
-c varchar(255) character set utf8,
-d varchar(255) character set utf8,
-e varchar(255) character set utf8,
-key (a,b,c,d,e)) engine=innodb;
-ERROR 42000: Specified key was too long; max key length is 3072 bytes
-End of 5.0 tests

--- 1.118/mysql-test/t/innodb.test	2005-12-06 22:02:30 +03:00
+++ 1.119/mysql-test/t/innodb.test	2005-12-07 16:08:38 +03:00
@@ -1815,22 +1815,3 @@
 rename table t3 to t1;
 set foreign_key_checks=1;
 drop table t2,t3;
-
-#
-# Test that we can create a large (>1K) key
-#
-create table t1 (a varchar(255) character set utf8,
-                 b varchar(255) character set utf8,
-                 c varchar(255) character set utf8,
-                 d varchar(255) character set utf8,
-                 key (a,b,c,d)) engine=innodb;
-drop table t1;
---error ER_TOO_LONG_KEY
-create table t1 (a varchar(255) character set utf8,
-                 b varchar(255) character set utf8,
-                 c varchar(255) character set utf8,
-                 d varchar(255) character set utf8,
-                 e varchar(255) character set utf8,
-                 key (a,b,c,d,e)) engine=innodb;
-
---echo End of 5.0 tests

--- 1.279/sql/ha_innodb.cc	2005-12-06 22:02:30 +03:00
+++ 1.280/sql/ha_innodb.cc	2005-12-07 16:08:38 +03:00
@@ -142,16 +142,15 @@
 ulong 	innobase_cache_size 	= 0;
 ulong 	innobase_large_page_size = 0;
 
-/* The default values for the following, type long or longlong, start-up
-parameters are declared in mysqld.cc: */
+/* The default values for the following, type long, start-up parameters
+are declared in mysqld.cc: */
 
 long innobase_mirrored_log_groups, innobase_log_files_in_group,
-     innobase_log_buffer_size, innobase_buffer_pool_awe_mem_mb,
-     innobase_additional_mem_pool_size, innobase_file_io_threads,
-     innobase_lock_wait_timeout, innobase_force_recovery,
-     innobase_open_files;
-
-longlong innobase_buffer_pool_size, innobase_log_file_size;
+     innobase_log_file_size, innobase_log_buffer_size,
+     innobase_buffer_pool_awe_mem_mb,
+     innobase_buffer_pool_size, innobase_additional_mem_pool_size,
+     innobase_file_io_threads,  innobase_lock_wait_timeout,
+     innobase_force_recovery, innobase_open_files;
 
 /* The default values for the following char* start-up parameters
 are determined in innobase_init below: */
@@ -1211,25 +1210,6 @@
 
 	ut_a(DATA_MYSQL_TRUE_VARCHAR == (ulint)MYSQL_TYPE_VARCHAR);
 
-	/* Check that values don't overflow on 32-bit systems. */
-	if (sizeof(ulint) == 4) {
-		if (innobase_buffer_pool_size > UINT_MAX32) {
-			sql_print_error(
-				"innobase_buffer_pool_size can't be over 4GB"
-				" on 32-bit systems");
-
-			DBUG_RETURN(0);
-		}
-
-		if (innobase_log_file_size > UINT_MAX32) {
-			sql_print_error(
-				"innobase_log_file_size can't be over 4GB"
-				" on 32-bit systems");
-
-			DBUG_RETURN(0);
-		}
-	}
-
   	os_innodb_umask = (ulint)my_umask;
 
 	/* First calculate the default path for innodb_data_home_dir etc.,
@@ -2198,13 +2178,11 @@
 
 	DBUG_ENTER("innobase_savepoint");
 
-        /*
-          In the autocommit mode there is no sense to set a savepoint
-          (unless we are in sub-statement), so SQL layer ensures that
-          this method is never called in such situation.
-        */
-        DBUG_ASSERT(thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN) ||
-                    thd->in_sub_stmt);
+	if (!(thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))) {
+		/* In the autocommit state there is no sense to set a
+		savepoint: we return immediate success */
+	        DBUG_RETURN(0);
+	}
 
 	trx = check_trx_exists(thd);
 
@@ -3037,8 +3015,8 @@
 
 			if (key_part->length > 0 && cs->mbmaxlen > 1) {
 				len = (ulint) cs->cset->well_formed_len(cs, 
-					(const char *) src_start,
-					(const char *) src_start + key_part->length,
+					src_start,
+					src_start + key_part->length,
 					key_part->length / cs->mbmaxlen, 
 					&error);
 			} else {

--- 1.108/sql/ha_innodb.h	2005-12-06 22:02:30 +03:00
+++ 1.109/sql/ha_innodb.h	2005-12-07 16:08:38 +03:00
@@ -206,9 +206,8 @@
 extern char *innobase_home, *innobase_tmpdir, *innobase_logdir;
 extern long innobase_lock_scan_time;
 extern long innobase_mirrored_log_groups, innobase_log_files_in_group;
-extern longlong innobase_buffer_pool_size, innobase_log_file_size;
-extern long innobase_log_buffer_size;
-extern long innobase_additional_mem_pool_size;
+extern long innobase_log_file_size, innobase_log_buffer_size;
+extern long innobase_buffer_pool_size, innobase_additional_mem_pool_size;
 extern long innobase_buffer_pool_awe_mem_mb;
 extern long innobase_file_io_threads, innobase_lock_wait_timeout;
 extern long innobase_force_recovery;
Thread
bk commit into 5.0 tree (aivanov:1.1987)Alex Ivanov7 Dec