diff options
| author | unknown <monty@donna.mysql.fi> | 2001-03-07 23:50:44 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.fi> | 2001-03-07 23:50:44 +0200 |
| commit | 5151b5520edafd3374093a73635ef52d4044f10e (patch) | |
| tree | 5185e82a23f37f9c337833e5c194164d9eaf8804 /sql/slave.h | |
| parent | e3dc55a839a23d6f1b63f05238d0b33454b7a5ab (diff) | |
| download | mariadb-git-5151b5520edafd3374093a73635ef52d4044f10e.tar.gz | |
Fixed test cases for innobase
Fixed bug introduced with last ORDER BY optimization
Changed log position to longlong to avoid warnings.
Docs/manual.texi:
Update for innobase
mysql-test/r/innobase.result:
Fixed test cases
mysql-test/t/bdb.test:
Removed not used tables
mysql-test/t/innobase.test:
Fixed test cases
sql/field.h:
Fixed bug introduced with last ORDER BY optimization
sql/ha_berkeley.cc:
Fixed bug when index_init() was called twice.
sql/mysql_priv.h:
Added option to not get stack trace (when using gdb)
sql/mysqld.cc:
Added option to not get stack trace (when using gdb)
sql/slave.cc:
Changed log position to longlong to avoid warnings.
sql/slave.h:
Changed log position to longlong to avoid warnings.
sql/sql_parse.cc:
Removed warnings
sql/sql_select.cc:
Cleanups
Diffstat (limited to 'sql/slave.h')
| -rw-r--r-- | sql/slave.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/slave.h b/sql/slave.h index d47ec22410c..e667cac52eb 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -4,7 +4,7 @@ typedef struct st_master_info { char log_file_name[FN_REFLEN]; - uint32 pos,pending; + ulonglong pos,pending; File fd; // we keep the file open, so we need to remember the file pointer IO_CACHE file; // the variables below are needed because we can change masters on the fly @@ -29,11 +29,11 @@ typedef struct st_master_info pthread_mutex_destroy(&lock); pthread_cond_destroy(&cond); } - inline void inc_pending(uint32 val) + inline void inc_pending(ulonglong val) { pending += val; } - inline void inc_pos(uint32 val) + inline void inc_pos(ulonglong val) { pthread_mutex_lock(&lock); pos += val + pending; @@ -43,14 +43,14 @@ typedef struct st_master_info } // thread safe read of position - not needed if we are in the slave thread, // but required otherwise - inline void read_pos(uint32& var) + inline void read_pos(ulonglong& var) { pthread_mutex_lock(&lock); var = pos; pthread_mutex_unlock(&lock); } - int wait_for_pos(THD* thd, String* log_name, ulong log_pos); + int wait_for_pos(THD* thd, String* log_name, ulonglong log_pos); } MASTER_INFO; typedef struct st_table_rule_ent |