summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Callaghan <tmcallaghan@gmail.com>2013-12-20 14:12:34 -0500
committerTim Callaghan <tmcallaghan@gmail.com>2013-12-20 14:12:34 -0500
commitdbdaa9360d258c0710e60366ed7f0adf4fc31c41 (patch)
treeeebe1b1ee4a83e48043704e329c8ac05917744e1
parent6e3e7fb5fcda1fccdc7085ca01bd45b9524c267a (diff)
downloadmariadb-git-dbdaa9360d258c0710e60366ed7f0adf4fc31c41.tar.gz
Update README.md
Updating for v7.1.0, cleaning up the CentOS / Ubuntu portion.
-rw-r--r--README.md15
1 files changed, 8 insertions, 7 deletions
diff --git a/README.md b/README.md
index 099c0971b0a..bc87c0ebe42 100644
--- a/README.md
+++ b/README.md
@@ -24,21 +24,22 @@ working MySQL or MariaDB with Tokutek patches, and with the TokuDB storage
engine, called `make.mysql.bash`. This script will download copies of the
needed source code from github and build everything.
-To build MySQL with TokuDB 7.0.4:
+To build MySQL with TokuDB 7.1.0:
```sh
-scripts/make.mysql.bash --mysqlbuild=mysql-5.5.30-tokudb-7.0.4-linux-x86_64
+scripts/make.mysql.bash --mysqlbuild=mysql-5.5.30-tokudb-7.1.0-linux-x86_64
```
-To build MariaDB with TokuDB 7.0.4:
+To build MariaDB with TokuDB 7.1.0:
```sh
-scripts/make.mysql.bash --mysqlbuild=mariadb-5.5.30-tokudb-7.0.4-linux-x86_64
+scripts/make.mysql.bash --mysqlbuild=mariadb-5.5.30-tokudb-7.1.0-linux-x86_64
```
Before you start, make sure you have a C++11-compatible compiler (GCC >=
4.7 is recommended), as well as CMake >=2.8.8, and the libraries and
-header files for valgrind,zlib, and Berkeley DB. On Centos, `yum install
-valgrind-devel zlib-devel libdb-devel`, on Ubuntu, `apt-get install
-valgrind zlib1g-dev libdb-dev`.
+header files for valgrind,zlib, and Berkeley DB.
+
+On CentOS, `yum install valgrind-devel zlib-devel libdb-devel`
+On Ubuntu, `apt-get install valgrind zlib1g-dev libdb-dev`
You can set the compiler by passing `--cc` and `--cxx` to the script, to
select one that's new enough. The default is `scripts/make.mysql.bash