diff options
| author | unknown <monty@mysql.com> | 2004-05-11 12:21:38 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-11 12:21:38 +0300 |
| commit | 19f41e6e0df2d875cff2404f9bbbab30d81b72b1 (patch) | |
| tree | 0752eb9dfe0f1e306cf9a542e09d9cc646c11a0f /innobase/include/com0shm.ic | |
| parent | cb24e8b9b29f1aa3edfc4d7a61a9d842cb48ca69 (diff) | |
| parent | f3d691a970627f34ed825a9cf7b84520dcdd43b3 (diff) | |
| download | mariadb-git-19f41e6e0df2d875cff2404f9bbbab30d81b72b1.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql-bench/limits/mysql-4.0.cfg:
Auto merged
Diffstat (limited to 'innobase/include/com0shm.ic')
| -rw-r--r-- | innobase/include/com0shm.ic | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/innobase/include/com0shm.ic b/innobase/include/com0shm.ic deleted file mode 100644 index e0d3cb26f69..00000000000 --- a/innobase/include/com0shm.ic +++ /dev/null @@ -1,7 +0,0 @@ -/****************************************************** -Communication through shared memory - -(c) 1995 Innobase Oy - -Created 9/23/1995 Heikki Tuuri -*******************************************************/ |