diff options
| author | Staale Smedseng <staale.smedseng@sun.com> | 2009-06-29 16:00:47 +0200 |
|---|---|---|
| committer | Staale Smedseng <staale.smedseng@sun.com> | 2009-06-29 16:00:47 +0200 |
| commit | db1591a7a295c0c4d57cf8c7cbbd0fe1f33ffa49 (patch) | |
| tree | 4e9ce667a1b14bf9610672bb5f604bb5f5becbab /client | |
| parent | a0b5d1be2b15e3064142e3fa2e337143f950e702 (diff) | |
| parent | 19dfaa5824ef47de51a568be4e7a30ff028bcbe8 (diff) | |
| download | mariadb-git-db1591a7a295c0c4d57cf8c7cbbd0fe1f33ffa49.tar.gz | |
Merge from 5.0
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 6 | ||||
| -rw-r--r-- | client/mysqlbinlog.cc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 4ab46ed1e7d..40c446299be 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -2004,7 +2004,7 @@ static COMMANDS *find_command(char *name,char cmd_char) (uchar*)commands[i].name,len) && !commands[i].name[len] && (!end || (end && commands[i].takes_params))) || - !name && commands[i].cmd_char == cmd_char)) + (!name && commands[i].cmd_char == cmd_char))) { DBUG_PRINT("exit",("found command: %s", commands[i].name)); DBUG_RETURN(&commands[i]); @@ -2163,7 +2163,7 @@ static bool add_line(String &buffer,char *line,char *in_string, buffer.length(0); } else if (!*ml_comment && (!*in_string && (inchar == '#' || - inchar == '-' && pos[1] == '-' && + (inchar == '-' && pos[1] == '-' && /* The third byte is either whitespace or is the end of the line -- which would occur only @@ -2171,7 +2171,7 @@ static bool add_line(String &buffer,char *line,char *in_string, itself whitespace and should also match. */ (my_isspace(charset_info,pos[2]) || - !pos[2])))) + !pos[2]))))) { // Flush previously accepted characters if (out != line) diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 2cf91ec7da5..22d93e06e2f 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -689,8 +689,8 @@ Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev, Format events are not concerned by --offset and such, we always need to read them to be able to process the wanted events. */ - if ((rec_count >= offset) && - ((my_time_t)(ev->when) >= start_datetime) || + if (((rec_count >= offset) && + ((my_time_t)(ev->when) >= start_datetime)) || (ev_type == FORMAT_DESCRIPTION_EVENT)) { if (ev_type != FORMAT_DESCRIPTION_EVENT) |