diff options
| author | unknown <patg@patrick.local> | 2005-04-01 12:32:17 -0800 |
|---|---|---|
| committer | unknown <patg@patrick.local> | 2005-04-01 12:32:17 -0800 |
| commit | c0333ecee42a4de499b3377cfa21d7b5af1ddd2b (patch) | |
| tree | 389228d07d324be3e962fefab032b134daa8021a /myisam | |
| parent | 844acf9a66bb85ea0604f385efdaf2c655fd957a (diff) | |
| parent | bd2da82b2131241ce960bb02075aba2689ed1a3a (diff) | |
| download | mariadb-git-c0333ecee42a4de499b3377cfa21d7b5af1ddd2b.tar.gz | |
5.0 to 5.1 merge
mysql-test/r/grant.result:
Auto merged
scripts/mysql_create_system_tables.sh:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/Makefile.am:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
configure.in:
merge of 5.0 to 5.1, version info and NDB_VERSION_() conflicts
libmysqld/Makefile.am:
merge of Makefile sql_sources list
sql/sql_acl.h:
merge, no need to hand resolve
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_open.c | 4 | ||||
| -rw-r--r-- | myisam/mi_packrec.c | 2 | ||||
| -rw-r--r-- | myisam/myisamchk.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/myisam/mi_open.c b/myisam/mi_open.c index 504bc33ecc1..d65a46a92fb 100644 --- a/myisam/mi_open.c +++ b/myisam/mi_open.c @@ -1090,10 +1090,10 @@ char *mi_keyseg_read(char *ptr, HA_KEYSEG *keyseg) keyseg->null_pos = mi_uint4korr(ptr); ptr +=4; keyseg->charset=0; /* Will be filled in later */ if (keyseg->null_bit) - keyseg->bit_pos= keyseg->null_pos + (keyseg->null_bit == 7); + keyseg->bit_pos= (uint16)(keyseg->null_pos + (keyseg->null_bit == 7)); else { - keyseg->bit_pos= keyseg->null_pos; + keyseg->bit_pos= (uint16)keyseg->null_pos; keyseg->null_pos= 0; } return ptr; diff --git a/myisam/mi_packrec.c b/myisam/mi_packrec.c index cc62614cb07..4b512dd89dd 100644 --- a/myisam/mi_packrec.c +++ b/myisam/mi_packrec.c @@ -1212,7 +1212,7 @@ my_bool _mi_memmap_file(MI_INFO *info) DBUG_RETURN(0); } file_map=(byte*) - my_mmap(0,share->state.state.data_file_length+MEMMAP_EXTRA_MARGIN,PROT_READ, + my_mmap(0,(size_t)(share->state.state.data_file_length+MEMMAP_EXTRA_MARGIN),PROT_READ, MAP_SHARED | MAP_NORESERVE,info->dfile,0L); if (file_map == (byte*) MAP_FAILED) { diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c index 09e2914bbaa..519e123e9da 100644 --- a/myisam/myisamchk.c +++ b/myisam/myisamchk.c @@ -427,8 +427,8 @@ static void usage(void) can't fix the data file.\n\ --character-sets-dir=...\n\ Directory where character sets are.\n\ - --set-character-set=name\n\ - Change the character set used by the index.\n\ + --set-collation=name\n\ + Change the collation used by the index.\n\ -q, --quick Faster repair by not modifying the data file.\n\ One can give a second '-q' to force myisamchk to\n\ modify the original datafile in case of duplicate keys.\n\ |