STATUS
------
Patch approved.
SUGGESTIONS
-----------
1. In test, use @@backupdir, not @@datadir [1].
2. Use ulong return type [2].
DETAILS
-------
Jorgen Loland wrote:
> === added file 'mysql-test/suite/backup/t/backup_object_count.test'
> --- a/mysql-test/suite/backup/t/backup_object_count.test 1970-01-01 00:00:00 +0000
> +++ b/mysql-test/suite/backup/t/backup_object_count.test 2009-02-12 09:08:39 +0000
> @@ -0,0 +1,113 @@
> +#
> +# This file tests that the backup_history table shows the correct
> +# object count after performing a backup
> +#
> +# The following object types should be counted:
> +# - Tablespaces
> +# - Databases
> +# - Tables
> +# - Views
> +# - Routines (procedures, triggers etc)
> +#
> +# Privileges should not be counted.
> +#
> +
> +--source include/not_embedded.inc
> +--source include/have_falcon.inc
> +
> +let $MYSQLD_DATADIR = `select @@datadir`;
1. Please use @@backupdir to make test case independent from the assumption that
@@backupdir = @@datadir.
...
> === modified file 'sql/backup/image_info.h'
> --- a/sql/backup/image_info.h 2009-01-08 14:57:41 +0000
> +++ b/sql/backup/image_info.h 2009-02-12 09:08:39 +0000
> @@ -90,9 +90,13 @@ public: // public interface
> size_t data_size; ///< How much of table data is saved in the image.
> st_bstream_binlog_pos master_pos; ///< To store master position info.
>
> - ulong table_count() const;
> + uint object_count() const;
> uint db_count() const;
> uint ts_count() const;
> + uint table_count() const;
> + uint view_count() const;
> + uint routine_count() const;
> + uint priv_count() const;
> ushort snap_count() const;
2. I still think ulong is a better option for the return type.
Rafal