Merge work.mysql.com:/home/bk/mysql

into threads.polyesthetic.msg:/usr/local/src/my/work

mysys/Makefile.am

@@ -83,17 +83,17 @@ FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 test_thr_alarm: thr_alarm.c $(LIBRARIES)
 	$(CP) $(srcdir)/thr_alarm.c ./test_thr_alarm.c
 	$(LINK) $(FLAGS) -DMAIN ./test_thr_alarm.c $(LDADD) $(LIBS)
-	$(RM) ./test_thr_alarm.*
+	$(RM) -f ./test_thr_alarm.*
 
 test_thr_lock: thr_lock.c $(LIBRARIES)
 	$(CP) $(srcdir)/thr_lock.c test_thr_lock.c
 	$(LINK) $(FLAGS) -DMAIN ./test_thr_lock.c $(LDADD) $(LIBS)
-	$(RM) ./test_thr_lock.*
+	$(RM) -f ./test_thr_lock.*
 
 test_vsnprintf: my_vsnprintf.c $(LIBRARIES)
 	$(CP) $(srcdir)/my_vsnprintf.c test_vsnprintf.c
 	$(LINK) $(FLAGS) -DMAIN ./test_vsnprintf.c $(LDADD) $(LIBS)
-	$(RM) test_vsnprintf.*
+	$(RM) -f test_vsnprintf.*
 
 test_dir: test_dir.c $(LIBRARIES)
 	$(LINK) $(FLAGS) -DMAIN $(srcdir)/test_dir.c $(LDADD) $(LIBS)

sql/sql_show.cc

@@ -603,7 +603,7 @@ mysqld_show_keys(THD *thd, TABLE_LIST *table_list)
       else
         net_store_null(packet);
       net_store_null(packet);                   // No pack_information yet
-      net_store_null(packet);                   // No comments yet
+      net_store_data(packet,key_info->flags & HA_FULLTEXT ? "FULLTEXT":"");
       if (my_net_write(&thd->net,(char*) packet->ptr(),packet->length()))
         DBUG_RETURN(1); /* purecov: inspected */
     }
@@ -719,7 +719,7 @@ store_create_info(THD *thd, TABLE *table, String *packet)
     field->sql_type(type);
     packet->append(type.ptr(),type.length());
 
-    bool has_default = (field->type() != FIELD_TYPE_BLOB && 
+    bool has_default = (field->type() != FIELD_TYPE_BLOB &&
 			field->type() != FIELD_TYPE_TIMESTAMP &&
 			field->unireg_check != Field::NEXT_NUMBER);
     if (flags & NOT_NULL_FLAG)
@@ -822,7 +822,7 @@ store_create_info(THD *thd, TABLE *table, String *packet)
     packet->append(" DELAY_KEY_WRITE=1",18);
   if(table->comment)
     {
-      packet->append(" COMMENT='", 10); 
+      packet->append(" COMMENT='", 10);
       append_unescaped(packet, table->comment);
       packet->append('\'');
     }