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/insert_update.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/insert_update.result')
| -rw-r--r-- | mysql-test/r/insert_update.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/insert_update.result b/mysql-test/r/insert_update.result index 068f7c68286..4ef25781331 100644 --- a/mysql-test/r/insert_update.result +++ b/mysql-test/r/insert_update.result @@ -26,7 +26,7 @@ a b c 3 4 1020 5 6 130 INSERT t1 VALUES (1,9,70) ON DUPLICATE KEY UPDATE c=c+100000, b=4; -Duplicate entry '4' for key 2 +ERROR 23000: Duplicate entry '4' for key 2 SELECT * FROM t1; a b c 1 2 10010 |