diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-05-20 12:36:30 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-05-20 12:36:30 +0200 |
| commit | d7a6c801ac6890fd8a218484db5293afdcc2808a (patch) | |
| tree | d399d63510cafdb2bb11ac083ae285aaebbb9096 /.bzrignore | |
| parent | db7085dfae07e8cf4e98e41bd0dc111fb1b4896b (diff) | |
| parent | 639a766096733861ce5f4ed4863d9db37090a4f4 (diff) | |
| download | mariadb-git-d7a6c801ac6890fd8a218484db5293afdcc2808a.tar.gz | |
5.3 merge.
change maria.distinct to use a function that doesn't require ssl-enabled builds
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 37ae77824f8..fa493bd3ede 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1129,6 +1129,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 @@ -1145,3 +1146,4 @@ sql/db.opt ./install_manifest_*.txt typescript mysql-test/collections/default.release.done +sql/sql_yacc.hh |