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
31b337fe
Commit
31b337fe
authored
21 years ago
by
serg@serg.mylan
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
parents
ee46c673
d09626d9
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
174 additions
and
3 deletions
+174
-3
myisam/mi_dynrec.c
myisam/mi_dynrec.c
+1
-0
mysql-test/r/isam.result
mysql-test/r/isam.result
+170
-0
sql/sql_select.cc
sql/sql_select.cc
+3
-3
No files found.
myisam/mi_dynrec.c
View file @
31b337fe
...
@@ -17,6 +17,7 @@
...
@@ -17,6 +17,7 @@
/* Functions to handle space-packed-records and blobs */
/* Functions to handle space-packed-records and blobs */
#include "myisamdef.h"
#include "myisamdef.h"
#include <assert.h>
/* Enough for comparing if number is zero */
/* Enough for comparing if number is zero */
static
char
zero_string
[]
=
{
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
};
static
char
zero_string
[]
=
{
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
};
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/isam.result
View file @
31b337fe
This diff is collapsed.
Click to expand it.
sql/sql_select.cc
View file @
31b337fe
...
@@ -906,9 +906,9 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds,
...
@@ -906,9 +906,9 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds,
if
(
join
.
group
||
join
.
tmp_table_param
.
sum_func_count
||
if
(
join
.
group
||
join
.
tmp_table_param
.
sum_func_count
||
(
procedure
&&
(
procedure
->
flags
&
PROC_GROUP
)))
(
procedure
&&
(
procedure
->
flags
&
PROC_GROUP
)))
{
{
alloc_group_fields
(
&
join
,
group
);
if
(
alloc_group_fields
(
&
join
,
group
)
||
setup_copy_fields
(
thd
,
&
join
.
tmp_table_param
,
all_fields
);
setup_copy_fields
(
thd
,
&
join
.
tmp_table_param
,
all_fields
)
||
if
(
make_sum_func_list
(
&
join
,
all_fields
)
||
thd
->
fatal_error
)
make_sum_func_list
(
&
join
,
all_fields
)
||
thd
->
fatal_error
)
goto
err
;
/* purecov: inspected */
goto
err
;
/* purecov: inspected */
}
}
if
(
group
||
order
)
if
(
group
||
order
)
...
...
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