diff options
| author | unknown <guilhem@mysql.com> | 2004-03-11 16:24:47 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-03-11 16:24:47 +0100 |
| commit | b1e0a38f1863c0d963196530e9eb14953a13063a (patch) | |
| tree | 19283808f0a276450e8443af20228c4da83ef985 /sql/set_var.cc | |
| parent | cb9f304897564f0eb0c76b6cd155a337fac34b19 (diff) | |
| parent | f808030209e7bd102b6100df04aa7094bc767af2 (diff) | |
| download | mariadb-git-b1e0a38f1863c0d963196530e9eb14953a13063a.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
sql/set_var.cc:
Auto merged
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 51ea6047794..71c0865dd91 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -1273,7 +1273,7 @@ byte *sys_var_insert_id::value_ptr(THD *thd, enum_var_type type) bool sys_var_slave_skip_counter::check(THD *thd, set_var *var) { int result= 0; - LOCK_ACTIVE_MI; + pthread_mutex_lock(&LOCK_active_mi); pthread_mutex_lock(&active_mi->rli.run_lock); if (active_mi->rli.slave_running) { @@ -1281,14 +1281,14 @@ bool sys_var_slave_skip_counter::check(THD *thd, set_var *var) result=1; } pthread_mutex_unlock(&active_mi->rli.run_lock); - UNLOCK_ACTIVE_MI; + pthread_mutex_unlock(&LOCK_active_mi); return result; } bool sys_var_slave_skip_counter::update(THD *thd, set_var *var) { - LOCK_ACTIVE_MI; + pthread_mutex_lock(&LOCK_active_mi); pthread_mutex_lock(&active_mi->rli.run_lock); /* The following test should normally never be true as we test this @@ -1302,7 +1302,7 @@ bool sys_var_slave_skip_counter::update(THD *thd, set_var *var) pthread_mutex_unlock(&active_mi->rli.data_lock); } pthread_mutex_unlock(&active_mi->rli.run_lock); - UNLOCK_ACTIVE_MI; + pthread_mutex_unlock(&LOCK_active_mi); return 0; } |