diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-12-02 14:34:01 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-12-02 14:34:01 +0200 |
| commit | 7c999bb03223114a4d07f23db2842363d32d1859 (patch) | |
| tree | 8e30a64d5c7aaa0ba8554c4c316cc9b76a6724ca /myisam/mi_locking.c | |
| parent | 95e94560eac0ee72bbc566517ca70f14128a01e8 (diff) | |
| download | mariadb-git-7c999bb03223114a4d07f23db2842363d32d1859.tar.gz | |
Query cache.
Remove some warnings
Docs/manual.texi:
Solaris and gcc
include/ft_global.h:
Remove warnings
include/myisam.h:
Query cache
include/myisammrg.h:
Query cache
include/mysql_com.h:
Query cache
libmysqld/lib_sql.cc:
Query cache
myisam/ft_boolean_search.c:
Remove warnings
myisam/ft_dump.c:
Remove warnings
myisam/ft_parser.c:
Remove warnings
myisam/ft_static.c:
Remove warnings
myisam/ft_update.c:
Remove warnings
myisam/ftdefs.h:
Remove warnings
myisam/mi_delete.c:
Query cache
myisam/mi_locking.c:
Query cache
myisam/mi_update.c:
Query cache
myisam/myisamdef.h:
Optimize for Ia64
myisammrg/myrg_extra.c:
Query cache
mysys/mf_keycache.c:
DBUG statements
regex/cclass.h:
Remove warnings
regex/cname.h:
Remove warnings
regex/main.c:
Remove warnings
regex/regcomp.c:
Remove warnings
regex/regcomp.ih:
Remove warnings
regex/regerror.c:
Remove warnings
regex/reginit.c:
Remove warnings
regex/split.c:
Remove warnings
sql-bench/test-connect.sh:
Make tests query-cache safe.
sql-bench/test-transactions.sh:
Fix for old perl versions
sql/convert.cc:
Query cache
sql/ha_myisammrg.cc:
Query cache
sql/ha_myisammrg.h:
Query cache
sql/handler.cc:
Query cache
sql/item_create.cc:
Query cache
sql/item_func.cc:
Remove warnings
sql/item_func.h:
Remove warnings
sql/lex.h:
Query cache
sql/mysql_priv.h:
Query cache
sql/mysqld.cc:
Query cache
sql/net_serv.cc:
Query cache
sql/sql_cache.cc:
Query cache
sql/sql_class.cc:
Query cache
sql/sql_class.h:
Query cache
sql/sql_db.cc:
Query cache
sql/sql_delete.cc:
Query cache
sql/sql_insert.cc:
Query cache
sql/sql_parse.cc:
Query cache
sql/sql_select.cc:
Query cache
sql/sql_table.cc:
Query cache
sql/sql_update.cc:
Query cache
sql/sql_yacc.yy:
Query cache
Diffstat (limited to 'myisam/mi_locking.c')
| -rw-r--r-- | myisam/mi_locking.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/myisam/mi_locking.c b/myisam/mi_locking.c index 68ef52ea819..22ec4ba875c 100644 --- a/myisam/mi_locking.c +++ b/myisam/mi_locking.c @@ -43,8 +43,7 @@ int mi_lock_database(MI_INFO *info, int lock_type) pthread_mutex_lock(&share->intern_lock); if (share->kfile >= 0) /* May only be false on windows */ { - switch (lock_type) - { + switch (lock_type) { case F_UNLCK: if (info->lock_type == F_RDLCK) count= --share->r_locks; @@ -201,6 +200,7 @@ int mi_lock_database(MI_INFO *info, int lock_type) } VOID(_mi_test_if_changed(info)); info->lock_type=lock_type; + info->invalidator=info->s->invalidator; share->w_locks++; share->tot_locks++; break; @@ -319,6 +319,7 @@ int _mi_readinfo(register MI_INFO *info, int lock_type, int check_keybuffer) } if (check_keybuffer) VOID(_mi_test_if_changed(info)); + info->invalidator=info->s->invalidator; } else if (lock_type == F_WRLCK && info->lock_type == F_RDLCK) { |