summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-06-25 20:13:05 +0300
committermonty@mysql.com <>2004-06-25 20:13:05 +0300
commitb1d08ba2b423bd6d88aaa0efaba1807f7e792a47 (patch)
tree983268d5f30394d4fa4ffdd75cd095f6227e5170 /.bzrignore
parentf6765146c1b97bbb71f79adbd275dc2b6ca79333 (diff)
parentc3eb93604085134940f89c7d12366d431ced9ea9 (diff)
downloadmariadb-git-b1d08ba2b423bd6d88aaa0efaba1807f7e792a47.tar.gz
Merge with 4.0 to get the latest bug patches to 4.1
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index 1f9a067990c..080b46f1e3d 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -790,3 +790,4 @@ sql/mysql_tzinfo_to_sql_tztime.cc
sql/my_time.c
libmysql/my_time.c
libmysqld/my_time.c
+sql/mysql_tzinfo_to_sql