diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-10 12:24:31 +0200 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-10 12:24:31 +0200 |
commit | 1ac0bce36e5bf2136cedb1ce1da949f53cce4404 (patch) | |
tree | 7b81481b201c4e64aaa4a70411d992e0fac2289d /client/mysqldump.c | |
parent | 3b071bad1981a12e76769cbfc31b62fbd7362372 (diff) | |
parent | 65e8506ca9d03967191b6ed207cf107d311f7f99 (diff) | |
download | mariadb-git-1ac0bce36e5bf2136cedb1ce1da949f53cce4404.tar.gz |
Merge branch '10.4' into 10.5mariadb-10.5.17
Diffstat (limited to 'client/mysqldump.c')
-rw-r--r-- | client/mysqldump.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 1332da9ab00..e742519fa02 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -1096,8 +1096,8 @@ static int get_options(int *argc, char ***argv) return(ho_error); /* - Dumping under --system=stats with --replace or --inser-ignore is safe and will not - retult into race condition. Otherwise dump only structure and ignore data by default + Dumping under --system=stats with --replace or --insert-ignore is safe and will not + result into race condition. Otherwise dump only structure and ignore data by default while dumping. */ if (!(opt_system & OPT_SYSTEM_STATS) && !(opt_ignore || opt_replace_into)) @@ -2901,7 +2901,7 @@ static inline my_bool general_log_or_slow_log_tables(const char *db, !my_strcasecmp(charset_info, table, "transaction_registry")); } /* - get_sequence_structure-- retrievs sequence structure, prints out corresponding + get_sequence_structure-- retrieves sequence structure, prints out corresponding CREATE statement ARGS seq - sequence name @@ -2963,7 +2963,7 @@ static void get_sequence_structure(const char *seq, const char *db) DBUG_VOID_RETURN; } /* - get_table_structure -- retrievs database structure, prints out corresponding + get_table_structure -- retrieves database structure, prints out corresponding CREATE statement and fills out insert_pat if the table is the type we will be dumping. @@ -4605,7 +4605,7 @@ static int dump_all_users_roles_and_grants() echo "$dosomethingspecial" ) | mysql -h $host - doesn't end up with a suprise that the $dosomethingspecial cannot + doesn't end up with a surprise that the $dosomethingspecial cannot be done because `special_role` isn't active. We create a new role for importing that becomes the default admin for new @@ -4614,8 +4614,8 @@ static int dump_all_users_roles_and_grants() create new admins for the created role. At the end of the import the mariadb_dump_import_role is be dropped, - which implictly drops all its admin aspects of the dropped role. - This is significiantly easlier than revoking the ADMIN of each role + which implicitly drops all its admin aspects of the dropped role. + This is significantly easier than revoking the ADMIN of each role from the current user. */ fputs("SELECT COALESCE(CURRENT_ROLE(),'NONE') into @current_role;\n" @@ -7038,7 +7038,7 @@ int main(int argc, char **argv) if (opt_system & OPT_SYSTEM_SERVERS) dump_all_servers(); - /* These must be last as they explictly change the current database to mysql */ + /* These must be last as they explicitly change the current database to mysql */ if (opt_system & OPT_SYSTEM_STATS) dump_all_stats(); |