Merge bk-internal.mysql.com:/home/bk/mysql-maria

into  mysql.com:/home/my/mysql-maria


scripts/mysql_fix_privilege_tables.sh:
  Manual merge
storage/maria/unittest/ma_test_all-t:
  Manual merge

1 files changed, 10 insertions, 0 deletions

diff --git a/dbug/dbug.c b/dbug/dbug.c
index 9c92fcc9a7e..68e52388ae3 100644
--- a/dbug/dbug.c
+++ b/dbug/dbug.c
@@ -2263,6 +2263,16 @@ static void dbug_flush(CODE_STATE *cs)
 } /* dbug_flush */
 
 
+/* For debugging */
+
+void _db_force_flush()
+{
+  CODE_STATE *cs;
+  get_code_state_or_return;
+  (void) fflush(cs->stack->out_file);
+}
+
+
 void _db_lock_file_()
 {
   CODE_STATE *cs;