Mercurial > hg > orthanc-databases

annotate Resources/MariaDB/mariadb-connector-c-3.1.11.patch @ 332:2592c0e9b724

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix link on windows
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 11 Aug 2021 07:45:54 +0200
parents 7c46155b5bb4
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
184
e8c3c92f2532 upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 diff -urEb mariadb-connector-c-3.1.11-src.orig/include/ma_global.h mariadb-connector-c-3.1.11-src/include/ma_global.h
185
7c46155b5bb4 fix mingw build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 184
diff changeset
2 --- mariadb-connector-c-3.1.11-src.orig/include/ma_global.h 2020-12-16 13:47:31.950009259 +0100
7c46155b5bb4 fix mingw build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 184
diff changeset
3 +++ mariadb-connector-c-3.1.11-src/include/ma_global.h 2020-12-16 13:50:23.705910282 +0100
184
e8c3c92f2532 upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 @@ -606,7 +606,9 @@
e8c3c92f2532 upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 #error "Neither int or long is of 4 bytes width"
e8c3c92f2532 upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 #endif
e8c3c92f2532 upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7
e8c3c92f2532 upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 -#if !defined(HAVE_ULONG) && !defined(HAVE_LINUXTHREADS) && !defined(__USE_MISC)
e8c3c92f2532 upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 +#if defined(__LSB_VERSION__)
e8c3c92f2532 upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 +typedef unsigned long ulong; /* Short for unsigned long */
e8c3c92f2532 upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 +#elif !defined(HAVE_ULONG) && !defined(HAVE_LINUXTHREADS) && !defined(__USE_MISC)
e8c3c92f2532 upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 typedef unsigned long ulong; /* Short for unsigned long */
e8c3c92f2532 upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 #endif
e8c3c92f2532 upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 #ifndef longlong_defined
185
7c46155b5bb4 fix mingw build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 184
diff changeset
15 diff -urEb mariadb-connector-c-3.1.11-src.orig/include/mysql/client_plugin.h mariadb-connector-c-3.1.11-src/include/mysql/client_plugin.h
7c46155b5bb4 fix mingw build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 184
diff changeset
16 --- mariadb-connector-c-3.1.11-src.orig/include/mysql/client_plugin.h 2020-12-16 13:47:31.950009259 +0100
7c46155b5bb4 fix mingw build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 184
diff changeset
17 +++ mariadb-connector-c-3.1.11-src/include/mysql/client_plugin.h 2020-12-16 13:50:37.913900837 +0100
7c46155b5bb4 fix mingw build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 184
diff changeset
18 @@ -180,7 +180,7 @@
7c46155b5bb4 fix mingw build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 184
diff changeset
19 @retval
7c46155b5bb4 fix mingw build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 184
diff changeset
20 a pointer to the loaded plugin, or NULL in case of a failure
7c46155b5bb4 fix mingw build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 184
diff changeset
21 */
7c46155b5bb4 fix mingw build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 184
diff changeset
22 -struct st_mysql_client_plugin *
7c46155b5bb4 fix mingw build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 184
diff changeset
23 +struct st_mysql_client_plugin * STDCALL
7c46155b5bb4 fix mingw build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 184
diff changeset
24 mysql_load_plugin(struct st_mysql *mysql, const char *name, int type,
7c46155b5bb4 fix mingw build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 184
diff changeset
25 int argc, ...);
7c46155b5bb4 fix mingw build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 184
diff changeset
26
7c46155b5bb4 fix mingw build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 184
diff changeset
27 diff -urEb mariadb-connector-c-3.1.11-src.orig/include/mysql.h mariadb-connector-c-3.1.11-src/include/mysql.h
7c46155b5bb4 fix mingw build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 184
diff changeset
28 --- mariadb-connector-c-3.1.11-src.orig/include/mysql.h 2020-12-16 13:47:31.950009259 +0100
7c46155b5bb4 fix mingw build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 184
diff changeset
29 +++ mariadb-connector-c-3.1.11-src/include/mysql.h 2020-12-16 13:54:01.145749406 +0100
7c46155b5bb4 fix mingw build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 184
diff changeset
30 @@ -467,7 +467,7 @@
7c46155b5bb4 fix mingw build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 184
diff changeset
31 MYSQL_CLIENT_PLUGIN_HEADER
7c46155b5bb4 fix mingw build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 184
diff changeset
32 };
7c46155b5bb4 fix mingw build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 184
diff changeset
33
7c46155b5bb4 fix mingw build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 184
diff changeset
34 -struct st_mysql_client_plugin *
7c46155b5bb4 fix mingw build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 184
diff changeset
35 +struct st_mysql_client_plugin * STDCALL
7c46155b5bb4 fix mingw build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 184
diff changeset
36 mysql_load_plugin(struct st_mysql *mysql, const char *name, int type,
7c46155b5bb4 fix mingw build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 184
diff changeset
37 int argc, ...);
7c46155b5bb4 fix mingw build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 184
diff changeset
38 struct st_mysql_client_plugin * STDCALL
7c46155b5bb4 fix mingw build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 184
diff changeset
39 Only in mariadb-connector-c-3.1.11-src/include: mysql.h~
184
e8c3c92f2532 upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
40 diff -urEb mariadb-connector-c-3.1.11-src.orig/plugins/pvio/pvio_socket.c mariadb-connector-c-3.1.11-src/plugins/pvio/pvio_socket.c
185
7c46155b5bb4 fix mingw build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 184
diff changeset
41 --- mariadb-connector-c-3.1.11-src.orig/plugins/pvio/pvio_socket.c 2020-12-16 13:47:31.954009258 +0100
7c46155b5bb4 fix mingw build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 184
diff changeset
42 +++ mariadb-connector-c-3.1.11-src/plugins/pvio/pvio_socket.c 2020-12-16 13:50:23.705910282 +0100
184
e8c3c92f2532 upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43 @@ -60,6 +60,11 @@
e8c3c92f2532 upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44 #define IS_SOCKET_EINTR(err) 0
e8c3c92f2532 upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45 #endif
e8c3c92f2532 upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
46
e8c3c92f2532 upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
47 +#if defined(__LSB_VERSION__)
e8c3c92f2532 upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48 +// WARNING: This definition might break true Linux Standard Base compatibility!
e8c3c92f2532 upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49 +# define MSG_DONTWAIT 0x40 /* Nonblocking IO. */
e8c3c92f2532 upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
50 +#endif
e8c3c92f2532 upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51 +
e8c3c92f2532 upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
52 #ifndef SOCKET_ERROR
e8c3c92f2532 upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
53 #define SOCKET_ERROR -1
e8c3c92f2532 upgade to mariadb-connector-c 3.1.11
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
54 #endif