diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index 8cee60cf49a..1016cf27c18 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -421,6 +421,18 @@ set tmp_table_size=100;
 set tx_isolation="READ-COMMITTED";
 set wait_timeout=100;
 set log_warnings=1;
+select @@session.insert_id;
+@@session.insert_id
+1
+set @save_insert_id=@@session.insert_id;
+set session insert_id=20;
+select @@session.insert_id;
+@@session.insert_id
+20
+set @@session.insert_id=@save_insert_id;
+select @@session.insert_id;
+@@session.insert_id
+1
 create table t1 (a int not null auto_increment, primary key(a));
 create table t2 (a int not null auto_increment, primary key(a));
 insert into t1 values(null),(null),(null);
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test
index be1731e7493..d0def5af8d0 100644
--- a/mysql-test/t/variables.test
+++ b/mysql-test/t/variables.test
@@ -301,6 +301,16 @@ set tx_isolation="READ-COMMITTED";
 set wait_timeout=100;
 set log_warnings=1;
 
+#
+# Bugs: #20392: INSERT_ID session variable has weird value
+#
+select @@session.insert_id;
+set @save_insert_id=@@session.insert_id;
+set session insert_id=20;
+select @@session.insert_id;
+set @@session.insert_id=@save_insert_id;
+select @@session.insert_id;
+
 #
 # key buffer
 #
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 003dd4a8ab3..51317dec50d 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -2578,7 +2578,7 @@ bool sys_var_insert_id::update(THD *thd, set_var *var)
 byte *sys_var_insert_id::value_ptr(THD *thd, enum_var_type type,
 				   LEX_STRING *base)
 {
-  return (byte*) &thd->current_insert_id;
+  return (byte*) &thd->next_insert_id;
 }