diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-09-11 13:00:53 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-09-11 13:00:53 +0200 |
| commit | 2b440ba3afed528ee1437d27ead31ae483608bc0 (patch) | |
| tree | 06b55289e53e919149de7ddf5a2b1d4d2c178c40 /support-files | |
| parent | 13fd5e08b51601ad7677e206a7ecb2954a0935b4 (diff) | |
| download | mariadb-git-2b440ba3afed528ee1437d27ead31ae483608bc0.tar.gz | |
After-merge fixes for merge of MySQL-5.1.38.
mysql-test/r/innodb.result:
Fix wrong merge of result file conflicts.
mysql-test/t/bug46080-master.opt:
Fix memory limit to take into account extra storage engines in MariaDB.
mysql-test/t/innodb.test:
Add comment clarifying tricky --replace_result.
sql/sql_select.cc:
Restore fix of Bug#34374, accudentally lost during MySQL 5.1.38 merge.
support-files/build-tags:
Fix missing -R option for bzr, accidentally lost in MySQL-5.1.38 merge.
Diffstat (limited to 'support-files')
| -rwxr-xr-x | support-files/build-tags | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/support-files/build-tags b/support-files/build-tags index 1737910a692..b5386dc79c3 100755 --- a/support-files/build-tags +++ b/support-files/build-tags @@ -4,7 +4,7 @@ rm -f TAGS filter='\.cc$\|\.c$\|\.h$\|\.yy$' list="find . -type f" -bzr root >/dev/null 2>/dev/null && list="bzr ls --from-root --kind=file --versioned" +bzr root >/dev/null 2>/dev/null && list="bzr ls --from-root -R --kind=file --versioned" $list |grep $filter |while read f; do |