Skip to content

Commit 757339b

Browse files
skuzzisskuzzis
committed
update(vendor/mysql): libmysqlclient -> libmariadbclient
1 parent 18897be commit 757339b

File tree

876 files changed

+283323
-20504
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

876 files changed

+283323
-20504
lines changed

‎AMBuilder‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,13 @@ for sdk_target in MMSPlugin.sdk_targets:
6868
os.path.join(builder.sourcePath, 'vendor', 'funchook', 'lib', 'libfunchook.a'),
6969
os.path.join(builder.sourcePath, 'vendor', 'funchook', 'lib', 'libdistorm.a'),
7070
os.path.join(builder.sourcePath, 'vendor', 'curl', 'linuxsteamrt64', 'lib', 'libcurl.a'),
71-
os.path.join(builder.sourcePath, 'vendor', 'mysql', 'linuxsteamrt64', 'lib', 'libmysqlclient.a'),
71+
os.path.join(builder.sourcePath, 'vendor', 'mysql', 'linuxsteamrt64', 'lib', 'libmariadbclient.a'),
7272
os.path.join(builder.sourcePath, 'vendor', 'dynohook', 'linuxsteamrt64', 'lib', 'libdynohook.a'),
7373
os.path.join(builder.sourcePath, 'vendor', 'zydis', 'linuxsteamrt64', 'libZydis.a'),
7474
os.path.join(builder.sourcePath, 'vendor', 'dyncall', 'linuxsteamrt64', 'lib', 'libdyncall_s.a'),
7575
os.path.join(builder.sourcePath, 'vendor', 'bzip2', 'linuxsteamrt64', 'lib', 'libbz2.a'),
7676

77+
"-lgnutls",
7778
"-lz",
7879
"-lpthread",
7980
"-lssl",
@@ -118,7 +119,7 @@ for sdk_target in MMSPlugin.sdk_targets:
118119
os.path.join(builder.sourcePath, 'vendor', 'funchook', 'lib', 'funchook.lib'),
119120
os.path.join(builder.sourcePath, 'vendor', 'funchook', 'lib', 'distorm.lib'),
120121
os.path.join(builder.sourcePath, 'vendor', 'curl', 'win64', 'lib', 'libcurl_a.lib'),
121-
os.path.join(builder.sourcePath, 'vendor', 'mysql', 'win64', 'lib', 'mysqlclient.lib'),
122+
os.path.join(builder.sourcePath, 'vendor', 'mysql', 'win64', 'lib', 'mariadbclient.lib'),
122123
os.path.join(builder.sourcePath, 'vendor', 'dynohook', 'win64', 'lib', 'dynohook.lib'),
123124
os.path.join(builder.sourcePath, 'vendor', 'zydis', 'win64', 'Zydis.lib'),
124125
os.path.join(builder.sourcePath, 'vendor', 'dyncall', 'win64', 'lib', 'dyncall_s.lib'),

‎src/database/Database.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ std::any ParseFieldType(enum_field_types type, const char *value)
4343
return atof(value);
4444
else if (type == enum_field_types::MYSQL_TYPE_INT24 || type == enum_field_types::MYSQL_TYPE_LONG || type == enum_field_types::MYSQL_TYPE_LONGLONG)
4545
return atoi(value);
46-
else if (type == enum_field_types::MYSQL_TYPE_VARCHAR || type == enum_field_types::MYSQL_TYPE_VAR_STRING || type == enum_field_types::MYSQL_TYPE_BLOB || type == 245 || type == enum_field_types::MYSQL_TYPE_TIMESTAMP)
46+
else if (type == enum_field_types::MYSQL_TYPE_VARCHAR || type == enum_field_types::MYSQL_TYPE_VAR_STRING || type == enum_field_types::MYSQL_TYPE_BLOB || type == enum_field_types::MYSQL_TYPE_JSON || type == enum_field_types::MYSQL_TYPE_TIMESTAMP)
4747
return std::string(value);
4848
else if (type == enum_field_types::MYSQL_TYPE_SHORT || type == enum_field_types::MYSQL_TYPE_TINY)
4949
return (short)strtol(value, nullptr, 10);

‎vendor/mysql/linuxsteamrt64/include/errmsg.h‎

Lines changed: 81 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,110 +1,118 @@
1-
#ifndef ERRMSG_INCLUDED
2-
#define ERRMSG_INCLUDED
3-
4-
/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
5-
6-
This program is free software; you can redistribute it and/or modify
7-
it under the terms of the GNU General Public License as published by
8-
the Free Software Foundation; version 2 of the License.
9-
10-
This program is distributed in the hope that it will be useful,
1+
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
2+
2012-2016 SkySQL AB, MariaDB Corporation AB
3+
4+
This library is free software; you can redistribute it and/or
5+
modify it under the terms of the GNU Library General Public
6+
License as published by the Free Software Foundation; either
7+
version 2 of the License, or (at your option) any later version.
8+
9+
This library is distributed in the hope that it will be useful,
1110
but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
GNU General Public License for more details.
11+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12+
Library General Public License for more details.
13+
14+
You should have received a copy of the GNU Library General Public
15+
License along with this library; if not, write to the Free
16+
Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
17+
MA 02111-1301, USA */
1418

15-
You should have received a copy of the GNU General Public License
16-
along with this program; if not, write to the Free Software
17-
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
18-
19-
/* Error messages for MySQL clients */
20-
/* (Error messages for the daemon are in sql/share/errmsg.txt) */
19+
/* Error messages for mysql clients */
20+
/* error messages for the demon is in share/language/errmsg.sys */
21+
#ifndef _errmsg_h_
22+
#define _errmsg_h_
2123

2224
#ifdef __cplusplus
2325
extern "C" {
2426
#endif
2527
void init_client_errs(void);
26-
void finish_client_errs(void);
2728
extern const char *client_errors[]; /* Error messages */
29+
extern const char *mariadb_client_errors[]; /* Error messages */
2830
#ifdef __cplusplus
2931
}
3032
#endif
3133

3234
#define CR_MIN_ERROR 2000 /* For easier client code */
3335
#define CR_MAX_ERROR 2999
34-
#if !defined(ER)
35-
#define ER(X) (((X) >= CR_ERROR_FIRST && (X) <= CR_ERROR_LAST)? \
36-
client_errors[(X)-CR_ERROR_FIRST]: client_errors[CR_UNKNOWN_ERROR])
36+
#define CER_MIN_ERROR 5000
37+
#define CER_MAX_ERROR 5999
38+
#define CLIENT_ERRMAP 2 /* Errormap used by ma_error() */
3739

38-
#endif
39-
#define CLIENT_ERRMAP 2 /* Errormap used by my_error() */
40+
#define ER_UNKNOWN_ERROR_CODE "Unknown or undefined error code (%d)"
4041

41-
/* Do not add error numbers before CR_ERROR_FIRST. */
42-
/* If necessary to add lower numbers, change CR_ERROR_FIRST accordingly. */
43-
#define CR_ERROR_FIRST 2000 /*Copy first error nr.*/
4442
#define CR_UNKNOWN_ERROR 2000
4543
#define CR_SOCKET_CREATE_ERROR 2001
4644
#define CR_CONNECTION_ERROR 2002
47-
#define CR_CONN_HOST_ERROR 2003
45+
#define CR_CONN_HOST_ERROR 2003 /* never sent to a client, message only */
4846
#define CR_IPSOCK_ERROR 2004
4947
#define CR_UNKNOWN_HOST 2005
50-
#define CR_SERVER_GONE_ERROR 2006
48+
#define CR_SERVER_GONE_ERROR 2006 /* disappeared _between_ queries */
5149
#define CR_VERSION_ERROR 2007
5250
#define CR_OUT_OF_MEMORY 2008
5351
#define CR_WRONG_HOST_INFO 2009
5452
#define CR_LOCALHOST_CONNECTION 2010
5553
#define CR_TCP_CONNECTION 2011
5654
#define CR_SERVER_HANDSHAKE_ERR 2012
57-
#define CR_SERVER_LOST 2013
55+
#define CR_SERVER_LOST 2013 /* disappeared _during_ a query */
5856
#define CR_COMMANDS_OUT_OF_SYNC 2014
5957
#define CR_NAMEDPIPE_CONNECTION 2015
60-
#define CR_NAMEDPIPEWAIT_ERROR 2016
61-
#define CR_NAMEDPIPEOPEN_ERROR 2017
58+
#define CR_NAMEDPIPEWAIT_ERROR 2016
59+
#define CR_NAMEDPIPEOPEN_ERROR 2017
6260
#define CR_NAMEDPIPESETSTATE_ERROR 2018
6361
#define CR_CANT_READ_CHARSET 2019
6462
#define CR_NET_PACKET_TOO_LARGE 2020
65-
#define CR_EMBEDDED_CONNECTION 2021
66-
#define CR_PROBE_SLAVE_STATUS 2022
67-
#define CR_PROBE_SLAVE_HOSTS 2023
68-
#define CR_PROBE_SLAVE_CONNECT 2024
69-
#define CR_PROBE_MASTER_CONNECT 2025
7063
#define CR_SSL_CONNECTION_ERROR 2026
7164
#define CR_MALFORMED_PACKET 2027
72-
#define CR_WRONG_LICENSE 2028
73-
74-
/* new 4.1 error codes */
75-
#define CR_NULL_POINTER 2029
76-
#define CR_NO_PREPARE_STMT 2030
77-
#define CR_PARAMS_NOT_BOUND 2031
78-
#define CR_DATA_TRUNCATED 2032
79-
#define CR_NO_PARAMETERS_EXISTS 2033
80-
#define CR_INVALID_PARAMETER_NO 2034
81-
#define CR_INVALID_BUFFER_USE 2035
65+
#define CR_NO_PREPARE_STMT 2030
66+
#define CR_PARAMS_NOT_BOUND 2031
67+
#define CR_INVALID_PARAMETER_NO 2034
68+
#define CR_INVALID_BUFFER_USE 2035
8269
#define CR_UNSUPPORTED_PARAM_TYPE 2036
8370

84-
#define CR_SHARED_MEMORY_CONNECTION 2037
85-
#define CR_SHARED_MEMORY_CONNECT_REQUEST_ERROR 2038
86-
#define CR_SHARED_MEMORY_CONNECT_ANSWER_ERROR 2039
87-
#define CR_SHARED_MEMORY_CONNECT_FILE_MAP_ERROR 2040
88-
#define CR_SHARED_MEMORY_CONNECT_MAP_ERROR 2041
89-
#define CR_SHARED_MEMORY_FILE_MAP_ERROR 2042
90-
#define CR_SHARED_MEMORY_MAP_ERROR 2043
91-
#define CR_SHARED_MEMORY_EVENT_ERROR 2044
92-
#define CR_SHARED_MEMORY_CONNECT_ABANDONED_ERROR 2045
93-
#define CR_SHARED_MEMORY_CONNECT_SET_ERROR 2046
94-
#define CR_CONN_UNKNOW_PROTOCOL 2047
95-
#define CR_INVALID_CONN_HANDLE 2048
96-
#define CR_SECURE_AUTH 2049
97-
#define CR_FETCH_CANCELED 2050
98-
#define CR_NO_DATA 2051
99-
#define CR_NO_STMT_METADATA 2052
100-
#define CR_NO_RESULT_SET 2053
101-
#define CR_NOT_IMPLEMENTED 2054
102-
#define CR_SERVER_LOST_EXTENDED 2055
103-
#define CR_STMT_CLOSED 2056
104-
#define CR_NEW_STMT_METADATA 2057
105-
#define CR_ALREADY_CONNECTED 2058
106-
#define CR_AUTH_PLUGIN_CANNOT_LOAD 2059
107-
#define CR_ERROR_LAST /*Copy last error nr:*/ 2059
108-
/* Add error numbers before CR_ERROR_LAST and change it accordingly. */
71+
#define CR_SHARED_MEMORY_CONNECTION 2037
72+
#define CR_SHARED_MEMORY_CONNECT_ERROR 2038
73+
74+
#define CR_CONN_UNKNOWN_PROTOCOL 2047
75+
#define CR_SECURE_AUTH 2049
76+
#define CR_NO_DATA 2051
77+
#define CR_NO_STMT_METADATA 2052
78+
#define CR_NOT_IMPLEMENTED 2054
79+
#define CR_SERVER_LOST_EXTENDED 2055 /* never sent to a client, message only */
80+
#define CR_STMT_CLOSED 2056
81+
#define CR_NEW_STMT_METADATA 2057
82+
#define CR_ALREADY_CONNECTED 2058
83+
#define CR_AUTH_PLUGIN_CANNOT_LOAD 2059
84+
#define CR_DUPLICATE_CONNECTION_ATTR 2060
85+
#define CR_AUTH_PLUGIN_ERR 2061
86+
/* Always last, if you add new error codes please update the
87+
value for CR_MYSQL_LAST_ERROR */
88+
#define CR_MYSQL_LAST_ERROR CR_AUTH_PLUGIN_ERR
89+
90+
/*
91+
* MariaDB Connector/C errors:
92+
*/
93+
#define CR_EVENT_CREATE_FAILED 5000
94+
#define CR_BIND_ADDR_FAILED 5001
95+
#define CR_ASYNC_NOT_SUPPORTED 5002
96+
#define CR_FUNCTION_NOT_SUPPORTED 5003
97+
#define CR_FILE_NOT_FOUND 5004
98+
#define CR_FILE_READ 5005
99+
#define CR_BULK_WITHOUT_PARAMETERS 5006
100+
#define CR_INVALID_STMT 5007
101+
#define CR_VERSION_MISMATCH 5008
102+
#define CR_ERR_NET_READ 5013
103+
#define CR_ERR_NET_WRITE 5014
104+
#define CR_ERR_NET_UNCOMPRESS 5015
105+
106+
/* Always last, if you add new error codes please update the
107+
value for CR_MARIADB_LAST_ERROR */
108+
#define CR_MARIADB_LAST_ERROR CR_ERR_NET_UNCOMPRESS
109+
#endif
110+
111+
#define IS_MYSQL_ERROR(code) ((code) > CR_MIN_ERROR && (code) <= CR_MYSQL_LAST_ERROR)
112+
#define IS_MARIADB_ERROR(code) ((code) > CER_MIN_ERROR && (code) <= CR_MARIADB_LAST_ERROR)
113+
114+
#define ER(code) IS_MYSQL_ERROR((code)) ? client_errors[(code) - CR_MIN_ERROR] : \
115+
IS_MARIADB_ERROR((code)) ? mariadb_client_errors[(code) - CER_MIN_ERROR] : \
116+
"Unknown or undefined error code"
117+
#define CER(code) ER((code))
109118

110-
#endif /* ERRMSG_INCLUDED */

‎vendor/mysql/linuxsteamrt64/include/keycache.h‎

Lines changed: 0 additions & 146 deletions
This file was deleted.

0 commit comments

Comments
 (0)