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
2384ed8c
Commit
2384ed8c
authored
Apr 09, 2004
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-ps3-4.1
parents
c3d172a6
1bbca272
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
4 deletions
+15
-4
mysql-test/r/lowercase_table2.result
mysql-test/r/lowercase_table2.result
+1
-1
mysql-test/r/repair.result
mysql-test/r/repair.result
+1
-0
mysql-test/t/repair.test
mysql-test/t/repair.test
+1
-0
mysys/my_thr_init.c
mysys/my_thr_init.c
+2
-1
sql/field.cc
sql/field.cc
+8
-2
sql/log.cc
sql/log.cc
+2
-0
No files found.
mysql-test/r/lowercase_table2.result
View file @
2384ed8c
...
@@ -68,7 +68,7 @@ SHOW CREATE TABLE T1;
...
@@ -68,7 +68,7 @@ SHOW CREATE TABLE T1;
Table Create Table
Table Create Table
T1 CREATE TABLE `T1` (
T1 CREATE TABLE `T1` (
`a` int(11) default NULL
`a` int(11) default NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin
) ENGINE=InnoDB DEFAULT CHARSET=latin
1
RENAME TABLE T1 TO T2;
RENAME TABLE T1 TO T2;
SHOW TABLES LIKE "T2";
SHOW TABLES LIKE "T2";
Tables_in_test (T2)
Tables_in_test (T2)
...
...
mysql-test/r/repair.result
View file @
2384ed8c
...
@@ -28,6 +28,7 @@ repair table t1 use_frm;
...
@@ -28,6 +28,7 @@ repair table t1 use_frm;
Table Op Msg_type Msg_text
Table Op Msg_type Msg_text
test.t1 repair error Table 'test.t1' doesn't exist
test.t1 repair error Table 'test.t1' doesn't exist
create table t1 engine=myisam SELECT 1,"table 1";
create table t1 engine=myisam SELECT 1,"table 1";
flush tables;
repair table t1;
repair table t1;
Table Op Msg_type Msg_text
Table Op Msg_type Msg_text
test.t1 repair error Can't open file: 't1.MYI' (errno: 130)
test.t1 repair error Can't open file: 't1.MYI' (errno: 130)
...
...
mysql-test/t/repair.test
View file @
2384ed8c
...
@@ -28,6 +28,7 @@ drop table t1;
...
@@ -28,6 +28,7 @@ drop table t1;
repair
table
t1
use_frm
;
repair
table
t1
use_frm
;
create
table
t1
engine
=
myisam
SELECT
1
,
"table 1"
;
create
table
t1
engine
=
myisam
SELECT
1
,
"table 1"
;
flush
tables
;
system
echo
1
>
$MYSQL_TEST_DIR
/
var
/
master
-
data
/
test
/
t1
.
MYI
;
system
echo
1
>
$MYSQL_TEST_DIR
/
var
/
master
-
data
/
test
/
t1
.
MYI
;
repair
table
t1
;
repair
table
t1
;
repair
table
t1
use_frm
;
repair
table
t1
use_frm
;
...
...
mysys/my_thr_init.c
View file @
2384ed8c
...
@@ -203,7 +203,8 @@ void my_thread_end(void)
...
@@ -203,7 +203,8 @@ void my_thread_end(void)
tmp
->
dbug
=
0
;
tmp
->
dbug
=
0
;
}
}
#endif
#endif
#if !defined(__bsdi__) || defined(HAVE_mit_thread)
/* bsdi dumps core here */
#if !defined(__bsdi__) && !defined(__OpenBSD__) || defined(HAVE_mit_thread)
/* bsdi and openbsd 3.5 dumps core here */
pthread_cond_destroy
(
&
tmp
->
suspend
);
pthread_cond_destroy
(
&
tmp
->
suspend
);
#endif
#endif
pthread_mutex_destroy
(
&
tmp
->
mutex
);
pthread_mutex_destroy
(
&
tmp
->
mutex
);
...
...
sql/field.cc
View file @
2384ed8c
...
@@ -2308,7 +2308,12 @@ int Field_float::store(double nr)
...
@@ -2308,7 +2308,12 @@ int Field_float::store(double nr)
else
else
{
{
max_value
=
(
log_10
[
field_length
]
-
1
)
/
log_10
[
dec
];
max_value
=
(
log_10
[
field_length
]
-
1
)
/
log_10
[
dec
];
nr
=
floor
(
nr
*
log_10
[
dec
]
+
0.5
)
/
log_10
[
dec
];
/*
The following comparison is needed to not get an overflow if nr
is close to FLT_MAX
*/
if
(
fabs
(
nr
)
<
FLT_MAX
/
10.0e+32
)
nr
=
floor
(
nr
*
log_10
[
dec
]
+
0.5
)
/
log_10
[
dec
];
}
}
if
(
nr
<
-
max_value
)
if
(
nr
<
-
max_value
)
{
{
...
@@ -2603,7 +2608,8 @@ int Field_double::store(double nr)
...
@@ -2603,7 +2608,8 @@ int Field_double::store(double nr)
else
else
{
{
max_value
=
(
log_10
[
field_length
]
-
1
)
/
log_10
[
dec
];
max_value
=
(
log_10
[
field_length
]
-
1
)
/
log_10
[
dec
];
nr
=
floor
(
nr
*
log_10
[
dec
]
+
0.5
)
/
log_10
[
dec
];
if
(
fabs
(
nr
)
<
DBL_MAX
/
10.0e+32
)
nr
=
floor
(
nr
*
log_10
[
dec
]
+
0.5
)
/
log_10
[
dec
];
}
}
if
(
nr
<
-
max_value
)
if
(
nr
<
-
max_value
)
{
{
...
...
sql/log.cc
View file @
2384ed8c
...
@@ -107,6 +107,7 @@ MYSQL_LOG::~MYSQL_LOG()
...
@@ -107,6 +107,7 @@ MYSQL_LOG::~MYSQL_LOG()
void
MYSQL_LOG
::
cleanup
()
void
MYSQL_LOG
::
cleanup
()
{
{
DBUG_ENTER
(
"cleanup"
);
if
(
inited
)
if
(
inited
)
{
{
inited
=
0
;
inited
=
0
;
...
@@ -115,6 +116,7 @@ void MYSQL_LOG::cleanup()
...
@@ -115,6 +116,7 @@ void MYSQL_LOG::cleanup()
(
void
)
pthread_mutex_destroy
(
&
LOCK_index
);
(
void
)
pthread_mutex_destroy
(
&
LOCK_index
);
(
void
)
pthread_cond_destroy
(
&
update_cond
);
(
void
)
pthread_cond_destroy
(
&
update_cond
);
}
}
DBUG_VOID_RETURN
;
}
}
...
...
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