Commit a9a4202c authored by unknown's avatar unknown
Browse files

Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  hasky.mysql.fi:/home/anjuta/my/mysql-5.0-clean


sql/table.cc:
  Auto merged
parents 9b871930 59a33015

.bzrignore

+2 −0
Original line number Diff line number Diff line
@@ -1282,3 +1282,5 @@ extra/yassl/taocrypt/benchmark/benchmark 
extra/yassl/taocrypt/test/test

extra/yassl/testsuite/testsuite

client/mysql_upgrade

sql/share/iso639-2.txt

sql/share/fixerrmsg.pl

include/config-win.h

+1 −0
Original line number Diff line number Diff line
@@ -384,6 +384,7 @@ inline double ulonglong2double(ulonglong value) 


#define FN_LIBCHAR	'\\'

#define FN_ROOTDIR	"\\"

#define FN_DEVCHAR	':'

#define FN_NETWORK_DRIVES	/* Uses \\ to indicate network drives */

#define FN_NO_CASE_SENCE	/* Files are not case-sensitive */

#define OS_FILE_LIMIT	2048

include/my_global.h

+0 −1
Original line number Diff line number Diff line
@@ -599,7 +599,6 @@ typedef SOCKET_SIZE_TYPE size_socket; 
#define FN_HOMELIB	'~'	/* ~/ is used as abbrev for home dir */

#define FN_CURLIB	'.'	/* ./ is used as abbrev for current dir */

#define FN_PARENTDIR	".."	/* Parent directory; Must be a string */

#define FN_DEVCHAR	':'



#ifndef FN_LIBCHAR

#ifdef __EMX__

mysql-test/r/create.result

+14 −0
Original line number Diff line number Diff line
@@ -773,3 +773,17 @@ Warnings: 
Warning	1071	Specified key was too long; max key length is 765 bytes

insert into t1 values('aaa');

drop table t1;

drop table if exists `about:text`;

create table `about:text` ( 

_id int not null auto_increment,

`about:text` varchar(255) not null default '',

primary key (_id)

);

show create table `about:text`;

Table	Create Table

about:text	CREATE TABLE `about:text` (

  `_id` int(11) NOT NULL auto_increment,

  `about:text` varchar(255) NOT NULL default '',

  PRIMARY KEY  (`_id`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table `about:text`;

mysql-test/t/create.test

+15 −0
Original line number Diff line number Diff line
@@ -674,4 +674,19 @@ create table t1(f1 varchar(800) binary not null, key(f1)) engine = innodb 
insert into t1 values('aaa');

drop table t1;



#

# Bug#19479:mysqldump creates invalid dump

#

--disable_warnings

drop table if exists `about:text`;

--enable_warnings

create table `about:text` ( 

_id int not null auto_increment,

`about:text` varchar(255) not null default '',

primary key (_id)

);



show create table `about:text`; 

drop table `about:text`;



# End of 5.0 tests