summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
Diffstat (limited to 'sql')
-rw-r--r--sql/Makefile.am2
-rw-r--r--sql/log.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am
index 28abf407f3f..a589f1379f9 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -93,7 +93,7 @@ DEFS = -DMYSQL_SERVER \
# Don't put lex_hash.h in BUILT_SOURCES as this will give infinite recursion
BUILT_SOURCES = sql_yacc.cc sql_yacc.h
EXTRA_DIST = udf_example.cc $(BUILT_SOURCES)
-YFLAGS = -d
+AM_YFLAGS = -d
link_sources:
rm -f mini_client_errors.c
diff --git a/sql/log.cc b/sql/log.cc
index 01bd08956fb..1ccd6f4ba41 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -1070,7 +1070,7 @@ bool MYSQL_LOG::write(Log_event* event_info)
if (thd->last_insert_id_used)
{
Intvar_log_event e(thd,(uchar) LAST_INSERT_ID_EVENT,
- thd->last_insert_id);
+ thd->current_insert_id);
e.set_log_pos(this);
if (thd->server_id)
e.server_id = thd->server_id;