andrey
815874c646
plug a leak when the server ask the client for a auth protocol, that
...
the client doesn't understand. This is 5.5 specific bug, as a result
of a refactoring in 5.5
2012-08-22 20:04:42 +02:00
andrey
79c6c93e0d
Fix crashes with filenames that don't contain directory separator - generated
...
files like scanners/parsers.
2012-07-30 21:50:13 +03:00
Xinchen Hui
f13288de96
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #62594 (segfault in mysqlnd_res_meta::set_mode)
2012-07-18 19:06:58 +08:00
Xinchen Hui
25be12a3bc
Fixed bug #62594 (segfault in mysqlnd_res_meta::set_mode)
2012-07-18 19:06:27 +08:00
Anatoliy Belsky
6071bfb325
fix windows build
...
- there should be no trailing white spaces after \ in multiline macros
2012-07-11 13:32:19 +02:00
andrey
049abdfb26
fix valgrind warning
2012-07-09 18:13:35 +03:00
andrey
66e1ac23c1
Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4
2012-07-09 17:59:42 +03:00
andrey
555db7dc4e
fix valgrind warning
2012-07-09 17:59:23 +03:00
Stanislav Malyshev
a3322f8927
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed the common misspelling of the word occurred (occured -> occurred)
2012-06-30 17:00:25 -07:00
Marc Easen
896ac689c9
Fixed the common misspelling of the word occurred (occured -> occurred)
2012-06-30 16:54:03 -07:00
andrey
c51fbbe4b4
merge
2012-06-29 16:58:53 +03:00
andrey
ed1f058591
merge
2012-06-29 16:32:55 +03:00
andrey
b7dbcbd41f
Merge branch 'PHP-5.3' into PHP-5.4
2012-06-29 14:48:37 +03:00
andrey
8fe87e7fea
fix Bug #62273 Segmentation Fault in Mysqli/Mysqlnd
2012-06-29 14:42:36 +03:00
andrey
0620ad2031
Merge branch 'PHP-5.4'
2012-06-29 12:43:41 +03:00
andrey
08f4b3c3ac
Merge branch 'PHP-5.3' into PHP-5.4
2012-06-29 12:43:14 +03:00
andrey
f826ea093f
new charsets
2012-06-29 12:42:54 +03:00
andrey
6e648e9340
trace allocations in a file
2012-06-27 16:51:07 +03:00
Johannes Schlüter
d6e421f6a6
Pass orig filename and line through to emalloc and friends
2012-06-26 12:33:36 +02:00
Anatoliy Belsky
40af974c73
fix windows build
2012-06-20 15:02:49 +02:00
andrey
2c230fb574
close the underlying stream as early as possible and so notify the
...
NET layer
2012-06-01 22:12:08 +03:00
andrey
f96d19fa70
close the stream whenever possible, no need to keep it open altough the
...
connection is marked as unusable
2012-06-01 11:22:19 +03:00
andrey
0d1bc3e8e5
more refactoring stuff. Reduced code duplication in the authentication
...
code
2012-05-31 15:46:26 +03:00
andrey
5a2578a333
small refactoring - factour out code from connection establishment.
...
Add a define for the default authentication protocol - get away from
the hardcoded magic value
2012-05-30 15:24:17 +03:00
andrey
dec56ca1e3
Merge branch 'PHP-5.4'
2012-05-16 16:00:17 +02:00
andrey
4d2d8e8717
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
ext/mysqlnd/mysqlnd_ps.c
merge fix for bug#62046
2012-05-16 15:59:39 +02:00
andrey
d4afbd487a
Fix for bug#62046
...
Bug#62046 mysqli@mysqlnd can't iterate over stored sets after call to
mysqli_stmt_reset().
Stmt's state was changed to STMT_PREPARED and leads the driver to think
that the stmt was just prepared. Because result set exist also for only
prepared but not executed sets, the check for stmt->result isn't any good.
There is a result set, because as response for COM_PREPARE the server sends
metadata and metadata is part of a result set. After COM_EXECUTE the server
sends metadata again, which could be different and in this case more correct.
2012-05-16 14:28:55 +02:00
Johannes Schlüter
544c6f2f22
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix #61704 (Crash apache, phpinfo() threading issue)
Fix folding marks
2012-05-08 17:30:46 +02:00
Johannes Schlüter
e8e661128a
Fix #61704 (Crash apache, phpinfo() threading issue)
2012-05-08 17:30:05 +02:00
Johannes Schlüter
fb3b6bcf83
Fix folding marks
2012-05-08 15:18:33 +02:00
andrey
c75cbd62dd
these methods should return a stream. This makes it easier to intercept
...
the return value
2012-05-07 15:32:00 +02:00
andrey
68536a4167
comment for the #else
2012-05-07 13:55:40 +02:00
andrey
ec159081a0
reorganize things a bit...just shifting code
2012-05-07 13:31:42 +02:00
andrey
267f691a45
bump mysqlnd versions
2012-05-03 15:33:47 +02:00
andrey
cd9e4d1def
Merge branch 'PHP-5.4'
2012-05-02 16:15:35 +02:00
andrey
67419499b2
Merge branch 'PHP-5.3' into PHP-5.4
2012-05-02 15:57:08 +02:00
andrey
b42d000471
Fix for bug#61411
...
Bug #61411 PDO Segfaults with PERSISTENT == TRUE && EMULATE_PREPARES == FALSE
Wrong allocation, that doesn't follow the scheme of using stmt->persistent
was the root cause of the problem and the crash at free.
2012-05-02 15:55:22 +02:00
andrey
174bf906f8
refactor MYSQLND_NET, split it two parts for easy resharing
2012-04-30 17:01:56 +02:00
Johannes Schlüter
ca7b122c8c
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix folding
2012-04-22 02:25:36 +02:00
Johannes Schlüter
bb2f806534
Fix folding
2012-04-22 02:25:02 +02:00
David Soria Parra
6e7284fb5b
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Replace $Revision$ with $Id$ in keyword expansion enable files
Enable $Id$ expansion for files with the $Revision$ keyword
Conflicts:
ext/mysqlnd/mysqlnd.h
2012-03-20 17:59:33 +01:00
David Soria Parra
c918ca57a7
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Replace $Revision$ with $Id$ in keyword expansion enable files
Enable $Id$ expansion for files with the $Revision$ keyword
Conflicts:
ext/mysqlnd/mysqlnd.h
2012-03-20 17:58:58 +01:00
David Soria Parra
f7b10abae9
Replace $Revision$ with $Id$ in keyword expansion enable files
2012-03-20 17:53:47 +01:00
Johannes Schlüter
4c4a33e706
Fix bug #60948 mysqlnd FTBFS when -Wformat-security is enabled
...
# 5.3 not affected
2012-03-05 23:55:12 +00:00
Johannes Schlüter
5cea216900
Fix bug #60948 mysqlnd FTBFS when -Wformat-security is enabled
...
# 5.3 not affected
2012-03-05 23:55:12 +00:00
Stanislav Malyshev
f43330a371
remove -dev for release
2012-02-28 18:43:44 +00:00
Andrey Hristov
7153f7f887
assert
2012-02-02 15:00:42 +00:00
Andrey Hristov
da0da10bc9
assert
2012-02-02 15:00:42 +00:00
Andrey Hristov
d54bdbbbe4
assert
2012-02-02 15:00:42 +00:00
Christopher Jones
f115235a6e
Fix configuration message typo and alignment (5.4 merge approved by Stas)
2012-01-12 23:23:05 +00:00
