summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2017-03-29 23:10:42 +0300
committerMonty <monty@mariadb.org>2017-04-07 11:41:56 +0300
commit6b81ece1beeb3be90356a2decec3f74771c30cf5 (patch)
treea30883a9caab447b33b99d86b950f3834b69adc1
parent0bfc8b37db7fff6d3d0dee3e5cd3e1841d5b16d0 (diff)
downloadmariadb-git-6b81ece1beeb3be90356a2decec3f74771c30cf5.tar.gz
Simple cleanups
- Added file name to error in mysql-test-run - When creating tags, first do it for sql to make it easier to find things in server
-rwxr-xr-xmysql-test/mysql-test-run.pl2
-rwxr-xr-xsupport-files/build-tags4
2 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index e151d86fe88..c8fa34cc545 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -4233,7 +4233,7 @@ sub extract_server_log ($$) {
push(@lines, $line);
if (scalar(@lines) > 1000000) {
$Ferr = undef;
- mtr_warning("Too much log from test, bailing out from extracting");
+ mtr_warning("Too much log in $error_log, bailing out from extracting");
return ();
}
}
diff --git a/support-files/build-tags b/support-files/build-tags
index 03b243ee8cc..e0616661a75 100755
--- a/support-files/build-tags
+++ b/support-files/build-tags
@@ -5,8 +5,8 @@ rm -f TAGS
if git rev-parse HEAD >/dev/null 2>&1
then
cd `git rev-parse --show-toplevel`
- echo client storage dbug libmysql sql-common \
- sql extra mysys mysys_ssl strings regex pcre vio include \
+ echo sql mysys strings client storage dbug libmysql sql-common \
+ extra mysys_ssl strings regex pcre vio include \
tools unittest plugin libmysqld | \
xargs -n1 git ls-files | grep -v '\.jar$' | \
xargs etags -o TAGS --append