diff options
| author | monty@mysql.com <> | 2005-01-03 23:04:52 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-01-03 23:04:52 +0200 |
| commit | 309b1a2b6ca36ed76753057cb032b6f4179bdc9b (patch) | |
| tree | 0f73878fcf058ff862f3f7eb305aafae2ad3465d /mysql-test/r/ps_6bdb.result | |
| parent | a9853184d3b69a3802984e0994282dc3a3320296 (diff) | |
| parent | 530a104eec3abc0620ee6c3b649f9a425306bfe1 (diff) | |
| download | mariadb-git-309b1a2b6ca36ed76753057cb032b6f4179bdc9b.tar.gz | |
Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY
Diffstat (limited to 'mysql-test/r/ps_6bdb.result')
| -rw-r--r-- | mysql-test/r/ps_6bdb.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/ps_6bdb.result b/mysql-test/r/ps_6bdb.result index b6fb52c1120..6817c0000c5 100644 --- a/mysql-test/r/ps_6bdb.result +++ b/mysql-test/r/ps_6bdb.result @@ -3009,7 +3009,7 @@ c1 c13 c14 c15 c16 c17 42 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 43 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 50 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 -51 0010-00-00 0010-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 +51 2010-00-00 2010-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 52 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 53 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 60 NULL NULL 1991-01-01 01:01:01 NULL NULL |