diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-21 11:45:00 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-21 11:45:00 +0300 |
| commit | 4930f9c94bb610f4d76b73a8b6b351d9fa9c5d68 (patch) | |
| tree | ed6b2754116233ca8a39515c7ba06e09b2a8cdc8 /mysql-test/suite/innodb_gis | |
| parent | 502b769561760f35d2b612ab984906c8a4bb9b51 (diff) | |
| parent | d104fe6f734df2aebe24b3e5e3dbc189a5302920 (diff) | |
| download | mariadb-git-4930f9c94bb610f4d76b73a8b6b351d9fa9c5d68.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/suite/innodb_gis')
| -rw-r--r-- | mysql-test/suite/innodb_gis/r/rollback.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/innodb_gis/r/rollback.result b/mysql-test/suite/innodb_gis/r/rollback.result index 8688690b66a..0d2b9c7cf2c 100644 --- a/mysql-test/suite/innodb_gis/r/rollback.result +++ b/mysql-test/suite/innodb_gis/r/rollback.result @@ -411,6 +411,6 @@ set session debug="+d,row_mysql_crash_if_error"; Warnings: Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead update t1 set a=point(5,5), b=point(5,5), c=5 where i < 3; -ERROR HY000: Lost connection to MySQL server during query +ERROR HY000: Lost connection to server during query insert into t1 values(5, point(5,5), point(5,5), 5); drop table t1; |