Commit 2da1cbd9 authored by unknown's avatar unknown
Browse files

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

into mishka.local:/home/my/mysql-4.1


client/mysqlimport.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
parents ca1a24e0 4736d0fe

client/mysqltest.c

+7 −15
Original line number Diff line number Diff line
@@ -58,13 +58,6 @@ 
#include <stdarg.h>

#include <sys/stat.h>

#include <violite.h>

#ifdef HAVE_SYS_PARAM_H

#include <sys/param.h>

#endif



#ifndef MAXPATHLEN

#define MAXPATHLEN 256

#endif



#define MAX_QUERY     131072

#define MAX_VAR_NAME	256
@@ -2105,10 +2098,9 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
      embedded_server_arg_count=1;

      embedded_server_args[0]= (char*) "";

    }

    embedded_server_args[embedded_server_arg_count++]=

      my_strdup(argument, MYF(MY_FAE));

    if (embedded_server_arg_count == MAX_SERVER_ARGS ||

	!embedded_server_args[embedded_server_arg_count-1])

    if (embedded_server_arg_count == MAX_SERVER_ARGS-1 ||

        !(embedded_server_args[embedded_server_arg_count++]=

          my_strdup(argument, MYF(MY_FAE))))

    {

      die("Can't use server argument");

    }
@@ -2166,7 +2158,7 @@ char* safe_str_append(char* buf, const char* str, int size) 
void str_to_file(const char* fname, char* str, int size)

{

  int fd;

  char buff[MAXPATHLEN];

  char buff[FN_REFLEN];

  if (!test_if_hard_path(fname))

  {

    strxmov(buff, opt_basedir, fname, NullS);
@@ -2979,10 +2971,10 @@ static void timer_output(void) 
{

  if (timer_file)

  {

    char buf[1024];

    char buf[32], *end;

    ulonglong timer= timer_now() - timer_start;

    sprintf(buf,"%llu",timer);

    str_to_file(timer_file,buf,strlen(buf));

    end= longlong2str(timer, buf, 10);

    str_to_file(timer_file,buf, (int) (end-buf));

  }

}

include/my_sys.h

+1 −1
Original line number Diff line number Diff line
@@ -726,7 +726,7 @@ extern void my_free_lock(byte *ptr,myf flags); 
#endif

#define alloc_root_inited(A) ((A)->min_malloc != 0)

#define ALLOC_ROOT_MIN_BLOCK_SIZE (MALLOC_OVERHEAD + sizeof(USED_MEM) + 8)

#define clear_alloc_root(A) do { (A)->free= (A)->used= (A)->pre_alloc= 0; } while(0)

#define clear_alloc_root(A) do { (A)->free= (A)->used= (A)->pre_alloc= 0; (A)->min_malloc=0;} while(0)

extern void init_alloc_root(MEM_ROOT *mem_root, uint block_size,

			    uint pre_alloc_size);

extern gptr alloc_root(MEM_ROOT *mem_root,unsigned int Size);

include/mysql.h

+1 −0
Original line number Diff line number Diff line
@@ -506,6 +506,7 @@ char * STDCALL mysql_odbc_escape_string(MYSQL *mysql, 
						  unsigned long *length));

void 		STDCALL myodbc_remove_escape(MYSQL *mysql,char *name);

unsigned int	STDCALL mysql_thread_safe(void);

my_bool		STDCALL mysql_embedded(void);

MYSQL_MANAGER*  STDCALL mysql_manager_init(MYSQL_MANAGER* con);  

MYSQL_MANAGER*  STDCALL mysql_manager_connect(MYSQL_MANAGER* con,

					      const char* host,

innobase/srv/srv0start.c

+13 −0
Original line number Diff line number Diff line
@@ -95,6 +95,19 @@ static char* srv_monitor_file_name; 
#define SRV_N_PENDING_IOS_PER_THREAD 	OS_AIO_N_PENDING_IOS_PER_THREAD

#define SRV_MAX_N_PENDING_SYNC_IOS	100





/* Avoid warnings when using purify */



#ifdef HAVE_purify

static int inno_bcmp(register const char *s1, register const char *s2,

                     register uint len)

{

  while (len-- != 0 && *s1++ == *s2++) ;

  return len+1;

}

#define memcmp(A,B,C) inno_bcmp((A),(B),(C))

#endif



/*************************************************************************

Reads the data files and their sizes from a character string given in

the .cnf file. */

libmysql/libmysql.c

+10 −0
Original line number Diff line number Diff line
@@ -1516,6 +1516,16 @@ uint STDCALL mysql_thread_safe(void) 
#endif

}





my_bool STDCALL mysql_embedded(void)

{

#ifdef EMBEDDED_LIBRARY

  return 1;

#else

  return 0;

#endif

}



/****************************************************************************

  Some support functions

****************************************************************************/