2684 Chad MILLER 2008-08-06 [merge]
Merge from local 5.0-bugteam.
modified:
support-files/build-tags
2683 Kristofer Pettersson 2008-08-06 [merge]
Manual merge 5.0->5.1
modified:
sql/share/errmsg.txt
sql/sql_acl.cc
sql/sql_parse.cc
=== modified file 'support-files/build-tags'
--- a/support-files/build-tags 2002-01-20 02:16:52 +0000
+++ b/support-files/build-tags 2008-08-06 19:27:28 +0000
@@ -2,7 +2,7 @@
rm -f TAGS
filter='\.cc$\|\.c$\|\.h$\|\.yy$'
-files=`bk -r sfiles -gU | grep $filter `
+files=`bzr ls --kind=file | grep $filter `
for f in $files ;
do
etags -o TAGS --append $f
| Thread |
|---|
| • bzr push into mysql-5.1 branch (chad:2683 to 2684) Bug#37201 | Chad MILLER | 6 Aug |
