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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
3345c54b
Commit
3345c54b
authored
Dec 31, 2004
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
parents
064c2890
9b7bbc4a
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
7 deletions
+9
-7
mysql-test/include/varchar.inc
mysql-test/include/varchar.inc
+1
-0
mysql-test/r/bdb.result
mysql-test/r/bdb.result
+1
-1
mysql-test/r/myisam.result
mysql-test/r/myisam.result
+1
-1
sql/table.cc
sql/table.cc
+6
-5
No files found.
mysql-test/include/varchar.inc
View file @
3345c54b
...
...
@@ -77,6 +77,7 @@ explain select count(*) from t1 where v between 'a' and 'a ' and v between 'a '
alter
table
t1
add
unique
(
v
);
alter
table
t1
add
key
(
v
);
select
concat
(
'*'
,
v
,
'*'
,
c
,
'*'
,
t
,
'*'
)
as
qq
from
t1
where
v
=
'a'
;
--
replace_column
6
#
explain
select
*
from
t1
where
v
=
'a'
;
# GROUP BY
...
...
mysql-test/r/bdb.result
View file @
3345c54b
...
...
@@ -1445,7 +1445,7 @@ qq
*a
*a*a *
explain select * from t1 where v='a';
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ref v,v_2
v
13 const 10 Using where
1 SIMPLE t1 ref v,v_2
#
13 const 10 Using where
select v,count(*) from t1 group by v limit 10;
v count(*)
a 1
...
...
mysql-test/r/myisam.result
View file @
3345c54b
...
...
@@ -716,7 +716,7 @@ qq
*a
*a*a *
explain select * from t1 where v='a';
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ref v,v_2
v_2
13 const 7 Using where
1 SIMPLE t1 ref v,v_2
#
13 const 7 Using where
select v,count(*) from t1 group by v limit 10;
v count(*)
a 1
...
...
sql/table.cc
View file @
3345c54b
...
...
@@ -262,11 +262,6 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat,
}
key_part
->
store_length
=
key_part
->
length
;
}
set_if_bigger
(
outparam
->
max_key_length
,
keyinfo
->
key_length
+
keyinfo
->
key_parts
);
outparam
->
total_key_length
+=
keyinfo
->
key_length
;
if
(
keyinfo
->
flags
&
HA_NOSAME
)
set_if_bigger
(
outparam
->
max_unique_length
,
keyinfo
->
key_length
);
}
keynames
=
(
char
*
)
key_part
;
strpos
+=
(
strmov
(
keynames
,
(
char
*
)
strpos
)
-
keynames
)
+
1
;
...
...
@@ -718,6 +713,12 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat,
}
}
keyinfo
->
usable_key_parts
=
usable_parts
;
// Filesort
set_if_bigger
(
outparam
->
max_key_length
,
keyinfo
->
key_length
+
keyinfo
->
key_parts
);
outparam
->
total_key_length
+=
keyinfo
->
key_length
;
if
(
keyinfo
->
flags
&
HA_NOSAME
)
set_if_bigger
(
outparam
->
max_unique_length
,
keyinfo
->
key_length
);
}
if
(
primary_key
<
MAX_KEY
&&
(
outparam
->
keys_in_use
.
is_set
(
primary_key
)))
...
...
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