diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-25 19:41:58 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-25 19:41:58 +0300 |
| commit | ecc7f305dde85d704a37e584c29df0ed3f97f7be (patch) | |
| tree | 31810998f5f198e105c0f1f8e5acd6c9e7a581c3 /mysql-test/main/perror.result | |
| parent | 736ca14323fa16e409378f0da8005bce4be6dcf8 (diff) | |
| parent | 5530a93f47324b847c799d00a2756729a2869d13 (diff) | |
| download | mariadb-git-ecc7f305dde85d704a37e584c29df0ed3f97f7be.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/main/perror.result')
| -rw-r--r-- | mysql-test/main/perror.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/main/perror.result b/mysql-test/main/perror.result index 46554442721..e5eb9a083ee 100644 --- a/mysql-test/main/perror.result +++ b/mysql-test/main/perror.result @@ -1,5 +1,5 @@ Illegal error code: 10000 -MySQL error code 1062 (ER_DUP_ENTRY): Duplicate entry '%-.192s' for key %d +MySQL error code 1062 (ER_DUP_ENTRY): Duplicate entry '%-.192T' for key %d MySQL error code 1408 (ER_STARTUP): %s: ready for connections. Version: '%s' socket: '%s' port: %d %s MySQL error code 1459 (ER_TABLE_NEEDS_UPGRADE): Upgrade required. Please do "REPAIR %s %`s" or dump/reload to fix it! |