summaryrefslogtreecommitdiff
path: root/ext/pdo_mysql
Commit message (Collapse)AuthorAgeFilesLines
* Fix #78623: Regression caused by "SP call yields additional empty result set"Christoph M. Becker2019-10-074-2/+8
| | | | This reverts commit 41a4379cb45419a376043ca5f8c5a2bca82cea7c.
* Fix #41997: SP call yields additional empty result setChristoph M. Becker2019-09-034-8/+2
| | | | | | | When stored procedures are called, the "final result set is a status result that includes no result set". Calling `::nextRowset()` on the actual last result set should return FALSE, since there is actually no further result set to be processed.
* fix the problem for connect_attr, set db condition, and add a new attribute ↵Qianqian Bu2019-08-201-0/+58
| | | | _server_host
* Enable STRICT_TRANS_TABLES in new testNikita Popov2019-06-071-1/+4
| | | | The part testing error cases relies on this.
* Fixed bug #38546Cameron Porter2019-06-073-4/+302
| | | | | | Properly support binding boolean parameters with emulated prepared statements disabled. Also add the necessary mysqlnd support for MYSQL_TYPE_TINY.
* Fix testsChristoph M. Becker2019-04-292-89/+7
| | | | | | | | | | These tests are obviously meant to test successful and failing uri: DSNs, but did not pass proper file:// URIs, so actually ended up testing for invalid data source URIs twice. We fix this, and adjust the expectations accordingly. We also unfork the -win32 variant, since both test cases are almost identical, and the expected error message may be either one.
* Make MySQLPDOTest::extractVersion() more liberalChristoph M. Becker2019-04-282-2/+2
| | | | | | | | | | | MySQL/MariaDB version strings may have suffixes which may contain dots; for instance, Debian stretch has 5.5.5-10.1.37-MariaDB-0+deb9u1 or such. Therefore, we make the version extraction more liberal, and only require that there are at least three parts separated by dot, and ignore additional parts. We also fix an erroneous test expectation, which would be triggered on CI now, right away. This patch has been provided by petk@.
* Fix #77944: Wrong meta pdo_type for bigint on LLP64Christoph M. Becker2019-04-271-1/+1
| | | | | | When actually fetching the data, bigint (unsigned) column values are returned as integers on LLP64 architectures, so their pdo_type has to be PDO::PARAM_INT accordingly.
* Merge branch 'PHP-7.1' into PHP-7.2Darek Slusarczyk2019-02-114-3/+69
|\
| * security fix - by default 'local infile' is disabled:Darek Slusarczyk2019-02-114-3/+69
| | | | | | | | | | | | | | | | - set default for mysqli.allow_local_infile=0 - explicitly disable PDO::MYSQL_ATTR_LOCAL_INFILE in case of lack of driver options - add getAttribute support for PDO::MYSQL_ATTR_LOCAL_INFILE - update existing tests where needed - add new tests [checking default value and setting on] the 'local infile' in ext/mysqli and ext/pdo_mysql
| * Sync leading and final newlines in *.phpt sectionsPeter Kokot2018-10-1540-39/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds missing newlines, trims multiple redundant final newlines into a single one, and trims redundant leading newlines in all *.phpt sections. According to POSIX, a line is a sequence of zero or more non-' <newline>' characters plus a terminating '<newline>' character. [1] Files should normally have at least one final newline character. C89 [2] and later standards [3] mention a final newline: "A source file that is not empty shall end in a new-line character, which shall not be immediately preceded by a backslash character." Although it is not mandatory for all files to have a final newline fixed, a more consistent and homogeneous approach brings less of commit differences issues and a better development experience in certain text editors and IDEs. [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206 [2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2 [3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
| * Trim trailing whitespace in *.phptPeter Kokot2018-10-149-20/+20
| |
| * Sync leading and final newlines in source code filesPeter Kokot2018-10-143-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds missing newlines, trims multiple redundant final newlines into a single one, and trims redundant leading newlines. According to POSIX, a line is a sequence of zero or more non-' <newline>' characters plus a terminating '<newline>' character. [1] Files should normally have at least one final newline character. C89 [2] and later standards [3] mention a final newline: "A source file that is not empty shall end in a new-line character, which shall not be immediately preceded by a backslash character." Although it is not mandatory for all files to have a final newline fixed, a more consistent and homogeneous approach brings less of commit differences issues and a better development experience in certain text editors and IDEs. [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206 [2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2 [3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
| * Trim trailing whitespace in source code filesPeter Kokot2018-10-134-8/+8
| |
| * Convert CRLF line endings to LFPeter Kokot2018-10-131-33/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch simplifies line endings tracked in the Git repository and syncs them to all include the LF style instead of the CRLF files. Newline characters: - LF (\n) (*nix and Mac) - CRLF (\r\n) (Windows) - CR (\r) (old Mac, obsolete) To see which line endings are in the index and in the working copy the following command can be used: `git ls-files --eol` Git additionally provides `.gitattributes` file to specify if some files need to have specific line endings on all platforms (either CRLF or LF). Changed files shouldn't cause issues on modern Windows platforms because also Git can do output conversion is core.autocrlf=true is set on Windows and use CRLF newlines in all files in the working tree. Unless CRLF files are tracked specifically, Git by default tracks all files in the index using LF newlines.
* | Sync leading and final newlines in *.phpt sectionsPeter Kokot2018-10-1540-39/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds missing newlines, trims multiple redundant final newlines into a single one, and trims redundant leading newlines in all *.phpt sections. According to POSIX, a line is a sequence of zero or more non-' <newline>' characters plus a terminating '<newline>' character. [1] Files should normally have at least one final newline character. C89 [2] and later standards [3] mention a final newline: "A source file that is not empty shall end in a new-line character, which shall not be immediately preceded by a backslash character." Although it is not mandatory for all files to have a final newline fixed, a more consistent and homogeneous approach brings less of commit differences issues and a better development experience in certain text editors and IDEs. [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206 [2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2 [3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
* | Trim trailing whitespace in *.phptPeter Kokot2018-10-149-20/+20
| |
* | Sync leading and final newlines in source code filesPeter Kokot2018-10-142-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds missing newlines, trims multiple redundant final newlines into a single one, and trims redundant leading newlines. According to POSIX, a line is a sequence of zero or more non-' <newline>' characters plus a terminating '<newline>' character. [1] Files should normally have at least one final newline character. C89 [2] and later standards [3] mention a final newline: "A source file that is not empty shall end in a new-line character, which shall not be immediately preceded by a backslash character." Although it is not mandatory for all files to have a final newline fixed, a more consistent and homogeneous approach brings less of commit differences issues and a better development experience in certain text editors and IDEs. [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206 [2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2 [3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
* | Trim trailing whitespace in source code filesPeter Kokot2018-10-134-8/+8
| |
* | Merge branch 'PHP-7.1' into PHP-7.2Nikita Popov2018-09-191-8/+8
|\ \ | |/
| * Fix getColumnMeta() testNikita Popov2018-09-191-8/+8
| | | | | | | | | | | | | | | | | | | | | | Newer MySQL versions are stricter about invalid values. Three issues are fixed: * Don't use negative values with ZEROFILL. ZEROFILL implies UNSIGNED. * Use a legal TIMESTAMP value. TIMESTAMP does not accept a Unix timestamp. * Specify BIGINT values as strings, to avoid overflows. This is a cherry-pick of d2dc0a32911c0e08986da799ce11e18c3fa5ca57 from master.
| * year++Xinchen Hui2018-01-025-5/+5
| |
* | year++Xinchen Hui2018-01-025-5/+5
| |
* | Fix bug #75615Jaromír Doleček2017-12-171-1/+1
| | | | | | | | Remove -I without argument in pdo_mysql config.m4.
* | Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2017-09-131-0/+33
|\ \ | |/ | | | | | | * PHP-7.1: Fixed bug #75018, fixed bug #75177
| * Fixed bug #75018, fixed bug #75177Anatol Belski2017-09-131-0/+33
| | | | | | | | Both are caused by the same cast issue in mysqlnd on 32-bit.
* | Req #74963 (Improved error message on fetching property of non-object)Xinchen Hui2017-07-311-1/+1
| |
* | Merge branch 'PHP-7.1' into PHP-7.2Nikita Popov2017-07-181-1/+1
|\ \ | |/
| * Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-07-181-1/+1
| |\
| | * Fix check of mysql_commit() return valueYaoGuai2017-07-181-1/+1
| | | | | | | | | | | | For mysql_commit() everything non-zero is an error.
* | | Merge branch 'PHP-7.1'Xinchen Hui2017-04-071-0/+27
|\ \ \ | |/ / | | | | | | | | | | | | | | | * PHP-7.1: Update NEWS Remove unused var Fix invalid free of persistent results on error/connection loss in mysqlnd (bug 74376)
| * | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2017-04-071-0/+27
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | * PHP-7.0: Fix invalid free of persistent results on error/connection loss in mysqlnd (bug 74376) Conflicts: ext/mysqlnd/mysqlnd_ps.c
| | * Fix invalid free of persistent results on error/connection loss in mysqlnd ↵Yussuf Khalil2017-04-051-0/+27
| | | | | | | | | | | | (bug 74376)
* | | Add PDO parameter types for national character set stringsAdam Baratz2017-03-204-4/+122
| | |
* | | Remove unused fieldAdam Baratz2017-03-201-1/+0
| | |
* | | Merge branch 'PHP-7.1'Nikita Popov2017-03-094-0/+19
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-03-094-0/+19
| |\ \ | | |/
| | * Fixed bug #71003: Add PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERTThomas Orozco2017-03-094-0/+19
| | |
| | * Update copyright headers to 2017Sammy Kaye Powers2017-01-045-5/+5
| | |
| * | Update copyright headers to 2017Sammy Kaye Powers2017-01-045-5/+5
| | |
* | | Update copyright headers to 2017Sammy Kaye Powers2017-01-025-5/+5
| | |
* | | Merge branch 'PHP-7.1'Matteo Beccati2016-12-152-1/+23
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-7.1: Skip tests when secure_file_priv dir not writable Add missing UPGRADING entry. Manual is updated before 7.0 release.
| * | Merge branch 'PHP-7.0' into PHP-7.1Matteo Beccati2016-12-152-1/+23
| |\ \ | | |/ | | | | | | | | | | | | * PHP-7.0: Skip tests when secure_file_priv dir not writable Add missing UPGRADING entry. Manual is updated before 7.0 release.
| | * Merge branch 'PHP-5.6' into PHP-7.0Matteo Beccati2016-12-152-1/+23
| | |\ | | | | | | | | | | | | | | | | * PHP-5.6: Skip tests when secure_file_priv dir not writable
| | | * Skip tests when secure_file_priv dir not writableMatteo Beccati2016-12-152-1/+23
| | | |
* | | | Remove more PHP 6 leftovers from testsNikita Popov2016-11-2430-366/+366
| | | |
* | | | Fix CRLF line-endings in testsNikita Popov2016-11-201-33/+33
| | | | | | | | | | | | | | | | Also fix a single instance of CRLF in ibase_query.c.
* | | | Remove the b prefix from literals on unrelated testsPedro Magalhães2016-11-202-4/+4
| | | |
* | | | Cleanup tests version checksTom Van Looy2016-11-205-12/+0
| | | |
* | | | Addendum to #73234: Assume param types are nullableAdam Baratz2016-10-122-2/+2
| | | |
View Lorry Controller Status