summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorKonstantin Osipov <kostja@sun.com>2010-02-05 01:08:08 +0300
committerKonstantin Osipov <kostja@sun.com>2010-02-05 01:08:08 +0300
commitad0f1f8021dff9b93bd963603a790b5c30a7c01a (patch)
treea1d34e4650281143b62067088c8965f2cceacb2d /.bzrignore
parent06e1a73af6ca0b912153b10bb23deba8fd333974 (diff)
parentb78e3a5d1efff8958a2ac44efadbefacaba0f163 (diff)
downloadmariadb-git-ad0f1f8021dff9b93bd963603a790b5c30a7c01a.tar.gz
Merge next-mr -> next-4284.
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index 61177d5ed62..4b21b35d5ea 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -392,6 +392,7 @@ client/rpl_record_old.h
client/rpl_tblmap.h
client/rpl_tblmap.cc
client/rpl_utility.h
+client/rpl_utility.cc
client/select_test
client/sql_string.cpp
client/ssl_test
@@ -1143,6 +1144,7 @@ libmysqld/rpl_handler.cc
libmysqld/rpl_injector.cc
libmysqld/rpl_record.cc
libmysqld/rpl_record_old.cc
+libmysqld/rpl_utility.cc
libmysqld/scheduler.cc
libmysqld/set_var.cc
libmysqld/simple-test
@@ -3075,3 +3077,4 @@ client/transaction.h
libmysqld/transaction.cc
libmysqld/sys_vars.cc
libmysqld/keycaches.cc
+client/dtoa.c