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
eaa9350c
Commit
eaa9350c
authored
Jul 08, 2006
by
ingo/mydev@chilla.local
Browse files
Options
Browse Files
Download
Plain Diff
Merge chilla.local:/home/mydev/mysql-4.1-bug11824
into chilla.local:/home/mydev/mysql-4.1-amerge
parents
23030772
e67bdaf6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
35 additions
and
6 deletions
+35
-6
myisam/mi_create.c
myisam/mi_create.c
+17
-0
myisam/mi_delete_table.c
myisam/mi_delete_table.c
+18
-6
No files found.
myisam/mi_create.c
View file @
eaa9350c
...
@@ -59,6 +59,8 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
...
@@ -59,6 +59,8 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
my_off_t
key_root
[
MI_MAX_POSSIBLE_KEY
],
key_del
[
MI_MAX_KEY_BLOCK_SIZE
];
my_off_t
key_root
[
MI_MAX_POSSIBLE_KEY
],
key_del
[
MI_MAX_KEY_BLOCK_SIZE
];
MI_CREATE_INFO
tmp_create_info
;
MI_CREATE_INFO
tmp_create_info
;
DBUG_ENTER
(
"mi_create"
);
DBUG_ENTER
(
"mi_create"
);
DBUG_PRINT
(
"enter"
,
(
"keys: %u columns: %u uniques: %u flags: %u"
,
keys
,
columns
,
uniques
,
flags
));
if
(
!
ci
)
if
(
!
ci
)
{
{
...
@@ -447,6 +449,16 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
...
@@ -447,6 +449,16 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
uniques
*
MI_UNIQUEDEF_SIZE
+
uniques
*
MI_UNIQUEDEF_SIZE
+
(
key_segs
+
unique_key_parts
)
*
HA_KEYSEG_SIZE
+
(
key_segs
+
unique_key_parts
)
*
HA_KEYSEG_SIZE
+
columns
*
MI_COLUMNDEF_SIZE
);
columns
*
MI_COLUMNDEF_SIZE
);
DBUG_PRINT
(
"info"
,
(
"info_length: %u"
,
info_length
));
/* There are only 16 bits for the total header length. */
if
(
info_length
>
65535
)
{
my_printf_error
(
0
,
"MyISAM table '%s' has too many columns and/or "
"indexes and/or unique constraints."
,
MYF
(
0
),
name
+
dirname_length
(
name
));
my_errno
=
HA_WRONG_CREATE_OPTION
;
goto
err
;
}
bmove
(
share
.
state
.
header
.
file_version
,(
byte
*
)
myisam_file_magic
,
4
);
bmove
(
share
.
state
.
header
.
file_version
,(
byte
*
)
myisam_file_magic
,
4
);
ci
->
old_options
=
options
|
(
ci
->
old_options
&
HA_OPTION_TEMP_COMPRESS_RECORD
?
ci
->
old_options
=
options
|
(
ci
->
old_options
&
HA_OPTION_TEMP_COMPRESS_RECORD
?
...
@@ -616,6 +628,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
...
@@ -616,6 +628,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
errpos
=
3
;
errpos
=
3
;
}
}
DBUG_PRINT
(
"info"
,
(
"write state info and base info"
));
if
(
mi_state_info_write
(
file
,
&
share
.
state
,
2
)
||
if
(
mi_state_info_write
(
file
,
&
share
.
state
,
2
)
||
mi_base_info_write
(
file
,
&
share
.
base
))
mi_base_info_write
(
file
,
&
share
.
base
))
goto
err
;
goto
err
;
...
@@ -629,6 +642,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
...
@@ -629,6 +642,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
#endif
#endif
/* Write key and keyseg definitions */
/* Write key and keyseg definitions */
DBUG_PRINT
(
"info"
,
(
"write key and keyseg definitions"
));
for
(
i
=
0
;
i
<
share
.
base
.
keys
-
uniques
;
i
++
)
for
(
i
=
0
;
i
<
share
.
base
.
keys
-
uniques
;
i
++
)
{
{
uint
sp_segs
=
(
keydefs
[
i
].
flag
&
HA_SPATIAL
)
?
2
*
SPDIMS
:
0
;
uint
sp_segs
=
(
keydefs
[
i
].
flag
&
HA_SPATIAL
)
?
2
*
SPDIMS
:
0
;
...
@@ -677,6 +691,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
...
@@ -677,6 +691,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
}
}
/* Save unique definition */
/* Save unique definition */
DBUG_PRINT
(
"info"
,
(
"write unique definitions"
));
for
(
i
=
0
;
i
<
share
.
state
.
header
.
uniques
;
i
++
)
for
(
i
=
0
;
i
<
share
.
state
.
header
.
uniques
;
i
++
)
{
{
if
(
mi_uniquedef_write
(
file
,
&
uniquedefs
[
i
]))
if
(
mi_uniquedef_write
(
file
,
&
uniquedefs
[
i
]))
...
@@ -687,6 +702,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
...
@@ -687,6 +702,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
goto
err
;
goto
err
;
}
}
}
}
DBUG_PRINT
(
"info"
,
(
"write field definitions"
));
for
(
i
=
0
;
i
<
share
.
base
.
fields
;
i
++
)
for
(
i
=
0
;
i
<
share
.
base
.
fields
;
i
++
)
if
(
mi_recinfo_write
(
file
,
&
recinfo
[
i
]))
if
(
mi_recinfo_write
(
file
,
&
recinfo
[
i
]))
goto
err
;
goto
err
;
...
@@ -701,6 +717,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
...
@@ -701,6 +717,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
#endif
#endif
/* Enlarge files */
/* Enlarge files */
DBUG_PRINT
(
"info"
,
(
"enlarge to keystart: %lu"
,
(
ulong
)
share
.
base
.
keystart
));
if
(
my_chsize
(
file
,(
ulong
)
share
.
base
.
keystart
,
0
,
MYF
(
0
)))
if
(
my_chsize
(
file
,(
ulong
)
share
.
base
.
keystart
,
0
,
MYF
(
0
)))
goto
err
;
goto
err
;
...
...
myisam/mi_delete_table.c
View file @
eaa9350c
...
@@ -34,12 +34,24 @@ int mi_delete_table(const char *name)
...
@@ -34,12 +34,24 @@ int mi_delete_table(const char *name)
#ifdef USE_RAID
#ifdef USE_RAID
{
{
MI_INFO
*
info
;
MI_INFO
*
info
;
/* we use 'open_for_repair' to be able to delete a crashed table */
/*
if
(
!
(
info
=
mi_open
(
name
,
O_RDONLY
,
HA_OPEN_FOR_REPAIR
)))
When built with RAID support, we need to determine if this table
DBUG_RETURN
(
my_errno
);
makes use of the raid feature. If yes, we need to remove all raid
raid_type
=
info
->
s
->
base
.
raid_type
;
chunks. This is done with my_raid_delete(). Unfortunately it is
raid_chunks
=
info
->
s
->
base
.
raid_chunks
;
necessary to open the table just to check this. We use
mi_close
(
info
);
'open_for_repair' to be able to open even a crashed table. If even
this open fails, we assume no raid configuration for this table
and try to remove the normal data file only. This may however
leave the raid chunks behind.
*/
if
(
!
(
info
=
mi_open
(
name
,
O_RDONLY
,
HA_OPEN_FOR_REPAIR
)))
raid_type
=
0
;
else
{
raid_type
=
info
->
s
->
base
.
raid_type
;
raid_chunks
=
info
->
s
->
base
.
raid_chunks
;
mi_close
(
info
);
}
}
}
#ifdef EXTRA_DEBUG
#ifdef EXTRA_DEBUG
check_table_is_closed
(
name
,
"delete"
);
check_table_is_closed
(
name
,
"delete"
);
...
...
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