summaryrefslogtreecommitdiff
path: root/include/mysql.h.pp
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-06-15 18:02:57 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2017-06-15 18:06:55 +0300
commit43eec57fabc81304a4d3c5de7c2d18245b1cfdf6 (patch)
treec9c58115b8efa5bac523ca3333e39937fd37a5c9 /include/mysql.h.pp
parent765347384af7fd3393ad37567a612d93ed8b3d92 (diff)
parent6b71b3e3484818b667790b0f7426c37138fbbe53 (diff)
downloadmariadb-git-43eec57fabc81304a4d3c5de7c2d18245b1cfdf6.tar.gz
Merge 10.2 into bb-10.2-ext; also, fix MDEV-13015 After restart, InnoDB wrongly thinks that a SEQUENCE is a TABLE
sql_sequence.read_only: Show that the sequence can be read in both read-only and read-write mode, and that the sequence remains accessible after a server restart.
Diffstat (limited to 'include/mysql.h.pp')
-rw-r--r--include/mysql.h.pp3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/mysql.h.pp b/include/mysql.h.pp
index 3316574a423..d061df71944 100644
--- a/include/mysql.h.pp
+++ b/include/mysql.h.pp
@@ -12,7 +12,8 @@ enum enum_server_command
COM_UNIMPLEMENTED,
COM_RESET_CONNECTION,
COM_MDB_GAP_BEG,
- COM_MDB_GAP_END=250,
+ COM_MDB_GAP_END=249,
+ COM_STMT_BULK_EXECUTE=250,
COM_SLAVE_WORKER=251,
COM_SLAVE_IO=252,
COM_SLAVE_SQL=253,