diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-03 20:22:58 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-03 20:22:58 +0300 |
| commit | 1a46ff873e282e7b0e00e5d7ed2d8b082f56d60e (patch) | |
| tree | 3be2d65dceed74b20b35b0dd5706d1b3daeddbb6 /win | |
| parent | defe010c7368bf590bcdd6edd896c16a2febaae2 (diff) | |
| parent | 0a90bfe6c019fd1dc3db3090de969077ac311fb5 (diff) | |
| download | mariadb-git-1a46ff873e282e7b0e00e5d7ed2d8b082f56d60e.tar.gz | |
Manual merge from mysql-5.1-bugteam.
Conflicts:
- configure.in
- mysql-test/include/setup_fake_relay_log.inc
- sql/sql_select.cc
Diffstat (limited to 'win')
| -rw-r--r-- | win/configure.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/win/configure.js b/win/configure.js index 07dccb66f83..00a66b32b64 100644 --- a/win/configure.js +++ b/win/configure.js @@ -140,11 +140,11 @@ function GetValue(str, key) function GetVersion(str) { - var key = "AM_INIT_AUTOMAKE(mysql, "; - var pos = str.indexOf(key); //5.0.6-beta) + var key = "AC_INIT([MySQL Server], ["; + var pos = str.indexOf(key); if (pos == -1) return null; pos += key.length; - var end = str.indexOf(")", pos); + var end = str.indexOf("]", pos); if (end == -1) return null; return str.substring(pos, end); } |