Skip to content

Fix mysqli tests for MariaDB/MySQL versions exceeding 25 characters #13625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
grooverdan wants to merge 1 commit into from
Closed

Fix mysqli tests for MariaDB/MySQL versions exceeding 25 characters #13625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ if (mysqli_get_server_version($link) <= 50000) {
if (!mysqli_query($link, 'DROP PROCEDURE IF EXISTS p'))
printf("[009] [%d] %s.\n", mysqli_errno($link), mysqli_error($link));

if (mysqli_real_query($link, 'CREATE PROCEDURE p(OUT ver_param VARCHAR(25)) BEGIN SELECT VERSION() INTO ver_param; END;')) {
if (mysqli_real_query($link, 'CREATE PROCEDURE p(OUT ver_param VARCHAR(50)) BEGIN SELECT VERSION() INTO ver_param; END;')) {
/* no result set, one output parameter */
if (!$stmt = mysqli_prepare($link, 'CALL p(@version)'))
printf("[011] Cannot prepare CALL, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
Expand Down Expand Up @@ -68,7 +68,7 @@ if (mysqli_get_server_version($link) <= 50000) {
if (!mysqli_query($link, 'DROP PROCEDURE IF EXISTS p'))
printf("[019] [%d] %s.\n", mysqli_errno($link), mysqli_error($link));

if (mysqli_real_query($link, 'CREATE PROCEDURE p(OUT ver_param VARCHAR(25)) BEGIN SELECT VERSION() INTO ver_param; END;')) {
if (mysqli_real_query($link, 'CREATE PROCEDURE p(OUT ver_param VARCHAR(50)) BEGIN SELECT VERSION() INTO ver_param; END;')) {
// no result set, one output parameter
if (!$stmt = mysqli_prepare($link, 'CALL p(@version)'))
printf("[020] Cannot prepare CALL, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
Expand Down Expand Up @@ -105,7 +105,7 @@ if (mysqli_get_server_version($link) <= 50000) {
if (!mysqli_query($link, 'DROP PROCEDURE IF EXISTS p'))
printf("[028] [%d] %s.\n", mysqli_errno($link), mysqli_error($link));

if (mysqli_real_query($link, 'CREATE PROCEDURE p(IN ver_in VARCHAR(25), OUT ver_out VARCHAR(25)) BEGIN SELECT ver_in INTO ver_out; END;')) {
if (mysqli_real_query($link, 'CREATE PROCEDURE p(IN ver_in VARCHAR(50), OUT ver_out VARCHAR(50)) BEGIN SELECT ver_in INTO ver_out; END;')) {
// no result set, one input parameter, output parameter
// yes, I really do not want to bind input values...
if (!$stmt = mysqli_prepare($link, "CALL p('myversion', @version)"))
Expand Down Expand Up @@ -143,7 +143,7 @@ if (mysqli_get_server_version($link) <= 50000) {
if (!mysqli_query($link, 'DROP PROCEDURE IF EXISTS p'))
printf("[037] [%d] %s.\n", mysqli_errno($link), mysqli_error($link));

if (mysqli_real_query($link, 'CREATE PROCEDURE p(IN ver_in VARCHAR(25), OUT ver_out VARCHAR(25)) BEGIN SELECT ver_in INTO ver_out; END;')) {
if (mysqli_real_query($link, 'CREATE PROCEDURE p(IN ver_in VARCHAR(50), OUT ver_out VARCHAR(50)) BEGIN SELECT ver_in INTO ver_out; END;')) {
// no result set, one input parameter, output parameter
// yes, I really do not want to bind input values...
if (!$stmt = mysqli_prepare($link, 'CALL p(?, @version)'))
Expand Down
2 changes: 1 addition & 1 deletion ext/mysqli/tests/mysqli_store_result_copy.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ mysqlnd.fetch_data_copy=0
if (mysqli_get_server_version($link) > 50000) {
// let's try to play with stored procedures
mysqli_real_query($link, 'DROP PROCEDURE IF EXISTS p');
if (mysqli_real_query($link, 'CREATE PROCEDURE p(OUT ver_param VARCHAR(25)) READS SQL DATA BEGIN SELECT id FROM test WHERE id >= 100 ORDER BY id; SELECT id + 1, label FROM test WHERE id > 0 AND id < 3 ORDER BY id; SELECT VERSION() INTO ver_param;
if (mysqli_real_query($link, 'CREATE PROCEDURE p(OUT ver_param VARCHAR(50)) READS SQL DATA BEGIN SELECT id FROM test WHERE id >= 100 ORDER BY id; SELECT id + 1, label FROM test WHERE id > 0 AND id < 3 ORDER BY id; SELECT VERSION() INTO ver_param;
END;')) {
mysqli_multi_query($link, "CALL p(@version)");
do {
Expand Down