Commit 2b5e539c authored by Davi Arnaut's avatar Davi Arnaut
Browse files

Merge of mysql-5.1-bugteam branch.

parents 7e63f138 46abb094

include/my_sys.h

+1 −0
Original line number Diff line number Diff line
@@ -577,6 +577,7 @@ extern int my_close(File Filedes,myf MyFlags); 
extern File my_dup(File file, myf MyFlags);

extern int my_mkdir(const char *dir, int Flags, myf MyFlags);

extern int my_readlink(char *to, const char *filename, myf MyFlags);

extern int my_is_symlink(const char *filename);

extern int my_realpath(char *to, const char *filename, myf MyFlags);

extern File my_create_with_symlink(const char *linkname, const char *filename,

				   int createflags, int access_flags,

include/myisam.h

+4 −0
Original line number Diff line number Diff line
@@ -256,6 +256,10 @@ extern my_bool myisam_flush,myisam_delay_key_write,myisam_single_user; 
extern my_off_t myisam_max_temp_length;

extern ulong myisam_bulk_insert_tree_size, myisam_data_pointer_size;



/* usually used to check if a symlink points into the mysql data home */

/* which is normally forbidden                                        */

extern int (*myisam_test_invalid_symlink)(const char *filename);



	/* Prototypes for myisam-functions */



extern int mi_close(struct st_myisam_info *file);

mysql-test/r/myisam.result

+22 −0
Original line number Diff line number Diff line
@@ -1831,6 +1831,28 @@ id ref 
3	2

4	5

DROP TABLE t1, t2;

CREATE TABLE t1 (a INT) ENGINE=MyISAM CHECKSUM=1 ROW_FORMAT=DYNAMIC;

INSERT INTO t1 VALUES (0);

UPDATE t1 SET a=1;

SELECT a FROM t1;

a

1

CHECK TABLE t1;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

INSERT INTO t1 VALUES (0), (5), (4), (2);

UPDATE t1 SET a=2;

SELECT a FROM t1;

a

2

2

2

2

2

CHECK TABLE t1;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

DROP TABLE t1;

End of 5.0 tests

create table t1 (a int not null, key `a` (a) key_block_size=1024);

show create table t1;

mysql-test/r/partition_symlink.result

+2 −2
Original line number Diff line number Diff line
@@ -113,9 +113,9 @@ set @@sql_mode=@org_mode; 
create table t1 (a int)

partition by key (a)

(partition p0 DATA DIRECTORY 'part-data' INDEX DIRECTORY 'part-data');

ERROR 42000: Incorrect table name 'part-data'

Got one of the listed errors

create table t1 (a int)

partition by key (a)

(partition p0,

partition p1 DATA DIRECTORY 'part-data' INDEX DIRECTORY 'part-data');

ERROR 42000: Incorrect table name 'part-data'
 
Got one of the listed errors

mysql-test/r/symlink.result

+0 −4
Original line number Diff line number Diff line
@@ -55,13 +55,9 @@ t9 CREATE TABLE `t9` ( 
  `d` int(11) NOT NULL,

  PRIMARY KEY (`a`)

) ENGINE=MyISAM AUTO_INCREMENT=16725 DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQLTEST_VARDIR/tmp/' INDEX DIRECTORY='MYSQLTEST_VARDIR/run/'

create table t1 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam data directory="tmp";

Got one of the listed errors

create database mysqltest;

create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam index directory="/this-dir-does-not-exist";

Got one of the listed errors

create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam index directory="not-hard-path";

Got one of the listed errors

create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam index directory="MYSQLTEST_VARDIR/run";

Got one of the listed errors

create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam data directory="MYSQLTEST_VARDIR/tmp";