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
e4f12577
Commit
e4f12577
authored
May 31, 2006
by
ingo@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/mydev/mysql-5.0-bug19604
into mysql.com:/home/mydev/mysql-5.1-bug19604
parents
ed2e4755
6345502b
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
27 additions
and
29 deletions
+27
-29
storage/myisam/mi_check.c
storage/myisam/mi_check.c
+16
-18
storage/myisam/mi_key.c
storage/myisam/mi_key.c
+6
-8
storage/myisam/mi_update.c
storage/myisam/mi_update.c
+2
-1
storage/myisam/mi_write.c
storage/myisam/mi_write.c
+2
-1
storage/myisam/myisamdef.h
storage/myisam/myisamdef.h
+1
-1
No files found.
storage/myisam/mi_check.c
View file @
e4f12577
...
@@ -453,25 +453,24 @@ int chk_key(MI_CHECK *param, register MI_INFO *info)
...
@@ -453,25 +453,24 @@ int chk_key(MI_CHECK *param, register MI_INFO *info)
if
((
uint
)
share
->
base
.
auto_key
-
1
==
key
)
if
((
uint
)
share
->
base
.
auto_key
-
1
==
key
)
{
{
/* Check that auto_increment key is bigger than max key value */
/* Check that auto_increment key is bigger than max key value */
ulonglong
save_auto_value
=
info
->
s
->
state
.
auto_increment
;
ulonglong
auto_increment
;
info
->
s
->
state
.
auto_increment
=
0
;
info
->
lastinx
=
key
;
info
->
lastinx
=
key
;
_mi_read_key_record
(
info
,
0L
,
info
->
rec_buff
);
_mi_read_key_record
(
info
,
0L
,
info
->
rec_buff
);
updat
e_auto_increment
(
info
,
info
->
rec_buff
);
auto_increment
=
retriev
e_auto_increment
(
info
,
info
->
rec_buff
);
if
(
info
->
s
->
state
.
auto_increment
>
save_auto_value
)
if
(
auto_increment
>
info
->
s
->
state
.
auto_increment
)
{
{
mi_check_print_warning
(
param
,
mi_check_print_warning
(
param
,
"Auto-increment value: %s is smaller "
"Auto-increment value: %s is smaller
than max used value: %s"
,
"
than max used value: %s"
,
llstr
(
save_auto_value
,
buff2
),
llstr
(
info
->
s
->
state
.
auto_increment
,
buff2
),
llstr
(
info
->
s
->
state
.
auto_increment
,
buff
));
llstr
(
auto_increment
,
buff
));
}
}
if
(
param
->
testflag
&
T_AUTO_INC
)
if
(
param
->
testflag
&
T_AUTO_INC
)
{
{
set_if_bigger
(
info
->
s
->
state
.
auto_increment
,
auto_increment
);
set_if_bigger
(
info
->
s
->
state
.
auto_increment
,
set_if_bigger
(
info
->
s
->
state
.
auto_increment
,
param
->
auto_increment_value
);
param
->
auto_increment_value
);
}
}
else
info
->
s
->
state
.
auto_increment
=
save_auto_value
;
/* Check that there isn't a row with auto_increment = 0 in the table */
/* Check that there isn't a row with auto_increment = 0 in the table */
mi_extra
(
info
,
HA_EXTRA_KEYREAD
,
0
);
mi_extra
(
info
,
HA_EXTRA_KEYREAD
,
0
);
...
@@ -481,8 +480,8 @@ int chk_key(MI_CHECK *param, register MI_INFO *info)
...
@@ -481,8 +480,8 @@ int chk_key(MI_CHECK *param, register MI_INFO *info)
{
{
/* Don't count this as a real warning, as myisamchk can't correct it */
/* Don't count this as a real warning, as myisamchk can't correct it */
uint
save
=
param
->
warning_printed
;
uint
save
=
param
->
warning_printed
;
mi_check_print_warning
(
param
,
mi_check_print_warning
(
param
,
"Found row where the auto_increment "
"Found row where the auto_increment
column has the value 0"
);
"
column has the value 0"
);
param
->
warning_printed
=
save
;
param
->
warning_printed
=
save
;
}
}
mi_extra
(
info
,
HA_EXTRA_NO_KEYREAD
,
0
);
mi_extra
(
info
,
HA_EXTRA_NO_KEYREAD
,
0
);
...
@@ -4096,11 +4095,10 @@ void update_auto_increment_key(MI_CHECK *param, MI_INFO *info,
...
@@ -4096,11 +4095,10 @@ void update_auto_increment_key(MI_CHECK *param, MI_INFO *info,
}
}
else
else
{
{
ulonglong
auto_increment
=
(
repair_only
?
info
->
s
->
state
.
auto_increment
:
ulonglong
auto_increment
=
retrieve_auto_increment
(
info
,
record
);
param
->
auto_increment_value
);
info
->
s
->
state
.
auto_increment
=
0
;
update_auto_increment
(
info
,
record
);
set_if_bigger
(
info
->
s
->
state
.
auto_increment
,
auto_increment
);
set_if_bigger
(
info
->
s
->
state
.
auto_increment
,
auto_increment
);
if
(
!
repair_only
)
set_if_bigger
(
info
->
s
->
state
.
auto_increment
,
param
->
auto_increment_value
);
}
}
mi_extra
(
info
,
HA_EXTRA_NO_KEYREAD
,
0
);
mi_extra
(
info
,
HA_EXTRA_NO_KEYREAD
,
0
);
my_free
((
char
*
)
record
,
MYF
(
0
));
my_free
((
char
*
)
record
,
MYF
(
0
));
...
...
storage/myisam/mi_key.c
View file @
e4f12577
...
@@ -509,20 +509,19 @@ int _mi_read_key_record(MI_INFO *info, my_off_t filepos, byte *buf)
...
@@ -509,20 +509,19 @@ int _mi_read_key_record(MI_INFO *info, my_off_t filepos, byte *buf)
/*
/*
Updat
e auto_increment info
Retriev
e auto_increment info
SYNOPSIS
SYNOPSIS
updat
e_auto_increment()
retriev
e_auto_increment()
info MyISAM handler
info MyISAM handler
record Row to update
record Row to update
IMPLEMENTATION
IMPLEMENTATION
Only replace the auto_increment value if it is higher than the previous
For signed columns we don't retrieve the auto increment value if it's
one. For signed columns we don't update the auto increment value if it's
less than zero.
less than zero.
*/
*/
void
updat
e_auto_increment
(
MI_INFO
*
info
,
const
byte
*
record
)
ulonglong
retriev
e_auto_increment
(
MI_INFO
*
info
,
const
byte
*
record
)
{
{
ulonglong
value
=
0
;
/* Store unsigned values here */
ulonglong
value
=
0
;
/* Store unsigned values here */
longlong
s_value
=
0
;
/* Store signed values here */
longlong
s_value
=
0
;
/* Store signed values here */
...
@@ -587,6 +586,5 @@ void update_auto_increment(MI_INFO *info,const byte *record)
...
@@ -587,6 +586,5 @@ void update_auto_increment(MI_INFO *info,const byte *record)
and if s_value == 0 then value will contain either s_value or the
and if s_value == 0 then value will contain either s_value or the
correct value.
correct value.
*/
*/
set_if_bigger
(
info
->
s
->
state
.
auto_increment
,
return
(
s_value
>
0
)
?
(
ulonglong
)
s_value
:
value
;
(
s_value
>
0
)
?
(
ulonglong
)
s_value
:
value
);
}
}
storage/myisam/mi_update.c
View file @
e4f12577
...
@@ -164,7 +164,8 @@ int mi_update(register MI_INFO *info, const byte *oldrec, byte *newrec)
...
@@ -164,7 +164,8 @@ int mi_update(register MI_INFO *info, const byte *oldrec, byte *newrec)
key_changed
|=
HA_STATE_CHANGED
;
/* Must update index file */
key_changed
|=
HA_STATE_CHANGED
;
/* Must update index file */
}
}
if
(
auto_key_changed
)
if
(
auto_key_changed
)
update_auto_increment
(
info
,
newrec
);
set_if_bigger
(
info
->
s
->
state
.
auto_increment
,
retrieve_auto_increment
(
info
,
newrec
));
if
(
share
->
calc_checksum
)
if
(
share
->
calc_checksum
)
info
->
state
->
checksum
+=
(
info
->
checksum
-
old_checksum
);
info
->
state
->
checksum
+=
(
info
->
checksum
-
old_checksum
);
...
...
storage/myisam/mi_write.c
View file @
e4f12577
...
@@ -149,7 +149,8 @@ int mi_write(MI_INFO *info, byte *record)
...
@@ -149,7 +149,8 @@ int mi_write(MI_INFO *info, byte *record)
info
->
state
->
checksum
+=
info
->
checksum
;
info
->
state
->
checksum
+=
info
->
checksum
;
}
}
if
(
share
->
base
.
auto_key
)
if
(
share
->
base
.
auto_key
)
update_auto_increment
(
info
,
record
);
set_if_bigger
(
info
->
s
->
state
.
auto_increment
,
retrieve_auto_increment
(
info
,
record
));
info
->
update
=
(
HA_STATE_CHANGED
|
HA_STATE_AKTIV
|
HA_STATE_WRITTEN
|
info
->
update
=
(
HA_STATE_CHANGED
|
HA_STATE_AKTIV
|
HA_STATE_WRITTEN
|
HA_STATE_ROW_CHANGED
);
HA_STATE_ROW_CHANGED
);
info
->
state
->
records
++
;
info
->
state
->
records
++
;
...
...
storage/myisam/myisamdef.h
View file @
e4f12577
...
@@ -591,7 +591,7 @@ extern uint _mi_pack_key(MI_INFO *info,uint keynr,uchar *key,uchar *old,
...
@@ -591,7 +591,7 @@ extern uint _mi_pack_key(MI_INFO *info,uint keynr,uchar *key,uchar *old,
extern
int
_mi_read_key_record
(
MI_INFO
*
info
,
my_off_t
filepos
,
byte
*
buf
);
extern
int
_mi_read_key_record
(
MI_INFO
*
info
,
my_off_t
filepos
,
byte
*
buf
);
extern
int
_mi_read_cache
(
IO_CACHE
*
info
,
byte
*
buff
,
my_off_t
pos
,
extern
int
_mi_read_cache
(
IO_CACHE
*
info
,
byte
*
buff
,
my_off_t
pos
,
uint
length
,
int
re_read_if_possibly
);
uint
length
,
int
re_read_if_possibly
);
extern
void
updat
e_auto_increment
(
MI_INFO
*
info
,
const
byte
*
record
);
extern
ulonglong
retriev
e_auto_increment
(
MI_INFO
*
info
,
const
byte
*
record
);
extern
byte
*
mi_alloc_rec_buff
(
MI_INFO
*
,
ulong
,
byte
**
);
extern
byte
*
mi_alloc_rec_buff
(
MI_INFO
*
,
ulong
,
byte
**
);
#define mi_get_rec_buff_ptr(info,buf) \
#define mi_get_rec_buff_ptr(info,buf) \
...
...
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