diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-02-18 18:07:45 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-02-18 18:07:45 -0500 |
| commit | 860576f4161ab0ea29bf7ecf6dee0e9d10b6fed6 (patch) | |
| tree | 4e3298fd280e7e1e3aca5716c0b93f95f636ac4c /mysql-test/r/file_contents.result | |
| parent | cd187ecf90e9988e5a729a1a4db7239e3baa2e6c (diff) | |
| parent | f37bdd9c1a29865574b10fe7d21164ee7cae4d19 (diff) | |
| download | mariadb-git-860576f4161ab0ea29bf7ecf6dee0e9d10b6fed6.tar.gz | |
Merge branch '10.0' into 10.0-galera
Merge branch 10.0 till revision:
f37bdd9 - Merge remote-tracking branch 'github/10.0' into 10.0
Conflicts:
.bzrignore
storage/xtradb/CMakeLists.txt
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 |