Commit 89519b67 authored by unknown's avatar unknown
Browse files

Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 

into rurik.mysql.com:/home/igor/mysql-4.1


sql/sql_select.cc:
  Auto merged
parents b4e0ce56 7adfe96d

client/mysqltest.c

+2 −2
Original line number Diff line number Diff line
@@ -3141,10 +3141,10 @@ static void run_query_display_metadata(MYSQL_FIELD *field, uint num_fields, 
    int10_to_str((int) field->type, buff, 10);

    dynstr_append(ds, buff);

    dynstr_append_mem(ds, "\t", 1);

    int10_to_str((int) field->length, buff, 10);

    longlong10_to_str((unsigned int) field->length, buff, 10);

    dynstr_append(ds, buff);

    dynstr_append_mem(ds, "\t", 1);

    int10_to_str((int) field->max_length, buff, 10);

    longlong10_to_str((unsigned int) field->max_length, buff, 10);

    dynstr_append(ds, buff);

    dynstr_append_mem(ds, "\t", 1);

    dynstr_append_mem(ds, (char*) (IS_NOT_NULL(field->flags) ?

cmd-line-utils/libedit/chared.c

+2 −2
Original line number Diff line number Diff line
@@ -51,13 +51,13 @@ cv_undo(EditLine *el) 
{

	c_undo_t *vu = &el->el_chared.c_undo;

	c_redo_t *r = &el->el_chared.c_redo;

	uint size;

	int size;



	/* Save entire line for undo */

	size = el->el_line.lastchar - el->el_line.buffer;

	vu->len = size;

	vu->cursor = el->el_line.cursor - el->el_line.buffer;

	memcpy(vu->buf, el->el_line.buffer, size);

	memcpy(vu->buf, el->el_line.buffer, (size_t)size);



	/* save command info for redo */

	r->count = el->el_state.doingarg ? el->el_state.argument : 0;

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 4.1.13)

AM_INIT_AUTOMAKE(mysql, 4.1.14)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -16,7 +16,7 @@ SHARED_LIB_VERSION=14:0:0 
# ndb version

NDB_VERSION_MAJOR=4

NDB_VERSION_MINOR=1

NDB_VERSION_BUILD=13

NDB_VERSION_BUILD=14

NDB_VERSION_STATUS=""



# Set all version vars based on $VERSION. How do we do this more elegant ?

include/my_global.h

+1 −1
Original line number Diff line number Diff line
@@ -797,7 +797,7 @@ typedef off_t os_off_t; 
#define socket_errno	WSAGetLastError()

#define SOCKET_EINTR	WSAEINTR

#define SOCKET_EAGAIN	WSAEINPROGRESS

#define SOCKET_EWOULDBLOCK WSAEINPROGRESS

#define SOCKET_EWOULDBLOCK WSAEWOULDBLOCK

#define SOCKET_ENFILE	ENFILE

#define SOCKET_EMFILE	EMFILE

#elif defined(OS2)

libmysql/libmysql.c

+12 −0
Original line number Diff line number Diff line
@@ -1834,6 +1834,17 @@ static void net_clear_error(NET *net) 
  }

}





static void stmt_clear_error(MYSQL_STMT *stmt)

{

  if (stmt->last_errno)

  {

    stmt->last_errno= 0;

    stmt->last_error[0]= '\0';

    strmov(stmt->sqlstate, not_error_sqlstate);

  }

}



/*

  Set statement error code, sqlstate, and error message

  from given errcode and sqlstate.
@@ -4625,6 +4636,7 @@ my_bool STDCALL mysql_stmt_reset(MYSQL_STMT *stmt) 
       param < param_end;

       param++)

    param->long_data_used= 0;

  stmt_clear_error(stmt);



  DBUG_RETURN(0);

}