bk commit into 6.0-falcon tree (jas:1.2523)

[U-ROWVWADEjas]

Below is the list of changes that have just been committed into a local
6.0-falcon repository of . When  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@stripped, 2007-05-18 17:09:07-04:00, jas@rowvwade. +2 -0
  Disable range test for unsupported very large precision decimals.

  storage/falcon/Log.cpp@stripped, 2007-05-18 17:08:54-04:00, jas@rowvwade. +3 -0
    Define ASSERT macro for non-engine use.

  storage/falcon/ha_falcon.cpp@stripped, 2007-05-18 17:08:55-04:00, jas@rowvwade. +14 -35
    Disable range test for unsupported very large precision decimals.

# 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:	jas
# Host:	rowvwade.
# Root:	D:/MySQL/mysql-5.1-falcon

--- 1.10/storage/falcon/Log.cpp	2007-05-18 17:09:24 -04:00
+++ 1.11/storage/falcon/Log.cpp	2007-05-18 17:09:24 -04:00
@@ -57,6 +57,9 @@
 #define vsnprintf	_vsnprintf
 #endif
 
+#ifndef ASSERT
+#define ASSERT
+#endif
 
 static LogListener		*listeners;
 static SymbolManager	*symbols;

--- 1.161/storage/falcon/ha_falcon.cpp	2007-05-18 17:09:24 -04:00
+++ 1.162/storage/falcon/ha_falcon.cpp	2007-05-18 17:09:24 -04:00
@@ -392,14 +392,6 @@
 int StorageInterface::open(const char *name, int mode, uint test_if_locked)
 {
 	DBUG_ENTER("StorageInterface::open");
-	/***
-	int tableType = storageHandler->isTempTable(name);
-	
-	if (tableType >= 0)
-		tempTable = tableType > 0;
-	else
-		tempTable = (table) ? table->s->tmp_table : 0;
-	***/
 	
 	if (!mySqlThread)
 		mySqlThread = current_thd;
@@ -416,24 +408,6 @@
 		storageConnection->addRef();
 		storageTable = storageConnection->getStorageTable(storageShare);
 		
-		/***
-		if (!storageConnection)
-			{
-			if (!(storageConnection = storageHandler->getStorageConnection(getDbName(name),
mySqlThread, OpenDatabase, name, NULL)))
-				DBUG_RETURN(HA_ERR_NO_CONNECTION);
-
-			if (mySqlThread)
-				{
-				((StorageConnection**) (mySqlThread->ha_data))[falcon_hton->slot] =
storageConnection;
-				storageConnection->addRef();
-				}
-			}
-
-		storageTable = storageConnection->getStorageTable(name, sizeof(THR_LOCK),
tempTable);
-		storageTable->localTable = this;
-		storageShare = storageTable->share;
-		***/
-		
 		if (!storageShare->initialized)
 			{
 			storageShare->lock(true);
@@ -467,6 +441,18 @@
 	if (ret)
 		DBUG_RETURN(error(ret));
 
+	for (uint n = 0; n < table->s->keys; ++n)
+		{
+		KEY *key = table->s->key_info + n;
+		
+		for (uint segment = 0; segment < key->key_parts; ++segment)
+			{
+			//KEY_PART_INFO *part = key->key_part + segment;
+			//Field *field = part->field;
+			key->rec_per_key[segment] = 100;
+			}
+		}		
+
 	thr_lock_data_init((THR_LOCK *)storageShare->impure, &lockData, NULL);
 	setIndexes();
 
@@ -623,17 +609,8 @@
 	if (!storageConnection)
 		DBUG_RETURN(HA_ERR_NO_CONNECTION);
 	
-	/***
-	if (!storageConnection &&
-		!(storageConnection = storageHandler->getStorageConnection(getDbName(mySqlName),
mySqlThread, openOption, mySqlName, info->tablespace)))
-		DBUG_RETURN(HA_ERR_NO_CONNECTION);
-
-	storageTable = storageConnection->getStorageTable(mySqlName, sizeof(THR_LOCK),
tempTable);
-	***/
 	storageTable = storageConnection->getStorageTable(storageShare);
 	storageTable->localTable = this;
-	//storageShare = storageTable->share;
-	//storageShare->setTablePath(mySqlName, tempTable);
 
 	int ret;
 	int64 incrementValue = 0;
@@ -1901,12 +1878,14 @@
 			{
 			Field_new_decimal *newDecimal = (Field_new_decimal*) field;
 			
+			/***
 			if (newDecimal->precision > 18 && newDecimal->dec > 9)
 				{
 				errorText = "columns with greater than 18 digits precision and greater than 9 digits
of fraction are not supported";
 				
 				return HA_ERR_UNSUPPORTED;
 				}
+			***/
 				
 			gen->gen("numeric (%d,%d)", newDecimal->precision, newDecimal->dec);