From f84365b37bd85bffcd231a81a0ac9b4df382bb06 Mon Sep 17 00:00:00 2001 From: Jason Fulghum Date: Tue, 27 Jun 2023 17:25:11 -0700 Subject: [PATCH 1/7] Bumping to latest GMS version at current tip of fulghum/bugfix-2 dev branch (d6ad0e3) --- go/go.mod | 2 +- go/go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go/go.mod b/go/go.mod index 91b63b522ae..81f96d75742 100644 --- a/go/go.mod +++ b/go/go.mod @@ -59,7 +59,7 @@ require ( github.com/cespare/xxhash v1.1.0 github.com/creasty/defaults v1.6.0 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 - github.com/dolthub/go-mysql-server v0.15.1-0.20230626222615-df8f121038d8 + github.com/dolthub/go-mysql-server v0.15.1-0.20230628001534-d6ad0e3e0080 github.com/dolthub/swiss v0.1.0 github.com/goccy/go-json v0.10.2 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 diff --git a/go/go.sum b/go/go.sum index 748072e1582..cc71f5353f1 100644 --- a/go/go.sum +++ b/go/go.sum @@ -170,6 +170,8 @@ github.com/dolthub/go-icu-regex v0.0.0-20230524105445-af7e7991c97e h1:kPsT4a47cw github.com/dolthub/go-icu-regex v0.0.0-20230524105445-af7e7991c97e/go.mod h1:KPUcpx070QOfJK1gNe0zx4pA5sicIK1GMikIGLKC168= github.com/dolthub/go-mysql-server v0.15.1-0.20230626222615-df8f121038d8 h1:Qx19dAKfQWeGCcNBTd0GeglAV8ncuxA6dzYfjQSSE8I= github.com/dolthub/go-mysql-server v0.15.1-0.20230626222615-df8f121038d8/go.mod h1:ANNYjFKs4Ysh0e2r3Yi87QND7swUZsyk5vLuq5LpbHQ= +github.com/dolthub/go-mysql-server v0.15.1-0.20230628001534-d6ad0e3e0080 h1:zXBKJrj1MKyulIGXZxSY9nOT5ENl4Tp2bzUvxVWw+5w= +github.com/dolthub/go-mysql-server v0.15.1-0.20230628001534-d6ad0e3e0080/go.mod h1:ANNYjFKs4Ysh0e2r3Yi87QND7swUZsyk5vLuq5LpbHQ= github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488 h1:0HHu0GWJH0N6a6keStrHhUAK5/o9LVfkh44pvsV4514= github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488/go.mod h1:ehexgi1mPxRTk0Mok/pADALuHbvATulTh6gzr7NzZto= github.com/dolthub/jsonpath v0.0.2-0.20230525180605-8dc13778fd72 h1:NfWmngMi1CYUWU4Ix8wM+USEhjc+mhPlT9JUR/anvbQ= From cbd52efa0126659bd994cd94406a1a112102544b Mon Sep 17 00:00:00 2001 From: Jason Fulghum Date: Wed, 28 Jun 2023 11:51:27 -0700 Subject: [PATCH 2/7] Bumping to latest GMS version at current tip of fulghum/bugfix-2 dev branch (6265f6763d75d110480d9b17984fec639d8122a4) --- go/go.mod | 2 +- go/go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go/go.mod b/go/go.mod index 81f96d75742..569597accef 100644 --- a/go/go.mod +++ b/go/go.mod @@ -59,7 +59,7 @@ require ( github.com/cespare/xxhash v1.1.0 github.com/creasty/defaults v1.6.0 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 - github.com/dolthub/go-mysql-server v0.15.1-0.20230628001534-d6ad0e3e0080 + github.com/dolthub/go-mysql-server v0.15.1-0.20230628184126-6265f6763d75 github.com/dolthub/swiss v0.1.0 github.com/goccy/go-json v0.10.2 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 diff --git a/go/go.sum b/go/go.sum index cc71f5353f1..855b7c633cc 100644 --- a/go/go.sum +++ b/go/go.sum @@ -172,6 +172,8 @@ github.com/dolthub/go-mysql-server v0.15.1-0.20230626222615-df8f121038d8 h1:Qx19 github.com/dolthub/go-mysql-server v0.15.1-0.20230626222615-df8f121038d8/go.mod h1:ANNYjFKs4Ysh0e2r3Yi87QND7swUZsyk5vLuq5LpbHQ= github.com/dolthub/go-mysql-server v0.15.1-0.20230628001534-d6ad0e3e0080 h1:zXBKJrj1MKyulIGXZxSY9nOT5ENl4Tp2bzUvxVWw+5w= github.com/dolthub/go-mysql-server v0.15.1-0.20230628001534-d6ad0e3e0080/go.mod h1:ANNYjFKs4Ysh0e2r3Yi87QND7swUZsyk5vLuq5LpbHQ= +github.com/dolthub/go-mysql-server v0.15.1-0.20230628184126-6265f6763d75 h1:G5orls70iCIgAumthclPxl6H018Je897nh+a36W7qOc= +github.com/dolthub/go-mysql-server v0.15.1-0.20230628184126-6265f6763d75/go.mod h1:ANNYjFKs4Ysh0e2r3Yi87QND7swUZsyk5vLuq5LpbHQ= github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488 h1:0HHu0GWJH0N6a6keStrHhUAK5/o9LVfkh44pvsV4514= github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488/go.mod h1:ehexgi1mPxRTk0Mok/pADALuHbvATulTh6gzr7NzZto= github.com/dolthub/jsonpath v0.0.2-0.20230525180605-8dc13778fd72 h1:NfWmngMi1CYUWU4Ix8wM+USEhjc+mhPlT9JUR/anvbQ= From 0876b98b3c0b86ae54789c08de948f97852a0ac4 Mon Sep 17 00:00:00 2001 From: Jason Fulghum Date: Wed, 28 Jun 2023 12:07:46 -0700 Subject: [PATCH 3/7] Bumping to latest GMS version at current tip of fulghum/bugfix-2 dev branch (ce42021087dd33532d6d0805a3517daebcebced2) --- go/go.mod | 2 +- go/go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go/go.mod b/go/go.mod index 569597accef..86f4410a44d 100644 --- a/go/go.mod +++ b/go/go.mod @@ -59,7 +59,7 @@ require ( github.com/cespare/xxhash v1.1.0 github.com/creasty/defaults v1.6.0 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 - github.com/dolthub/go-mysql-server v0.15.1-0.20230628184126-6265f6763d75 + github.com/dolthub/go-mysql-server v0.15.1-0.20230628190453-ce42021087dd github.com/dolthub/swiss v0.1.0 github.com/goccy/go-json v0.10.2 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 diff --git a/go/go.sum b/go/go.sum index 855b7c633cc..0a97e47e005 100644 --- a/go/go.sum +++ b/go/go.sum @@ -174,6 +174,8 @@ github.com/dolthub/go-mysql-server v0.15.1-0.20230628001534-d6ad0e3e0080 h1:zXBK github.com/dolthub/go-mysql-server v0.15.1-0.20230628001534-d6ad0e3e0080/go.mod h1:ANNYjFKs4Ysh0e2r3Yi87QND7swUZsyk5vLuq5LpbHQ= github.com/dolthub/go-mysql-server v0.15.1-0.20230628184126-6265f6763d75 h1:G5orls70iCIgAumthclPxl6H018Je897nh+a36W7qOc= github.com/dolthub/go-mysql-server v0.15.1-0.20230628184126-6265f6763d75/go.mod h1:ANNYjFKs4Ysh0e2r3Yi87QND7swUZsyk5vLuq5LpbHQ= +github.com/dolthub/go-mysql-server v0.15.1-0.20230628190453-ce42021087dd h1:Z6alHmT/NpigcKh9POc7plJMudfiQK/bBoG/aGsnbGY= +github.com/dolthub/go-mysql-server v0.15.1-0.20230628190453-ce42021087dd/go.mod h1:ANNYjFKs4Ysh0e2r3Yi87QND7swUZsyk5vLuq5LpbHQ= github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488 h1:0HHu0GWJH0N6a6keStrHhUAK5/o9LVfkh44pvsV4514= github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488/go.mod h1:ehexgi1mPxRTk0Mok/pADALuHbvATulTh6gzr7NzZto= github.com/dolthub/jsonpath v0.0.2-0.20230525180605-8dc13778fd72 h1:NfWmngMi1CYUWU4Ix8wM+USEhjc+mhPlT9JUR/anvbQ= From a460b543a743a04b56500a22bf1c9367acc330b7 Mon Sep 17 00:00:00 2001 From: Jason Fulghum Date: Wed, 28 Jun 2023 15:39:48 -0700 Subject: [PATCH 4/7] Bumping to latest GMS version at current tip of fulghum/bugfix-2 dev branch (be6e67275b25a2421f0ee0117ce7b4901cce99e0) --- go/go.mod | 2 +- go/go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go/go.mod b/go/go.mod index 86f4410a44d..7ee824651cb 100644 --- a/go/go.mod +++ b/go/go.mod @@ -59,7 +59,7 @@ require ( github.com/cespare/xxhash v1.1.0 github.com/creasty/defaults v1.6.0 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 - github.com/dolthub/go-mysql-server v0.15.1-0.20230628190453-ce42021087dd + github.com/dolthub/go-mysql-server v0.15.1-0.20230628223125-be6e67275b25 github.com/dolthub/swiss v0.1.0 github.com/goccy/go-json v0.10.2 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 diff --git a/go/go.sum b/go/go.sum index 0a97e47e005..5b1ea1a59bb 100644 --- a/go/go.sum +++ b/go/go.sum @@ -176,6 +176,8 @@ github.com/dolthub/go-mysql-server v0.15.1-0.20230628184126-6265f6763d75 h1:G5or github.com/dolthub/go-mysql-server v0.15.1-0.20230628184126-6265f6763d75/go.mod h1:ANNYjFKs4Ysh0e2r3Yi87QND7swUZsyk5vLuq5LpbHQ= github.com/dolthub/go-mysql-server v0.15.1-0.20230628190453-ce42021087dd h1:Z6alHmT/NpigcKh9POc7plJMudfiQK/bBoG/aGsnbGY= github.com/dolthub/go-mysql-server v0.15.1-0.20230628190453-ce42021087dd/go.mod h1:ANNYjFKs4Ysh0e2r3Yi87QND7swUZsyk5vLuq5LpbHQ= +github.com/dolthub/go-mysql-server v0.15.1-0.20230628223125-be6e67275b25 h1:nsMTUO/gEI09oVX80JTYplx9TfjEKnS6T1pZLpM+eP4= +github.com/dolthub/go-mysql-server v0.15.1-0.20230628223125-be6e67275b25/go.mod h1:ANNYjFKs4Ysh0e2r3Yi87QND7swUZsyk5vLuq5LpbHQ= github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488 h1:0HHu0GWJH0N6a6keStrHhUAK5/o9LVfkh44pvsV4514= github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488/go.mod h1:ehexgi1mPxRTk0Mok/pADALuHbvATulTh6gzr7NzZto= github.com/dolthub/jsonpath v0.0.2-0.20230525180605-8dc13778fd72 h1:NfWmngMi1CYUWU4Ix8wM+USEhjc+mhPlT9JUR/anvbQ= From 4fb4e906b60473b3e357557e25c8d696f8d99c30 Mon Sep 17 00:00:00 2001 From: Jason Fulghum Date: Wed, 28 Jun 2023 17:17:12 -0700 Subject: [PATCH 5/7] Bumping to latest GMS version at current tip of fulghum/bugfix-2 dev branch (8b27f1dbb282078e65424bd7c247a80402c212a7) --- go/go.mod | 2 +- go/go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go/go.mod b/go/go.mod index 7ee824651cb..26cfe4a999f 100644 --- a/go/go.mod +++ b/go/go.mod @@ -59,7 +59,7 @@ require ( github.com/cespare/xxhash v1.1.0 github.com/creasty/defaults v1.6.0 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 - github.com/dolthub/go-mysql-server v0.15.1-0.20230628223125-be6e67275b25 + github.com/dolthub/go-mysql-server v0.15.1-0.20230629001548-8b27f1dbb282 github.com/dolthub/swiss v0.1.0 github.com/goccy/go-json v0.10.2 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 diff --git a/go/go.sum b/go/go.sum index 5b1ea1a59bb..c1ec1cdb46f 100644 --- a/go/go.sum +++ b/go/go.sum @@ -178,6 +178,8 @@ github.com/dolthub/go-mysql-server v0.15.1-0.20230628190453-ce42021087dd h1:Z6al github.com/dolthub/go-mysql-server v0.15.1-0.20230628190453-ce42021087dd/go.mod h1:ANNYjFKs4Ysh0e2r3Yi87QND7swUZsyk5vLuq5LpbHQ= github.com/dolthub/go-mysql-server v0.15.1-0.20230628223125-be6e67275b25 h1:nsMTUO/gEI09oVX80JTYplx9TfjEKnS6T1pZLpM+eP4= github.com/dolthub/go-mysql-server v0.15.1-0.20230628223125-be6e67275b25/go.mod h1:ANNYjFKs4Ysh0e2r3Yi87QND7swUZsyk5vLuq5LpbHQ= +github.com/dolthub/go-mysql-server v0.15.1-0.20230629001548-8b27f1dbb282 h1:I1Ygki0k4454j6TGuV+z5IKxjFY0hTRpL90xr1wkltQ= +github.com/dolthub/go-mysql-server v0.15.1-0.20230629001548-8b27f1dbb282/go.mod h1:ANNYjFKs4Ysh0e2r3Yi87QND7swUZsyk5vLuq5LpbHQ= github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488 h1:0HHu0GWJH0N6a6keStrHhUAK5/o9LVfkh44pvsV4514= github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488/go.mod h1:ehexgi1mPxRTk0Mok/pADALuHbvATulTh6gzr7NzZto= github.com/dolthub/jsonpath v0.0.2-0.20230525180605-8dc13778fd72 h1:NfWmngMi1CYUWU4Ix8wM+USEhjc+mhPlT9JUR/anvbQ= From 21990809de6dd1a6dd67700ce404e51b847a643b Mon Sep 17 00:00:00 2001 From: Jason Fulghum Date: Thu, 29 Jun 2023 15:57:21 -0700 Subject: [PATCH 6/7] Bumping to latest GMS version at current tip of fulghum/bugfix-2 dev branch (4d87e5ac5607d72c256d7a5234c95d0815981228) --- go/go.mod | 2 +- go/go.sum | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/go/go.mod b/go/go.mod index 26cfe4a999f..377eb68378c 100644 --- a/go/go.mod +++ b/go/go.mod @@ -59,7 +59,7 @@ require ( github.com/cespare/xxhash v1.1.0 github.com/creasty/defaults v1.6.0 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 - github.com/dolthub/go-mysql-server v0.15.1-0.20230629001548-8b27f1dbb282 + github.com/dolthub/go-mysql-server v0.15.1-0.20230629225452-4d87e5ac5607 github.com/dolthub/swiss v0.1.0 github.com/goccy/go-json v0.10.2 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 diff --git a/go/go.sum b/go/go.sum index c1ec1cdb46f..b06d42b9d26 100644 --- a/go/go.sum +++ b/go/go.sum @@ -180,6 +180,10 @@ github.com/dolthub/go-mysql-server v0.15.1-0.20230628223125-be6e67275b25 h1:nsMT github.com/dolthub/go-mysql-server v0.15.1-0.20230628223125-be6e67275b25/go.mod h1:ANNYjFKs4Ysh0e2r3Yi87QND7swUZsyk5vLuq5LpbHQ= github.com/dolthub/go-mysql-server v0.15.1-0.20230629001548-8b27f1dbb282 h1:I1Ygki0k4454j6TGuV+z5IKxjFY0hTRpL90xr1wkltQ= github.com/dolthub/go-mysql-server v0.15.1-0.20230629001548-8b27f1dbb282/go.mod h1:ANNYjFKs4Ysh0e2r3Yi87QND7swUZsyk5vLuq5LpbHQ= +github.com/dolthub/go-mysql-server v0.15.1-0.20230629004905-400a09a388fe h1:aBtCrSgs1gw08LNyUpf6asSncd5qrGB8LVvBBgvCNek= +github.com/dolthub/go-mysql-server v0.15.1-0.20230629004905-400a09a388fe/go.mod h1:ANNYjFKs4Ysh0e2r3Yi87QND7swUZsyk5vLuq5LpbHQ= +github.com/dolthub/go-mysql-server v0.15.1-0.20230629225452-4d87e5ac5607 h1:+CRzGw2J+riV8nT2JReIKC2Qq6JKhsZr6VfXbi2fXHw= +github.com/dolthub/go-mysql-server v0.15.1-0.20230629225452-4d87e5ac5607/go.mod h1:ANNYjFKs4Ysh0e2r3Yi87QND7swUZsyk5vLuq5LpbHQ= github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488 h1:0HHu0GWJH0N6a6keStrHhUAK5/o9LVfkh44pvsV4514= github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488/go.mod h1:ehexgi1mPxRTk0Mok/pADALuHbvATulTh6gzr7NzZto= github.com/dolthub/jsonpath v0.0.2-0.20230525180605-8dc13778fd72 h1:NfWmngMi1CYUWU4Ix8wM+USEhjc+mhPlT9JUR/anvbQ= From 2c6b4442cc45e62f941a9adeab02fc5aa233032d Mon Sep 17 00:00:00 2001 From: Jason Fulghum Date: Thu, 29 Jun 2023 16:01:52 -0700 Subject: [PATCH 7/7] Bumping to latest GMS version at current tip of fulghum/bugfix-2 dev branch (fd89c5b13b05ab34fbe88a2834b84ca96b97fa7a) --- go/go.mod | 2 +- go/go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go/go.mod b/go/go.mod index 377eb68378c..99e59c73efc 100644 --- a/go/go.mod +++ b/go/go.mod @@ -59,7 +59,7 @@ require ( github.com/cespare/xxhash v1.1.0 github.com/creasty/defaults v1.6.0 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 - github.com/dolthub/go-mysql-server v0.15.1-0.20230629225452-4d87e5ac5607 + github.com/dolthub/go-mysql-server v0.15.1-0.20230629230043-fd89c5b13b05 github.com/dolthub/swiss v0.1.0 github.com/goccy/go-json v0.10.2 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 diff --git a/go/go.sum b/go/go.sum index b06d42b9d26..4cfb792acb1 100644 --- a/go/go.sum +++ b/go/go.sum @@ -184,6 +184,8 @@ github.com/dolthub/go-mysql-server v0.15.1-0.20230629004905-400a09a388fe h1:aBtC github.com/dolthub/go-mysql-server v0.15.1-0.20230629004905-400a09a388fe/go.mod h1:ANNYjFKs4Ysh0e2r3Yi87QND7swUZsyk5vLuq5LpbHQ= github.com/dolthub/go-mysql-server v0.15.1-0.20230629225452-4d87e5ac5607 h1:+CRzGw2J+riV8nT2JReIKC2Qq6JKhsZr6VfXbi2fXHw= github.com/dolthub/go-mysql-server v0.15.1-0.20230629225452-4d87e5ac5607/go.mod h1:ANNYjFKs4Ysh0e2r3Yi87QND7swUZsyk5vLuq5LpbHQ= +github.com/dolthub/go-mysql-server v0.15.1-0.20230629230043-fd89c5b13b05 h1:V5pu5zE3E2CN6bcx+AYfyPeEEUiVFYaGPAObhlazXNM= +github.com/dolthub/go-mysql-server v0.15.1-0.20230629230043-fd89c5b13b05/go.mod h1:ANNYjFKs4Ysh0e2r3Yi87QND7swUZsyk5vLuq5LpbHQ= github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488 h1:0HHu0GWJH0N6a6keStrHhUAK5/o9LVfkh44pvsV4514= github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488/go.mod h1:ehexgi1mPxRTk0Mok/pADALuHbvATulTh6gzr7NzZto= github.com/dolthub/jsonpath v0.0.2-0.20230525180605-8dc13778fd72 h1:NfWmngMi1CYUWU4Ix8wM+USEhjc+mhPlT9JUR/anvbQ=