Commit a25aed33 authored by sasha@laptop.slkc.uswest.net's avatar sasha@laptop.slkc.uswest.net
Browse files

laptop commit, syncing with the repostitory. Fixed some bad bugs in replication

parent f325f5fc

BUILD/compile-pentium-debug

+2 −2
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ C_WARNINGS="$GLOBAL_WARNINGS -Wunused" 
CC_WARNINGS="$GLOBAL_WARNINGS -Woverloaded-virtual -Wextern-inline -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"





CFLAGS="-DFORCE_INIT_OF_VARS  -O2 -mpentiumpro $C_WARNINGS" CXX=gcc \

CXXFLAGS="-DFORCE_INIT_OF_VARS -O2 -mpentiumpro -felide-constructors -fno-exceptions -fno-rtti $CC_WARNINGS" \

CFLAGS="-DEXTRA_DEBUG -DFORCE_INIT_OF_VARS  -O2 -mpentiumpro $C_WARNINGS" CXX=gcc \

CXXFLAGS="-DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -O2 -mpentiumpro -felide-constructors -fno-exceptions -fno-rtti $CC_WARNINGS" \

./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charsets=complex --with-debug=full \

--with-berkeley-db=/usr/local/BerkeleyDB

make

BitKeeper/etc/logging_ok

+1 −3
Original line number Diff line number Diff line 
sasha@mysql.sashanet.com

sasha@work.mysql.com

tim@threads.polyesthetic.msg
 
sasha@laptop.slkc.uswest.net

sql/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ 
			opt_range.h opt_ft.h \

			sql_select.h structs.h table.h sql_udf.h hash_filo.h\

			lex.h lex_symbol.h sql_acl.h sql_crypt.h md5.h \

                        log_event.h mini_client.h sql_repl.h

                        log_event.h mini_client.h sql_repl.h slave.h

mysqld_SOURCES =	sql_lex.cc \

			item.cc item_sum.cc item_buff.cc item_func.cc \

			item_cmpfunc.cc item_strfunc.cc item_timefunc.cc \

sql/log_event.h

+4 −4
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ class Log_event 


  // if mutex is 0, the read will proceed without mutex

  static Log_event* read_log_event(FILE* file, pthread_mutex_t* log_lock);

  static Log_event* read_log_event(const char* buf, int max_buf);

  static Log_event* read_log_event(const char* buf, int event_len);



#ifndef MYSQL_CLIENT

  static int read_log_event(FILE* file, String* packet,
@@ -133,7 +133,7 @@ class Query_log_event: public Log_event 
#endif



  Query_log_event(FILE* file, time_t when, uint32 server_id);

  Query_log_event(const char* buf, int max_buf);

  Query_log_event(const char* buf, int event_len);

  ~Query_log_event()

  {

    if (data_buf)
@@ -273,7 +273,7 @@ class Load_log_event: public Log_event 
#endif



  Load_log_event(FILE* file, time_t when, uint32 server_id);

  Load_log_event(const char* buf, int max_buf);

  Load_log_event(const char* buf, int event_len);

  ~Load_log_event()

  {

    if (data_buf)
@@ -398,7 +398,7 @@ class Rotate_log_event: public Log_event 
  {}

  

  Rotate_log_event(FILE* file, time_t when, uint32 server_id) ;

  Rotate_log_event(const char* buf, int max_buf);

  Rotate_log_event(const char* buf, int event_len);

  ~Rotate_log_event()

  {

    if (alloced)

sql/mysql_priv.h

+0 −14
Original line number Diff line number Diff line
@@ -205,19 +205,6 @@ inline THD *_current_thd(void) 
#include "sql_class.h"

#include "opt_range.h"



int mysql_table_dump(THD* thd, char* db, char* tbl_name, int fd = -1);

// if fd is -1, dump to NET

int fetch_nx_table(THD* thd, MASTER_INFO* mi);

// retrieve non-exitent table from master

// the caller must set thd->last_nx_table and thd->last_nx_db first

int show_master_info(THD* thd);

int show_binlog_info(THD* thd);



int db_ok(const char* db, I_List<i_string> &do_list,

	  I_List<i_string> &ignore_list );

// check to see if the database is ok to operate on with respect to the

// do and ignore lists - used in replication





void mysql_create_db(THD *thd, char *db, uint create_info);

void mysql_binlog_send(THD* thd, char* log_ident, ulong pos, ushort flags);
@@ -522,7 +509,6 @@ int lock_table_name(THD *thd, TABLE_LIST *table_list); 
void unlock_table_name(THD *thd, TABLE_LIST *table_list);

bool wait_for_locked_table_names(THD *thd, TABLE_LIST *table_list);



extern int flush_master_info(MASTER_INFO* mi);



/* old unireg functions */