diff options
| author | monty@mishka.local <> | 2005-07-31 12:49:55 +0300 |
|---|---|---|
| committer | monty@mishka.local <> | 2005-07-31 12:49:55 +0300 |
| commit | 8437e9c1be5b925a46640302a391af9c9cf83a30 (patch) | |
| tree | c4df327e7bc6c594e03c6454dddbc63a93203c6a /mysys/thr_lock.c | |
| parent | e60d786dde7bfec95a16967bb57d8c570af8ac9e (diff) | |
| download | mariadb-git-8437e9c1be5b925a46640302a391af9c9cf83a30.tar.gz | |
Fixes during review of new pushed code
Change bool in C code to my_bool
Added to mysqltest --enable_parsning and --disable_parsing to avoid to have to comment parts of tests
Added comparison of LEX_STRING's and use this to compare file types for view and trigger files.
Diffstat (limited to 'mysys/thr_lock.c')
| -rw-r--r-- | mysys/thr_lock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c index 1a47a061b97..c076e8934ad 100644 --- a/mysys/thr_lock.c +++ b/mysys/thr_lock.c @@ -509,7 +509,7 @@ thr_lock(THR_LOCK_DATA *data, THR_LOCK_OWNER *owner, (*lock->read.last)=data; /* Add to running FIFO */ data->prev=lock->read.last; lock->read.last= &data->next; - if ((int) lock_type == (int) TL_READ_NO_INSERT) + if (lock_type == TL_READ_NO_INSERT) lock->read_no_write_count++; check_locks(lock,"read lock with old write lock",0); if (lock->get_status) @@ -535,14 +535,14 @@ thr_lock(THR_LOCK_DATA *data, THR_LOCK_OWNER *owner, lock->read.last= &data->next; if (lock->get_status) (*lock->get_status)(data->status_param, 0); - if ((int) lock_type == (int) TL_READ_NO_INSERT) + if (lock_type == TL_READ_NO_INSERT) lock->read_no_write_count++; check_locks(lock,"read lock with no write locks",0); statistic_increment(locks_immediate,&THR_LOCK_lock); goto end; } /* - We're here if there is an active write lock or no write + We're here if there is an active write lock or no write lock but a high priority write waiting in the write_wait queue. In the latter case we should yield the lock to the writer. */ |