diff options
| author | unknown <monty@mysql.com> | 2003-11-25 23:15:15 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2003-11-25 23:15:15 +0200 |
| commit | 0994f09c1294b54a531e7d7f08fe218eeabd296f (patch) | |
| tree | 76222adfd26feaf313afdc2c989508a9963c79a3 | |
| parent | 1daf856de56dfb5c9c2bf2880b10a8f14f7a12df (diff) | |
| parent | 78d3586b4dccda82c5c0f9d0850cd97722bb1e85 (diff) | |
| download | mariadb-git-0994f09c1294b54a531e7d7f08fe218eeabd296f.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
mysql-test/r/rpl_change_master.result:
Auto merged
mysql-test/t/rpl_change_master.test:
Auto merged
| -rw-r--r-- | myisam/mi_extra.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/myisam/mi_extra.c b/myisam/mi_extra.c index fcc753b62e5..10f52f1e39a 100644 --- a/myisam/mi_extra.c +++ b/myisam/mi_extra.c @@ -33,15 +33,11 @@ Used when function is one of: HA_EXTRA_WRITE_CACHE HA_EXTRA_CACHE - HA_EXTRA_BULK_INSERT_BEGIN - If extra_arg is 0, then the default cache size is used. - HA_EXTRA_BULK_INSERT_FLUSH - extra_arg is a a pointer to which index to flush (uint*) - RETURN VALUES - 0 ok + RETURN VALUES + 0 ok + # error */ - int mi_extra(MI_INFO *info, enum ha_extra_function function, void *extra_arg) { int error=0; |