Commit graph

674 commits

Author SHA1 Message Date
Lior Kaplan
53fb2f1e5c Happy new year (Update copyright to 2016) 2016-01-03 01:44:37 +02:00
Lior Kaplan
49493a2dcf Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
Xinchen Hui
be6fd4ba89 Fixed bug #68077 (LOAD DATA LOCAL INFILE / open_basedir restriction)
Actually, this only be fixed if php uses mysqlnd
2015-11-16 16:59:55 +08:00
Xinchen Hui
0579e8278d bump year 2015-01-15 23:26:37 +08:00
Dmitry Stogov
f08a5bfadc Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed MarinaDB support
2014-06-20 13:58:26 +04:00
Dmitry Stogov
f0639611cf Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed MarinaDB support
2014-06-20 13:57:38 +04:00
Dmitry Stogov
680ddabac1 Fixed MarinaDB support 2014-06-20 13:56:32 +04:00
Andrey Hristov
090c3e87c0 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Conflicts:
	ext/mysqli/tests/mysqli_begin_transaction.phpt
2014-04-10 16:49:13 +03:00
Andrey Hristov
63791d055a New result fetching mode for mysqlnd, which should use less memory but
implies more memory copy. The old method is still available and can be used.
It stays as default. Choosing the method is through a flag to mysqli_query()/mysqli_real_query()
New mode can be forced with an INI setting, for all extensions that support this mode
(ext/mysql and mysqli, because PDO due to it's architecture can't support it)
The setting is mysqlnd.fetch_data_copy=[0|1]
2014-04-10 16:44:54 +03:00
Nikita Popov
eaf44ec397 Remove some usages of hashtable internals 2014-04-09 12:31:21 +02:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0 Bump year 2014-01-03 11:04:26 +08:00
Stanislav Malyshev
a2d8ae9a1f fix mysql tests & mark nextRowset problematic tests 2013-08-24 23:56:48 -07:00
Christopher Jones
c6d977dd39 Fix long-standing visual pain point: the misalignment of './configure help' text.
Whitespace changes and a couple of grammar fixes.
2013-08-06 11:06:09 -07:00
Stanislav Malyshev
c793a65690 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  non living code related typo fixes

Conflicts:
	Zend/zend_compile.c
2013-08-04 16:06:24 -07:00
Veres Lajos
8d86597d73 non living code related typo fixes 2013-08-04 16:05:36 -07:00
Stanislav Malyshev
b8d4a6939e Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - addressed bug #65159, Misleading configure help text for --with-mysql-sock
2013-07-21 23:14:42 -07:00
Yoshinari Takaoka
1b4103c09d - addressed bug #65159, Misleading configure help text for --with-mysql-sock 2013-07-21 23:12:54 -07:00
Veres Lajos
b79b13b4ef less serious compatAbility fixes 2013-07-15 00:21:39 -07:00
Veres Lajos
227556c6a2 less serious compatAbility fixes 2013-07-15 00:17:35 -07:00
Andrey Hristov
378a5f9bfe updates 2013-05-21 13:27:45 +02:00
Anatol Belski
077b575d51 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix unitialized vars when sql.safe_mode=1
  more check for php_stream_fopen_tmpfile failure
2013-05-15 11:17:18 +02:00
Anatol Belski
de82e7edf7 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix unitialized vars when sql.safe_mode=1
  more check for php_stream_fopen_tmpfile failure
2013-05-15 11:14:58 +02:00
Anatol Belski
86db5fb4c2 Fix unitialized vars when sql.safe_mode=1
which can break the subsequent mysqlnd_connect() call
2013-05-15 11:12:17 +02:00
Nikita Popov
4633e07e29 Fix mysql_list_fields.phpt test
The minimum length is given in bytes, so it is charset dependent.
For utf8 charsets for example it's 3 rather than 1.
2013-03-24 17:07:16 +01:00
Nikita Popov
aa2b54812f Fix version check in test 2013-03-24 13:58:35 +01:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Xinchen Hui
a2045ff332 Happy New Year~ 2013-01-01 16:02:16 +08:00
Adam Harvey
b7091aaf01 Deprecate ext/mysql.
Per https://wiki.php.net/rfc/mysql_deprecation, connecting to a MySQL database
via ext/mysql now generates an E_DEPRECATED error. This commit includes the
minimal EXPECTF updates required for the test suite to pass: it may be
preferable to refactor some of the tests to suppress deprecation errors in
situations where no other error is expected from mysql_[p]connect(), but I'm
not enough of a MySQL expert to want to get my hands that dirty in a long
standing test suite.
2012-12-10 22:12:09 +08:00
ULF WENDEL
e7fc671dc0 Deprecating undocumented function alias, related to bug #63295 2012-10-23 12:02:58 +02:00
Johannes Schlüter
36e60436db Merge branch 'PHP-5.4' 2012-10-17 18:27:03 +02:00
Johannes Schlüter
82fb5df380 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-17 18:26:27 +02:00
Andrey Hristov
7314ed535f Merge branch 'PHP-5.3' of ssh://git.php.net/php-src into PHP-5.3 2012-10-17 17:23:37 +02:00
Andrey Hristov
c50d732f76 fix compilation failure on 32/64bit linux systems, when libmysql is used
with ext/mysql
2012-10-17 17:22:31 +02:00
ULF WENDEL
ccf749e38d Merge branch 'PHP-5.4'
* PHP-5.4:
  - BFN
  Minor changes for MySQL 5.6
  NEWS for 76601c4
2012-09-29 12:21:55 +02:00
ULF WENDEL
13d4d8e2d0 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Minor changes for MySQL 5.6
  NEWS for 76601c4

Conflicts:
	NEWS
2012-09-29 12:17:13 +02:00
Xinchen Hui
69a4301f6c Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:45:07 +08:00
Xinchen Hui
1b9e0de2cc Remove executable permission on inc 2012-10-10 10:44:34 +08:00
Xinchen Hui
e081c55fb5 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:31:31 +08:00
Xinchen Hui
610c7fbe7b Remove executable permission on phpt 2012-10-10 10:27:49 +08:00
ULF WENDEL
20e76f4487 Minor changes for MySQL 5.6 2012-09-29 12:10:24 +02:00
Xinchen Hui
4e5e8c9da0 Merge branch 'PHP-5.4' 2012-10-10 10:45:34 +08:00
Xinchen Hui
4b152e5470 Merge branch 'PHP-5.4' 2012-10-10 10:32:38 +08:00
Xinchen Hui
460d258e57 Merge branch 'PHP-5.4' 2012-08-21 22:19:23 +08:00
Xinchen Hui
cd34067aec skip test properly 2012-08-21 22:15:54 +08:00
Xinchen Hui
60ad16e11f skip test properly 2012-08-21 22:11:22 +08:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
8775a37559 - Year++ 2012-01-01 13:15:04 +00:00