diff options
| author | Alexander Barkov <bar@mariadb.com> | 2018-04-03 20:06:57 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2018-04-03 20:06:57 +0400 |
| commit | b7ea56349189489e0276ad78a27214b8f76193ef (patch) | |
| tree | b380e08ff8099d1e5f7c680a4cb706ecb1386f0d /mysql-test/main/key_cache.test | |
| parent | 94ecd2314d74eb3a77cf5ba762a2fabe21f211ac (diff) | |
| download | mariadb-git-b7ea56349189489e0276ad78a27214b8f76193ef.tar.gz | |
Cleanup in the system variable parsing code
- Adding "return true" into LEX::set_system_variable()
and LEX::set_default_system_variable() after my_error().
This makes the parser exit on error immediately.
Previously, the error was caught only in mysql_parser(),
a few lines after the parse_sql() call.
- Fixing "--error 1272" to "--error ER_VARIABLE_IS_NOT_STRUCT" in tests
Diffstat (limited to 'mysql-test/main/key_cache.test')
| -rw-r--r-- | mysql-test/main/key_cache.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/main/key_cache.test b/mysql-test/main/key_cache.test index d28e7c23a4c..fb6ae497e74 100644 --- a/mysql-test/main/key_cache.test +++ b/mysql-test/main/key_cache.test @@ -44,7 +44,7 @@ SET @@global.key_buffer_size=@save_key_buffer_size; --error 1064 SELECT @@default.key_buffer_size; ---error 1272 +--error ER_VARIABLE_IS_NOT_STRUCT SELECT @@skr.storage_engine="test"; select @@keycache1.key_cache_block_size; |