bk commit into 5.1 tree (gluh:1.2551) BUG#27327

[gluh]

Below is the list of changes that have just been committed into a local
5.1 repository of gluh. When gluh does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-04-03 14:24:35+05:00, gluh@stripped +5 -0
  Bug#27327 information_schema status views, variable_value conversion
  Type of 'Slave_running' status variable is changed to bool

  mysql-test/r/compress.result@stripped, 2007-04-03 14:24:33+05:00, gluh@stripped +3 -0
    test result

  mysql-test/r/rpl_packet.result@stripped, 2007-04-03 14:24:33+05:00, gluh@stripped +6 -0
    test result

  mysql-test/t/compress.test@stripped, 2007-04-03 14:24:33+05:00, gluh@stripped +1 -0
    test case

  mysql-test/t/rpl_packet.test@stripped, 2007-04-03 14:24:33+05:00, gluh@stripped +2 -0
    test case

  sql/mysqld.cc@stripped, 2007-04-03 14:24:33+05:00, gluh@stripped +4 -3
    Type of 'Slave_running' status variable is changed to bool

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gluh
# Host:	eagle.(none)
# Root:	/home/gluh/MySQL/Merge/5.1-opt

--- 1.625/sql/mysqld.cc	2007-03-31 15:38:12 +05:00
+++ 1.626/sql/mysqld.cc	2007-04-03 14:24:33 +05:00
@@ -6513,10 +6513,11 @@ static int show_rpl_status(THD *thd, SHO
 
 static int show_slave_running(THD *thd, SHOW_VAR *var, char *buff)
 {
-  var->type= SHOW_CHAR;
+  var->type= SHOW_MY_BOOL;
   pthread_mutex_lock(&LOCK_active_mi);
-  var->value= const_cast<char*>((active_mi && active_mi->slave_running &&
-               active_mi->rli.slave_running) ? "ON" : "OFF");
+  var->value= buff;
+  *((my_bool *)buff)= (my_bool) (active_mi && active_mi->slave_running &&
+                                 active_mi->rli.slave_running);
   pthread_mutex_unlock(&LOCK_active_mi);
   return 0;
 }

--- 1.4/mysql-test/r/rpl_packet.result	2007-03-16 18:25:15 +04:00
+++ 1.5/mysql-test/r/rpl_packet.result	2007-04-03 14:24:33 +05:00
@@ -14,6 +14,12 @@ INSERT INTO `t1`(`f1`) VALUES ('aaaaaaaa
 select count(*) from `DB_NAME_OF_MAX_LENGTH_AKA_NAME_LEN_64_BYTES_____________________`.`t1` /* must be 1 */;
 count(*)
 1
+SHOW STATUS LIKE 'Slave_running';
+Variable_name	Value
+Slave_running	ON
+select * from information_schema.session_status where variable_name= 'SLAVE_RUNNING';
+VARIABLE_NAME	VARIABLE_VALUE
+SLAVE_RUNNING	1.0000000
 drop database DB_NAME_OF_MAX_LENGTH_AKA_NAME_LEN_64_BYTES_____________________;
 SET @@global.max_allowed_packet=4096;
 SET @@global.net_buffer_length=4096;

--- 1.4/mysql-test/t/rpl_packet.test	2007-03-16 18:25:15 +04:00
+++ 1.5/mysql-test/t/rpl_packet.test	2007-04-03 14:24:33 +05:00
@@ -29,6 +29,8 @@ connection slave;
 sync_with_master;
 eval select count(*) from `$db`.`t1` /* must be 1 */;
 
+SHOW STATUS LIKE 'Slave_running';
+select * from information_schema.session_status where variable_name= 'SLAVE_RUNNING';
 connection master;
 eval drop database $db;
 save_master_pos;

--- 1.7/mysql-test/r/compress.result	2006-07-28 22:26:55 +05:00
+++ 1.8/mysql-test/r/compress.result	2007-04-03 14:24:33 +05:00
@@ -1,6 +1,9 @@
 SHOW STATUS LIKE 'Compression';
 Variable_name	Value
 Compression	ON
+select * from information_schema.session_status where variable_name= 'COMPRESSION';
+VARIABLE_NAME	VARIABLE_VALUE
+COMPRESSION	1.0000000
 drop table if exists t1,t2,t3,t4;
 CREATE TABLE t1 (
 Period smallint(4) unsigned zerofill DEFAULT '0000' NOT NULL,

--- 1.5/mysql-test/t/compress.test	2006-02-25 22:35:06 +04:00
+++ 1.6/mysql-test/t/compress.test	2007-04-03 14:24:33 +05:00
@@ -10,6 +10,7 @@ connect (comp_con,localhost,root,,,,,COM
 
 # Check compression turned on
 SHOW STATUS LIKE 'Compression';
+select * from information_schema.session_status where variable_name= 'COMPRESSION';
 
 # Source select test case
 -- source include/common-tests.inc