mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1

Browse source 
into sanja.is.com.ua:/home/bell/mysql/bk/work-ps3-4.1
This commit is contained in:
bell@sanja.is.com.ua 2004-04-09 11:31:06 +03:00
commit e8137a13e0
6 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/r/lowercase_table2.result
View file

@ -68,7 +68,7 @@ SHOW CREATE TABLE T1;
Table Create Table
T1 CREATE TABLE `T1` (
`a` int(11) default NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin
) ENGINE=InnoDB DEFAULT CHARSET=latin1
RENAME TABLE T1 TO T2;
SHOW TABLES LIKE "T2";
Tables_in_test (T2)

1
mysql-test/r/repair.result
View file

@ -28,6 +28,7 @@ repair table t1 use_frm;
Table Op Msg_type Msg_text
test.t1 repair error Table 'test.t1' doesn't exist
create table t1 engine=myisam SELECT 1,"table 1";
flush tables;
repair table t1;
Table Op Msg_type Msg_text
test.t1 repair error Can't open file: 't1.MYI' (errno: 130)

1
mysql-test/t/repair.test
View file

@ -28,6 +28,7 @@ drop table t1;
repair table t1 use_frm;
create table t1 engine=myisam SELECT 1,"table 1";
flush tables;
system echo 1 > $MYSQL_TEST_DIR/var/master-data/test/t1.MYI ;
repair table t1;
repair table t1 use_frm;

3
mysys/my_thr_init.c
View file

@ -203,7 +203,8 @@ void my_thread_end(void)
tmp->dbug=0;
}
#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);
#endif
pthread_mutex_destroy(&tmp->mutex);

10
sql/field.cc
View file

@ -2308,7 +2308,12 @@ int Field_float::store(double nr)
else
{
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)
{
@ -2603,7 +2608,8 @@ int Field_double::store(double nr)
else
{
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)
{

2
sql/log.cc
View file

@ -107,6 +107,7 @@ MYSQL_LOG::~MYSQL_LOG()
void MYSQL_LOG::cleanup()
{
DBUG_ENTER("cleanup");
if (inited)
{
inited= 0;
@ -115,6 +116,7 @@ void MYSQL_LOG::cleanup()
(void) pthread_mutex_destroy(&LOCK_index);
(void) pthread_cond_destroy(&update_cond);
}
DBUG_VOID_RETURN;
}