Commit e4293968 authored by unknown's avatar unknown
Browse files

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

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
parents b6ed85ba 81880bab

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.

mysql-test/r/ps_2myisam.result

+2 −2
Original line number Diff line number Diff line
@@ -1790,7 +1790,7 @@ t5 CREATE TABLE `t5` ( 
  `param10` bigint(20) default NULL,

  `const11` int(4) default NULL,

  `param11` bigint(20) default NULL,

  `const12` char(0) default NULL,

  `const12` binary(0) default NULL,

  `param12` bigint(20) default NULL,

  `param13` double default NULL,

  `param14` longtext,
@@ -1820,7 +1820,7 @@ def test t5 t5 const10 const10 3 10 9 N 32769 0 63 
def	test	t5	t5	param10	param10	8	20	9	Y	32768	0	63

def	test	t5	t5	const11	const11	3	4	4	Y	32768	0	63

def	test	t5	t5	param11	param11	8	20	4	Y	32768	0	63

def	test	t5	t5	const12	const12	254	0	0	Y	0	0	8

def	test	t5	t5	const12	const12	254	0	0	Y	128	0	63

def	test	t5	t5	param12	param12	8	20	0	Y	32768	0	63

def	test	t5	t5	param13	param13	5	20	0	Y	32768	31	63

def	test	t5	t5	param14	param14	252	16777215	0	Y	16	0	8