bk commit into 6.0 tree (jas:1.2644)

[U-ROWVWADEjas]

Below is the list of changes that have just been committed into a local
6.0 repository of jas.  When jas 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, 2008-04-21 15:29:03-04:00, jas@rowvwade. +1 -0
  Skip online add column for temporary tables to workaround
  server bug.

  storage/falcon/ha_falcon.cpp@stripped, 2008-04-21 15:28:47-04:00, jas@rowvwade. +2 -1
    Skip online add column for temporary tables to workaround
    server bug.

diff -Nrup a/storage/falcon/ha_falcon.cpp b/storage/falcon/ha_falcon.cpp
--- a/storage/falcon/ha_falcon.cpp	2008-04-21 14:10:00 -04:00
+++ b/storage/falcon/ha_falcon.cpp	2008-04-21 15:28:47 -04:00
@@ -2035,8 +2035,9 @@ int StorageInterface::check_if_supported
 {
 	DBUG_ENTER("StorageInterface::check_if_supported_alter");
 	ulonglong bits = alter_flags->to_ulonglong();
+	tempTable = (create_info->options & HA_LEX_CREATE_TMP_TABLE) ? true : false;
 	
-	if (alter_flags->is_set(HA_ADD_COLUMN))
+	if (!tempTable && alter_flags->is_set(HA_ADD_COLUMN))
 		{
 		Field *field = NULL;