diff options
| author | unknown <monty@mysql.com/narttu.mysql.fi> | 2006-11-30 23:23:23 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2006-11-30 23:23:23 +0200 |
| commit | e0aeba21a5b58038d38c92f750c1684ccb2a72d4 (patch) | |
| tree | 19e5ff050bcbcc633063771e1222a6c9f8015e37 /storage | |
| parent | 600336ef45024e4841f46784b2cf9de5ffdf3828 (diff) | |
| download | mariadb-git-e0aeba21a5b58038d38c92f750c1684ccb2a72d4.tar.gz | |
After merge fixes
Marked some functions as noreturn
sql/mysql_priv.h:
Marked some functions as noreturn
storage/federated/ha_federated.cc:
After merge fix
storage/myisam/ft_boolean_search.c:
Removed duplicate code
storage/myisam/myisamchk.c:
Added LINT_INIT()
storage/myisam/myisampack.c:
After merge fix
storage/myisam/sort.c:
Indentation fixup
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/federated/ha_federated.cc | 4 | ||||
| -rw-r--r-- | storage/myisam/ft_boolean_search.c | 1 | ||||
| -rw-r--r-- | storage/myisam/myisamchk.c | 1 | ||||
| -rw-r--r-- | storage/myisam/myisampack.c | 1 | ||||
| -rw-r--r-- | storage/myisam/sort.c | 1 |
5 files changed, 4 insertions, 4 deletions
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc index 8508d23b172..2d406b35643 100644 --- a/storage/federated/ha_federated.cc +++ b/storage/federated/ha_federated.cc @@ -2020,8 +2020,8 @@ int ha_federated::delete_row(const byte *buf) { DBUG_RETURN(stash_remote_error()); } - deleted+= (ha_rows) mysql->affected_rows; - records-= (ha_rows) mysql->affected_rows; + stats.deleted+= (ha_rows) mysql->affected_rows; + stats.records-= (ha_rows) mysql->affected_rows; DBUG_PRINT("info", ("rows deleted %ld rows deleted for all time %ld", (long) mysql->affected_rows, (long) stats.deleted)); diff --git a/storage/myisam/ft_boolean_search.c b/storage/myisam/ft_boolean_search.c index cb4005d5c84..6ef2149b5da 100644 --- a/storage/myisam/ft_boolean_search.c +++ b/storage/myisam/ft_boolean_search.c @@ -333,7 +333,6 @@ static int _ft2_search(FTB *ftb, FTB_WORD *ftbw, my_bool init_search) MI_INFO *info=ftb->info; uint off, extra=HA_FT_WLEN+info->s->base.rec_reflength; byte *lastkey_buf=ftbw->word+ftbw->off; - LINT_INIT(off); LINT_INIT(off); if (ftbw->flags & FTB_FLAG_TRUNC) diff --git a/storage/myisam/myisamchk.c b/storage/myisam/myisamchk.c index 7fcfb8fc65a..eb7e4deca96 100644 --- a/storage/myisam/myisamchk.c +++ b/storage/myisam/myisamchk.c @@ -697,6 +697,7 @@ get_one_option(int optid, { int method; enum_mi_stats_method method_conv; + LINT_INIT(method_conv); myisam_stats_method_str= argument; if ((method=find_type(argument, &myisam_stats_method_typelib, 2)) <= 0) { diff --git a/storage/myisam/myisampack.c b/storage/myisam/myisampack.c index 36c328bd089..d16821d3cda 100644 --- a/storage/myisam/myisampack.c +++ b/storage/myisam/myisampack.c @@ -2279,6 +2279,7 @@ static my_off_t write_huff_tree(HUFF_TREE *huff_tree, uint trees) if (bits > 8 * sizeof(code)) { VOID(fflush(stdout)); + VOID(fprintf(stderr, "error: Huffman code too long: %u/%u\n", bits, (uint) (8 * sizeof(code)))); errors++; break; diff --git a/storage/myisam/sort.c b/storage/myisam/sort.c index a6bf3934959..950d32617b4 100644 --- a/storage/myisam/sort.c +++ b/storage/myisam/sort.c @@ -899,7 +899,6 @@ merge_buffers(MI_SORT_PARAM *info, uint keys, IO_CACHE *from_file, BUFFPEK *buffpek,**refpek; QUEUE queue; volatile int *killed= killed_ptr(info->sort_info->param); - DBUG_ENTER("merge_buffers"); count=error=0; |