diff options
| author | unknown <jimw@mysql.com> | 2005-06-09 19:27:45 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-06-09 19:27:45 -0700 |
| commit | a3fe14096397ddd8ce7095aad9361c25090569ca (patch) | |
| tree | 21b83bd4a16f0ba1a0620910f0f0e0e6e265983c /mysql-test/r/heap.result | |
| parent | 967256ebd7d3214092535217f41cff0d7a7f6e60 (diff) | |
| parent | cec24f77462bdee9a6f042149953fe2466068259 (diff) | |
| download | mariadb-git-a3fe14096397ddd8ce7095aad9361c25090569ca.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysys/hash.c:
Auto merged
sql/ha_heap.h:
Auto merged
configure.in:
Resolve conflicts from 4.1
mysql-test/r/heap.result:
Update results
mysql-test/t/heap.test:
Merge from 4.1
Diffstat (limited to 'mysql-test/r/heap.result')
| -rw-r--r-- | mysql-test/r/heap.result | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/r/heap.result b/mysql-test/r/heap.result index d2750fd5a43..52bf99d45ea 100644 --- a/mysql-test/r/heap.result +++ b/mysql-test/r/heap.result @@ -696,3 +696,8 @@ drop table t1; create table t1 (a int not null, b int not null auto_increment, primary key(a, b)) engine=heap; ERROR 42000: Incorrect table definition; there can be only one auto column and it must be defined as a key +create table t1 (c char(255), primary key(c(90))); +insert into t1 values ("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz"); +insert into t1 values ("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz"); +ERROR 23000: Duplicate entry 'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl' for key 1 +drop table t1; |