Commit b7a2d666 authored by unknown's avatar unknown
Browse files

Merge mskold@build.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
parents bc58332d e9a3612a

include/m_ctype.h

+7 −1
Original line number Diff line number Diff line
@@ -184,7 +184,8 @@ typedef struct my_charset_handler_st 
			 int base, char **e, int *err);

  double      (*strntod)(struct charset_info_st *, char *s, uint l, char **e,

			 int *err);

  

  longlong (*my_strtoll10)(struct charset_info_st *cs,

                           const char *nptr, char **endptr, int *error);

  ulong        (*scan)(struct charset_info_st *, const char *b, const char *e,

		       int sq);

} MY_CHARSET_HANDLER;
@@ -303,6 +304,11 @@ int my_long10_to_str_8bit(CHARSET_INFO *, char *to, uint l, int radix, 
int my_longlong10_to_str_8bit(CHARSET_INFO *, char *to, uint l, int radix,

			      longlong val);



longlong my_strtoll10_8bit(CHARSET_INFO *cs,

                           const char *nptr, char **endptr, int *error);

longlong my_strtoll10_ucs2(CHARSET_INFO *cs, 

                           const char *nptr, char **endptr, int *error);



void my_fill_8bit(CHARSET_INFO *cs, char* to, uint l, int fill);



my_bool  my_like_range_simple(CHARSET_INFO *cs,

libmysql/Makefile.shared

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ mystringsobjects = strmov.lo strxmov.lo strxnmov.lo strnmov.lo \ 
			ctype-win1250ch.lo ctype-utf8.lo ctype-extra.lo \

			ctype-ucs2.lo ctype-gb2312.lo ctype-gbk.lo \

			ctype-sjis.lo ctype-tis620.lo ctype-ujis.lo \

			ctype-uca.lo xml.lo

			ctype-uca.lo xml.lo my_strtoll10.lo



mystringsextra= 	strto.c

dbugobjects =		dbug.lo # IT IS IN SAFEMALLOC.C sanity.lo

libmysqld/libmysqld.c

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, 


  if (mysql->options.methods_to_use == MYSQL_OPT_USE_REMOTE_CONNECTION ||

      (mysql->options.methods_to_use == MYSQL_OPT_GUESS_CONNECTION &&

       host && strcmp(host,LOCAL_HOST)))

       host && *host && strcmp(host,LOCAL_HOST)))

    DBUG_RETURN(cli_mysql_real_connect(mysql, host, user, 

				       passwd, db, port, 

				       unix_socket, client_flag));

mysql-test/include/ps_conv.inc

0 → 100644
+1202 −0

File added.

Preview size limit exceeded, changes collapsed.

mysql-test/include/ps_create.inc

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#---- Please do not alter the following table definitions -------#



--disable_warnings

drop table if exists t1, t_many_col_types ;

drop table if exists t1, t9 ;

--enable_warnings



eval create table t1
@@ -28,7 +28,7 @@ eval create table t1 
  primary key(a)

) engine = $type ;



eval create table t_many_col_types 

eval create table t9 

(

  c1  tinyint, c2  smallint, c3  mediumint, c4  int,

  c5  integer, c6  bigint, c7  float, c8  double,