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
e95e9066
Commit
e95e9066
authored
21 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
parents
5a38c59d
ec44c881
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
3 deletions
+9
-3
myisam/mi_open.c
myisam/mi_open.c
+5
-1
mysql-test/r/analyse.result
mysql-test/r/analyse.result
+1
-1
sql/sql_select.cc
sql/sql_select.cc
+3
-1
No files found.
myisam/mi_open.c
View file @
e95e9066
...
...
@@ -329,7 +329,11 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
{
*
pos
=
ft_keysegs
[
j
];
pos
[
0
].
language
=
pos
[
-
1
].
language
;
pos
[
0
].
charset
=
pos
[
-
1
].
charset
;
if
(
!
(
pos
[
0
].
charset
=
pos
[
-
1
].
charset
))
{
my_errno
=
HA_ERR_CRASHED
;
goto
err
;
}
pos
++
;
}
}
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/analyse.result
View file @
e95e9066
...
...
@@ -3,7 +3,7 @@ create table t1 (i int, j int);
insert into t1 values (1,2), (3,4), (5,6), (7,8);
select count(*) from t1 procedure analyse();
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
-6510615555426900571 -6510615555426900571 -6510615555426900571 -6510615555426900571
count(*) 4 4 1 1 0 0 4.0000 0.0000 ENUM('4') NOT NULL
select * from t1 procedure analyse();
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
t1.i 1 7 1 1 0 0 4.0000 2.2361 ENUM('1','3','5','7') NOT NULL
...
...
This diff is collapsed.
Click to expand it.
sql/sql_select.cc
View file @
e95e9066
...
...
@@ -732,7 +732,9 @@ JOIN::exec()
result
->
send_fields
(
fields_list
,
1
);
if
(
!
having
||
having
->
val_int
())
{
if
(
do_send_rows
&&
result
->
send_data
(
fields_list
))
if
(
do_send_rows
&&
(
procedure
?
(
procedure
->
send_row
(
fields_list
)
||
procedure
->
end_of_records
())
:
result
->
send_data
(
fields_list
)))
error
=
1
;
else
{
...
...
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