Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
08cea5f8
Commit
08cea5f8
authored
19 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Bugs/5.0.9404
parents
47b7b7f8
d775e4ec
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
8 deletions
+18
-8
heap/hp_hash.c
heap/hp_hash.c
+6
-7
mysql-test/r/information_schema.result
mysql-test/r/information_schema.result
+4
-0
mysql-test/t/information_schema.test
mysql-test/t/information_schema.test
+8
-1
No files found.
heap/hp_hash.c
View file @
08cea5f8
...
...
@@ -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
,
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/information_schema.result
View file @
08cea5f8
...
...
@@ -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
This diff is collapsed.
Click to expand it.
mysql-test/t/information_schema.test
View file @
08cea5f8
# 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
;
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment