diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-10-13 14:10:44 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-10-13 14:10:44 +0400 |
| commit | 702a2dfb3ef3c603d89bf7e4e9a63b6f8ff8968d (patch) | |
| tree | 95b84aa447928e30bb9767a6cacda4163d0eacdf /ext/mysqlnd/php_mysqlnd.c | |
| parent | 0b09ba84b912be90c06d8d5ffab55bf850c3070b (diff) | |
| parent | 7acba332fe96e5da6ad3165d0699b9e4e65d94fa (diff) | |
| download | php-git-702a2dfb3ef3c603d89bf7e4e9a63b6f8ff8968d.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
We can't eliminate FETCH_CONSTANT opcodes for constants represented by AST.
Conflicts:
ext/opcache/Optimizer/pass1_5.c
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.c')
0 files changed, 0 insertions, 0 deletions