Commit ff297775 authored by unknown's avatar unknown
Browse files

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

into  poseidon.ndb.mysql.com:/home/tomas/mysql51
parents 26754013 7088b39d

include/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ pkginclude_HEADERS = my_dbug.h m_string.h my_sys.h my_list.h my_xml.h \ 
			sslopt-vars.h sslopt-case.h sql_common.h keycache.h \

			mysql_time.h plugin.h $(BUILT_SOURCES)

noinst_HEADERS =	config-win.h config-os2.h config-netware.h \

			heap.h my_bitmap.h\

			heap.h my_bitmap.h my_uctype.h \

			myisam.h myisampack.h myisammrg.h ft_global.h\

			mysys_err.h my_base.h help_start.h help_end.h \

			my_nosys.h my_alarm.h queues.h rijndael.h sha1.h \

include/m_ctype.h

+16 −0
Original line number Diff line number Diff line
@@ -47,6 +47,15 @@ typedef struct unicase_info_st 
extern MY_UNICASE_INFO *my_unicase_default[256];

extern MY_UNICASE_INFO *my_unicase_turkish[256];



typedef struct uni_ctype_st

{

  unsigned char  pctype;

  unsigned char  *ctype;

} MY_UNI_CTYPE;



extern MY_UNI_CTYPE my_uni_ctype[256];





#define MY_CS_ILSEQ	0

#define MY_CS_ILUNI	0

#define MY_CS_TOOSMALL	-1
@@ -165,6 +174,10 @@ typedef struct my_charset_handler_st 
  int (*wc_mb)(struct charset_info_st *cs,my_wc_t wc,

	       unsigned char *s,unsigned char *e);

  

  /* CTYPE scanner */

  int (*ctype)(struct charset_info_st *cs, int *ctype,

               const unsigned char *s, const unsigned char *e);

  

  /* Functions for case and sort convertion */

  void    (*caseup_str)(struct charset_info_st *, char *);

  void    (*casedn_str)(struct charset_info_st *, char *);
@@ -308,6 +321,9 @@ extern int my_strcasecmp_8bit(CHARSET_INFO * cs, const char *, const char *); 
int my_mb_wc_8bit(CHARSET_INFO *cs,my_wc_t *wc, const uchar *s,const uchar *e);

int my_wc_mb_8bit(CHARSET_INFO *cs,my_wc_t wc, uchar *s, uchar *e);



int my_mb_ctype_8bit(CHARSET_INFO *,int *, const uchar *,const uchar *);

int my_mb_ctype_mb(CHARSET_INFO *,int *, const uchar *,const uchar *);



ulong my_scan_8bit(CHARSET_INFO *cs, const char *b, const char *e, int sq);



int my_snprintf_8bit(struct charset_info_st *, char *to, uint n,

include/my_uctype.h

0 → 100644
+1464 −0

File added.

Preview size limit exceeded, changes collapsed.

mysql-test/lib/init_db.sql

+9 −6
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ CREATE TABLE db ( 
  Alter_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,

  Execute_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,

  Event_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,

  Trigger_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,

  PRIMARY KEY Host (Host,Db,User),

  KEY User (User)

) engine=MyISAM
@@ -30,8 +31,8 @@ CHARACTER SET utf8 COLLATE utf8_bin 
comment='Database privileges';



  

INSERT INTO db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y');

INSERT INTO db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y');

INSERT INTO db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');

INSERT INTO db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');





CREATE TABLE host (
@@ -54,6 +55,7 @@ CREATE TABLE host ( 
  Create_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,

  Alter_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,

  Execute_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,

  Trigger_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,

  PRIMARY KEY Host (Host,Db)

) engine=MyISAM

CHARACTER SET utf8 COLLATE utf8_bin
@@ -91,6 +93,7 @@ CREATE TABLE user ( 
  Alter_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,

  Create_user_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,

  Event_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,

  Trigger_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,

  ssl_type enum('','ANY','X509', 'SPECIFIED') COLLATE utf8_general_ci DEFAULT '' NOT NULL,

  ssl_cipher BLOB NOT NULL,

  x509_issuer BLOB NOT NULL,
@@ -105,9 +108,9 @@ CHARACTER SET utf8 COLLATE utf8_bin 
comment='Users and global privileges';





INSERT INTO user VALUES ('localhost'   ,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);

INSERT INTO user VALUES ('@HOSTNAME@%' ,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);

REPLACE INTO user VALUES ('127.0.0.1'  ,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);

INSERT INTO user VALUES ('localhost'   ,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);

INSERT INTO user VALUES ('@HOSTNAME@%' ,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);

REPLACE INTO user VALUES ('127.0.0.1'  ,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);

INSERT  INTO user (host,user) VALUES ('localhost','');

INSERT  INTO user (host,user) VALUES ('@HOSTNAME@%','');
@@ -139,7 +142,7 @@ CREATE TABLE tables_priv ( 
  Table_name char(64) binary DEFAULT '' NOT NULL,

  Grantor char(77) DEFAULT '' NOT NULL,

  Timestamp timestamp(14),

  Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view') COLLATE utf8_general_ci DEFAULT '' NOT NULL,

  Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger') COLLATE utf8_general_ci DEFAULT '' NOT NULL,

  Column_priv set('Select','Insert','Update','References') COLLATE utf8_general_ci DEFAULT '' NOT NULL,

  PRIMARY KEY (Host,Db,User,Table_name),KEY Grantor (Grantor)

) engine=MyISAM

mysql-test/r/innodb_unsafe_binlog.result

0 → 100644
+48 −0
Original line number Diff line number Diff line 
drop table if exists t1,t2;

create table t1 (id int not null, f_id int not null, f int not null,

primary key(f_id, id)) engine=innodb;

create table t2 (id int not null,s_id int not null,s varchar(200),

primary key(id)) engine=innodb;

INSERT INTO t1 VALUES (8, 1, 3);

INSERT INTO t1 VALUES (1, 2, 1);

INSERT INTO t2 VALUES (1, 0, '');

INSERT INTO t2 VALUES (8, 1, '');

commit;

DELETE ml.* FROM t1 AS ml LEFT JOIN t2 AS mm ON (mm.id=ml.id)

WHERE mm.id IS NULL;

select ml.* from t1 as ml left join t2 as mm on (mm.id=ml.id)

where mm.id is null lock in share mode;

id	f_id	f

drop table t1,t2;

create table t1 (id int not null, f_id int not null, f int not null,

primary key(id),key(f_id)) engine=innodb;

create table t2 (id int not null,s_id int not null,s varchar(200),

primary key(id),key(s_id)) engine=innodb;

INSERT INTO t1 VALUES (8, 1, 3);

INSERT INTO t1 VALUES (1, 2, 1);

INSERT INTO t2 VALUES (1, 0, '');

INSERT INTO t2 VALUES (8, 1, '');

commit;

delete ml.* from t1 as ml left join t2 as mm on (mm.s_id=ml.f_id) where mm.s is null;

select ml.* from t1 as ml left join t2 as mm on (mm.s_id=ml.f_id) where mm.s is null lock in share mode;

id	f_id	f

drop table t1,t2;

create table t1(a int not null, b int, primary key(a)) engine=innodb;

insert into t1 values(1,1),(2,2),(3,1),(4,2),(5,1),(6,2);

commit;

set autocommit = 0;

select * from t1 lock in share mode;

a	b

1	1

2	2

3	1

4	2

5	1

6	2

update t1 set b = 5 where b = 1;

set autocommit = 0;

select * from t1 where a = 2 and b = 2 for update;

ERROR HY000: Lock wait timeout exceeded; try restarting transaction

commit;

commit;

drop table t1;