diff options
| author | unknown <monty@mysql.com/narttu.mysql.fi> | 2008-01-11 19:39:43 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2008-01-11 19:39:43 +0200 |
| commit | e689fbc4582de1b5f81cb69d98f5fe54b7064db1 (patch) | |
| tree | 77b755832a75628eaf9d6cea0f9ae271fd224c3a /storage/myisam/mi_check.c | |
| parent | 7bfb3446a0ef838c06fb53566d543000c0b62d0e (diff) | |
| download | mariadb-git-e689fbc4582de1b5f81cb69d98f5fe54b7064db1.tar.gz | |
Fixed compiler warnings by adding casts and changing variable types
Fixed bug that caused change_user.test to fail
Fixed bug that caused mysql_client_test to fail
include/myisam.h:
Fixed prototypes
mysql-test/r/create.result:
Fix that test works even if Maria is not used for temporary tables
mysql-test/t/create.test:
Fix that test works even if Maria is not used for temporary tables
sql/mysqld.cc:
Fixed that default value of max_join_size is set correctly; It needs to match usage in set_var.cc
sql/set_var.cc:
Fixed test, now when max_join_size is initialized correctly
sql/sql_select.cc:
Fixed that one can compile without -DUSE_MARIA_FOR_TMP_TABLES
storage/maria/ma_blockrec.c:
Fixed compiler warnings by adding casts
storage/maria/ma_checkpoint.c:
Fixed compiler warnings by adding casts
storage/maria/ma_create.c:
Fixed compiler warnings by adding casts
storage/maria/ma_delete_table.c:
Fixed compiler warnings by adding casts
storage/maria/ma_loghandler.c:
Fixed compiler warnings by adding casts and changing types for variables
Changed translog_new_page_header to use changing integer instead of calling time() as time() is a slow call and will give same results when calling many times withing one second
storage/maria/ma_pagecrc.c:
Fixed compiler warnings by adding casts
storage/maria/ma_recovery.c:
Fixed indentation
storage/myisam/ha_myisam.cc:
Fixed wrong types for variables
Changed chk_data_link() and repair*() functions to take my_bool as argument
storage/myisam/mi_check.c:
Fixes to handle that param.test_flag is now ulonglong
storage/myisam/myisamchk.c:
Fixes to handle that param.test_flag is now ulonglong
support-files/compiler_warnings.supp:
Fixed line numbers
Diffstat (limited to 'storage/myisam/mi_check.c')
| -rw-r--r-- | storage/myisam/mi_check.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/myisam/mi_check.c b/storage/myisam/mi_check.c index fc9d3a346dd..e45fe872d2d 100644 --- a/storage/myisam/mi_check.c +++ b/storage/myisam/mi_check.c @@ -136,7 +136,7 @@ int chk_status(HA_CHECK *param, register MI_INFO *info) /* Check delete links */ -int chk_del(HA_CHECK *param, register MI_INFO *info, uint test_flag) +int chk_del(HA_CHECK *param, register MI_INFO *info, ulonglong test_flag) { reg2 ha_rows i; uint delete_link_length; @@ -934,7 +934,7 @@ static uint isam_key_length(MI_INFO *info, register MI_KEYDEF *keyinfo) /* Check that record-link is ok */ -int chk_data_link(HA_CHECK *param, MI_INFO *info,int extend) +int chk_data_link(HA_CHECK *param, MI_INFO *info, my_bool extend) { int error,got_error,flag; uint key,left_length,b_type,field; @@ -2494,7 +2494,7 @@ int mi_repair_by_sort(HA_CHECK *param, register MI_INFO *info, goto err; } - if (rep_quick & T_FORCE_UNIQUENESS) + if (rep_quick && (param->testflag & T_FORCE_UNIQUENESS)) { my_off_t skr=info->state->data_file_length+ (share->options & HA_OPTION_COMPRESS_RECORD ? @@ -3014,7 +3014,7 @@ int mi_repair_parallel(HA_CHECK *param, register MI_INFO *info, goto err; } - if (rep_quick & T_FORCE_UNIQUENESS) + if (rep_quick && (param->testflag & T_FORCE_UNIQUENESS)) { my_off_t skr=info->state->data_file_length+ (share->options & HA_OPTION_COMPRESS_RECORD ? |