Bug #33748725 JDBC: Aggregate Function returning bad value on BIT field

silvakid · silvakid · commit 531c41453fa7 · 2022-01-18T10:56:49.000Z
type
diff --git a/driver/mysql_ps_resultset_metadata.cpp b/driver/mysql_ps_resultset_metadata.cpp
@@ -56,11 +56,13 @@ namespace mysql
 
 /* {{{ MySQL_PreparedResultSetMetaData::MySQL_PreparedResultSetMetaData -I- */
 MySQL_PreparedResultSetMetaData::MySQL_PreparedResultSetMetaData(boost::shared_ptr< NativeAPI::NativeStatementWrapper > & _proxy,
-                                  boost::shared_ptr< MySQL_DebugLogger> & l)
+    boost::shared_ptr< MySQL_DebugLogger> & l)
   : proxy(_proxy), logger(l), result_meta( _proxy->result_metadata()),
-    num_fields(_proxy->field_count())
+    num_fields(_proxy->field_count()),
+    server_version(_proxy->server_version())
 {
   CPP_ENTER("MySQL_PreparedResultSetMetaData::MySQL_PreparedResultSetMetaData");
+
 }
 /* }}} */
 
@@ -164,7 +166,7 @@ MySQL_PreparedResultSetMetaData::getColumnType(unsigned int columnIndex)
   int mysql_type = getFieldMeta(columnIndex)->type;
   CPP_INFO_FMT("type=%d", mysql_type);
   int ret = sql::mysql::util::mysql_type_to_datatype(
-          getFieldMeta(columnIndex)
+          getFieldMeta(columnIndex), server_version
         );
   CPP_INFO_FMT("our type is %d", ret);
   return ret;
diff --git a/driver/mysql_ps_resultset_metadata.h b/driver/mysql_ps_resultset_metadata.h
@@ -63,6 +63,8 @@ class MySQL_PreparedResultSetMetaData : public sql::ResultSetMetaData
 
   unsigned int num_fields;
 
+  unsigned long server_version;
+
 public:
   MySQL_PreparedResultSetMetaData(boost::shared_ptr< NativeAPI::NativeStatementWrapper > & _proxy,
                     boost::shared_ptr< MySQL_DebugLogger> & l);
diff --git a/driver/mysql_resultset.cpp b/driver/mysql_resultset.cpp
@@ -81,6 +81,8 @@ MySQL_ResultSet::MySQL_ResultSet(boost::shared_ptr< NativeAPI::NativeResultsetWr
     std::cout << "Elements=" << field_name_to_index_map.size() << "\n";
 #endif
     rs_meta.reset(new MySQL_ResultSetMetaData(result, logger));
+
+    server_version = proxy.lock()->get_server_version();
 }
 /* }}} */
 
@@ -512,11 +514,11 @@ MySQL_ResultSet::getInt64(const uint32_t columnIndex) const
         return 0;
     }
 
-
     CPP_INFO_FMT("%ssigned", (getFieldMeta(columnIndex)->flags & UNSIGNED_FLAG)? "un":"");
+
     was_null = false;
     if (getFieldMeta(columnIndex)->type == MYSQL_TYPE_BIT &&
-                getFieldMeta(columnIndex)->flags != (BINARY_FLAG|UNSIGNED_FLAG)) {
+        (server_version >= 80028 || !(getFieldMeta(columnIndex)->flags & BINARY_FLAG))) {
         uint64_t uval = 0;
         std::div_t length= std::div(getFieldMeta(columnIndex)->length, 8);
         if (length.rem) {
@@ -579,8 +581,9 @@ MySQL_ResultSet::getUInt64(const uint32_t columnIndex) const
 
     CPP_INFO_FMT("%ssigned", (getFieldMeta(columnIndex)->flags & UNSIGNED_FLAG)? "un":"");
     was_null = false;
+
     if (getFieldMeta(columnIndex)->type == MYSQL_TYPE_BIT &&
-                getFieldMeta(columnIndex)->flags != (BINARY_FLAG|UNSIGNED_FLAG)) {
+        ( server_version >= 80028 || !(getFieldMeta(columnIndex)->flags & BINARY_FLAG))) {
         uint64_t uval = 0;
         std::div_t length= std::div(getFieldMeta(columnIndex)->length, 8);
         if (length.rem) {
diff --git a/driver/mysql_resultset.h b/driver/mysql_resultset.h
@@ -80,6 +80,8 @@ class MySQL_ResultSet : public sql::ResultSet
 
   sql::ResultSet::enum_type resultset_type;
 
+  unsigned long server_version;
+
 protected:
   void checkValid() const;
   void checkScrollable() const;
diff --git a/driver/mysql_resultset_metadata.cpp b/driver/mysql_resultset_metadata.cpp
@@ -64,6 +64,7 @@ MySQL_ResultSetMetaData::MySQL_ResultSetMetaData(boost::shared_ptr< NativeAPI::N
   if (result_p) {
     num_fields = result_p->num_fields();
   }
+  server_version = result.lock()->server_version();
 }
 /* }}} */
 
@@ -179,7 +180,9 @@ MySQL_ResultSetMetaData::getColumnType(unsigned int columnIndex)
   checkValid();
   checkColumnIndex(columnIndex);
 
-  return sql::mysql::util::mysql_type_to_datatype(getFieldMeta(columnIndex));
+  return sql::mysql::util::mysql_type_to_datatype(
+    getFieldMeta(columnIndex),
+    server_version);
 }
 /* }}} */
 
diff --git a/driver/mysql_resultset_metadata.h b/driver/mysql_resultset_metadata.h
@@ -61,6 +61,7 @@ class MySQL_ResultSetMetaData : public sql::ResultSetMetaData
 {
   boost::weak_ptr< NativeAPI::NativeResultsetWrapper > result;
   boost::shared_ptr< MySQL_DebugLogger > logger;
+  unsigned long server_version;
   unsigned int num_fields;
 
 public:
diff --git a/driver/mysql_util.cpp b/driver/mysql_util.cpp
@@ -397,11 +397,12 @@ const OUR_CHARSET * find_charset(unsigned int charsetnr)
 
 /* {{{ mysql_to_datatype() -I- */
 int
-mysql_type_to_datatype(const MYSQL_FIELD * const field)
+mysql_type_to_datatype(const MYSQL_FIELD * const field,
+                       unsigned long server_version)
 {
   switch (field->type) {
     case MYSQL_TYPE_BIT:
-      if (field->flags !=(BINARY_FLAG|UNSIGNED_FLAG))
+      if (server_version >= 80028 || !(field->flags & BINARY_FLAG))
         return sql::DataType::BIT;
       return sql::DataType::BINARY;
     case MYSQL_TYPE_DECIMAL:
diff --git a/driver/mysql_util.h b/driver/mysql_util.h
@@ -185,7 +185,8 @@ void throwSQLException(::sql::mysql::NativeAPI::NativeConnectionWrapper & proxy)
 void throwSQLException(::sql::mysql::NativeAPI::NativeStatementWrapper & proxy);
 
 int mysql_string_type_to_datatype(const sql::SQLString & name);
-int mysql_type_to_datatype(const MYSQL_FIELD * const field);
+int mysql_type_to_datatype(const MYSQL_FIELD * const fieldm,
+                           unsigned long server_version);
 const char * mysql_type_to_string(const MYSQL_FIELD * const field, boost::shared_ptr< sql::mysql::MySQL_DebugLogger > & l);
 
 char * utf8_strup(const char * const src, size_t srclen);
diff --git a/driver/nativeapi/mysql_native_connection_wrapper.cpp b/driver/nativeapi/mysql_native_connection_wrapper.cpp
@@ -565,7 +565,7 @@ MySQL_NativeConnectionWrapper::store_result()
     return NULL;
   }
 
-  return new MySQL_NativeResultsetWrapper(raw, api);
+  return new MySQL_NativeResultsetWrapper(mysql, raw, api);
 }
 /* }}} */
 
@@ -601,7 +601,7 @@ MySQL_NativeConnectionWrapper::use_result()
     return NULL;
   }
 
-  return new MySQL_NativeResultsetWrapper(raw, api);
+  return new MySQL_NativeResultsetWrapper(mysql, raw, api);
 }
 /* }}} */
 
diff --git a/driver/nativeapi/mysql_native_resultset_wrapper.cpp b/driver/nativeapi/mysql_native_resultset_wrapper.cpp
@@ -46,9 +46,9 @@ namespace NativeAPI
 {
 
 /* {{{ MySQL_NativeResultsetWrapper::MySQL_NativeResultsetWrapper */
-MySQL_NativeResultsetWrapper::MySQL_NativeResultsetWrapper(::MYSQL_RES * res, boost::shared_ptr< NativeAPI::IMySQLCAPI > & _capi
+MySQL_NativeResultsetWrapper::MySQL_NativeResultsetWrapper(::MYSQL *_mysql,::MYSQL_RES * res, boost::shared_ptr< NativeAPI::IMySQLCAPI > & _capi
                       /*, boost::shared_ptr< MySQL_DebugLogger > & l*/)
-  : /*logger(l),*/ capi(_capi), rs(res)
+  : /*logger(l),*/ capi(_capi), mysql(_mysql), rs(res)
 {
 }
 /* }}} */
@@ -61,6 +61,13 @@ MySQL_NativeResultsetWrapper::~MySQL_NativeResultsetWrapper()
 }
 /* }}} */
 
+/* {{{ MySQL_NativeResultsetWrapper::server_version */
+unsigned long
+MySQL_NativeResultsetWrapper::server_version()
+{
+  return capi->get_server_version(mysql);
+}
+/* }}} */
 
 /* {{{ MySQL_NativeResultsetWrapper::data_seek */
 void
diff --git a/driver/nativeapi/mysql_native_resultset_wrapper.h b/driver/nativeapi/mysql_native_resultset_wrapper.h
@@ -40,7 +40,10 @@
 
 #if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004)
 struct MYSQL_RES;
+struct MYSQL;
 #else
+struct st_mysql;
+#define MYSQL st_mysql
 struct st_mysql_res;
 #define MYSQL_RES st_mysql_res
 #endif
@@ -60,23 +63,25 @@ class IMySQLCAPI;
 class MySQL_NativeResultsetWrapper : public NativeResultsetWrapper
 {
 public:
-  MySQL_NativeResultsetWrapper(::MYSQL_RES *, boost::shared_ptr<NativeAPI::IMySQLCAPI> &/*, boost::shared_ptr< MySQL_DebugLogger > & l*/);
+  MySQL_NativeResultsetWrapper(::MYSQL *,::MYSQL_RES *, boost::shared_ptr<NativeAPI::IMySQLCAPI> &/*, boost::shared_ptr< MySQL_DebugLogger > & l*/);
 
   ~MySQL_NativeResultsetWrapper();
 
-  void data_seek(uint64_t);
+  unsigned long server_version() override;
 
-  ::MYSQL_FIELD * fetch_field();
+  void data_seek(uint64_t) override;
 
-  ::MYSQL_FIELD * fetch_field_direct(unsigned int);
+  ::MYSQL_FIELD * fetch_field() override;
 
-  unsigned long * fetch_lengths();
+  ::MYSQL_FIELD * fetch_field_direct(unsigned int) override;
 
-  char** fetch_row();
+  unsigned long * fetch_lengths() override;
 
-  unsigned int num_fields();
+  char** fetch_row() override;
 
-  uint64_t num_rows();
+  unsigned int num_fields() override;
+
+  uint64_t num_rows() override;
 
   //boost::shared_ptr<IMySQLCAPI> getApiHandle();
 
@@ -89,6 +94,7 @@ class MySQL_NativeResultsetWrapper : public NativeResultsetWrapper
 
   boost::shared_ptr< NativeAPI::IMySQLCAPI > capi;
 
+  ::MYSQL *mysql;
   ::MYSQL_RES * rs;
 };
 
diff --git a/driver/nativeapi/mysql_native_statement_wrapper.cpp b/driver/nativeapi/mysql_native_statement_wrapper.cpp
@@ -67,6 +67,15 @@ MySQL_NativeStatementWrapper::~MySQL_NativeStatementWrapper()
 /* }}} */
 
 
+/* {{{ MySQL_NativeStatementWrapper::affected_rows() */
+unsigned long
+MySQL_NativeStatementWrapper::server_version()
+{
+  return api->get_server_version(stmt->mysql);
+}
+/* }}} */
+
+
 /* {{{ MySQL_NativeStatementWrapper::affected_rows() */
 uint64_t
 MySQL_NativeStatementWrapper::affected_rows()
@@ -212,7 +221,7 @@ MySQL_NativeStatementWrapper::result_metadata()
     return NULL;
   }
 
-  return new MySQL_NativeResultsetWrapper(raw, api);
+  return new MySQL_NativeResultsetWrapper(stmt->mysql, raw, api);
 }
 /* }}} */
 
diff --git a/driver/nativeapi/mysql_native_statement_wrapper.h b/driver/nativeapi/mysql_native_statement_wrapper.h
@@ -72,49 +72,51 @@ class MySQL_NativeStatementWrapper : public NativeStatementWrapper
   MySQL_NativeStatementWrapper(::MYSQL_STMT *, boost::shared_ptr<IMySQLCAPI>, NativeConnectionWrapper * connProxy);
   ~MySQL_NativeStatementWrapper();
 
-  uint64_t affected_rows();
+  unsigned long server_version() override;
 
-  bool attr_set(MySQL_Statement_Options option, const void *arg);
+  uint64_t affected_rows() override;
 
-  bool bind_param(::MYSQL_BIND *);
+  bool attr_set(MySQL_Statement_Options option, const void *arg) override;
 
-  bool bind_result(::MYSQL_BIND *);
+  bool bind_param(::MYSQL_BIND *) override;
 
-  void data_seek(uint64_t );
+  bool bind_result(::MYSQL_BIND *) override;
 
-  unsigned int errNo();
+  void data_seek(uint64_t ) override;
 
-  sql::SQLString error();
+  unsigned int errNo() override;
 
-  int execute ();
+  sql::SQLString error() override;
 
-  int fetch();
+  int execute () override;
 
-  unsigned int field_count();
+  int fetch() override;
 
-  bool more_results();
+  unsigned int field_count() override;
 
-  int next_result();
+  bool more_results() override;
 
-  uint64_t num_rows();
+  int next_result() override;
 
-  unsigned long param_count();
+  uint64_t num_rows() override;
 
-  int prepare (const ::sql::SQLString &);
+  unsigned long param_count() override;
 
-  NativeResultsetWrapper * result_metadata();
+  int prepare (const ::sql::SQLString &) override;
 
-  bool send_long_data(unsigned int par_number, const char * data, unsigned long len);
+  NativeResultsetWrapper * result_metadata() override;
 
-  ::sql::SQLString sqlstate();
+  bool send_long_data(unsigned int par_number, const char * data, unsigned long len) override;
 
-  int store_result();
+  ::sql::SQLString sqlstate() override;
 
-  int stmt_next_result();
+  int store_result() override;
 
-  bool stmt_free_result();
+  int stmt_next_result() override;
 
-  unsigned int warning_count();
+  bool stmt_free_result() override;
+
+  unsigned int warning_count() override;
 };
 
 
diff --git a/driver/nativeapi/native_resultset_wrapper.h b/driver/nativeapi/native_resultset_wrapper.h
@@ -60,6 +60,8 @@ class NativeResultsetWrapper : public boost::noncopyable
 public:
   virtual ~NativeResultsetWrapper(){}
 
+  virtual unsigned long server_version() = 0;
+
   virtual void data_seek(uint64_t) = 0;
 
   virtual ::MYSQL_FIELD * fetch_field() = 0;
diff --git a/driver/nativeapi/native_statement_wrapper.h b/driver/nativeapi/native_statement_wrapper.h
@@ -72,6 +72,8 @@ class NativeStatementWrapper : public boost::noncopyable
 
   virtual ~NativeStatementWrapper(){}
 
+  virtual unsigned long server_version() = 0;
+
   virtual uint64_t affected_rows() = 0;
 
   virtual bool attr_set(MySQL_Statement_Options attr, const void *arg) = 0;
diff --git a/test/unit/bugs/bugs.cpp b/test/unit/bugs/bugs.cpp
@@ -718,10 +718,6 @@ void bugs::bug68523()
 
 void bugs::bug66235()
 {
-  // TODO: remove this block when the test is fixed
-  if (!getenv("RUN_BUG_66235"))
-    return;
-
   logMsg("bug::bug66235");
   try
   {
@@ -824,10 +820,6 @@ void bugs::bug21066575()
 
 void bugs::bug14520822()
 {
-  // TODO: remove this block when the test is fixed
-  if (!getenv("RUN_BUG_14520822"))
-    return;
-
   logMsg("bug::bug14520822");
   try
   {

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ MySQL_ResultSetMetaData::MySQL_ResultSetMetaData(boost::shared_ptr< NativeAPI::N`
`64`	`64`	`if (result_p) {`
`65`	`65`	`num_fields = result_p->num_fields();`
`66`	`66`	`}`
	`67`	`+ server_version = result.lock()->server_version();`
`67`	`68`	`}`
`68`	`69`	`/* }}} */`
`69`	`70`
`@@ -179,7 +180,9 @@ MySQL_ResultSetMetaData::getColumnType(unsigned int columnIndex)`
`179`	`180`	`checkValid();`
`180`	`181`	`checkColumnIndex(columnIndex);`
`181`	`182`
`182`		`- return sql::mysql::util::mysql_type_to_datatype(getFieldMeta(columnIndex));`
	`183`	`+ return sql::mysql::util::mysql_type_to_datatype(`
	`184`	`+ getFieldMeta(columnIndex),`
	`185`	`+ server_version);`
`183`	`186`	`}`
`184`	`187`	`/* }}} */`
`185`	`188`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ class MySQL_ResultSetMetaData : public sql::ResultSetMetaData`
`61`	`61`	`{`
`62`	`62`	`boost::weak_ptr< NativeAPI::NativeResultsetWrapper > result;`
`63`	`63`	`boost::shared_ptr< MySQL_DebugLogger > logger;`
	`64`	`+ unsigned long server_version;`
`64`	`65`	`unsigned int num_fields;`
`65`	`66`
`66`	`67`	`public:`
Original file line number	Diff line number	Diff line change
`@@ -565,7 +565,7 @@ MySQL_NativeConnectionWrapper::store_result()`
`565`	`565`	`return NULL;`
`566`	`566`	`}`
`567`	`567`
`568`		`- return new MySQL_NativeResultsetWrapper(raw, api);`
	`568`	`+ return new MySQL_NativeResultsetWrapper(mysql, raw, api);`
`569`	`569`	`}`
`570`	`570`	`/* }}} */`
`571`	`571`
`@@ -601,7 +601,7 @@ MySQL_NativeConnectionWrapper::use_result()`
`601`	`601`	`return NULL;`
`602`	`602`	`}`
`603`	`603`
`604`		`- return new MySQL_NativeResultsetWrapper(raw, api);`
	`604`	`+ return new MySQL_NativeResultsetWrapper(mysql, raw, api);`
`605`	`605`	`}`
`606`	`606`	`/* }}} */`
`607`	`607`
Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,9 @@ namespace NativeAPI`
`46`	`46`	`{`
`47`	`47`
`48`	`48`	`/* {{{ MySQL_NativeResultsetWrapper::MySQL_NativeResultsetWrapper */`
`49`		`-MySQL_NativeResultsetWrapper::MySQL_NativeResultsetWrapper(::MYSQL_RES * res, boost::shared_ptr< NativeAPI::IMySQLCAPI > & _capi`
	`49`	`+MySQL_NativeResultsetWrapper::MySQL_NativeResultsetWrapper(::MYSQL _mysql,::MYSQL_RES res, boost::shared_ptr< NativeAPI::IMySQLCAPI > & _capi`
`50`	`50`	`/, boost::shared_ptr< MySQL_DebugLogger > & l/)`
`51`		`- : /logger(l),/ capi(_capi), rs(res)`
	`51`	`+ : /logger(l),/ capi(_capi), mysql(_mysql), rs(res)`
`52`	`52`	`{`
`53`	`53`	`}`
`54`	`54`	`/* }}} */`
`@@ -61,6 +61,13 @@ MySQL_NativeResultsetWrapper::~MySQL_NativeResultsetWrapper()`
`61`	`61`	`}`
`62`	`62`	`/* }}} */`
`63`	`63`
	`64`	`+/* {{{ MySQL_NativeResultsetWrapper::server_version */`
	`65`	`+unsigned long`
	`66`	`+MySQL_NativeResultsetWrapper::server_version()`
	`67`	`+{`
	`68`	`+ return capi->get_server_version(mysql);`
	`69`	`+}`
	`70`	`+/* }}} */`
`64`	`71`
`65`	`72`	`/* {{{ MySQL_NativeResultsetWrapper::data_seek */`
`66`	`73`	`void`