bk commit into 5.1 tree (cbell:1.2519)

[cbell]

Below is the list of changes that have just been committed into a local
5.1 repository of cbell. When cbell 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-13 14:13:52-04:00, cbell@mysql_cab_desk. +1 -0
  WL#3327 : Online Backup Plan - Phase 2
          
  This patch adds a check to ensure the mysql database is ignored for
  backup.

  sql/backup/sql_backup.cc@stripped, 2007-04-13 14:13:02-04:00, Chuck@mysql_cab_desk. +6 -2
    WL#3327 : Online Backup Plan - Phase 2
            
    This patch adds a check to ensure the mysql database is ignored for
    backup.

# 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:	cbell
# Host:	mysql_cab_desk.
# Root:	C:/source/c++/mysql-5.1-backup-phase2

--- 1.24/sql/backup/sql_backup.cc	2007-04-13 14:14:05 -04:00
+++ 1.25/sql/backup/sql_backup.cc	2007-04-13 14:14:05 -04:00
@@ -272,7 +272,9 @@
       if (tbl && !my_strcasecmp(system_charset_info,
          db_name.c_ptr(), tmp->str) &&
          my_strcasecmp(system_charset_info,
-         db_name.c_ptr(), "information_schema"))
+         db_name.c_ptr(), "information_schema") &&
+         my_strcasecmp(system_charset_info,
+         db_name.c_ptr(), "mysql"))
       {
         DBUG_PRINT("backup", ("Found table %s for database %s",
                                tbl.name().ptr(), tmp->str));
@@ -337,7 +339,9 @@
     db_name.length(0);
     db_table->field[1]->val_str(&db_name);
     if (my_strcasecmp(system_charset_info,
-       db_name.c_ptr(), "information_schema"))
+       db_name.c_ptr(), "information_schema") &&
+       my_strcasecmp(system_charset_info,
+       db_name.c_ptr(), "mysql"))
     {
       DBUG_PRINT("backup", ("Found database %s", db_name.ptr()));
       tmp= (LEX_STRING *)thd->alloc(sizeof(LEX_STRING));