bzr push into mysql-6.0-backup branch (charles.bell:2811 to 2812) Bug#35585

[Chuck Bell]

 2812 Chuck Bell	2009-05-26
      BUG#35585 : Synonyms for backup start position
      
      This patch corrects a result file issue in PB after the push of 
      this bug fix.
      modified:
        mysql-test/suite/funcs_1/r/is_columns_mysql.result

 2811 Ingo Struewing	2009-05-22
      Post-pushbuild fix.
      Fixed compiler warnings.
      modified:
        include/my_dir.h
        mysys/mf_pack.c
        mysys/my_lib.c

=== modified file 'mysql-test/suite/funcs_1/r/is_columns_mysql.result'
--- a/mysql-test/suite/funcs_1/r/is_columns_mysql.result	2009-04-21 21:31:05 +0000
+++ b/mysql-test/suite/funcs_1/r/is_columns_mysql.result	2009-05-26 20:00:01 +0000
@@ -7,7 +7,7 @@ def	mysql	backup_history	backup_file_pat
 def	mysql	backup_history	backup_id	1	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	Surrogate key for (near) duplicate entries	Default	Default
 def	mysql	backup_history	backup_state	5	NULL	NO	enum	14	56	NULL	NULL	utf8	utf8_general_ci	enum('complete','starting','validity point','running','error','cancel')			select,insert,update,references	Status of current operation	Default	Default
 def	mysql	backup_history	binlog_file	4		NO	char	64	256	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	The recorded binlog filename at time of backup/restore	Default	Default
-def	mysql	backup_history	binlog_pos	3	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned			select,insert,update,references	The recorded binlog position of backup/restore	Default	Default
+def	mysql	backup_history	binlog_start_pos	3	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned			select,insert,update,references	The recorded binlog position of backup/restore	Default	Default
 def	mysql	backup_history	command	18		NO	varchar	512	2048	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select,insert,update,references	The command used to issue operation	Default	Default
 def	mysql	backup_history	drivers	19		NO	varchar	100	400	NULL	NULL	utf8	utf8_general_ci	varchar(100)			select,insert,update,references	The name of the backup drivers used in the operation	Default	Default
 def	mysql	backup_history	error_num	7	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	The error from this run 0 == none	Default	Default
@@ -22,13 +22,9 @@ def	mysql	backup_history	username	14		NO
 def	mysql	backup_history	user_comment	17		NO	varchar	200	800	NULL	NULL	utf8	utf8_general_ci	varchar(200)			select,insert,update,references	The comment from user entered at command line	Default	Default
 def	mysql	backup_history	validity_point_time	10	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	The time of the validity point.	Default	Default
 def	mysql	backup_progress	backup_id	1	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	Key for backup_history table entries	Default	Default
-def	mysql	backup_progress	error_num	7	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	The error from this run 0 == none	Default	Default
-def	mysql	backup_progress	notes	8		NO	char	100	400	NULL	NULL	utf8	utf8_general_ci	char(100)			select,insert,update,references	Commentary from the backup engine	Default	Default
+def	mysql	backup_progress	error_num	3	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	The error from this run 0 == none	Default	Default
+def	mysql	backup_progress	notes	4		NO	char	100	400	NULL	NULL	utf8	utf8_general_ci	char(100)			select,insert,update,references	Commentary from the backup engine	Default	Default
 def	mysql	backup_progress	object	2		NO	char	30	120	NULL	NULL	utf8	utf8_general_ci	char(30)			select,insert,update,references	The object being operated on	Default	Default
-def	mysql	backup_progress	progress	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	The number of bytes processed	Default	Default
-def	mysql	backup_progress	start_time	3	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	The date/time of start of operation	Default	Default
-def	mysql	backup_progress	stop_time	4	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	The date/time of end of operation	Default	Default
-def	mysql	backup_progress	total_bytes	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20)			select,insert,update,references	The size of the object in bytes	Default	Default
 def	mysql	columns_priv	Column_name	5		NO	char	64	256	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references		Default	Default
 def	mysql	columns_priv	Column_priv	7		NO	set	31	124	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','References')			select,insert,update,references		Default	Default
 def	mysql	columns_priv	Db	2		NO	char	64	256	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references		Default	Default
@@ -317,7 +313,7 @@ ORDER BY TABLE_SCHEMA, TABLE_NAME, ORDIN
 COL_CML	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE
 NULL	mysql	backup_history	backup_id	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
 NULL	mysql	backup_history	process_id	int	NULL	NULL	NULL	NULL	int(10) unsigned
-NULL	mysql	backup_history	binlog_pos	int	NULL	NULL	NULL	NULL	int(10) unsigned
+NULL	mysql	backup_history	binlog_start_pos	int	NULL	NULL	NULL	NULL	int(10) unsigned
 4.0000	mysql	backup_history	binlog_file	char	64	256	utf8	utf8_general_ci	char(64)
 4.0000	mysql	backup_history	backup_state	enum	14	56	utf8	utf8_general_ci	enum('complete','starting','validity point','running','error','cancel')
 4.0000	mysql	backup_history	operation	enum	7	28	utf8	utf8_general_ci	enum('backup','restore')
@@ -336,10 +332,6 @@ NULL	mysql	backup_history	stop_time	date
 4.0000	mysql	backup_history	drivers	varchar	100	400	utf8	utf8_general_ci	varchar(100)
 NULL	mysql	backup_progress	backup_id	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
 4.0000	mysql	backup_progress	object	char	30	120	utf8	utf8_general_ci	char(30)
-NULL	mysql	backup_progress	start_time	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	mysql	backup_progress	stop_time	datetime	NULL	NULL	NULL	NULL	datetime
-NULL	mysql	backup_progress	total_bytes	bigint	NULL	NULL	NULL	NULL	bigint(20)
-NULL	mysql	backup_progress	progress	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
 NULL	mysql	backup_progress	error_num	int	NULL	NULL	NULL	NULL	int(11)
 4.0000	mysql	backup_progress	notes	char	100	400	utf8	utf8_general_ci	char(100)
 4.0000	mysql	columns_priv	Host	char	60	240	utf8	utf8_bin	char(60)