Commit 04e2ca68 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-5.0-12457 

into  mysql.com:/home/jimw/my/mysql-5.0-clean
parents 0014d5f5 0c88f09f

client/mysql.cc

+1 −4
Original line number Diff line number Diff line
@@ -1598,11 +1598,8 @@ You can turn off this feature to get a quicker startup with -A\n\n"); 
      mysql_free_result(fields);

    }

    else

    {

      tee_fprintf(stdout,

		  "Didn't find any fields in table '%s'\n",table_row[0]);

      field_names[i]= 0;

    }



    i++;

  }

  mysql_free_result(tables);

client/mysqltest.c

+1 −0
Original line number Diff line number Diff line
@@ -2781,6 +2781,7 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags) 
    if (!disable_result_log)

    {

      ulong affected_rows;    /* Ok to be undef if 'disable_info' is set */

      LINT_INIT(affected_rows);



      if (res)

      {

extra/yassl/src/Makefile.am

+2 −2
Original line number Diff line number Diff line 
INCLUDES = -I../include -I../taocrypt/include -I../mySTL



noinst_LIBRARIES = libyassl.a

libyassl_a_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp \

noinst_LTLIBRARIES = libyassl.la

libyassl_la_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp \

	handshake.cpp lock.cpp log.cpp socket_wrapper.cpp ssl.cpp \

	template_instnt.cpp timer.cpp yassl_imp.cpp yassl_error.cpp yassl_int.cpp

EXTRA_DIST = ../include/*.hpp ../include/openssl/*.h

extra/yassl/taocrypt/src/Makefile.am

+2 −2
Original line number Diff line number Diff line 
INCLUDES = -I../include -I../../mySTL



noinst_LIBRARIES = libtaocrypt.a

libtaocrypt_a_SOURCES  = aes.cpp aestables.cpp algebra.cpp arc4.cpp asn.cpp \

noinst_LTLIBRARIES = libtaocrypt.la

libtaocrypt_la_SOURCES  = aes.cpp aestables.cpp algebra.cpp arc4.cpp asn.cpp \

	coding.cpp dh.cpp des.cpp dsa.cpp file.cpp hash.cpp integer.cpp \

	md2.cpp md5.cpp misc.cpp random.cpp ripemd.cpp rsa.cpp sha.cpp \

	template_instnt.cpp

include/my_sys.h

+5 −0
Original line number Diff line number Diff line
@@ -866,6 +866,11 @@ extern void add_compiled_collation(CHARSET_INFO *cs); 
extern ulong escape_string_for_mysql(CHARSET_INFO *charset_info,

                                     char *to, ulong to_length,

                                     const char *from, ulong length);

#ifdef __WIN__

#define BACKSLASH_MBTAIL

/* File system character set */

extern CHARSET_INFO *fs_character_set(void);

#endif

extern ulong escape_quotes_for_mysql(CHARSET_INFO *charset_info,

                                     char *to, ulong to_length,

                                     const char *from, ulong length);