Re: bzr commit into mysql-6.0 branch (cbell:2675) WL#4073

[Øystein Grøvlen]

Approved.  There is some typos that you may want to fix (see below).

--
Øystein


Chuck Bell wrote:
...

> --- a/sql/share/errmsg.txt	2008-08-11 16:06:30 +0000
> +++ b/sql/share/errmsg.txt	2008-08-19 14:27:51 +0000
> @@ -6275,7 +6275,7 @@ ER_BACKUP_CANT_RESTORE_DB
>  ER_BACKUP_CANT_RESTORE_TABLE
>  	eng "Could not restore table %-.64s"
>  ER_BACKUP_CANT_RESTORE_VIEW
> -	eng "Could not restore view %-.64s"
> +	eng "Could not restore view %-.64s. Please check the view definition for possible
> missing dependencies."
>  ER_BACKUP_CANT_RESTORE_SROUT
>  	eng "Could not restore stored routine %-.64s"
>  ER_BACKUP_CANT_RESTORE_EVENT
> @@ -6374,3 +6374,15 @@ ER_BACKUP_RELEASE_NAME_LOCK_FAILED
>    eng "Restore failed to release the name locks on the tables."
>  ER_BACKUP_BACKUPDIR
>    eng "The path specified for the system variable backupdir cannot be accessed or is
> invalid. ref: %-.64s"
> +ER_BACKUP_LIST_DB_PRIV
> +        eng "Can't enumerate grants in database %-.64s"
> +ER_BACKUP_CATALOG_ADD_PRIV
> +	eng "Failed to add grant `%-.64s` to the catalog"
> +ER_BACKUP_GET_META_PRIV
> +        eng "Failed to obtain meta-data for grant %-.64s."
> +ER_BACKUP_CANT_RESTORE_PRIV
> +        eng "Could not execute grant %-.64s."
> +ER_BACKUP_GRANT_SKIPPED
> +        eng "The grant '%-.64s' was skipped because the user does not exist."
> +ER_BACKUP_GRANT_WRONG_DB
> +        eng "The grant '%-.64s' failed. Database not included in the backup image."

Still inconsistent use of ticks here.

...

> @@ -2742,6 +3347,90 @@ bool is_internal_db_name(const String *d
>  bool check_db_existence(const String *db_name)
>  {
>    return check_db_dir_existence(((String *) db_name)->c_ptr_safe());
> +}
> +
> +/*
> +  Splits grantee clause into user and host portions. Needed for checking
> +  to see if user exists on system.
> +*/
> +int split_user_host(String *grantee, String *user, String *host)
> +{
> +  int len= 0;
> +  int tics= 0;
> +  char *ptr= 0;
> +
> +  /*
> +    Since passwords are single byte characters and usernames can be multibyte
> +    characters and the 0x40 = 64 = @ can occur in the username, we must seach
> +    for the first @ from the right.
> +  */

seach -> search