summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2023-02-10 13:06:37 +0200
committerMonty <monty@mariadb.org>2023-02-10 13:35:32 +0200
commit7a9d658f7dde818b553c8cd7f4db95fbdf3bbe34 (patch)
treec3fb59a6efb6dfa889630b0205d8a5eec5d28f39
parent4493745a7d9fb99b25f74257fc7ef5dc19eab516 (diff)
downloadmariadb-git-7a9d658f7dde818b553c8cd7f4db95fbdf3bbe34.tar.gz
Fixed compiler warning in connect/ha_connect.cc
(fp->field_length is always >= 0)
-rw-r--r--storage/connect/ha_connect.cc5
-rw-r--r--storage/connect/tabext.cpp2
2 files changed, 2 insertions, 5 deletions
diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc
index 73dfa0af1a9..502c1f4af6d 100644
--- a/storage/connect/ha_connect.cc
+++ b/storage/connect/ha_connect.cc
@@ -1614,10 +1614,7 @@ void *ha_connect::GetColumnOption(PGLOBAL g, void *field, PCOLINFO pcf)
pcf->Scale= 0;
pcf->Opt= (fop) ? (int)fop->opt : 0;
- if (fp->field_length >= 0)
- pcf->Length= fp->field_length;
- else
- pcf->Length= 256; // BLOB?
+ pcf->Length= fp->field_length;
pcf->Precision= pcf->Length;
diff --git a/storage/connect/tabext.cpp b/storage/connect/tabext.cpp
index 96a9f70e4a3..6ece7115ea5 100644
--- a/storage/connect/tabext.cpp
+++ b/storage/connect/tabext.cpp
@@ -466,7 +466,7 @@ bool TDBEXT::MakeSQL(PGLOBAL g, bool cnt)
if (Quote) {
// Tabname can have both database and table identifiers, we need to parse
- if (res= strstr(buf, "."))
+ if ((res= strstr(buf, ".")))
{
// Parse schema
my_len= res - buf + 1;