Commit 9f7d0303 authored by monty@bitch.mysql.fi's avatar monty@bitch.mysql.fi
Browse files

Merge hundin:/my/mysql-4.0 into bitch.mysql.fi:/my/mysql-4.0

parents 5fe7461d d5fe1db8

Docs/manual.texi

+7 −1
Original line number Diff line number Diff line
@@ -8903,7 +8903,13 @@ version 4.0; 
@item

The old C API functions @code{mysql_drop_db}, @code{mysql_create_db} and

@code{mysql_connect} are not supported anymore, unless one compiles

MySQL with @code{USE_OLD_FUNCTIONS}.

MySQL with @code{USE_OLD_FUNCTIONS}.   Instead of doing this, one should

change the client to use the new 4.0 API.

@item

In the @code{MYSQL_FIELD} structure, @code{length} and @code{max_length} has

changed from @code{unsigned int} to @code{unsigned long}. This should not

cause any other problems than some warnings if you use these to

@code{printf()} type function.

@item

You should use @code{TRUNCATE TABLE} when you want to delete all rows

from a table and you don't care of how many rows where deleted.

client/mysqladmin.c

+3 −3
Original line number Diff line number Diff line
@@ -928,7 +928,7 @@ static void print_header(MYSQL_RES *result) 
  putchar('|');

  while ((field = mysql_fetch_field(result)))

  {

    printf(" %-*s|",field->max_length+1,field->name);

    printf(" %-*s|",(int) field->max_length+1,field->name);

  }

  putchar('\n');

  print_top(result);
@@ -983,11 +983,11 @@ static void print_relative_row(MYSQL_RES *result, MYSQL_ROW cur, uint row) 


  mysql_field_seek(result, 0);

  field = mysql_fetch_field(result);

  printf("| %-*s|", field->max_length + 1, cur[0]);

  printf("| %-*s|", (int) field->max_length + 1, cur[0]);



  field = mysql_fetch_field(result);

  tmp = cur[1] ? strtoull(cur[1], NULL, 0) : (ulonglong) 0;

  printf(" %-*s|\n", field->max_length + 1,

  printf(" %-*s|\n", (int) field->max_length + 1,

	 llstr((tmp - last_values[row]), buff));

  last_values[row] = tmp;

}

client/mysqlshow.c

+1 −1
Original line number Diff line number Diff line
@@ -713,7 +713,7 @@ static void print_res_header(MYSQL_RES *result) 
  putchar('|');

  while ((field = mysql_fetch_field(result)))

  {

    printf(" %-*s|",field->max_length+1,field->name);

    printf(" %-*s|",(int) field->max_length+1,field->name);

  }

  putchar('\n');

  print_res_top(result);

extra/resolveip.c

+2 −7
Original line number Diff line number Diff line
@@ -20,16 +20,11 @@ 
#define RESOLVE_VERSION "2.0"

 

#include <my_global.h>

#include <sys/types.h>

#include <sys/socket.h>

#ifndef HAVE_BROKEN_NETINET_INCLUDES

#include <netinet/in.h>

#endif

#include <arpa/inet.h>

#include <netdb.h>

#include <m_ctype.h>

#include <my_net.h>

#include <my_sys.h>

#include <m_string.h>

#include <netdb.h>

#include <getopt.h>



#if !defined(_AIX) && !defined(HAVE_UNIXWARE7_THREADS) && !defined(HAVE_UNIXWARE7_POSIX) && !defined(h_errno)

include/my_global.h

+1 −0
Original line number Diff line number Diff line
@@ -653,6 +653,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_ENFILE	ENFILE

#define SOCKET_EMFILE	EMFILE

#elif defined(OS2)