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 sinisa@work.mysql.com:/home/bk/mysql

Browse source 
into sinisa.nasamreza.org:/mnt/work/mysql
This commit is contained in:
Sinisa@sinisa.nasamreza.org 2002-08-28 16:44:32 +03:00
commit 69a9a39dee
6 changed files with 34 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Docs/manual.texi
View file

@ -46929,6 +46929,9 @@ not yet 100% confident in this code.
@appendixsubsec Changes in release 3.23.53
@itemize @bullet
@item
Fixed a bug with BDB @code[ALTER TABLE] with dropping column, and shutdown
immediately thereafter.
@item
Fixed problem with @code{UNSIGNED BIGINT} on AIX (again).
@item
Fixed bug in pthread_mutex_trylock() on HPUX 11.0

4
mysql-test/r/bdb-alter-table-1.result Normal file
View file

@ -0,0 +1,4 @@
objid tablename oid test
1 t1 4 9
2 metatable 1 9
3 metaindex 1 9

4
mysql-test/r/bdb-alter-table-2.result Normal file
View file

@ -0,0 +1,4 @@
objid tablename oid
1 t1 4
2 metatable 1
3 metaindex 1

12
mysql-test/t/bdb-alter-table-1.test Normal file
View file

@ -0,0 +1,12 @@
-- source include/have_bdb.inc
#
# Small basic test for ALTER TABLE bug ..
#
drop table if exists t1;
create table t1(objid BIGINT not null, tablename varchar(64), oid BIGINT not null, test BIGINT, PRIMARY KEY (objid), UNIQUE(tablename)) type=BDB;
insert into t1 values(1, 't1',4,9);
insert into t1 values(2, 'metatable',1,9);
insert into t1 values(3, 'metaindex',1,9 );
select * from t1;
alter table t1 drop column test;

3
mysql-test/t/bdb-alter-table-2.test Normal file
View file

@ -0,0 +1,3 @@
-- source include/have_bdb.inc
select * from t1;
drop table t1;

13
sql/sql_table.cc
View file

@ -1665,11 +1665,6 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
VOID(pthread_cond_broadcast(&COND_refresh));
goto err;
}
#ifdef HAVE_BERKELEY_DB
extern bool berkeley_flush_logs(void);
if (old_db_type == DB_TYPE_BERKELEY_DB && berkeley_flush_logs())
goto err;
#endif
thd->proc_info="end";
mysql_update_log.write(thd, thd->query,thd->query_length);
if (mysql_bin_log.is_open())
@ -1679,6 +1674,14 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
}
VOID(pthread_cond_broadcast(&COND_refresh));
VOID(pthread_mutex_unlock(&LOCK_open));
#ifdef HAVE_BERKELEY_DB
extern bool berkeley_flush_logs(void);
if (old_db_type == DB_TYPE_BERKELEY_DB)
{
(void)berkeley_flush_logs();
table=open_ltable(thd,table_list,TL_READ);
}
#endif
end_temporary:
sprintf(tmp_name,ER(ER_INSERT_INFO),(ulong) (copied+deleted),