Commit a2bb52c7 authored by unknown's avatar unknown
Browse files

Merge 


sql/ha_ndbcluster.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents dffefb30 448a4fd1

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ mronstrom@mysql.com 
mskold@bk-internal.mysql.com

mskold@mysql.com

msvensson@build.mysql.com

msvensson@neptunus.(none)

msvensson@neptunus.homeip.net

mwagner@cash.mwagner.org

mwagner@evoq.mwagner.org

VC++Files/libmysqld/libmysqld.dsp

+4 −0
Original line number Diff line number Diff line
@@ -344,6 +344,10 @@ SOURCE=..\mysys\my_alloc.c 
# End Source File

# Begin Source File



SOURCE=..\mysys\my_decimal.cpp

# End Source File

# Begin Source File



SOURCE=..\mysys\my_getopt.c

# End Source File

# Begin Source File

VC++Files/sql/mysqld.dsp

+4 −0
Original line number Diff line number Diff line
@@ -1085,6 +1085,10 @@ SOURCE=.\mf_iocache.cpp 
# End Source File

# Begin Source File



SOURCE=.\my_decimal.cpp

# End Source File

# Begin Source File



SOURCE=.\my_time.c

# End Source File

# Begin Source File

VC++Files/strings/strings.dsp

+4 −0
Original line number Diff line number Diff line
@@ -177,6 +177,10 @@ SOURCE=.\ctype.c 
# End Source File

# Begin Source File



SOURCE=.\decimal.c

# End Source File

# Begin Source File



SOURCE=.\int2str.c

# End Source File

# Begin Source File

client/mysqlbinlog.cc

+9 −3
Original line number Diff line number Diff line
@@ -1169,7 +1169,13 @@ static int dump_local_log_entries(const char* logname) 
    Log_event* ev = Log_event::read_log_event(file, description_event);

    if (!ev)

    {

      if (file->error)

      /*

        if binlog wasn't closed properly ("in use" flag is set) don't complain

        about a corruption, but treat it as EOF and move to the next binlog.

      */

      if (description_event->flags & LOG_EVENT_BINLOG_IN_USE_F)

        file->error= 0;

      else if (file->error)

      {

        fprintf(stderr,

                "Could not read entry at offset %s:"