Commit 08cea5f8 authored by unknown's avatar unknown
Browse files

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/home/gluh/MySQL/Bugs/5.0.9404
parents 47b7b7f8 d775e4ec

heap/hp_hash.c

+6 −7
Original line number Diff line number Diff line
@@ -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,

mysql-test/r/information_schema.result

+4 −0
Original line number Diff line number Diff line
@@ -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

mysql-test/t/information_schema.test

+8 −1
Original line number Diff line number Diff line
@@ -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;