diff options
| author | monty@mashka.mysql.fi <> | 2003-02-06 16:55:59 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-02-06 16:55:59 +0200 |
| commit | cf9668fd37cd5ee096033887251cfc653359b3e4 (patch) | |
| tree | af5a612629ae80e6237cf2b6ffc48017d60acef3 /sql/slave.cc | |
| parent | 5ce0cd16b8b9fa05c781ac6ff4687133ed145d84 (diff) | |
| download | mariadb-git-cf9668fd37cd5ee096033887251cfc653359b3e4.tar.gz | |
Added START TRANSACTION syntax
Added ALL as parameter option for all group functions.
Make join handling uniform. This allows us to use ',', JOIN and INNER JOIN the same way.
Sort NULL last if DESC is used (ANSI SQL 99 requirement)
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 164b8ba458f..64d54be113e 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1671,7 +1671,8 @@ int st_relay_log_info::wait_for_pos(THD* thd, String* log_name, */ ulong log_name_extension; char log_name_tmp[FN_REFLEN]; //make a char[] from String - char *end= strmake(log_name_tmp, log_name->ptr(), min(log_name->length(), FN_REFLEN-1)); + char *end= strmake(log_name_tmp, log_name->ptr(), min(log_name->length(), + FN_REFLEN-1)); char *p= fn_ext(log_name_tmp); char *p_end; if (!*p || log_pos<0) @@ -1756,15 +1757,14 @@ int st_relay_log_info::wait_for_pos(THD* thd, String* log_name, error= -1; break; } - else - error=0; + error=0; event_count++; } err: pthread_mutex_unlock(&data_lock); DBUG_PRINT("exit",("killed: %d abort: %d slave_running: %d \ -improper_arguments: %d timed_out: %d", +improper_arguments: %d timed_out: %d", (int) thd->killed, (int) (init_abort_pos_wait != abort_pos_wait), (int) mi->slave_running, |