diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-15 18:02:57 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-15 18:06:55 +0300 |
| commit | 43eec57fabc81304a4d3c5de7c2d18245b1cfdf6 (patch) | |
| tree | c9c58115b8efa5bac523ca3333e39937fd37a5c9 /include/mysql_com.h | |
| parent | 765347384af7fd3393ad37567a612d93ed8b3d92 (diff) | |
| parent | 6b71b3e3484818b667790b0f7426c37138fbbe53 (diff) | |
| download | mariadb-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_com.h')
| -rw-r--r-- | include/mysql_com.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index d24957d1990..6f0a2097f13 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -115,7 +115,8 @@ enum enum_server_command COM_RESET_CONNECTION, /* don't forget to update const char *command_name[] in sql_parse.cc */ 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, @@ -136,6 +137,13 @@ enum enum_indicator_type STMT_INDICATOR_IGNORE }; +/* + bulk PS flags +*/ +#define STMT_BULK_FLAG_CLIENT_SEND_TYPES 128 +#define STMT_BULK_FLAG_INSERT_ID_REQUEST 64 + + /* sql type stored in .frm files for virtual fields */ #define MYSQL_TYPE_VIRTUAL 245 /* @@ -311,7 +319,8 @@ enum enum_indicator_type CLIENT_SESSION_TRACK |\ CLIENT_DEPRECATE_EOF |\ CLIENT_CONNECT_ATTRS |\ - MARIADB_CLIENT_COM_MULTI) + MARIADB_CLIENT_COM_MULTI |\ + MARIADB_CLIENT_STMT_BULK_OPERATIONS) /* To be added later: |