diff --git a/Docs/manual.texi b/Docs/manual.texi
index 27800f6e2ac..0a0e85610c7 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -51081,6 +51081,10 @@ not yet 100% confident in this code.
 @appendixsubsec Changes in release 3.23.53
 @itemize @bullet
 @item
+Changed @code{AND/OR} to report that they can return NULL. This fixes a
+small problem in @code{GROUP BY} on @code{AND/OR} expression that return
+@code{NULL}.
+@item
 Fixed a bug that @code{OPTIMIZE} of locked and modified MyISAM table,
 reported table corruption.
 @item
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 7e3a5aa98d3..f2a59a8e77e 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -524,6 +524,7 @@ bool rm_temporary_table(enum db_type base, char *path);
 bool send_fields(THD *thd,List<Item> &item,uint send_field_count);
 void free_io_cache(TABLE *entry);
 void intern_close_table(TABLE *entry);
+bool close_thread_table(THD *thd, TABLE **table_ptr);
 void close_thread_tables(THD *thd,bool locked=0);
 bool close_thread_table(THD *thd, TABLE **table_ptr);
 void close_temporary_tables(THD *thd);
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index de4e285b128..12d41ae8843 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -19,6 +19,9 @@
 
 #include "mysql_priv.h"
 #include <hash.h>
+#ifdef HAVE_BERKELEY_DB
+#include <ha_berkeley.h>
+#endif
 #include <myisam.h>
 #ifdef HAVE_BERKELEY_DB
 #include <ha_berkeley.h>