diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-13 19:01:28 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-13 19:01:28 +0300 |
| commit | 805340936aa47493886bafd119863d83c475f45c (patch) | |
| tree | 46e5a4bd2e8311ef2880caa0526ce705a40c925e /client/mysql.cc | |
| parent | f9e53a659c87f1147d4f6d004702077d4d0ce5d7 (diff) | |
| parent | d83a4432503d199f6aed8e378563b08471d090dc (diff) | |
| download | mariadb-git-805340936aa47493886bafd119863d83c475f45c.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'client/mysql.cc')
| -rw-r--r-- | client/mysql.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index a643513d4cd..3cae7241969 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1287,8 +1287,8 @@ sig_handler mysql_end(int sig) { #ifndef _WIN32 /* - Ingnoring SIGQUIT and SIGINT signals when cleanup process starts. - This will help in resolving the double free issues, which occures in case + Ignoring SIGQUIT and SIGINT signals when cleanup process starts. + This will help in resolving the double free issues, which occurs in case the signal handler function is started in between the clean up function. */ signal(SIGQUIT, SIG_IGN); @@ -4714,7 +4714,7 @@ sql_real_connect(char *host,char *database,char *user,char *password, /* CLIENT_PROGRESS_OBSOLETE is set only if we requested it in mysql_real_connect() and the server also supports it - */ +*/ if (mysql.client_flag & CLIENT_PROGRESS_OBSOLETE) mysql_options(&mysql, MYSQL_PROGRESS_CALLBACK, (void*) report_progress); #else @@ -4783,7 +4783,7 @@ com_status(String *buffer __attribute__((unused)), tee_fprintf(stdout, "\nConnection id:\t\t%lu\n",mysql_thread_id(&mysql)); /* Don't remove "limit 1", - it is protection againts SQL_SELECT_LIMIT=0 + it is protection against SQL_SELECT_LIMIT=0 */ if (!mysql_store_result_for_lazy(&result)) { @@ -5132,7 +5132,7 @@ static const char *construct_prompt() time_t lclock = time(NULL); // Get the date struct struct tm *t = localtime(&lclock); - /* parse thru the settings for the prompt */ + /* parse through the settings for the prompt */ for (char *c = current_prompt; *c ; c++) { if (*c != PROMPT_CHAR) |