diff options
| author | Michael Widenius <monty@askmonty.org> | 2009-02-15 12:58:34 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2009-02-15 12:58:34 +0200 |
| commit | a8fdaa6f2c5b2e302bffb069be3475772ca20f48 (patch) | |
| tree | b5c9560ec7346f7af6a5904ad344fdbb8020849c /extra | |
| parent | 115efe100dbc1393bce964fa1370e50cfef71d18 (diff) | |
| parent | f7a24d72dc7a86341da4634f6d1a71f1ea77000b (diff) | |
| download | mariadb-git-a8fdaa6f2c5b2e302bffb069be3475772ca20f48.tar.gz | |
Merge with base MySQL 5.1
Contains fixes for test cases
Changed release tag to beta
configure.in:
change release tag to beta
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/resolve_stack_dump.c | 3 | ||||
| -rw-r--r-- | extra/yassl/include/openssl/ssl.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/extra/resolve_stack_dump.c b/extra/resolve_stack_dump.c index 5606c17ecf3..447d63890bd 100644 --- a/extra/resolve_stack_dump.c +++ b/extra/resolve_stack_dump.c @@ -290,7 +290,8 @@ static void do_resolve() char buf[1024], *p; while (fgets(buf, sizeof(buf), fp_dump)) { - p = buf; + /* skip bracket */ + p= (p= strchr(buf, '[')) ? p+1 : buf; /* skip space */ while (my_isspace(&my_charset_latin1,*p)) ++p; diff --git a/extra/yassl/include/openssl/ssl.h b/extra/yassl/include/openssl/ssl.h index de09f1ebe4b..05b34a0dc45 100644 --- a/extra/yassl/include/openssl/ssl.h +++ b/extra/yassl/include/openssl/ssl.h @@ -203,8 +203,8 @@ SSL_CTX* SSL_CTX_new(SSL_METHOD*); SSL* SSL_new(SSL_CTX*); int SSL_set_fd (SSL*, YASSL_SOCKET_T); YASSL_SOCKET_T SSL_get_fd(const SSL*); -int SSL_connect(SSL*); // if you get an error from connect - // see note at top of REAMDE +int SSL_connect(SSL*); /* if you get an error from connect + see note at top of REAMDE */ int SSL_write(SSL*, const void*, int); int SSL_read(SSL*, void*, int); int SSL_accept(SSL*); |