diff options
| author | monty@narttu.mysql.fi <> | 2003-06-04 18:28:51 +0300 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-06-04 18:28:51 +0300 |
| commit | 23145cfed72954c29f5a47e82af22898164be4b0 (patch) | |
| tree | f2e86edc169afb1fed9cecefdecd9f13561780c9 /mysql-test/r/lock.result | |
| parent | 7df5635ff2845bd708711f6b790997a3c68d5f2a (diff) | |
| download | mariadb-git-23145cfed72954c29f5a47e82af22898164be4b0.tar.gz | |
Added SQLSTATE to client/server protocol
bmove_allign -> bmove_align
Added OLAP function ROLLUP
Split mysql_fix_privilege_tables to a script and a .sql data file
Added new (MEMROOT*) functions to avoid calling current_thd() when creating some common objects.
Added table_alias_charset, for easier --lower-case-table-name handling
Better SQL_MODE handling (Setting complex options also sets sub options)
New (faster) assembler string functions for x86
Diffstat (limited to 'mysql-test/r/lock.result')
| -rw-r--r-- | mysql-test/r/lock.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/lock.result b/mysql-test/r/lock.result index ad5251b9110..68feb9c44d7 100644 --- a/mysql-test/r/lock.result +++ b/mysql-test/r/lock.result @@ -8,9 +8,9 @@ NULL 1 update t1 set id=-1 where id=1; LOCK TABLE t1 READ; update t1 set id=1 where id=1; -Table 't1' was locked with a READ lock and can't be updated +ERROR HY000: Table 't1' was locked with a READ lock and can't be updated create table t2 SELECT * from t1; -Table 't2' was not locked with LOCK TABLES +ERROR HY000: Table 't2' was not locked with LOCK TABLES create temporary table t2 SELECT * from t1; drop table if exists t2; unlock tables; |