diff options
author | unknown <malff@lambda.hsd1.co.comcast.net.> | 2007-10-18 16:57:51 -0600 |
---|---|---|
committer | unknown <malff@lambda.hsd1.co.comcast.net.> | 2007-10-18 16:57:51 -0600 |
commit | bf5bcb849f56735ffb5270772106ad252bc05cc6 (patch) | |
tree | a15f3629ffe50212edc840fdcf207616f09d249a /debian/mysql-client-BASE.lintian-overrides.in | |
parent | 84984f9111bf49418782eaa21b2d8cde41998eba (diff) | |
parent | 9014e8e951df75086520fe7c47cb26a299f3b23f (diff) | |
download | mariadb-git-bf5bcb849f56735ffb5270772106ad252bc05cc6.tar.gz |
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-base
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
client/mysqlcheck.c:
Auto merged
client/mysqltest.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/include/mix1.inc:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/t/udf.test:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
Diffstat (limited to 'debian/mysql-client-BASE.lintian-overrides.in')
-rw-r--r-- | debian/mysql-client-BASE.lintian-overrides.in | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/debian/mysql-client-BASE.lintian-overrides.in b/debian/mysql-client-BASE.lintian-overrides.in deleted file mode 100644 index 9de261e2154..00000000000 --- a/debian/mysql-client-BASE.lintian-overrides.in +++ /dev/null @@ -1 +0,0 @@ -mysql-client-@MYSQL_BRANDED_BASE_VERSION@: package-has-a-duplicate-relation |