diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-01-22 15:29:36 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-01-22 15:29:36 +0100 |
| commit | 37d240ecf9213a29d6a0a236ebeb1e72c0b43ce6 (patch) | |
| tree | 6bd2508d867303d8830aab0f246cd61a7ec5a835 /mysql-test/r/perror.result | |
| parent | e8f6f402922295ec36aab42976f3e494455407d4 (diff) | |
| parent | 5caddbfd5b4a7ec377f3d40a5830436e0e6e993b (diff) | |
| download | mariadb-git-37d240ecf9213a29d6a0a236ebeb1e72c0b43ce6.tar.gz | |
MySQL-5.5.35 merge
Diffstat (limited to 'mysql-test/r/perror.result')
| -rw-r--r-- | mysql-test/r/perror.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/perror.result b/mysql-test/r/perror.result index 74842b77ba1..30a56840b1b 100644 --- a/mysql-test/r/perror.result +++ b/mysql-test/r/perror.result @@ -1,6 +1,6 @@ Illegal error code: 10000 MySQL error code 1062 (ER_DUP_ENTRY): Duplicate entry '%-.192s' for key %d -MySQL error code 1076 (ER_READY): %s: ready for connections. -Version: '%s' socket: '%s' port: %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): Table upgrade required. Please do "REPAIR TABLE `%-.32s`" or dump/reload to fix it! MySQL error code 1461 (ER_MAX_PREPARED_STMT_COUNT_REACHED): Can't create more than max_prepared_stmt_count statements (current value: %lu) |