Skip to content

Commit

Permalink
MDEV-35905: Revert CONC-710 induced mysqlbinlog FIXME
Browse files Browse the repository at this point in the history
mariadb-corporation/mariadb-connector-c@/1a2ed3f67af698b394b2faed069b49d4f409a155
and
mariadb-corporation/mariadb-connector-c@78e56a7
of CONC-710 mistakenly moved Item_result from mariadb_com.h to
mariadb_rpl.h thinking it was only used by Connector/C's binlog API;
however it is also used by mysqlbinlog in the server. This broke
server compilation.

e41145f
provided a temporary fix to re-define Item_result in mysqlbinlog.cc
to get the build working

mariadb-corporation/mariadb-connector-c@75d381f
reverted the change from CONC-710 in libmariadb to move Item_result
back to mariadb_com.h

This patch updates the server libmariadb version to include the
latest connector-c fix, and reverts the old temporary fix, so
mysqlbinlog uses Item_result from mariadb_com.h again.

Reviewed By:
============
Marko Mäkelä <[email protected]>
  • Loading branch information
bnestere committed Jan 25, 2025
1 parent 3a6af45 commit 265f418
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
5 changes: 0 additions & 5 deletions client/mysqlbinlog.cc
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,6 @@
#include "sql_priv.h"
#include "sql_basic_types.h"
#include <atomic>
#if 0 /* FIXME: the following is broken for now */
# include "mariadb_rpl.h"
#else
enum Item_result {STRING_RESULT,REAL_RESULT,INT_RESULT,ROW_RESULT,DECIMAL_RESULT};
#endif
#include "log_event.h"
#include "compat56.h"
#include "sql_common.h"
Expand Down
2 changes: 1 addition & 1 deletion libmariadb

0 comments on commit 265f418

Please sign in to comment.