ODBC-331 Moved C/C to 3.2 branch

It's been updated to v3.2.4. utf8 charset is treated as utf8mb3, to avoid 3.2 change to treat it as utf8mb4 to affect users.
mariadb-corporation · Sep 9, 2021 · 5133f68 · 5133f68
1 parent ff3031c
commit 5133f68
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/libmariadb b/libmariadb
diff --git a/ma_connection.c b/ma_connection.c
@@ -1,5 +1,5 @@
 /************************************************************************************
-   Copyright (C) 2013,2019 MariaDB Corporation AB
+   Copyright (C) 2013,2021 MariaDB Corporation AB
    
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -19,6 +19,7 @@
 #include <ma_odbc.h>
 
 extern const char* DefaultPluginLocation;
+static const char* utf8mb3 = "utf8mb3";
 
 struct st_madb_isolation MADB_IsolationLevel[] =
 {
@@ -684,6 +685,10 @@ SQLRETURN MADB_DbcConnectDB(MADB_Dbc *Connection,
 
     if (!MADB_IS_EMPTY(Dsn->CharacterSet))
     {
+      if (strcmp(Dsn->CharacterSet, "utf8") == 0)
+      {
+        cs_name= utf8mb3;
+      }
      cs_name= Dsn->CharacterSet;
     }
     else if (Connection->IsAnsi)

diff --git a/ma_helper.c b/ma_helper.c
@@ -508,7 +508,7 @@ size_t MADB_GetDisplaySize(MYSQL_FIELD *Field, MARIADB_CHARSET_INFO *charset)
 /* {{{ MADB_GetOctetLength */
 size_t MADB_GetOctetLength(MYSQL_FIELD *Field, unsigned short MaxCharLen)
 {
-  size_t Length= MIN(MADB_INT_MAX32, Field->length);
+  size_t Length= MIN(MADB_INT_MAX32, Field->/*max_*/length);
 
   switch (Field->type) {
   case MYSQL_TYPE_NULL:

diff --git a/test/connstring.c b/test/connstring.c
@@ -636,6 +636,11 @@ ODBC_TEST(odbc_284)
   IS_STR(Dsn->Description, descr, strlen(descr) + 1);
   IS_STR(Dsn->ServerName, host, strlen(host) + 1);
 
+  RESET_DSN(Dsn);
+  _snprintf(connstr4dsn, sizeof(connstr4dsn), "driver={MariaDB ODBC 3.0 Driver};server={127.0.0.1};port=16001;database={test};pwd={}}};uid={root}}};OPTION=131;");
+
+  IS(MADB_ParseConnString(Dsn, connstr4dsn, SQL_NTS, ';'));
+
   return OK;
 }