Merge

mysql-test/r/derived.result

@@ -137,7 +137,7 @@ a	t
 explain select count(*) from t1 as tt1, (select * from t1) as tt2;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Select tables optimized away
-2	DERIVED	tt1	index	NULL	a	4	NULL	10000	Using index
+2	DERIVED	tt1	ALL	NULL	NULL	NULL	NULL	10000	
 drop table t1;
 SELECT * FROM (SELECT (SELECT * FROM (SELECT 1 as a) as a )) as b;
 (SELECT * FROM (SELECT 1 as a) as a )

mysql-test/r/innodb.result

@@ -1322,10 +1322,10 @@ SELECT t2.id, t1.label FROM t2 INNER JOIN
 (SELECT t1.id_object as id_object FROM t1 WHERE t1.label LIKE '%test%') AS lbl 
 ON (t2.id = lbl.id_object) INNER JOIN t1 ON (t2.id = t1.id_object);
 id	label
-3382	Fournisseur Test
+3382	Test
-102	Fournisseur Test
+102	Le Pekin (Test)
-1794	Fournisseur Test
+1794	Test de resto
-1822	Fournisseur Test
+1822	Test 3
-3524	Fournisseur Test
+3524	Societe Test
 3525	Fournisseur Test
 drop table t1,t2;

sql/ha_myisam.cc

@@ -767,12 +767,20 @@ int ha_myisam::preload_keys(THD* thd, HA_CHECK_OPT *check_opt)
 void ha_myisam::deactivate_non_unique_index(ha_rows rows)
 {
   MYISAM_SHARE* share = file->s;
+  bool do_warning=0;
   if (share->state.key_map == ((ulonglong) 1L << share->base.keys)-1)
   {
     if (!(specialflag & SPECIAL_SAFE_MODE))
     {
       if (rows == HA_POS_ERROR)
+      {
+	uint orig_update= file->update;
+	file->update ^= HA_STATE_CHANGED;
+	uint check_update= file->update;
         mi_extra(file, HA_EXTRA_NO_KEYS, 0);
+	do_warning= (file->update == check_update) && file->state->records;
+	file->update= orig_update;
+      }
       else
       {
 	/*
@@ -797,6 +805,10 @@ void ha_myisam::deactivate_non_unique_index(ha_rows rows)
   }
   else
     enable_activate_all_index=0;
+  if (do_warning)
+    push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN, 
+			ER_ILLEGAL_HA,
+			ER(ER_ILLEGAL_HA), table->table_name);
 }
 
 

sql/sql_base.cc

@@ -787,6 +787,7 @@ TABLE *open_table(THD *thd,const char *db,const char *table_name,
 	DBUG_RETURN(0);
       }
       table->query_id=thd->query_id;
+      table->clear_query_id=1;
       thd->tmp_table_used= 1;
       goto reset;
     }
@@ -2048,8 +2049,9 @@ bool setup_tables(TABLE_LIST *tables)
       table->keys_in_use_for_query &= ~map;
     }
     table->used_keys &= table->keys_in_use_for_query;
-    if (table_list->shared)
+    if (table_list->shared  || table->clear_query_id)
     {
+      table->clear_query_id= 0;
       /* Clear query_id that may have been set by previous select */
       for (Field **ptr=table->field ; *ptr ; ptr++)
 	(*ptr)->query_id=0;

sql/sql_derived.cc

@@ -122,6 +122,16 @@ int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit,
       res= -1;
       goto exit;
     }
+
+    /* 
+       This is done in order to redo all field optimisations when any of the 
+       involved tables is used in the outer query 
+    */
+    if (tables)
+    {
+      for (TABLE_LIST *cursor= tables;  cursor;  cursor= cursor->next)
+	cursor->table->clear_query_id= 1;
+    }
 	
     item_list= select_cursor->item_list;
     select_cursor->with_wild= 0;

sql/sql_table.cc

@@ -1858,10 +1858,19 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
 	/* COND_refresh will be signaled in close_thread_tables() */
 	break;
       case DISABLE:
-	VOID(pthread_mutex_lock(&LOCK_open));
+ 	if (table->db_type == DB_TYPE_MYISAM)
-	wait_while_table_is_used(thd, table);
+ 	{
-	VOID(pthread_mutex_unlock(&LOCK_open));
+	  VOID(pthread_mutex_lock(&LOCK_open));
-	table->file->deactivate_non_unique_index(HA_POS_ERROR);
+	  wait_while_table_is_used(thd, table);
+	  VOID(pthread_mutex_unlock(&LOCK_open));
+ 	  table->file->deactivate_non_unique_index(HA_POS_ERROR);
+ 	}
+ 	else
+ 	  push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN, 
+ 			      ER_ILLEGAL_HA,
+ 			      ER(ER_ILLEGAL_HA), table->table_name);
+  	break;
+
 	/* COND_refresh will be signaled in close_thread_tables() */
 	break;
       }

sql/sql_union.cc

@@ -136,7 +136,7 @@ int st_select_lex_unit::prepare(THD *thd, select_result *sel_result,
     found_rows_for_union= first_select()->options & OPTION_FOUND_ROWS && 
       global_parameters->select_limit;
     if (found_rows_for_union)
-      first_select()->options ^=  OPTION_FOUND_ROWS;
+      first_select()->options&=  ~OPTION_FOUND_ROWS;
   }
   if (t_and_f)
   {

sql/table.h

@@ -116,6 +116,7 @@ struct st_table {
   my_bool crashed;
   my_bool is_view;
   my_bool no_keyread;
+  my_bool clear_query_id;               /* To reset query_id for tables and cols */
   Field *next_number_field,		/* Set if next_number is activated */
 	*found_next_number_field,	/* Set on open */
         *rowid_field;