diff options
| author | unknown <monty@mysql.com> | 2004-03-30 02:32:41 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-30 02:32:41 +0300 |
| commit | ceeaa24d187b228fd6e8b1ac1e667d341155640f (patch) | |
| tree | 54b32bf1935af765ea1bb9b118082d9ce067d4c0 /sql/sql_test.cc | |
| parent | db9fde085fdbdacd48760c0243805e8df8b39a8c (diff) | |
| download | mariadb-git-ceeaa24d187b228fd6e8b1ac1e667d341155640f.tar.gz | |
false/true -> FALSE/TRUE
Fixes after last merge
mysql-test/r/bdb-crash.result:
fixed bad merge
mysql-test/r/myisam.result:
after merge fix
mysql-test/r/order_by.result:
fixed bad merge
mysql-test/t/order_by.test:
after merge fix
sql/field_conv.cc:
false/true -> FALSE/TRUE
sql/handler.cc:
false/true -> FALSE/TRUE
sql/item.cc:
false/true -> FALSE/TRUE
sql/item_cmpfunc.cc:
false/true -> FALSE/TRUE
sql/item_sum.cc:
false/true -> FALSE/TRUE
sql/slave.cc:
false/true -> FALSE/TRUE
sql/sql_acl.cc:
false/true -> FALSE/TRUE
sql/sql_cache.cc:
after merge fix
sql/sql_help.cc:
false/true -> FALSE/TRUE
sql/sql_olap.cc:
false/true -> FALSE/TRUE
sql/sql_parse.cc:
false/true -> FALSE/TRUE
sql/sql_select.cc:
fix after bad merge
sql/sql_table.cc:
fix after bad merge
sql/sql_test.cc:
false/true -> FALSE/TRUE
Diffstat (limited to 'sql/sql_test.cc')
| -rw-r--r-- | sql/sql_test.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sql/sql_test.cc b/sql/sql_test.cc index 6763181ce4a..cc3d30e5983 100644 --- a/sql/sql_test.cc +++ b/sql/sql_test.cc @@ -276,10 +276,14 @@ static void display_table_locks(void) THR_LOCK *lock=(THR_LOCK*) list->data; VOID(pthread_mutex_lock(&lock->mutex)); - push_locks_into_array(&saved_table_locks, lock->write.data, false, "Locked - write"); - push_locks_into_array(&saved_table_locks, lock->write_wait.data, true, "Waiting - write"); - push_locks_into_array(&saved_table_locks, lock->read.data, false, "Locked - read"); - push_locks_into_array(&saved_table_locks, lock->read_wait.data, true, "Waiting - read"); + push_locks_into_array(&saved_table_locks, lock->write.data, FALSE, + "Locked - write"); + push_locks_into_array(&saved_table_locks, lock->write_wait.data, TRUE, + "Waiting - write"); + push_locks_into_array(&saved_table_locks, lock->read.data, FALSE, + "Locked - read"); + push_locks_into_array(&saved_table_locks, lock->read_wait.data, TRUE, + "Waiting - read"); VOID(pthread_mutex_unlock(&lock->mutex)); } VOID(pthread_mutex_unlock(&THR_LOCK_lock)); |