diff options
| author | Otto Kekäläinen <otto@seravo.fi> | 2016-03-04 02:09:37 +0200 |
|---|---|---|
| committer | Otto Kekäläinen <otto@seravo.fi> | 2016-03-04 02:09:37 +0200 |
| commit | 1777fd5f556a9c68cae01ad2aadaf4865984e649 (patch) | |
| tree | 931f4a045467951a6ef8833631d6f0aeb04b53c3 /client | |
| parent | f8251911a44f6b65c2377e9945e208e240dfec33 (diff) | |
| download | mariadb-git-1777fd5f556a9c68cae01ad2aadaf4865984e649.tar.gz | |
Fix spelling: occurred, execute, which etc
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 2 | ||||
| -rw-r--r-- | client/mysql_upgrade.c | 2 | ||||
| -rw-r--r-- | client/mysqltest.cc | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index f1346395dfe..ea7d17abafc 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -3358,7 +3358,7 @@ com_go(String *buffer,char *line __attribute__((unused))) end: - /* Show warnings if any or error occured */ + /* Show warnings if any or error occurred */ if (show_warnings == 1 && (warnings >= 1 || error)) print_warnings(); diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index b84caa541c1..06b6f991567 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -644,7 +644,7 @@ static int get_upgrade_info_file_name(char* name) /* Read the content of mysql_upgrade_info file and compare the version number form file against - version number wich mysql_upgrade was compiled for + version number which mysql_upgrade was compiled for NOTE This is an optimization to avoid running mysql_upgrade diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 026934a2feb..ec5bf0957df 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -1104,7 +1104,7 @@ void do_eval(DYNAMIC_STRING *query_eval, const char *query, Run query and dump the result to stderr in vertical format NOTE! This function should be safe to call when an error - has occured and thus any further errors will be ignored(although logged) + has occurred and thus any further errors will be ignored (although logged) SYNOPSIS show_query @@ -1170,7 +1170,7 @@ static void show_query(MYSQL* mysql, const char* query) is added to the warning stack, only print @@warning_count-1 warnings. NOTE! This function should be safe to call when an error - has occured and this any further errors will be ignored(although logged) + has occurred and this any further errors will be ignored(although logged) SYNOPSIS show_warnings_before_error @@ -4701,7 +4701,7 @@ void do_sync_with_master2(struct st_command *command, long offset, master_pos_wait returned NULL. This indicates that slave SQL thread is not started, the slave's master information is not initialized, the arguments are - incorrect, or an error has occured + incorrect, or an error has occurred */ die("%.*s failed: '%s' returned NULL " \ "indicating slave SQL thread failure", |