Commit 6e7d47e2 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mysql.com:/home/dlenev/src/mysql-5.0-bg13525


sql/field.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_select.h:
  Manual merge.
parents ac24b2b7 a431e912

client/mysqltest.c

+4 −2
Original line number Diff line number Diff line
@@ -3093,8 +3093,10 @@ DYNAMIC_ARRAY patterns; 
static void init_win_path_patterns()

{

  /* List of string patterns to match in order to find paths */

  const char* paths[] = { "$MYSQL_TEST_DIR", "./test/", 0 };

  int num_paths= 2;

  const char* paths[] = { "$MYSQL_TEST_DIR",

                          "$MYSQL_TMP_DIR",

                          "./test/", 0 };

  int num_paths= 3;

  int i;

  char* p;

configure.in

+3 −0
Original line number Diff line number Diff line
@@ -356,6 +356,9 @@ then 
  # mysqld requires -fno-implicit-templates.

  # Disable exceptions as they seams to create problems with gcc and threads.

  # mysqld doesn't use run-time-type-checking, so we disable it.

  # We should use -Wno-invalid-offsetof flag to disable some warnings from gcc

  # regarding offset() usage in C++ which are done in a safe manner in the

  # server

  CXXFLAGS="$CXXFLAGS -fno-implicit-templates -fno-exceptions -fno-rtti"

  AC_DEFINE([HAVE_EXPLICIT_TEMPLATE_INSTANTIATION],

    [1], [Defined by configure. Use explicit template instantiation.])

include/my_global.h

+9 −0
Original line number Diff line number Diff line
@@ -43,6 +43,15 @@ 
#define HAVE_ERRNO_AS_DEFINE

#endif /* __CYGWIN__ */



#if defined(__QNXNTO__) && !defined(FD_SETSIZE)

#define FD_SETSIZE 1024         /* Max number of file descriptor bits in

                                   fd_set, used when calling 'select'

                                   Must be defined before including

                                   "sys/select.h" and "sys/time.h"

                                 */

#endif





/* to make command line shorter we'll define USE_PRAGMA_INTERFACE here */

#ifdef USE_PRAGMA_IMPLEMENTATION

#define USE_PRAGMA_INTERFACE

include/mysql.h

+6 −3
Original line number Diff line number Diff line
@@ -130,14 +130,14 @@ typedef MYSQL_ROWS *MYSQL_ROW_OFFSET; /* offset to current row */ 


#include "my_alloc.h"



typedef struct embedded_query_result EMBEDDED_QUERY_RESULT;

typedef struct st_mysql_data {

  my_ulonglong rows;

  unsigned int fields;

  MYSQL_ROWS *data;

  MEM_ROOT alloc;

#if !defined(CHECK_EMBEDDED_DIFFERENCES) || defined(EMBEDDED_LIBRARY)

  MYSQL_ROWS **prev_ptr;

#endif

  /* extra info for embedded library */

  struct embedded_query_result *embedded_info;

} MYSQL_DATA;



enum mysql_option
@@ -287,6 +287,8 @@ typedef struct st_mysql 
    from mysql_stmt_close if close had to cancel result set of this object.

  */

  my_bool *unbuffered_fetch_owner;

  /* needed for embedded server - no net buffer to store the 'info' */

  char *info_buffer;

} MYSQL;



typedef struct st_mysql_res {
@@ -755,6 +757,7 @@ typedef struct st_mysql_methods 
  const char *(*read_statistics)(MYSQL *mysql);

  my_bool (*next_result)(MYSQL *mysql);

  int (*read_change_user_result)(MYSQL *mysql, char *buff, const char *passwd);

  int (*read_rows_from_cursor)(MYSQL_STMT *stmt);

#endif

} MYSQL_METHODS;

libmysql/libmysql.c

+6 −6
Original line number Diff line number Diff line
@@ -2727,13 +2727,13 @@ stmt_read_row_from_cursor(MYSQL_STMT *stmt, unsigned char **row) 
    /* Send row request to the server */

    int4store(buff, stmt->stmt_id);

    int4store(buff + 4, stmt->prefetch_rows); /* number of rows to fetch */

    if (cli_advanced_command(mysql, COM_STMT_FETCH, buff, sizeof(buff),

                             NullS, 0, 1))

    if ((*mysql->methods->advanced_command)(mysql, COM_STMT_FETCH,

                                            buff, sizeof(buff), NullS, 0, 1))

    {

      set_stmt_errmsg(stmt, net->last_error, net->last_errno, net->sqlstate);

      return 1;

    }

    if (cli_read_binary_rows(stmt))

    if ((*mysql->methods->read_rows_from_cursor)(stmt))

      return 1;

    stmt->server_status= mysql->server_status;
@@ -5143,9 +5143,9 @@ my_bool STDCALL mysql_autocommit(MYSQL * mysql, my_bool auto_mode) 
  DBUG_ENTER("mysql_autocommit");

  DBUG_PRINT("enter", ("mode : %d", auto_mode));



  if (auto_mode) /* set to true */

    DBUG_RETURN((my_bool) mysql_real_query(mysql, "set autocommit=1", 16));

  DBUG_RETURN((my_bool) mysql_real_query(mysql, "set autocommit=0", 16));

  DBUG_RETURN((my_bool) mysql_real_query(mysql, auto_mode ?

                                         "set autocommit=1":"set autocommit=0",

                                         16));

}