Commit 5ec889c7 authored by unknown's avatar unknown
Browse files

Merge hasky:/my/mysql-build into mysql.com:/home/my/mysql-5.0 


sql/sql_lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
parents e38f06f7 1834f889

VC++Files/sql/mysqld.dsp

+7 −3
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ LINK32=xilink6.exe 
# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /FD /c

# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_ARCHIVE_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /FD /c

# SUBTRACT CPP /Fr /YX

# ADD BASE RSC /l 0x410 /d "_DEBUG"

# ADD RSC /l 0x409 /d "_DEBUG"
@@ -130,7 +130,7 @@ LINK32=xilink6.exe 
# PROP Target_Dir ""

# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c

# SUBTRACT BASE CPP /YX

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-nt-max /FD /c

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_ARCHIVE_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-nt-max /FD /c

# SUBTRACT CPP /YX

# ADD BASE RSC /l 0x409 /d "NDEBUG"

# ADD RSC /l 0x409 /d "NDEBUG"
@@ -159,7 +159,7 @@ LINK32=xilink6.exe 
# PROP Target_Dir ""

# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c

# SUBTRACT BASE CPP /YX

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "NDEBUG" /D "DBUG_OFF" /D "USE_SYMDIR" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-max /FD /c

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "NDEBUG" /D "DBUG_OFF" /D "USE_SYMDIR" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_ARCHIVE_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-max /FD /c

# SUBTRACT CPP /YX

# ADD BASE RSC /l 0x409 /d "NDEBUG"

# ADD RSC /l 0x409 /d "NDEBUG"
@@ -452,6 +452,10 @@ SOURCE=.\gstream.cpp 
# End Source File

# Begin Source File



SOURCE=.\examples\ha_archive.cpp

# End Source File

# Begin Source File



SOURCE=.\ha_blackhole.cpp

# End Source File

# Begin Source File

sql/examples/ha_archive.cc

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#pragma implementation        // gcc: Class implementation

#endif



#include <mysql_priv.h>

#include "../mysql_priv.h"



#ifdef HAVE_ARCHIVE_DB

#include "ha_archive.h"

sql/examples/ha_archive.h

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ class ha_archive: public handler 
  ha_archive(TABLE *table): handler(table), delayed_insert(0), bulk_insert(0)

  {

    /* Set our original buffer from pre-allocated memory */

    buffer.set(byte_buffer, IO_SIZE, system_charset_info);

    buffer.set((char *)byte_buffer, IO_SIZE, system_charset_info);



    /* The size of the offset value we will use for position() */

    ref_length = sizeof(z_off_t);

sql/sql_lex.h

+1 −0
Original line number Diff line number Diff line
@@ -635,6 +635,7 @@ typedef class st_select_lex SELECT_LEX; 
#define ALTER_CHANGE_COLUMN_DEFAULT 256

#define ALTER_KEYS_ONOFF        512

#define ALTER_CONVERT          1024

#define ALTER_FORCE		2048



typedef struct st_alter_info

{

sql/sql_table.cc

+15 −2
Original line number Diff line number Diff line
@@ -2202,12 +2202,14 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables, 
    if ((table->table->db_stat & HA_READ_ONLY) && open_for_modify)

    {

      char buff[FN_REFLEN + MYSQL_ERRMSG_SIZE];

      uint length;

      protocol->prepare_for_resend();

      protocol->store(table_name, system_charset_info);

      protocol->store(operator_name, system_charset_info);

      protocol->store("error", 5, system_charset_info);

      my_snprintf(buff, sizeof(buff), ER(ER_OPEN_AS_READONLY), table_name);

      protocol->store(buff, system_charset_info);

      length= my_snprintf(buff, sizeof(buff), ER(ER_OPEN_AS_READONLY),

                          table_name);

      protocol->store(buff, length, system_charset_info);

      close_thread_tables(thd);

      table->table=0;				// For query cache

      if (protocol->write())
@@ -2238,6 +2240,17 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables, 
      open_for_modify= 0;

    }



    if (table->table->s->crashed && operator_func == &handler::check)

    {

      protocol->prepare_for_resend();

      protocol->store(table_name, system_charset_info);

      protocol->store(operator_name, system_charset_info);

      protocol->store("warning", 7, system_charset_info);

      protocol->store("Table is marked as crashed", 26, system_charset_info);

      if (protocol->write())

        goto err;

    }



    result_code = (table->table->file->*operator_func)(thd, check_opt);



send_result: