diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-10-15 12:59:13 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-10-15 12:59:13 +0200 |
| commit | f62c12b405ba7ec80b8e2490856b83c6f5899211 (patch) | |
| tree | 010605c7f145da6ea6ac14b39abc4cf700d619b1 /mysql-test/r/max_statement_time.result | |
| parent | f947f73b2b6d2bd246b81a9038224d2a85777520 (diff) | |
| parent | f1afc003eefe0aafd3e070c7453d9e029d8445a8 (diff) | |
| download | mariadb-git-f62c12b405ba7ec80b8e2490856b83c6f5899211.tar.gz | |
Merge 10.0.14 into 10.1
Diffstat (limited to 'mysql-test/r/max_statement_time.result')
| -rw-r--r-- | mysql-test/r/max_statement_time.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/max_statement_time.result b/mysql-test/r/max_statement_time.result index 2681575daea..38334c59baa 100644 --- a/mysql-test/r/max_statement_time.result +++ b/mysql-test/r/max_statement_time.result @@ -112,7 +112,7 @@ UPDATE t1 SET a = 2; ERROR 70100: Query execution was interrupted (max_statement_time exceeded) SHOW WARNINGS; Level Code Message -Error 1967 Query execution was interrupted (max_statement_time exceeded) +Error 1968 Query execution was interrupted (max_statement_time exceeded) ROLLBACK; DROP TABLE t1; |