diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-05-26 11:26:58 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-05-26 11:26:58 +0300 |
| commit | bd0eae595fc5d050913ea01bd4c6a8e47f379176 (patch) | |
| tree | dc2915fa2f49d6c015d7f6f4d54fda9ae0ae046e /.bzrignore | |
| parent | 9d1546fe2cdced5efb4af831fa2e560b7f80fb54 (diff) | |
| parent | cb246b20d6e0dad16797b9e09bef6f0431b88d37 (diff) | |
| download | mariadb-git-bd0eae595fc5d050913ea01bd4c6a8e47f379176.tar.gz | |
References: MDEV-4572 - merge with mariaDB 5.5.31
bzr merge lp:maria/5.5 -rtag:mariadb-5.5.31
Text conflict in cmake/cpack_rpm.cmake
Text conflict in debian/dist/Debian/control
Text conflict in debian/dist/Ubuntu/control
Text conflict in sql/CMakeLists.txt
Conflict adding file sql/db.opt. Moved existing file to sql/db.opt.moved.
Conflict adding file sql/db.opt.moved. Moved existing file to sql/db.opt.moved.moved.
Text conflict in sql/mysqld.cc
Text conflict in support-files/mysql.spec.sh
8 conflicts encountered.
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 32c14cab73d..8f44e83369a 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1070,6 +1070,7 @@ vio/viotest.cpp ylwrap zlib/*.ds? sql-bench/test-table-elimination +sql/share/bulgarian sql/share/czech sql/share/danish sql/share/dutch @@ -1133,6 +1134,7 @@ cmd-line-utils/libedit/emacs.h mysql-test/collections/default.release support-files/plugins.files client/mysql_plugin +*.resource.txt plugin/handler_socket/perl-Net-HandlerSocket/HandlerSocket.c plugin/handler_socket/perl-Net-HandlerSocket/blib plugin/handler_socket/perl-Net-HandlerSocket/pm_to_blib @@ -1149,3 +1151,4 @@ sql/db.opt ./install_manifest_*.txt typescript mysql-test/collections/default.release.done +sql/sql_yacc.hh |