diff options
| author | unknown <monty@mishka.mysql.fi> | 2003-09-24 10:24:56 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.mysql.fi> | 2003-09-24 10:24:56 +0300 |
| commit | 74e3399af186b3159738c0c9c55672f0dbd7705c (patch) | |
| tree | cc7389163da24340a03858b997927a41eeedc545 /sql/lock.cc | |
| parent | 4e09f14b18ededb18aab527abe582fca34afe79c (diff) | |
| parent | 1c50f8ac7894e7a59e25f720ab700cbe73986347 (diff) | |
| download | mariadb-git-74e3399af186b3159738c0c9c55672f0dbd7705c.tar.gz | |
merge
sql/item_strfunc.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
sql/net_serv.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/lock.cc')
| -rw-r--r-- | sql/lock.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/lock.cc b/sql/lock.cc index ea5e60b558f..29795415720 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -75,8 +75,6 @@ TODO: #include "../myisammrg/myrg_def.h" #endif -extern HASH open_cache; - static MYSQL_LOCK *get_lock_data(THD *thd, TABLE **table,uint count, bool unlock, TABLE **write_locked); static int lock_external(THD *thd, TABLE **table,uint count); |