diff options
author | unknown <monty@mashka.mysql.fi> | 2003-01-19 02:28:36 +0200 |
---|---|---|
committer | unknown <monty@mashka.mysql.fi> | 2003-01-19 02:28:36 +0200 |
commit | f993a29ef1069dc841e3f74d4227672cc2c90c55 (patch) | |
tree | 6a0498a40b766c7ccb27f92dfd5d1cccabb1fc93 /cmd-line-utils/libedit/history.c | |
parent | e2c7d5d7ec77d056cc2ad7c9d9ef7cb132cc78de (diff) | |
parent | 44641c787c072feaf8cbc2d2335683cf93247106 (diff) | |
download | mariadb-git-f993a29ef1069dc841e3f74d4227672cc2c90c55.tar.gz |
Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1
sql/sql_parse.cc:
Auto merged
tests/client_test.c:
Auto merged
Diffstat (limited to 'cmd-line-utils/libedit/history.c')
-rw-r--r-- | cmd-line-utils/libedit/history.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/cmd-line-utils/libedit/history.c b/cmd-line-utils/libedit/history.c index 5c129dcbb21..90d94e7fc18 100644 --- a/cmd-line-utils/libedit/history.c +++ b/cmd-line-utils/libedit/history.c @@ -37,13 +37,6 @@ */ #include "compat.h" -#if !defined(lint) && !defined(SCCSID) -#if 0 -static char sccsid[] = "@(#)history.c 8.1 (Berkeley) 6/4/93"; -#else -__RCSID("$NetBSD: history.c,v 1.17 2001/03/20 00:08:31 christos Exp $"); -#endif -#endif /* not lint && not SCCSID */ /* * hist.c: History access functions |