Skip to content

Commit bbf721a

Browse files
committed
fix(vendor): Libraries
1 parent 7d1e4f9 commit bbf721a

File tree

432 files changed

+9780
-140877
lines changed

Some content is hidden

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

432 files changed

+9780
-140877
lines changed

AMBuilder

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ for sdk_target in MMSPlugin.sdk_targets:
6363
os.path.join(builder.sourcePath, 'vendor', 'funchook', 'lib', 'libfunchook.a'),
6464
os.path.join(builder.sourcePath, 'vendor', 'funchook', 'lib', 'libdistorm.a'),
6565
os.path.join(builder.sourcePath, 'vendor', 'curl', 'linuxsteamrt64', 'lib', 'libcurl.a'),
66-
os.path.join(builder.sourcePath, 'vendor', 'mysql', 'linuxsteamrt64', 'lib', 'libmariadbclient.a'),
66+
os.path.join(builder.sourcePath, 'vendor', 'mysql', 'linuxsteamrt64', 'lib', 'libmysqlclient.a'),
6767
os.path.join(builder.sourcePath, 'vendor', 'dynohook', 'linuxsteamrt64', 'lib', 'libdynohook.a'),
6868
os.path.join(builder.sourcePath, 'vendor', 'zydis', 'linuxsteamrt64', 'libZydis.a'),
6969
os.path.join(builder.sourcePath, 'vendor', 'dyncall', 'linuxsteamrt64', 'lib', 'libdyncall_s.a'),

src/database/Database.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,7 @@ bool Database::Connect()
3737
return true;
3838
}
3939

40-
static constexpr int MYSQL_JSON =
41-
#ifdef _WIN32
42-
245
43-
#else
44-
enum_field_types::MYSQL_TYPE_JSON
45-
#endif
46-
;
40+
static constexpr int MYSQL_JSON = 245;
4741

4842
std::any ParseFieldType(enum_field_types type, const char *value)
4943
{
1.57 MB
Binary file not shown.

vendor/mysql/linuxsteamrt64/include/server/decimal.h renamed to vendor/mysql/linuxsteamrt64/include/decimal.h

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,11 @@
1111
1212
You should have received a copy of the GNU General Public License
1313
along with this program; if not, write to the Free Software
14-
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
14+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
1515

1616
#ifndef _decimal_h
1717
#define _decimal_h
1818

19-
#ifdef __cplusplus
20-
extern "C" {
21-
#endif
22-
2319
typedef enum
2420
{TRUNCATE=0, HALF_EVEN, HALF_UP, CEILING, FLOOR}
2521
decimal_round_mode;
@@ -45,14 +41,14 @@ int internal_str2dec(const char *from, decimal_t *to, char **end,
4541
int decimal2string(const decimal_t *from, char *to, int *to_len,
4642
int fixed_precision, int fixed_decimals,
4743
char filler);
48-
int decimal2ulonglong(const decimal_t *from, ulonglong *to);
44+
int decimal2ulonglong(decimal_t *from, ulonglong *to);
4945
int ulonglong2decimal(ulonglong from, decimal_t *to);
50-
int decimal2longlong(const decimal_t *from, longlong *to);
46+
int decimal2longlong(decimal_t *from, longlong *to);
5147
int longlong2decimal(longlong from, decimal_t *to);
5248
int decimal2double(const decimal_t *from, double *to);
5349
int double2decimal(double from, decimal_t *to);
54-
int decimal_actual_fraction(const decimal_t *from);
55-
int decimal2bin(const decimal_t *from, uchar *to, int precision, int scale);
50+
int decimal_actual_fraction(decimal_t *from);
51+
int decimal2bin(decimal_t *from, uchar *to, int precision, int scale);
5652
int bin2decimal(const uchar *from, decimal_t *to, int precision, int scale);
5753

5854
int decimal_size(int precision, int scale);
@@ -116,9 +112,5 @@ void max_decimal(int precision, int frac, decimal_t *to);
116112
#define E_DEC_ERROR 31
117113
#define E_DEC_FATAL_ERROR 30
118114

119-
#ifdef __cplusplus
120-
}
121-
#endif
122-
123115
#endif
124116

Lines changed: 73 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,118 +1,110 @@
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,
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,
1011
but WITHOUT ANY WARRANTY; without even the implied warranty of
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 */
12+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
GNU General Public License for more details.
1814
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_
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) */
2321

2422
#ifdef __cplusplus
2523
extern "C" {
2624
#endif
2725
void init_client_errs(void);
26+
void finish_client_errs(void);
2827
extern const char *client_errors[]; /* Error messages */
29-
extern const char *mariadb_client_errors[]; /* Error messages */
3028
#ifdef __cplusplus
3129
}
3230
#endif
3331

3432
#define CR_MIN_ERROR 2000 /* For easier client code */
3533
#define CR_MAX_ERROR 2999
36-
#define CER_MIN_ERROR 5000
37-
#define CER_MAX_ERROR 5999
38-
#define CLIENT_ERRMAP 2 /* Errormap used by ma_error() */
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])
3937

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

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.*/
4244
#define CR_UNKNOWN_ERROR 2000
4345
#define CR_SOCKET_CREATE_ERROR 2001
4446
#define CR_CONNECTION_ERROR 2002
45-
#define CR_CONN_HOST_ERROR 2003 /* never sent to a client, message only */
47+
#define CR_CONN_HOST_ERROR 2003
4648
#define CR_IPSOCK_ERROR 2004
4749
#define CR_UNKNOWN_HOST 2005
48-
#define CR_SERVER_GONE_ERROR 2006 /* disappeared _between_ queries */
50+
#define CR_SERVER_GONE_ERROR 2006
4951
#define CR_VERSION_ERROR 2007
5052
#define CR_OUT_OF_MEMORY 2008
5153
#define CR_WRONG_HOST_INFO 2009
5254
#define CR_LOCALHOST_CONNECTION 2010
5355
#define CR_TCP_CONNECTION 2011
5456
#define CR_SERVER_HANDSHAKE_ERR 2012
55-
#define CR_SERVER_LOST 2013 /* disappeared _during_ a query */
57+
#define CR_SERVER_LOST 2013
5658
#define CR_COMMANDS_OUT_OF_SYNC 2014
5759
#define CR_NAMEDPIPE_CONNECTION 2015
58-
#define CR_NAMEDPIPEWAIT_ERROR 2016
59-
#define CR_NAMEDPIPEOPEN_ERROR 2017
60+
#define CR_NAMEDPIPEWAIT_ERROR 2016
61+
#define CR_NAMEDPIPEOPEN_ERROR 2017
6062
#define CR_NAMEDPIPESETSTATE_ERROR 2018
6163
#define CR_CANT_READ_CHARSET 2019
6264
#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
6370
#define CR_SSL_CONNECTION_ERROR 2026
6471
#define CR_MALFORMED_PACKET 2027
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
69-
#define CR_UNSUPPORTED_PARAM_TYPE 2036
72+
#define CR_WRONG_LICENSE 2028
7073

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)
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
82+
#define CR_UNSUPPORTED_PARAM_TYPE 2036
11383

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))
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. */
118109

110+
#endif /* ERRMSG_INCLUDED */

0 commit comments

Comments
 (0)