]>
Commit | Line | Data |
---|---|---|
0ddd3976 JR |
1 | --- php-5.4.45/ext/mysqli/mysqli.c.orig 2018-03-20 20:56:38.000000000 +0100 |
2 | +++ php-5.4.45/ext/mysqli/mysqli.c 2018-03-20 21:15:42.030265770 +0100 | |
3 | @@ -1376,7 +1376,7 @@ | |
4 | } | |
5 | ||
6 | if (!(mysql = (MY_MYSQL *)userdata)) { | |
7 | - LOCAL_INFILE_ERROR_MSG(data->error_msg, ER(CR_UNKNOWN_ERROR)); | |
8 | + LOCAL_INFILE_ERROR_MSG(data->error_msg, "Unknown MySQL error"); | |
9 | return 1; | |
10 | } | |
11 | ||
12 | @@ -1423,7 +1423,7 @@ | |
13 | int count = (int)php_stream_read(mysql->li_stream, buf, buf_len); | |
14 | ||
15 | if (count < 0) { | |
16 | - LOCAL_INFILE_ERROR_MSG(data->error_msg, ER(2)); | |
17 | + LOCAL_INFILE_ERROR_MSG(data->error_msg, "Can't connect to local MySQL server"); | |
18 | } | |
19 | ||
20 | return count; | |
21 | @@ -1499,7 +1499,7 @@ | |
22 | strlcpy(error_msg, data->error_msg, error_msg_len); | |
23 | return 2000; | |
24 | } | |
25 | - strlcpy(error_msg, ER(CR_OUT_OF_MEMORY), error_msg_len); | |
26 | + strlcpy(error_msg, "MySQL client ran out of memory", error_msg_len); | |
27 | return CR_OUT_OF_MEMORY; | |
28 | } | |
29 | /* }}} */ |