diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-28 08:51:03 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-28 08:51:03 +0200 |
| commit | 88b405c4e21162b73077e000a9b8f7ffe9d6d251 (patch) | |
| tree | cfcd7ea8160cf2c79be8d73ccca32445e830770a /sql | |
| parent | 84f81dc593e8e21cbfb4596aef375d45e3a26ba8 (diff) | |
| parent | 72455300841e1b00c312c3a03ace3bcbd57a4d2f (diff) | |
| download | mariadb-git-88b405c4e21162b73077e000a9b8f7ffe9d6d251.tar.gz | |
Merge with 3.23.56 (Replace manual with 'empty' document)
Fix for bug when using auto_increment column and LAST_INSERT_ID()
Makefile.am:
Auto merged
ltconfig:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
sql/Makefile.am:
Auto merged
Docs/Makefile.am:
Merge with 3.23.56
Docs/manual.texi:
Merge with 3.23.56 (Replace manual with 'empty' document)
libmysql/libmysql.c:
Use local version
sql/log.cc:
Fix for bug when using auto_increment column and LAST_INSERT_ID()
sql/sql_base.cc:
Use local version
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/Makefile.am | 2 | ||||
| -rw-r--r-- | sql/log.cc | 2 |
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; |