Commit d082ed72 authored by tim@threads.polyesthetic.msg's avatar tim@threads.polyesthetic.msg
Browse files

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

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

mysys/Makefile.am

+3 −3
Original line number Diff line number Diff line
@@ -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

+3 −3
Original line number Diff line number Diff line
@@ -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 */

    }