diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 17a2d7db632e2..05169b2353136 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -4235,7 +4235,7 @@ ($$)
 	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 03b243ee8cc6e..e0616661a75d2 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