archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 06:58:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
69778 commits 526 branches 1434 tags 873 MiB
Commit graph

1045 commits

Author SHA1 Message Date
ULF WENDEL
36e88d78e6 MySQL 5.6 EXPIRE PASSWORD flag tests 2013-01-10 14:51:14 +01:00
Andrey Hristov
d430b5a4eb Add mysqli support - constants and checking in mysqli_options() for the 
new constant for password expriration
 2013-01-09 19:14:48 +01:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Xinchen Hui
05deaf1706 Merge branch 'PHP-5.3' into PHP-5.4 2012-12-17 14:29:45 +08:00
Xinchen Hui
06739a1b72 dos2unix & skip on connect fail 2012-12-17 14:29:13 +08:00
Rasmus Lerdorf
77c4b84ac8 Merge branch 'PHP-5.3' into PHP-5.4 2012-12-13 16:54:31 -08:00
Rasmus Lerdorf
7a49e09fd8 Need connect.inc here 2012-12-13 16:54:16 -08:00
Rasmus Lerdorf
d845549257 Merge branch 'PHP-5.3' into PHP-5.4 2012-12-13 16:42:33 -08:00
Rasmus Lerdorf
9d1bc1b622 Fix broken test 
Need to use the configured connection parameters here. We can't assume
the test user has access.
 2012-12-13 16:41:56 -08:00
Xinchen Hui
b689819567 Merge branch 'PHP-5.3' into PHP-5.4 2012-11-30 14:29:59 +08:00
Xinchen Hui
40fabf68ed Fixed bug #63398 (Segfault when polling closed link) 2012-11-30 14:28:32 +08:00
Remi Collet
8d2c44b59d Fixed Bug #63361 Header not installed 
ext/mysqli/php_mysqli_structs.h is installed and includes
mysqli_mysqlnd.h or mysqli_libmysql.h. So this header must also
be installed.
 2012-11-25 07:46:02 +01:00
ULF WENDEL
7aa3d0ae65 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Cover have_ssl=NO and have_ssl=DISABLED
 2012-09-29 18:55:51 +02:00
ULF WENDEL
da541ff561 Cover have_ssl=NO and have_ssl=DISABLED 2012-09-29 18:54:54 +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
5f9023ca38 Correct PHP version 2012-09-05 23:41:42 +08:00
Xinchen Hui
4e561055a4 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-22 13:49:04 +08:00
Xinchen Hui
e5bdd2c0ee Fixed bug #62885 (mysqli_poll - Segmentation fault) 2012-08-22 13:41:47 +08:00
Marc Easen
896ac689c9 Fixed the common misspelling of the word occurred (occured -> occurred) 2012-06-30 16:54:03 -07: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
zoe slattery
63401268db Changes to remaining two tests, #62022 2012-05-15 14:39:51 +01:00
Ulf Wendel
8665e02ccd Test for MySQL version.Variable is deprecated in MySQL 5.6. 2012-03-14 14:55:09 +00:00
Ulf Wendel
0fde9acd12 Test for MySQL version.Variable is deprecated in MySQL 5.6. 2012-03-14 14:55:09 +00:00
Johannes Schlüter
ecf87a96b9 Use correct property ctor, should fix threading issue in bug #55334 
# The code was refactored in 5_4/trunk, no need to merge
 2012-03-08 12:52:12 +00:00
Johannes Schlüter
512fdb4cc2 Fix bug #61003 mysql_stat() require a valid connection 2012-03-06 00:15:40 +00:00
Johannes Schlüter
a845e7bc08 Fix bug #61003 mysql_stat() require a valid connection 2012-03-06 00:15:40 +00:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Andrey Hristov
4dfd69e84b fix for 5.5.19 2011-12-14 19:29:45 +00:00
Andrey Hristov
2f0d084ab8 fix for 5.5.19 2011-12-14 19:29:45 +00:00
Andrey Hristov
9e14665237 another fix 2011-12-14 19:28:41 +00:00
Andrey Hristov
f16c10898b another fix 2011-12-14 19:28:41 +00:00
Andrey Hristov
b8697d07f8 fix test 2011-12-14 18:37:49 +00:00
Andrey Hristov
536e675bfa fix test 2011-12-14 18:37:49 +00:00
Andrey Hristov
3ef71f9726 fix test 2011-12-14 18:36:04 +00:00
Andrey Hristov
63ded0f5e9 fix test 2011-12-14 18:36:04 +00:00
Andrey Hristov
9033d60caf fix typo 2011-12-14 17:59:11 +00:00
Andrey Hristov
8a65304a01 fix typo 2011-12-14 17:59:11 +00:00
Andrey Hristov
e38daffe60 fix test 2011-12-14 16:27:52 +00:00
Andrey Hristov
141905ce54 fix test 2011-12-14 16:27:52 +00:00
Ulf Wendel
0f799cc410 Good to fix something, but don't forget to update tests 2011-11-23 17:30:59 +00:00
Ulf Wendel
1d1d88bec0 Good to fix something, but don't forget to update tests 2011-11-23 17:23:57 +00:00
Ulf Wendel
2bfd24071b Always good to fix something, but don't forget to update tests 2011-11-23 17:01:09 +00:00
Ulf Wendel
87a1c1bf47 Fix test 2011-11-23 16:47:22 +00:00