Fixing offset of some patch file

deps/mariadb-client-library/mariadb_com.h.patch

@@ -1,4 +1,4 @@
-@@ -207,8 +207,6 @@
+@@ -210,8 +210,6 @@
                                   CLIENT_LONG_FLAG |\
                                   CLIENT_TRANSACTIONS |\
                                   CLIENT_SECURE_CONNECTION |\

deps/mariadb-client-library/mariadb_lib.c.collation.patch

@@ -1,4 +1,4 @@
-@@ -1017,7 +1017,10 @@ mysql_init(MYSQL *mysql)
+@@ -1109,7 +1109,10 @@ mysql_init(MYSQL *mysql)
      goto error;
    mysql->options.report_data_truncation= 1;
    mysql->options.connect_timeout=CONNECT_TIMEOUT;
@@ -9,8 +9,8 @@
 +  //mysql->charset= mysql_find_charset_name(MARIADB_DEFAULT_CHARSET);
    mysql->methods= &MARIADB_DEFAULT_METHODS;
    strcpy(mysql->net.sqlstate, "00000");
-   mysql->net.last_error[0]= mysql->net.last_errno= 0;
-@@ -1497,11 +1500,15 @@ MYSQL *mthd_my_real_connect(MYSQL *mysql
+   mysql->net.last_error[0]= mysql->net.last_errno= mysql->net.extension->extended_errno= 0;
+@@ -1625,11 +1628,15 @@ MYSQL *mthd_my_real_connect(MYSQL *mysql
      }
    }
  
@@ -31,7 +31,7 @@
  
    if (!mysql->charset)
    {
-@@ -1759,10 +1766,16 @@ my_bool	STDCALL mysql_change_user(MYSQL
+@@ -1892,10 +1899,16 @@ my_bool	STDCALL mysql_change_user(MYSQL
         *s_db= mysql->db;
    int rc;
  
@@ -52,7 +52,7 @@
  
    mysql->user= strdup(user ? user : "");
    mysql->passwd= strdup(passwd ? passwd : "");
-@@ -2767,6 +2780,12 @@ mysql_optionsv(MYSQL *mysql,enum mysql_o
+@@ -2963,6 +2976,12 @@ mysql_optionsv(MYSQL *mysql,enum mysql_o
      OPT_SET_VALUE_STR(&mysql->options, charset_dir, arg1);
      break;
    case MYSQL_SET_CHARSET_NAME:

deps/mariadb-client-library/mariadb_stmt.c.patch

@@ -1,4 +1,4 @@
-@@ -133,6 +133,7 @@
+@@ -131,6 +131,7 @@ my_bool mthd_supported_buffer_type(enum
    case MYSQL_TYPE_TIMESTAMP:
    case MYSQL_TYPE_TINY:
    case MYSQL_TYPE_TINY_BLOB:
@@ -6,7 +6,7 @@
    case MYSQL_TYPE_VAR_STRING:
    case MYSQL_TYPE_YEAR:
      return 1;
-@@ -1231,6 +1232,7 @@
+@@ -1229,6 +1230,7 @@ my_bool STDCALL mysql_stmt_bind_param(MY
          break;
        case MYSQL_TYPE_STRING:
        case MYSQL_TYPE_JSON:

deps/mariadb-client-library/mysql.h.patch

@@ -1,4 +1,4 @@
-@@ -492,7 +492,7 @@
+@@ -517,7 +517,7 @@
  unsigned long STDCALL mysql_thread_id(MYSQL *mysql);
  const char * STDCALL mysql_character_set_name(MYSQL *mysql);
  void STDCALL mysql_get_character_set_info(MYSQL *mysql, MY_CHARSET_INFO *cs);
@@ -7,7 +7,7 @@
  
  my_bool mariadb_get_infov(MYSQL *mysql, enum mariadb_value value, void *arg, ...);
  my_bool STDCALL mariadb_get_info(MYSQL *mysql, enum mariadb_value value, void *arg);
-@@ -511,6 +511,7 @@
+@@ -536,6 +536,7 @@
  					   const char *unix_socket,
  					   unsigned long clientflag);
  void		STDCALL mysql_close(MYSQL *sock);
@@ -15,7 +15,7 @@
  int		STDCALL mysql_select_db(MYSQL *mysql, const char *db);
  int		STDCALL mysql_query(MYSQL *mysql, const char *q);
  int		STDCALL mysql_send_query(MYSQL *mysql, const char *q,
-@@ -610,7 +611,7 @@
+@@ -635,7 +636,7 @@
  int STDCALL mysql_stmt_next_result_cont(int *ret, MYSQL_STMT *stmt, int status);
  
  int STDCALL mysql_set_character_set_start(int *ret, MYSQL *mysql,

deps/mariadb-client-library/plugin_auth_CMakeLists.txt.patch

@@ -1,5 +1,3 @@
---- /tmp/CMakeLists.txt	2019-11-12 10:34:39.913735922 +1100
-+++ ./plugins/auth/CMakeLists.txt	2019-11-12 10:35:51.642093480 +1100
 @@ -70,7 +70,7 @@
    REGISTER_PLUGIN(TARGET caching_sha2_password
                  TYPE MARIADB_CLIENT_PLUGIN_AUTH
@@ -16,7 +14,7 @@
 -                    DEFAULT DYNAMIC
 +                    DEFAULT STATIC
                      SOURCES ${AUTH_DIR}/sha256_pw.c
-                     LIBRARIES ${CRYT_LIBS})
+                     LIBRARIES ${CRYPT_LIBS})
    ENDIF()
 @@ -123,6 +123,6 @@
  REGISTER_PLUGIN(TARGET mysql_clear_password

deps/mariadb-client-library/unittest_charset.c.patch

@@ -13,7 +13,7 @@
  
    return OK;
  }
-@@ -543,7 +543,7 @@
+@@ -542,7 +542,7 @@
    }
    /* Retrieve character set information. */
  
@@ -22,7 +22,7 @@
    bug30472_retrieve_charset_info(mysql,
                                   character_set_name_1,
                                   character_set_client_1,
-@@ -552,7 +552,7 @@
+@@ -551,7 +551,7 @@
  
    /* Switch client character set. */
  
@@ -31,7 +31,7 @@
  
    /* Retrieve character set information. */
  
-@@ -582,7 +582,7 @@
+@@ -581,7 +581,7 @@
    /* Call mysql_change_user() with the same username, password, database. */
  
    rc= mysql_change_user(mysql, username, password, (schema) ? schema : "test");
@@ -40,7 +40,7 @@
    check_mysql_rc(rc, mysql);
  
    /* Retrieve character set information. */
-@@ -648,7 +648,7 @@
+@@ -647,7 +647,7 @@
      /* ignore ucs2 */
      if (strcmp(row[0], "ucs2") && strcmp(row[0], "utf16le") && strcmp(row[0], "utf8mb4") && 
          strcmp(row[0], "utf16") && strcmp(row[0], "utf32")) {
@@ -49,7 +49,7 @@
        check_mysql_rc(rc, mysql);
      }
    }
-@@ -749,7 +749,7 @@
+@@ -748,7 +748,7 @@
  
    if (strcmp(osname, "utf8"))
    {
@@ -58,7 +58,7 @@
      check_mysql_rc(rc, mysql);
  
      csname2= mysql_character_set_name(mysql);
-@@ -757,7 +757,7 @@
+@@ -756,7 +756,7 @@
  
      FAIL_IF(!strcmp(csname2, csname1), "Wrong charset: expected utf8");