Skip to content

Commit 1c2d62d

Browse files
committed
WL#12460, DevAPI: Support new session reset functionality.
1 parent 27655df commit 1c2d62d

File tree

12 files changed

+11840
-2135
lines changed

12 files changed

+11840
-2135
lines changed

CHANGES

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
Version 8.0.16
55

6+
- WL#12460, DevAPI: Support new session reset functionality.
7+
68
- WL#12459, DevAPI: Support connection-attributes.
79

810
- Fix for Bug#25650385, GETBYTE() RETURNS ERROR FOR BINARY() FLD.

src/generated/java/com/mysql/cj/x/protobuf/Mysqlx.java

Lines changed: 79 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
33
*
44
* This program is free software; you can redistribute it and/or modify it under
55
* the terms of the GNU General Public License, version 2.0, as published by the
@@ -201,6 +201,30 @@ public enum Type
201201
* <code>CRUD_DROP_VIEW = 32;</code>
202202
*/
203203
CRUD_DROP_VIEW(32),
204+
/**
205+
* <code>PREPARE_PREPARE = 40;</code>
206+
*/
207+
PREPARE_PREPARE(40),
208+
/**
209+
* <code>PREPARE_EXECUTE = 41;</code>
210+
*/
211+
PREPARE_EXECUTE(41),
212+
/**
213+
* <code>PREPARE_DEALLOCATE = 42;</code>
214+
*/
215+
PREPARE_DEALLOCATE(42),
216+
/**
217+
* <code>CURSOR_OPEN = 43;</code>
218+
*/
219+
CURSOR_OPEN(43),
220+
/**
221+
* <code>CURSOR_CLOSE = 44;</code>
222+
*/
223+
CURSOR_CLOSE(44),
224+
/**
225+
* <code>CURSOR_FETCH = 45;</code>
226+
*/
227+
CURSOR_FETCH(45),
204228
;
205229

206230
/**
@@ -271,6 +295,30 @@ public enum Type
271295
* <code>CRUD_DROP_VIEW = 32;</code>
272296
*/
273297
public static final int CRUD_DROP_VIEW_VALUE = 32;
298+
/**
299+
* <code>PREPARE_PREPARE = 40;</code>
300+
*/
301+
public static final int PREPARE_PREPARE_VALUE = 40;
302+
/**
303+
* <code>PREPARE_EXECUTE = 41;</code>
304+
*/
305+
public static final int PREPARE_EXECUTE_VALUE = 41;
306+
/**
307+
* <code>PREPARE_DEALLOCATE = 42;</code>
308+
*/
309+
public static final int PREPARE_DEALLOCATE_VALUE = 42;
310+
/**
311+
* <code>CURSOR_OPEN = 43;</code>
312+
*/
313+
public static final int CURSOR_OPEN_VALUE = 43;
314+
/**
315+
* <code>CURSOR_CLOSE = 44;</code>
316+
*/
317+
public static final int CURSOR_CLOSE_VALUE = 44;
318+
/**
319+
* <code>CURSOR_FETCH = 45;</code>
320+
*/
321+
public static final int CURSOR_FETCH_VALUE = 45;
274322

275323

276324
public final int getNumber() {
@@ -304,6 +352,12 @@ public static Type forNumber(int value) {
304352
case 30: return CRUD_CREATE_VIEW;
305353
case 31: return CRUD_MODIFY_VIEW;
306354
case 32: return CRUD_DROP_VIEW;
355+
case 40: return PREPARE_PREPARE;
356+
case 41: return PREPARE_EXECUTE;
357+
case 42: return PREPARE_DEALLOCATE;
358+
case 43: return CURSOR_OPEN;
359+
case 44: return CURSOR_CLOSE;
360+
case 45: return CURSOR_FETCH;
307361
default: return null;
308362
}
309363
}
@@ -3039,7 +3093,7 @@ public com.mysql.cj.x.protobuf.Mysqlx.Error getDefaultInstanceForType() {
30393093
static {
30403094
java.lang.String[] descriptorData = {
30413095
"\n\014mysqlx.proto\022\006Mysqlx\032 google/protobuf/" +
3042-
"descriptor.proto\"\364\002\n\016ClientMessages\"\341\002\n\004" +
3096+
"descriptor.proto\"\353\003\n\016ClientMessages\"\330\003\n\004" +
30433097
"Type\022\030\n\024CON_CAPABILITIES_GET\020\001\022\030\n\024CON_CA" +
30443098
"PABILITIES_SET\020\002\022\r\n\tCON_CLOSE\020\003\022\033\n\027SESS_" +
30453099
"AUTHENTICATE_START\020\004\022\036\n\032SESS_AUTHENTICAT" +
@@ -3048,26 +3102,29 @@ public com.mysql.cj.x.protobuf.Mysqlx.Error getDefaultInstanceForType() {
30483102
"\021\022\017\n\013CRUD_INSERT\020\022\022\017\n\013CRUD_UPDATE\020\023\022\017\n\013C" +
30493103
"RUD_DELETE\020\024\022\017\n\013EXPECT_OPEN\020\030\022\020\n\014EXPECT_" +
30503104
"CLOSE\020\031\022\024\n\020CRUD_CREATE_VIEW\020\036\022\024\n\020CRUD_MO" +
3051-
"DIFY_VIEW\020\037\022\022\n\016CRUD_DROP_VIEW\020 \"\342\002\n\016Serv" +
3052-
"erMessages\"\317\002\n\004Type\022\006\n\002OK\020\000\022\t\n\005ERROR\020\001\022\025" +
3053-
"\n\021CONN_CAPABILITIES\020\002\022\036\n\032SESS_AUTHENTICA" +
3054-
"TE_CONTINUE\020\003\022\030\n\024SESS_AUTHENTICATE_OK\020\004\022" +
3055-
"\n\n\006NOTICE\020\013\022\036\n\032RESULTSET_COLUMN_META_DAT" +
3056-
"A\020\014\022\021\n\rRESULTSET_ROW\020\r\022\030\n\024RESULTSET_FETC" +
3057-
"H_DONE\020\016\022\035\n\031RESULTSET_FETCH_SUSPENDED\020\017\022" +
3058-
"(\n$RESULTSET_FETCH_DONE_MORE_RESULTSETS\020" +
3059-
"\020\022\027\n\023SQL_STMT_EXECUTE_OK\020\021\022(\n$RESULTSET_" +
3060-
"FETCH_DONE_MORE_OUT_PARAMS\020\022\"\027\n\002Ok\022\013\n\003ms" +
3061-
"g\030\001 \001(\t:\004\220\3520\000\"\216\001\n\005Error\022/\n\010severity\030\001 \001(" +
3062-
"\0162\026.Mysqlx.Error.Severity:\005ERROR\022\014\n\004code" +
3063-
"\030\002 \002(\r\022\021\n\tsql_state\030\004 \002(\t\022\013\n\003msg\030\003 \002(\t\" " +
3064-
"\n\010Severity\022\t\n\005ERROR\020\000\022\t\n\005FATAL\020\001:\004\220\3520\001:Y" +
3065-
"\n\021client_message_id\022\037.google.protobuf.Me" +
3066-
"ssageOptions\030\241\215\006 \001(\0162\033.Mysqlx.ClientMess" +
3067-
"ages.Type:Y\n\021server_message_id\022\037.google." +
3068-
"protobuf.MessageOptions\030\242\215\006 \001(\0162\033.Mysqlx" +
3069-
".ServerMessages.TypeB\031\n\027com.mysql.cj.x.p" +
3070-
"rotobuf"
3105+
"DIFY_VIEW\020\037\022\022\n\016CRUD_DROP_VIEW\020 \022\023\n\017PREPA" +
3106+
"RE_PREPARE\020(\022\023\n\017PREPARE_EXECUTE\020)\022\026\n\022PRE" +
3107+
"PARE_DEALLOCATE\020*\022\017\n\013CURSOR_OPEN\020+\022\020\n\014CU" +
3108+
"RSOR_CLOSE\020,\022\020\n\014CURSOR_FETCH\020-\"\342\002\n\016Serve" +
3109+
"rMessages\"\317\002\n\004Type\022\006\n\002OK\020\000\022\t\n\005ERROR\020\001\022\025\n" +
3110+
"\021CONN_CAPABILITIES\020\002\022\036\n\032SESS_AUTHENTICAT" +
3111+
"E_CONTINUE\020\003\022\030\n\024SESS_AUTHENTICATE_OK\020\004\022\n" +
3112+
"\n\006NOTICE\020\013\022\036\n\032RESULTSET_COLUMN_META_DATA" +
3113+
"\020\014\022\021\n\rRESULTSET_ROW\020\r\022\030\n\024RESULTSET_FETCH" +
3114+
"_DONE\020\016\022\035\n\031RESULTSET_FETCH_SUSPENDED\020\017\022(" +
3115+
"\n$RESULTSET_FETCH_DONE_MORE_RESULTSETS\020\020" +
3116+
"\022\027\n\023SQL_STMT_EXECUTE_OK\020\021\022(\n$RESULTSET_F" +
3117+
"ETCH_DONE_MORE_OUT_PARAMS\020\022\"\027\n\002Ok\022\013\n\003msg" +
3118+
"\030\001 \001(\t:\004\220\3520\000\"\216\001\n\005Error\022/\n\010severity\030\001 \001(\016" +
3119+
"2\026.Mysqlx.Error.Severity:\005ERROR\022\014\n\004code\030" +
3120+
"\002 \002(\r\022\021\n\tsql_state\030\004 \002(\t\022\013\n\003msg\030\003 \002(\t\" \n" +
3121+
"\010Severity\022\t\n\005ERROR\020\000\022\t\n\005FATAL\020\001:\004\220\3520\001:Y\n" +
3122+
"\021client_message_id\022\037.google.protobuf.Mes" +
3123+
"sageOptions\030\241\215\006 \001(\0162\033.Mysqlx.ClientMessa" +
3124+
"ges.Type:Y\n\021server_message_id\022\037.google.p" +
3125+
"rotobuf.MessageOptions\030\242\215\006 \001(\0162\033.Mysqlx." +
3126+
"ServerMessages.TypeB\031\n\027com.mysql.cj.x.pr" +
3127+
"otobuf"
30713128
};
30723129
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
30733130
new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {

0 commit comments

Comments
 (0)