Commit 306bf0bf authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1-new 

into  mysql.com:/usr/local/mysql/mysql-5.1-new
parents d7901a2a b2168530

include/my_bitmap.h

+2 −0
Original line number Diff line number Diff line
@@ -17,7 +17,9 @@ 
#ifndef _my_bitmap_h_

#define _my_bitmap_h_



#ifdef THREAD

#include <my_pthread.h>

#endif



#define MY_BIT_NONE (~(uint) 0)

mysql-test/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -49,7 +49,8 @@ dist-hook: 
	-$(INSTALL_DATA) $(srcdir)/t/*.imtest $(distdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.sql $(distdir)/t

	-$(INSTALL_DATA) $(srcdir)/t/*.disabled $(distdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.opt $(srcdir)/t/*.sh $(srcdir)/t/*.slave-mi $(distdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.opt $(srcdir)/t/*.slave-mi $(distdir)/t

	$(INSTALL_SCRIPT) $(srcdir)/t/*.sh $(distdir)/t

	$(INSTALL_DATA) $(srcdir)/extra/binlog_tests/*.test $(distdir)/extra/binlog_tests

	$(INSTALL_DATA) $(srcdir)/extra/rpl_tests/*.test $(distdir)/extra/rpl_tests

	-$(INSTALL_DATA) $(srcdir)/extra/binlog_tests/*.opt $(distdir)/extra/binlog_tests

sql/rpl_tblmap.h

+0 −4
Original line number Diff line number Diff line
@@ -54,10 +54,6 @@ class table_mapping { 


public:



  enum {

    NO_TABLE = ULONG_MAX

  };



  enum enum_error {

      ERR_NO_ERROR = 0,

      ERR_LIMIT_EXCEEDED,

sql/sql_plugin.cc

+3 −3
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ char *opt_plugin_dir_ptr; 
char opt_plugin_dir[FN_REFLEN];

LEX_STRING plugin_type_names[]=

{

  { STRING_WITH_LEN("UDF") },

  { STRING_WITH_LEN("STORAGE ENGINE") },

  { STRING_WITH_LEN("FTPARSER") }

  { (char *)STRING_WITH_LEN("UDF") },

  { (char *)STRING_WITH_LEN("STORAGE ENGINE") },

  { (char *)STRING_WITH_LEN("FTPARSER") }

};

static const char *plugin_interface_version_sym=

                   "_mysql_plugin_interface_version_";