Commit abaeea49 authored by unknown's avatar unknown
Browse files

merge 


mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/t/key_cache.test:
  Auto merged
sql/field.cc:
  Auto merged
parents 6c68f27c c3a066e4

mysql-test/r/ps_1general.result

+2 −2
Original line number Diff line number Diff line
@@ -273,11 +273,11 @@ t2 1 t2_idx 1 b A NULL NULL NULL YES BTREE 
prepare stmt4 from ' show table status from test like ''t2%'' ';

execute stmt4;

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

t2	MyISAM	9	Fixed	0	0	0	64424509439	1024	0	NULL	#	#	#	latin1_swedish_ci	NULL		

t2	MyISAM	9	Fixed	0	0	#	#	#	0	NULL	#	#	#	latin1_swedish_ci	NULL		

prepare stmt4 from ' show table status from test like ''t9%'' ';

execute stmt4;

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

t9	MyISAM	9	Dynamic	2	220	440	4294967295	2048	0	NULL	#	#	#	latin1_swedish_ci	NULL		

t9	MyISAM	9	Dynamic	2	220	#	#	#	0	NULL	#	#	#	latin1_swedish_ci	NULL		

prepare stmt4 from ' show status like ''Threads_running'' ';

execute stmt4;

Variable_name	Value

mysql-test/t/key_cache.test

+3 −3
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ show status like 'key_blocks_used'; 
# Following results differs on 64 and 32 bit systems because of different

# pointer sizes, which takes up different amount of space in key cache



--replace_result 1812 KEY_BLOCKS_UNUSED 1793 KEY_BLOCKS_UNUSED 1674 KEY_BLOCKS_UNUSED 1818 KEY_BLOCKS_UNUSED

--replace_result 1812 KEY_BLOCKS_UNUSED 1793 KEY_BLOCKS_UNUSED 1674 KEY_BLOCKS_UNUSED 1818 KEY_BLOCKS_UNUSED 1824 KEY_BLOCKS_UNUSED

show status like 'key_blocks_unused';



insert into t1 values (1, 'qqqq'), (11, 'yyyy');
@@ -84,7 +84,7 @@ update t1 set p=2 where p=1; 
update t2 set i=2 where i=1;



show status like 'key_blocks_used';

--replace_result 1808 KEY_BLOCKS_UNUSED 1789 KEY_BLOCKS_UNUSED 1670 KEY_BLOCKS_UNUSED 1814 KEY_BLOCKS_UNUSED

--replace_result 1808 KEY_BLOCKS_UNUSED 1789 KEY_BLOCKS_UNUSED 1670 KEY_BLOCKS_UNUSED 1814 KEY_BLOCKS_UNUSED 1820 KEY_BLOCKS_UNUSED

show status like 'key_blocks_unused';



cache index t1 key (`primary`) in keycache1;
@@ -146,7 +146,7 @@ cache index t1,t2 in default; 
drop table t1,t2,t3;



show status like 'key_blocks_used';

--replace_result 1812 KEY_BLOCKS_UNUSED 1793 KEY_BLOCKS_UNUSED 1674 KEY_BLOCKS_UNUSED 1818 KEY_BLOCKS_UNUSED

--replace_result 1812 KEY_BLOCKS_UNUSED 1793 KEY_BLOCKS_UNUSED 1674 KEY_BLOCKS_UNUSED 1818 KEY_BLOCKS_UNUSED 1824 KEY_BLOCKS_UNUSED

show status like 'key_blocks_unused';



# Cleanup

sql/field.cc

+1 −1
Original line number Diff line number Diff line
@@ -2145,7 +2145,7 @@ int Field_longlong::store(double nr) 
      set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);

      error= 1;

    }

    else if (nr >= (double) LONGLONG_MAX)

    else if (nr >= (double) (ulonglong) LONGLONG_MAX)

    {

      res=(longlong) LONGLONG_MAX;

      set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);