mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-01-23 10:27:34 -06:00
Code Issues Packages Projects Releases 123 Wiki Activity

go/go.mod,integration-tests/mysql-client-tests: Bump go-mysql-server to pick up fix for prepared statement writes resultset metadata.

Browse Source 
Fixes: #2084.
This commit is contained in:
Aaron Son
2021-09-01 15:28:24 -07:00
parent a480bad711
commit a5a30ebfa2
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go/go.mod
View File

@@ -19,7 +19,7 @@ require (
github.com/denisbrodbeck/machineid v1.0.1
github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi v0.0.0-20201005193433-3ee972b1d078
github.com/dolthub/fslock v0.0.3
github.com/dolthub/go-mysql-server v0.10.1-0.20210830175348-13e1f53e141e
github.com/dolthub/go-mysql-server v0.10.1-0.20210901221611-9e2a5fe1b09b
github.com/dolthub/ishell v0.0.0-20210205014355-16a4ce758446
github.com/dolthub/mmap-go v1.0.4-0.20201107010347-f9f2a9588a66
github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81

4
go/go.sum
View File

@@ -146,6 +146,10 @@ github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U=
github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0=
github.com/dolthub/go-mysql-server v0.10.1-0.20210830175348-13e1f53e141e h1:0vNiaU4VoQ3/diOJSPOPbGB924QVBEUerwKw/Gv3XYU=
github.com/dolthub/go-mysql-server v0.10.1-0.20210830175348-13e1f53e141e/go.mod h1:cPg39xeFH8/+McnJxncb79SgUuREeIqR+eTvxE6OmXc=
github.com/dolthub/go-mysql-server v0.10.1-0.20210831222740-e2d8eb761ecd h1:inMCF2z9jmLkhHEPPTQrVik6dG/J49hVfDsSwBbXhE4=
github.com/dolthub/go-mysql-server v0.10.1-0.20210831222740-e2d8eb761ecd/go.mod h1:cPg39xeFH8/+McnJxncb79SgUuREeIqR+eTvxE6OmXc=
github.com/dolthub/go-mysql-server v0.10.1-0.20210901221611-9e2a5fe1b09b h1:ITm6QsoE0lcxSjQfMJ0xhXIZNm+zKvFwk5iGfBsplAQ=
github.com/dolthub/go-mysql-server v0.10.1-0.20210901221611-9e2a5fe1b09b/go.mod h1:cPg39xeFH8/+McnJxncb79SgUuREeIqR+eTvxE6OmXc=
github.com/dolthub/ishell v0.0.0-20210205014355-16a4ce758446 h1:0ol5pj+QlKUKAtqs1LiPM3ZJKs+rHPgLSsMXmhTrCAM=
github.com/dolthub/ishell v0.0.0-20210205014355-16a4ce758446/go.mod h1:dhGBqcCEfK5kuFmeO5+WOx3hqc1k3M29c1oS/R7N4ms=
github.com/dolthub/mmap-go v1.0.4-0.20201107010347-f9f2a9588a66 h1:WRPDbpJWEnPxPmiuOTndT+lUWUeGjx6eoNOK9O4tQQQ=

13
integration-tests/mysql-client-tests/c/mysql-connector-c-test.c
View File

@@ -19,6 +19,7 @@ typedef struct statement_t {
MYSQL_BIND bind[10];
int expect_prepare_error;
int expect_exec_error;
int expect_result_metadata;
} statement;
void test_statement(MYSQL *con, statement *stmt) {
@@ -39,6 +40,14 @@ void test_statement(MYSQL *con, statement *stmt) {
fprintf(stderr, "failed to bind stmt: %s: %s\n", stmt->query, mysql_stmt_error(mstmt));
exit(1);
}
MYSQL_RES *metadata = mysql_stmt_result_metadata(mstmt);
if (stmt->expect_result_metadata && metadata == NULL) {
fprintf(stderr, "result metadata was unexpectedly NULL: %s\n", stmt->query);
exit(1);
} else if (!stmt->expect_result_metadata && metadata != NULL) {
fprintf(stderr, "result metadata was unexpectedly non-NULL: %s\n", stmt->query);
exit(1);
}
if ( mysql_stmt_execute(mstmt) ) {
if ( !stmt->expect_exec_error) {
fprintf(stderr, "failed to execute stmt: %s: %s\n", stmt->query, mysql_stmt_error(mstmt));
@@ -107,6 +116,7 @@ int main(int argc, char **argv) {
.buffer_length = sizeof(pk),
},
},
.expect_result_metadata = 1,
},
{
.query = "select * from test where pk = ?",
@@ -118,6 +128,7 @@ int main(int argc, char **argv) {
.is_unsigned = 1,
},
},
.expect_result_metadata = 1,
},
{
.query = "insert into test values (?, ?)",
@@ -133,6 +144,7 @@ int main(int argc, char **argv) {
.buffer_length = sizeof(value),
},
},
.expect_result_metadata = 0,
},
{
.query = "update test set `value` = ?",
@@ -145,6 +157,7 @@ int main(int argc, char **argv) {
},
},
.expect_exec_error = 1,
.expect_result_metadata = 0,
},
{
.query = "select * from test SYNTAX ERROR where pk = ?",