Skip to content

Commit

Permalink
MDEV-35905: Revert CONC-710 induced mysqlbinlog FIXME
Browse files Browse the repository at this point in the history
CONC-710 incorrectly removed Item_result from mariadb_com.h.

Commit e41145f (of the server git repo) provided a temporary
fix to get the build working.

Commit 75d381ffb2b (of mariadb-connector-c) reverted the change
from CONC-710 in libmariadb.

This patch updates libmariadb to include the latest connector-c
fix (75d381ffb2b), and reverts the old temporary fix
(e41145f).

Reviewed By:
============
<TODO>
  • Loading branch information
bnestere committed Jan 22, 2025
1 parent c1559f2 commit 3d7006b
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 3d7006b

Please sign in to comment.