Commit b8ad65ba authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:wl1744 into w2k.:C:/mysql-4.1 


sql/ha_ndbcluster.cc:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
parents 6049821c 81880bab

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ Administrador@light. 
Administrator@co3064164-a.

Administrator@co3064164-a.rochd1.qld.optushome.com.au

Administrator@fred.

Administrator@w2k.

Greg@greg-laptop.

Miguel@light.local

Sinisa@sinisa.nasamreza.org

include/mysql.h

+2 −0
Original line number Diff line number Diff line
@@ -490,6 +490,8 @@ MYSQL_RES * STDCALL mysql_list_fields(MYSQL *mysql, const char *table, 
					  const char *wild);

unsigned long	STDCALL mysql_escape_string(char *to,const char *from,

					    unsigned long from_length);

unsigned long	STDCALL mysql_hex_string(char *to,const char *from,

                                         unsigned long from_length);

unsigned long STDCALL mysql_real_escape_string(MYSQL *mysql,

					       char *to,const char *from,

					       unsigned long length);

mysql-test/init_db.sql

+43 −11

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/r/metadata.result

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ def 1 8 1 1 N 32769 0 8 
def					1.0	5	3	3	N	32769	1	8

def					-1	8	1	2	N	32769	0	8

def					hello	254	5	5	N	1	31	8

def					NULL	6	0	0	Y	32768	0	8

def					NULL	6	0	0	Y	32896	0	63

1	1.0	-1	hello	NULL

1	1.0	-1	hello	NULL

create table t1 (a tinyint, b smallint, c mediumint, d int, e bigint, f float(3,2), g double(4,3), h decimal(5,4), i year, j date, k timestamp, l datetime, m enum('a','b'), n set('a','b'), o char(10));

mysql-test/r/null.result

+94 −0

File changed.

Preview size limit exceeded, changes collapsed.