Commit d9732be2 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/usr/home/bar/mysql-5.0
parents b2c77079 48c3c329

mysql-test/r/information_schema.result

+11 −0
Original line number Diff line number Diff line
@@ -979,3 +979,14 @@ WHERE TABLE_SCHEMA='test' AND TABLE_TYPE='BASE TABLE'); 
Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	MyISAM	10	Fixed	0	0	0	#	1024	0	NULL	#	#	NULL	latin1_swedish_ci	NULL		

t2	MyISAM	10	Fixed	0	0	0	#	1024	0	NULL	#	#	NULL	latin1_swedish_ci	NULL		

DROP TABLE t1,t2;

create table t1(f1 int);

create view v1 (c) as select f1 from t1;

select database();

database()

NULL

show fields from test.v1;

Field	Type	Null	Key	Default	Extra

c	int(11)	YES		NULL	

drop view v1;

drop table t1;

mysql-test/r/variables.result

+7 −0
Original line number Diff line number Diff line
@@ -545,3 +545,10 @@ select @@max_heap_table_size > 0; 
select @@have_innodb;

@@have_innodb

#

select @@character_set_system;

@@character_set_system

utf8

set global character_set_system = latin1;

ERROR HY000: Variable 'character_set_system' is a read only variable

set @@global.version_compile_os='234';

ERROR HY000: Variable 'version_compile_os' is a read only variable

mysql-test/t/information_schema.test

+13 −1
Original line number Diff line number Diff line
@@ -665,4 +665,16 @@ SHOW TABLE STATUS FROM test 
  WHERE name IN ( SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES

                    WHERE TABLE_SCHEMA='test' AND TABLE_TYPE='BASE TABLE');



DROP TABLE t1,t2
 
DROP TABLE t1,t2;



#

# Bug #12905 show fields from view behaving erratically with current database

#

create table t1(f1 int);

create view v1 (c) as select f1 from t1;

connect (con5,localhost,root,,*NO-ONE*);

select database();

show fields from test.v1;

connection default;

drop view v1;

drop table t1;

mysql-test/t/variables.test

+9 −0
Original line number Diff line number Diff line
@@ -435,3 +435,12 @@ select @@max_heap_table_size > 0; 


--replace_column 1 #

select @@have_innodb;



#

# Bug #11775 Variable character_set_system does not exist (sometimes)

#

select @@character_set_system;

--error 1238

set global character_set_system = latin1;

--error 1238

set @@global.version_compile_os='234';

sql/set_var.cc

+3 −26
Original line number Diff line number Diff line
@@ -142,10 +142,7 @@ sys_var_long_ptr sys_binlog_cache_size("binlog_cache_size", 
sys_var_thd_ulong	sys_bulk_insert_buff_size("bulk_insert_buffer_size",

						  &SV::bulk_insert_buff_size);

sys_var_character_set_server	sys_character_set_server("character_set_server");

sys_var_str			sys_charset_system("character_set_system",

				    sys_check_charset,

				    sys_update_charset,

				    sys_set_default_charset,

sys_var_const_str       sys_charset_system("character_set_system",

                                           (char *)my_charset_utf8_general_ci.name);

sys_var_character_set_database	sys_character_set_database("character_set_database");

sys_var_character_set_client  sys_character_set_client("character_set_client");
@@ -569,6 +566,7 @@ sys_var *sys_variables[]= 
  &sys_character_set_client,

  &sys_character_set_connection,

  &sys_character_set_results,

  &sys_charset_system,

  &sys_collation_connection,

  &sys_collation_database,

  &sys_collation_server,
@@ -1117,27 +1115,6 @@ static void sys_default_ftb_syntax(THD *thd, enum_var_type type) 
	  sizeof(ft_boolean_syntax)-1);

}



/*

  The following 3 functions need to be changed in 4.1 when we allow

  one to change character sets

*/



static int sys_check_charset(THD *thd, set_var *var)

{

  return 0;

}





static bool sys_update_charset(THD *thd, set_var *var)

{

  return 0;

}





static void sys_set_default_charset(THD *thd, enum_var_type type)

{

}





/*

  If one sets the LOW_PRIORIY UPDATES flag, we also must change the