diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-10-08 05:36:35 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-10-08 05:36:35 +0300 |
| commit | 515c747dcfcca8d04a509496c5864f302d6d76be (patch) | |
| tree | 87a4027a65ad98a422987c566b6d394464e95623 /myisammrg/myrg_locking.c | |
| parent | 41972bea9234345ed36ea92d40c0b0cf3ec315b0 (diff) | |
| parent | cef1d752497f81229788e56abaf7fa62c1ab31a9 (diff) | |
| download | mariadb-git-515c747dcfcca8d04a509496c5864f302d6d76be.tar.gz | |
merge
BitKeeper/etc/ignore:
auto-union
acinclude.m4:
Auto merged
Docs/manual.texi:
Auto merged
include/my_sys.h:
Auto merged
include/mysql.h:
Auto merged
libmysqld/libmysqld.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/t/count_distinct2.test:
Auto merged
mysql-test/t/flush.test:
Auto merged
mysql-test/t/rpl000017.test:
Auto merged
libmysql/libmysql.c:
Auto merged
mysys/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
sql/handler.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
libmysqld/Makefile.am:
Added back md5.c
Diffstat (limited to 'myisammrg/myrg_locking.c')
| -rw-r--r-- | myisammrg/myrg_locking.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/myisammrg/myrg_locking.c b/myisammrg/myrg_locking.c index c89acca3918..70eb2c94d13 100644 --- a/myisammrg/myrg_locking.c +++ b/myisammrg/myrg_locking.c @@ -18,7 +18,7 @@ Lock databases against read or write. */ -#include "mymrgdef.h" +#include "myrg_def.h" int myrg_lock_database( MYRG_INFO *info, |