]> git.pld-linux.org Git - packages/php.git/blame - mysqli-err.patch
Update obsoletes list to include php 8.2
[packages/php.git] / mysqli-err.patch
CommitLineData
f9fed404
AM
1diff -urNp -x '*.orig' php-5.2.17.org/ext/mysqli/mysqli.c php-5.2.17/ext/mysqli/mysqli.c
2--- php-5.2.17.org/ext/mysqli/mysqli.c 2021-10-23 19:15:35.113125046 +0200
3+++ php-5.2.17/ext/mysqli/mysqli.c 2021-10-23 19:15:37.713125046 +0200
4@@ -1063,7 +1063,7 @@ int php_local_infile_init(void **ptr, co
0ddd3976
JR
5 }
6
7 if (!(mysql = (MY_MYSQL *)userdata)) {
8- LOCAL_INFILE_ERROR_MSG(data->error_msg, ER(CR_UNKNOWN_ERROR));
9+ LOCAL_INFILE_ERROR_MSG(data->error_msg, "Unknown MySQL error");
10 return 1;
11 }
12
f9fed404
AM
13@@ -1112,7 +1112,7 @@ int php_local_infile_read(void *ptr, cha
14 count = (int)php_stream_read(mysql->li_stream, buf, buf_len);
0ddd3976
JR
15
16 if (count < 0) {
17- LOCAL_INFILE_ERROR_MSG(data->error_msg, ER(2));
18+ LOCAL_INFILE_ERROR_MSG(data->error_msg, "Can't connect to local MySQL server");
19 }
20
21 return count;
f9fed404 22@@ -1174,7 +1174,7 @@ int php_local_infile_error(void *ptr, ch
0ddd3976
JR
23 strlcpy(error_msg, data->error_msg, error_msg_len);
24 return 2000;
25 }
26- strlcpy(error_msg, ER(CR_OUT_OF_MEMORY), error_msg_len);
27+ strlcpy(error_msg, "MySQL client ran out of memory", error_msg_len);
28 return CR_OUT_OF_MEMORY;
29 }
30 /* }}} */
This page took 0.051654 seconds and 4 git commands to generate.