diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-02-18 15:16:27 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-18 15:16:27 +0100 |
| commit | d7e7862364ae344fea5657eb5aae9db3fbb84553 (patch) | |
| tree | 38f30e541f98dae9092a09cf030de8f2a336bfd1 /mysql-test/r/file_contents.result | |
| parent | a06624d61f36c70edd63adcfe2803bb7a8564de5 (diff) | |
| parent | fdd6c111c254c5044cd9b6c2f7e4d0c74f427a79 (diff) | |
| download | mariadb-git-d7e7862364ae344fea5657eb5aae9db3fbb84553.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'mysql-test/r/file_contents.result')
| -rw-r--r-- | mysql-test/r/file_contents.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/file_contents.result b/mysql-test/r/file_contents.result index 110769e12f8..0b0d5d598d6 100644 --- a/mysql-test/r/file_contents.result +++ b/mysql-test/r/file_contents.result @@ -1,6 +1,6 @@ Checking 'INFO_SRC' and 'INFO_BIN' -INFO_SRC: Found MySQL version number / Found BZR revision id +INFO_SRC: Found MySQL version number / Found GIT revision id INFO_BIN: Found 'Compiler ... used' line / Found 'Feature flags' line End of tests |