diff options
| author | gluh@mysql.com <> | 2005-05-09 18:28:53 +0000 |
|---|---|---|
| committer | gluh@mysql.com <> | 2005-05-09 18:28:53 +0000 |
| commit | 2ae1faaf4b7ec3ef94b123e3a135489acbaf5d1c (patch) | |
| tree | eaedb005c6fd7a31f662fcd59e08e2bfc13e0443 | |
| parent | fa8bf7bc09e1f812b36ec210e7937c624f3ec014 (diff) | |
| parent | 639f7ccba2e06dc9e824291c7255096aa793f588 (diff) | |
| download | mariadb-git-2ae1faaf4b7ec3ef94b123e3a135489acbaf5d1c.tar.gz | |
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Bugs/5.0.9404
| -rw-r--r-- | heap/hp_hash.c | 13 | ||||
| -rw-r--r-- | mysql-test/r/information_schema.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/information_schema.test | 9 |
3 files changed, 18 insertions, 8 deletions
diff --git a/heap/hp_hash.c b/heap/hp_hash.c index 52a250bd7af..7f02eb587a8 100644 --- a/heap/hp_hash.c +++ b/heap/hp_hash.c @@ -635,13 +635,12 @@ int hp_key_cmp(HP_KEYDEF *keydef, const byte *rec, const byte *key) key+= 2; /* skip key pack length */ if (cs->mbmaxlen > 1) { - uint char_length= seg->length / cs->mbmaxlen; - char_length_key= my_charpos(cs, key, key + char_length_key, - char_length); - set_if_smaller(char_length_key, seg->length); - char_length_rec= my_charpos(cs, pos, pos + char_length_rec, - char_length); - set_if_smaller(char_length_rec, seg->length); + uint char_length1, char_length2; + char_length1= char_length2= seg->length / cs->mbmaxlen; + char_length1= my_charpos(cs, key, key + char_length_key, char_length1); + set_if_smaller(char_length_key, char_length1); + char_length2= my_charpos(cs, pos, pos + char_length_rec, char_length2); + set_if_smaller(char_length_rec, char_length2); } if (cs->coll->strnncollsp(seg->charset, diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result index 6c8e7a9cf8b..0b993d681e3 100644 --- a/mysql-test/r/information_schema.result +++ b/mysql-test/r/information_schema.result @@ -748,3 +748,7 @@ TABLE_CONSTRAINTS TABLE_NAME select KEY_COLUMN_USAGE TABLE_NAME select delete from mysql.user where user='mysqltest_4'; flush privileges; +SELECT table_schema, count(*) FROM information_schema.TABLES GROUP BY TABLE_SCHEMA; +table_schema count(*) +information_schema 15 +mysql 17 diff --git a/mysql-test/t/information_schema.test b/mysql-test/t/information_schema.test index 3e322ad2f5b..05dfeb67ccc 100644 --- a/mysql-test/t/information_schema.test +++ b/mysql-test/t/information_schema.test @@ -1,4 +1,4 @@ -# This test uses grants, which can't get tested for embedded server +# This test uses grants, which can't get tested for embedded server -- source include/not_embedded.inc # Test for information_schema.schemata & @@ -486,3 +486,10 @@ where COLUMN_NAME='TABLE_NAME'; connection default; delete from mysql.user where user='mysqltest_4'; flush privileges; + +# +# Bug #9404 information_schema: Weird error messages +# with SELECT SUM() ... GROUP BY queries +# +SELECT table_schema, count(*) FROM information_schema.TABLES GROUP BY TABLE_SCHEMA; + |