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

Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse source 
into  zim.(none):/home/brian/mysql/mysql-5.0


sql/handler.h:
  Auto merged
This commit is contained in:
unknown 2005-08-30 08:28:55 -07:00
commit 489e0f3bf8
5 changed files with 3682 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3654
mysql-test/r/archive.result
View file

File diff suppressed because it is too large Load diff

15
mysql-test/t/archive.test
View file

@ -1332,6 +1332,19 @@ INSERT DELAYED INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily',''
#
# Cleanup, test is over
#
drop table t1, t2, t4;
# End of 4.1 tests
#
# For bug #12836
# Delete was allowing all rows to be removed
DELETE FROM t2;
SELECT * FROM t2;
INSERT INTO t2 VALUES (2,011401,37,'breaking','dreaded','Steinberg','W');
INSERT INTO t2 VALUES (3,011402,37,'Romans','scholastics','jarring','');
INSERT INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily','');
SELECT * FROM t2;
TRUNCATE TABLE t2;
SELECT * FROM t2;
drop table t1, t2, t4;

11
sql/examples/ha_archive.cc
View file

@ -1028,4 +1028,15 @@ int ha_archive::end_bulk_insert()
share->dirty= TRUE;
DBUG_RETURN(0);
}
/*
We cancel a truncate command. The only way to delete an archive table is to drop it.
This is done for security reasons. In a later version we will enable this by
allowing the user to select a different row format.
*/
int ha_archive::delete_all_rows()
{
DBUG_ENTER("ha_archive::delete_all_rows");
DBUG_RETURN(0);
}
#endif /* HAVE_ARCHIVE_DB */

1
sql/examples/ha_archive.h
View file

@ -78,6 +78,7 @@ public:
int close(void);
int write_row(byte * buf);
int real_write_row(byte *buf, gzFile writer);
int delete_row(const byte * buf);
int rnd_init(bool scan=1);
int rnd_next(byte *buf);
int rnd_pos(byte * buf, byte *pos);

2
sql/handler.h
View file

@ -834,6 +834,8 @@ extern ulong total_ha, total_ha_2pc;
#define ha_supports_generate(T) (T != DB_TYPE_INNODB && \
T != DB_TYPE_BERKELEY_DB && \
T != DB_TYPE_ARCHIVE_DB && \
T != DB_TYPE_FEDERATED_DB && \
T != DB_TYPE_NDBCLUSTER)
/* lookups */