Commit 0f9ec6d6 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 

into  mysql.com:/home/my/mysql-5.1


mysql-test/extra/rpl_tests/rpl_log.test:
  Auto merged
mysql-test/r/rpl_ndb_log.result:
  Auto merged
mysql-test/r/rpl_row_log.result:
  Auto merged
mysql-test/r/rpl_row_log_innodb.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/mysql_priv.h:
  SCCS merged
parents 99392032 962ae921

include/my_sys.h

+5 −4
Original line number Diff line number Diff line
@@ -547,7 +547,6 @@ extern File my_open(const char *FileName,int Flags,myf MyFlags); 
extern File my_register_filename(File fd, const char *FileName,

				 enum file_type type_of_file,

				 uint error_message_number, myf MyFlags);

extern void my_print_open_files(void);

extern File my_create(const char *FileName,int CreateFlags,

		      int AccessFlags, myf MyFlags);

extern int my_close(File Filedes,myf MyFlags);
@@ -638,7 +637,7 @@ extern void allow_break(void); 
#endif



#ifdef EXTRA_DEBUG

void my_print_open_files();

void my_print_open_files(void);

#else

#define my_print_open_files()

#endif
@@ -672,13 +671,15 @@ extern my_string my_path(my_string to,const char *progname, 
			 const char *own_pathname_part);

extern my_string my_load_path(my_string to, const char *path,

			      const char *own_path_prefix);

extern int wild_compare(const char *str,const char *wildstr,pbool str_is_pattern);

extern int wild_compare(const char *str,const char *wildstr,

                        pbool str_is_pattern);

extern WF_PACK *wf_comp(my_string str);

extern int wf_test(struct wild_file_pack *wf_pack,const char *name);

extern void wf_end(struct wild_file_pack *buffer);

extern size_s strip_sp(my_string str);

extern void get_date(my_string to,int timeflag,time_t use_time);

extern void soundex(CHARSET_INFO *, my_string out_pntr, my_string in_pntr,pbool remove_garbage);

extern void soundex(CHARSET_INFO *, my_string out_pntr, my_string in_pntr,

                    pbool remove_garbage);

extern int init_record_cache(RECORD_CACHE *info,uint cachesize,File file,

			     uint reclength,enum cache_type type,

			     pbool use_async_io);

mysql-test/r/grant_cache.result

+8 −8
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ Variable_name Value 
Qcache_hits	0

show status like "Qcache_not_cached";

Variable_name	Value

Qcache_not_cached	5

Qcache_not_cached	0

select "user1";

user1

user1
@@ -72,7 +72,7 @@ Variable_name Value 
Qcache_hits	0

show status like "Qcache_not_cached";

Variable_name	Value

Qcache_not_cached	9

Qcache_not_cached	1

select * from t1;

a	b	c

1	1	1
@@ -85,7 +85,7 @@ Variable_name Value 
Qcache_hits	1

show status like "Qcache_not_cached";

Variable_name	Value

Qcache_not_cached	12

Qcache_not_cached	1

select a from t1 ;

a

1
@@ -98,7 +98,7 @@ Variable_name Value 
Qcache_hits	2

show status like "Qcache_not_cached";

Variable_name	Value

Qcache_not_cached	15

Qcache_not_cached	1

select c from t1;

c

1
@@ -111,7 +111,7 @@ Variable_name Value 
Qcache_hits	3

show status like "Qcache_not_cached";

Variable_name	Value

Qcache_not_cached	18

Qcache_not_cached	1

show grants for current_user();

Grants for @localhost

GRANT USAGE ON *.* TO ''@'localhost'
@@ -144,7 +144,7 @@ Variable_name Value 
Qcache_hits	7

show status like "Qcache_not_cached";

Variable_name	Value

Qcache_not_cached	22

Qcache_not_cached	2

select "user3";

user3

user3
@@ -168,7 +168,7 @@ Variable_name Value 
Qcache_hits	7

show status like "Qcache_not_cached";

Variable_name	Value

Qcache_not_cached	30

Qcache_not_cached	7

select "user4";

user4

user4
@@ -198,7 +198,7 @@ Variable_name Value 
Qcache_hits	8

show status like "Qcache_not_cached";

Variable_name	Value

Qcache_not_cached	34

Qcache_not_cached	8

set names binary;

delete from mysql.user where user in ("mysqltest_1","mysqltest_2","mysqltest_3");

delete from mysql.db where user in ("mysqltest_1","mysqltest_2","mysqltest_3");

mysql-test/r/information_schema.result

+2 −0
Original line number Diff line number Diff line
@@ -199,6 +199,8 @@ select table_name, column_name, privileges from information_schema.columns 
where table_schema = 'mysqltest' and table_name = 'v1';

table_name	column_name	privileges

v1	c	select

explain select * from v1;

ERROR HY000: EXPLAIN/SHOW can not be issued; lacking privileges for underlying table

drop view v1, mysqltest.v1;

drop tables mysqltest.t4, mysqltest.t1, t2, t3, t5;

drop database mysqltest;

mysql-test/r/query_cache.result

+1 −0
Original line number Diff line number Diff line
@@ -1050,6 +1050,7 @@ Qcache_hits 1 
drop table t1;

create table t1 (a int);

insert into t1 values (1),(2);

drop procedure if exists p1;

CREATE PROCEDURE `p1`()

begin

Declare c1 cursor for select a from t1;

mysql-test/r/status.result

+50 −0
Original line number Diff line number Diff line
@@ -23,6 +23,32 @@ select 1; 
show status like 'last_query_cost';

Variable_name	Value

Last_query_cost	0.000000

create table t1 (a int);

insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);

insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);

insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);

insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);

insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);

select * from t1 where a=6;

a

6

6

6

6

6

show status like 'last_query_cost';

Variable_name	Value

Last_query_cost	12.084449

show status like 'last_query_cost';

Variable_name	Value

Last_query_cost	12.084449

select 1;

1

1

show status like 'last_query_cost';

Variable_name	Value

Last_query_cost	0.000000

drop table t1;

FLUSH STATUS;

SHOW STATUS LIKE 'max_used_connections';

Variable_name	Value
@@ -43,3 +69,27 @@ SHOW STATUS LIKE 'max_used_connections'; 
Variable_name	Value

Max_used_connections	5

SET GLOBAL thread_cache_size=@save_thread_cache_size;

show status like 'com_show_status';

Variable_name	Value

Com_show_status	3

show status like 'hand%write%';

Variable_name	Value

Handler_write	0

show status like '%tmp%';

Variable_name	Value

Created_tmp_disk_tables	0

Created_tmp_files	0

Created_tmp_tables	0

show status like 'hand%write%';

Variable_name	Value

Handler_write	0

show status like '%tmp%';

Variable_name	Value

Created_tmp_disk_tables	0

Created_tmp_files	0

Created_tmp_tables	0

show status like 'com_show_status';

Variable_name	Value

Com_show_status	8

rnd_diff	tmp_table_diff

20	8