diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 2 | ||||
| -rw-r--r-- | client/mysqltest.c | 18 |
2 files changed, 12 insertions, 8 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 98bc7e750e1..c9ee6819a13 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1727,7 +1727,7 @@ com_help(String *buffer __attribute__((unused)), commands[i].cmd_char, commands[i].doc); } if (connected && mysql_get_server_version(&mysql) >= 40100) - put_info("\nFor server side help, type 'help all'\n", INFO_INFO); + put_info("\nFor server side help, type 'help contents'\n", INFO_INFO); return 0; } diff --git a/client/mysqltest.c b/client/mysqltest.c index 442f44f434e..8307fe44bd9 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -1851,12 +1851,6 @@ int read_query(struct st_query** q_ptr) q->record_file[0]= 0; q->require_file= 0; q->first_word_len= 0; - memcpy((gptr) q->expected_errno, (gptr) global_expected_errno, - sizeof(global_expected_errno)); - q->expected_errors= global_expected_errors; - q->abort_on_error= global_expected_errors == 0; - bzero((gptr) global_expected_errno, sizeof(global_expected_errno)); - global_expected_errors=0; q->type = Q_UNKNOWN; q->query_buf= q->query= 0; @@ -1869,8 +1863,16 @@ int read_query(struct st_query** q_ptr) if (*p == '#') { q->type = Q_COMMENT; + /* This goto is to avoid losing the "expected error" info. */ + goto end; } - else if (p[0] == '-' && p[1] == '-') + memcpy((gptr) q->expected_errno, (gptr) global_expected_errno, + sizeof(global_expected_errno)); + q->expected_errors= global_expected_errors; + q->abort_on_error= global_expected_errors == 0; + bzero((gptr) global_expected_errno, sizeof(global_expected_errno)); + global_expected_errors=0; + if (p[0] == '-' && p[1] == '-') { q->type= Q_COMMENT_WITH_COMMAND; p+= 2; /* To calculate first word */ @@ -1905,6 +1907,8 @@ int read_query(struct st_query** q_ptr) *p1 = 0; } } + +end: while (*p && my_isspace(charset_info, *p)) p++; if (!(q->query_buf= q->query= my_strdup(p, MYF(MY_WME)))) |