Skip to content

Commit 51d4cc4

Browse files
lkotulalkotula
committed
Merge branch 'mysql-8.0' into mysql-8.4
2 parents 9c71c2f + 4d19b5b commit 51d4cc4

File tree

2 files changed

+38
-38
lines changed

2 files changed

+38
-38
lines changed

‎mysql-test/suite/x/r/udf_mysqlx_generate_document_id.result

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -82,45 +82,45 @@ DO mysqlx_generate_document_id();
8282
CALL mysqlx_generate_document_id();
8383
ERROR 42000: PROCEDURE xtest.mysqlx_generate_document_id does not exist
8484
DO mysqlx_generate_document_id('abc');
85-
ERROR HY000: Can't initialize function 'mysqlx_generate_document_id'; Function expect integer argument
85+
ERROR HY000: Can't initialize function 'mysqlx_generate_document_id'; Function expects integer argument
8686
DO mysqlx_generate_document_id(NULL);
87-
ERROR HY000: Can't initialize function 'mysqlx_generate_document_id'; Function expect integer argument
87+
ERROR HY000: Can't initialize function 'mysqlx_generate_document_id'; Function expects integer argument
8888
DO mysqlx_generate_document_id(123.45);
89-
ERROR HY000: Can't initialize function 'mysqlx_generate_document_id'; Function expect integer argument
89+
ERROR HY000: Can't initialize function 'mysqlx_generate_document_id'; Function expects integer argument
9090
DO mysqlx_generate_document_id(1, 'abc');
91-
ERROR HY000: Can't initialize function 'mysqlx_generate_document_id'; Function expect two integer arguments
91+
ERROR HY000: Can't initialize function 'mysqlx_generate_document_id'; Function expects two integer arguments
9292
DO mysqlx_generate_document_id(1, NULL);
93-
ERROR HY000: Can't initialize function 'mysqlx_generate_document_id'; Function expect two integer arguments
93+
ERROR HY000: Can't initialize function 'mysqlx_generate_document_id'; Function expects two integer arguments
9494
DO mysqlx_generate_document_id(1, 123.45);
95-
ERROR HY000: Can't initialize function 'mysqlx_generate_document_id'; Function expect two integer arguments
95+
ERROR HY000: Can't initialize function 'mysqlx_generate_document_id'; Function expects two integer arguments
9696
DO mysqlx_generate_document_id(1, 1, 'abc');
97-
ERROR HY000: Can't initialize function 'mysqlx_generate_document_id'; Function expect three integer arguments
97+
ERROR HY000: Can't initialize function 'mysqlx_generate_document_id'; Function expects three integer arguments
9898
DO mysqlx_generate_document_id(1, 1, NULL);
99-
ERROR HY000: Can't initialize function 'mysqlx_generate_document_id'; Function expect three integer arguments
99+
ERROR HY000: Can't initialize function 'mysqlx_generate_document_id'; Function expects three integer arguments
100100
DO mysqlx_generate_document_id(1, 1, 123.45);
101-
ERROR HY000: Can't initialize function 'mysqlx_generate_document_id'; Function expect three integer arguments
101+
ERROR HY000: Can't initialize function 'mysqlx_generate_document_id'; Function expects three integer arguments
102102
DO mysqlx_generate_document_id(1, 1, 1, 1);
103-
ERROR HY000: Can't initialize function 'mysqlx_generate_document_id'; Function expect up to three integer arguments
103+
ERROR HY000: Can't initialize function 'mysqlx_generate_document_id'; Function expects up to three integer arguments
104104
DO mysqlx_generate_document_id(1, 1, 1, 1, 1);
105-
ERROR HY000: Can't initialize function 'mysqlx_generate_document_id'; Function expect up to three integer arguments
105+
ERROR HY000: Can't initialize function 'mysqlx_generate_document_id'; Function expects up to three integer arguments
106106

107107
#
108108
## Ad 2.a. Handling of NULL values in DO
109109
DO mysqlx_generate_document_id(NULL, 1, 1);
110-
ERROR HY000: Can't initialize function 'mysqlx_generate_document_id'; Function expect three integer arguments
110+
ERROR HY000: Can't initialize function 'mysqlx_generate_document_id'; Function expects three integer arguments
111111
DO mysqlx_generate_document_id(1, NULL, 1);
112-
ERROR HY000: Can't initialize function 'mysqlx_generate_document_id'; Function expect three integer arguments
112+
ERROR HY000: Can't initialize function 'mysqlx_generate_document_id'; Function expects three integer arguments
113113
DO mysqlx_generate_document_id(1, 1, NULL);
114-
ERROR HY000: Can't initialize function 'mysqlx_generate_document_id'; Function expect three integer arguments
114+
ERROR HY000: Can't initialize function 'mysqlx_generate_document_id'; Function expects three integer arguments
115115

116116
#
117117
## Ad 2.b. Handling of NULL values in SELECT
118118
SELECT mysqlx_generate_document_id(NULL,1,1);
119-
ERROR HY000: Can't initialize function 'mysqlx_generate_document_id'; Function expect three integer arguments
119+
ERROR HY000: Can't initialize function 'mysqlx_generate_document_id'; Function expects three integer arguments
120120
SELECT mysqlx_generate_document_id(1,NULL,1);
121-
ERROR HY000: Can't initialize function 'mysqlx_generate_document_id'; Function expect three integer arguments
121+
ERROR HY000: Can't initialize function 'mysqlx_generate_document_id'; Function expects three integer arguments
122122
SELECT mysqlx_generate_document_id(1,1,NULL);
123-
ERROR HY000: Can't initialize function 'mysqlx_generate_document_id'; Function expect three integer arguments
123+
ERROR HY000: Can't initialize function 'mysqlx_generate_document_id'; Function expects three integer arguments
124124

125125
#
126126
## Ad 2.c. Handling of FUNCTION returning NULL values in DO
@@ -217,45 +217,45 @@ RUN use xtest
217217
RUN CALL mysqlx_generate_document_id();
218218
Got expected error: PROCEDURE xtest.mysqlx_generate_document_id does not exist (code 1305)
219219
RUN DO mysqlx_generate_document_id('abc');
220-
Got expected error: Can't initialize function 'mysqlx_generate_document_id'; Function expect integer argument (code 1123)
220+
Got expected error: Can't initialize function 'mysqlx_generate_document_id'; Function expects integer argument (code 1123)
221221
RUN DO mysqlx_generate_document_id(NULL);
222-
Got expected error: Can't initialize function 'mysqlx_generate_document_id'; Function expect integer argument (code 1123)
222+
Got expected error: Can't initialize function 'mysqlx_generate_document_id'; Function expects integer argument (code 1123)
223223
RUN DO mysqlx_generate_document_id(123.45);
224-
Got expected error: Can't initialize function 'mysqlx_generate_document_id'; Function expect integer argument (code 1123)
224+
Got expected error: Can't initialize function 'mysqlx_generate_document_id'; Function expects integer argument (code 1123)
225225
RUN DO mysqlx_generate_document_id(1, 'abc');
226-
Got expected error: Can't initialize function 'mysqlx_generate_document_id'; Function expect two integer arguments (code 1123)
226+
Got expected error: Can't initialize function 'mysqlx_generate_document_id'; Function expects two integer arguments (code 1123)
227227
RUN DO mysqlx_generate_document_id(1, NULL);
228-
Got expected error: Can't initialize function 'mysqlx_generate_document_id'; Function expect two integer arguments (code 1123)
228+
Got expected error: Can't initialize function 'mysqlx_generate_document_id'; Function expects two integer arguments (code 1123)
229229
RUN DO mysqlx_generate_document_id(1, 123.45);
230-
Got expected error: Can't initialize function 'mysqlx_generate_document_id'; Function expect two integer arguments (code 1123)
230+
Got expected error: Can't initialize function 'mysqlx_generate_document_id'; Function expects two integer arguments (code 1123)
231231
RUN DO mysqlx_generate_document_id(1, 1, 'abc');
232-
Got expected error: Can't initialize function 'mysqlx_generate_document_id'; Function expect three integer arguments (code 1123)
232+
Got expected error: Can't initialize function 'mysqlx_generate_document_id'; Function expects three integer arguments (code 1123)
233233
RUN DO mysqlx_generate_document_id(1, 1, NULL);
234-
Got expected error: Can't initialize function 'mysqlx_generate_document_id'; Function expect three integer arguments (code 1123)
234+
Got expected error: Can't initialize function 'mysqlx_generate_document_id'; Function expects three integer arguments (code 1123)
235235
RUN DO mysqlx_generate_document_id(1, 1, 123.45);
236-
Got expected error: Can't initialize function 'mysqlx_generate_document_id'; Function expect three integer arguments (code 1123)
236+
Got expected error: Can't initialize function 'mysqlx_generate_document_id'; Function expects three integer arguments (code 1123)
237237
RUN DO mysqlx_generate_document_id(1, 1, 1, 1);
238-
Got expected error: Can't initialize function 'mysqlx_generate_document_id'; Function expect up to three integer arguments (code 1123)
238+
Got expected error: Can't initialize function 'mysqlx_generate_document_id'; Function expects up to three integer arguments (code 1123)
239239
RUN DO mysqlx_generate_document_id(1, 1, 1, 1, 1);
240-
Got expected error: Can't initialize function 'mysqlx_generate_document_id'; Function expect up to three integer arguments (code 1123)
240+
Got expected error: Can't initialize function 'mysqlx_generate_document_id'; Function expects up to three integer arguments (code 1123)
241241

242242
#
243243
## Ad 4.a. Handling of NULL values in DO
244244
RUN DO mysqlx_generate_document_id(NULL, 1, 1);
245-
Got expected error: Can't initialize function 'mysqlx_generate_document_id'; Function expect three integer arguments (code 1123)
245+
Got expected error: Can't initialize function 'mysqlx_generate_document_id'; Function expects three integer arguments (code 1123)
246246
RUN DO mysqlx_generate_document_id(1, NULL, 1);
247-
Got expected error: Can't initialize function 'mysqlx_generate_document_id'; Function expect three integer arguments (code 1123)
247+
Got expected error: Can't initialize function 'mysqlx_generate_document_id'; Function expects three integer arguments (code 1123)
248248
RUN DO mysqlx_generate_document_id(1, 1, NULL);
249-
Got expected error: Can't initialize function 'mysqlx_generate_document_id'; Function expect three integer arguments (code 1123)
249+
Got expected error: Can't initialize function 'mysqlx_generate_document_id'; Function expects three integer arguments (code 1123)
250250

251251
#
252252
## Ad 4.b. Handling of NULL values in SELECT
253253
RUN SELECT mysqlx_generate_document_id(NULL,1,1);
254-
Got expected error: Can't initialize function 'mysqlx_generate_document_id'; Function expect three integer arguments (code 1123)
254+
Got expected error: Can't initialize function 'mysqlx_generate_document_id'; Function expects three integer arguments (code 1123)
255255
RUN SELECT mysqlx_generate_document_id(1,NULL,1);
256-
Got expected error: Can't initialize function 'mysqlx_generate_document_id'; Function expect three integer arguments (code 1123)
256+
Got expected error: Can't initialize function 'mysqlx_generate_document_id'; Function expects three integer arguments (code 1123)
257257
RUN SELECT mysqlx_generate_document_id(1,1,NULL);
258-
Got expected error: Can't initialize function 'mysqlx_generate_document_id'; Function expect three integer arguments (code 1123)
258+
Got expected error: Can't initialize function 'mysqlx_generate_document_id'; Function expects three integer arguments (code 1123)
259259

260260
#
261261
## Ad 4.c. Handling of FUNCTION returning NULL values in DO

‎plugin/x/src/udf/mysqlx_generate_document_id.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,28 +58,28 @@ bool mysqlx_generate_document_id_init(UDF_INIT *, UDF_ARGS *args,
5858
return false;
5959
case 1:
6060
if (args->arg_type[0] != INT_RESULT) {
61-
fill_server_errmsg(message, "Function expect integer argument"sv);
61+
fill_server_errmsg(message, "Function expects integer argument"sv);
6262
return true;
6363
}
6464
break;
6565
case 2:
6666
if (args->arg_type[0] != INT_RESULT || args->arg_type[1] != INT_RESULT) {
67-
fill_server_errmsg(message, "Function expect two integer arguments"sv);
67+
fill_server_errmsg(message, "Function expects two integer arguments"sv);
6868
return true;
6969
}
7070
break;
7171
case 3:
7272
if (args->arg_type[0] != INT_RESULT || args->arg_type[1] != INT_RESULT ||
7373
args->arg_type[2] != INT_RESULT) {
7474
fill_server_errmsg(message,
75-
"Function expect three integer arguments"sv);
75+
"Function expects three integer arguments"sv);
7676
return true;
7777
}
7878
break;
7979

8080
default:
8181
fill_server_errmsg(message,
82-
"Function expect up to three integer arguments"sv);
82+
"Function expects up to three integer arguments"sv);
8383
return true;
8484
}
8585

0 commit comments

Comments
 (0)