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
25b16cd6
Commit
25b16cd6
authored
Jul 15, 2003
by
serg@serg.mylan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug #702 - ALTER TABLE tm UNION=(t1,t2) doesn't work if t1.MYD is compressed
parent
fe399f74
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
myisammrg/myrg_open.c
myisammrg/myrg_open.c
+3
-6
sql/handler.cc
sql/handler.cc
+3
-0
No files found.
myisammrg/myrg_open.c
View file @
25b16cd6
...
...
@@ -33,7 +33,7 @@
MYRG_INFO
*
myrg_open
(
const
char
*
name
,
int
mode
,
int
handle_locking
)
{
int
save_errno
,
i
,
errpos
;
uint
files
,
dir_length
,
length
,
options
,
key_parts
;
uint
files
,
dir_length
,
length
,
key_parts
;
ulonglong
file_offset
;
char
name_buff
[
FN_REFLEN
*
2
],
buff
[
FN_REFLEN
],
*
end
;
MYRG_INFO
info
,
*
m_info
;
...
...
@@ -110,13 +110,11 @@ MYRG_INFO *myrg_open(const char *name, int mode, int handle_locking)
}
errpos
=
2
;
options
=
(
uint
)
~
0
;
for
(
i
=
files
;
i
--
>
0
;
)
{
uint
j
;
m_info
->
open_tables
[
i
].
table
=
isam
;
m_info
->
options
|=
isam
->
s
->
options
;
options
&=
isam
->
s
->
options
;
m_info
->
records
+=
isam
->
state
->
records
;
m_info
->
del
+=
isam
->
state
->
del
;
m_info
->
data_file_length
+=
isam
->
state
->
data_file_length
;
...
...
@@ -125,9 +123,8 @@ MYRG_INFO *myrg_open(const char *name, int mode, int handle_locking)
if
(
i
)
isam
=
(
MI_INFO
*
)
(
isam
->
open_list
.
next
->
data
);
}
/* Don't force readonly if not all tables are readonly */
if
(
!
(
options
&
(
HA_OPTION_COMPRESS_RECORD
|
HA_OPTION_READ_ONLY_DATA
)))
m_info
->
options
&=
~
(
HA_OPTION_COMPRESS_RECORD
|
HA_OPTION_READ_ONLY_DATA
);
/* Don't mark table readonly, for ALTER TABLE ... UNION=(...) to work */
m_info
->
options
&=
~
(
HA_OPTION_COMPRESS_RECORD
|
HA_OPTION_READ_ONLY_DATA
);
/* Fix fileinfo for easyer debugging (actually set by rrnd) */
file_offset
=
0
;
...
...
sql/handler.cc
View file @
25b16cd6
...
...
@@ -801,6 +801,9 @@ void handler::print_error(int error, myf errflag)
int
textno
=
ER_GET_ERRNO
;
switch
(
error
)
{
case
EACCES
:
textno
=
ER_OPEN_AS_READONLY
;
break
;
case
EAGAIN
:
textno
=
ER_FILE_USED
;
break
;
...
...
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