diff options
| author | unknown <monty@tik.mysql.com> | 2000-10-11 00:06:37 +0300 |
|---|---|---|
| committer | unknown <monty@tik.mysql.com> | 2000-10-11 00:06:37 +0300 |
| commit | da5366886f2c852cb05f8b9b31848d13a4816cad (patch) | |
| tree | cf18eb0d045153270d68aec8884a4732e953e883 /mysys/charset.c | |
| parent | dbde9337c201b7a53357d3904c7f0ac5b046ed85 (diff) | |
| download | mariadb-git-da5366886f2c852cb05f8b9b31848d13a4816cad.tar.gz | |
Automatic repair of MyISAM tables + portability fixes
Docs/manual.texi:
Changes for 3.23 and change Ansi mode -> ANSI mode
include/my_base.h:
Automatic repair of MyISAM tables
include/myisam.h:
Automatic repair of MyISAM tables
myisam/ft_update.c:
Portability fix
myisam/mi_check.c:
Automatic repair of MyISAM tables
myisam/mi_open.c:
Automatic repair of MyISAM tables
myisam/myisamchk.c:
Allow one to combine check with --old-repair
myisam/sort.c:
Fix for usage of IO_CACHE
mysys/charset.c:
Portability fixes
mysys/default.c:
Added --defaults-extra-dir
mysys/mf_tempfile.c:
Portability fixes
mysys/my_init.c:
Remove compiler warning
mysys/my_pread.c:
Remove compiler warning
sql-bench/server-cfg.sh:
New benchmark tests
sql-bench/test-insert.sh:
New benchmark tests
sql/ha_myisam.cc:
Automatic repair of MyISAM tables
sql/ha_myisam.h:
Automatic repair of MyISAM tables
sql/handler.h:
Automatic repair of MyISAM tables
sql/lock.cc:
Add missing free
sql/log_event.cc:
Portability fixes
sql/sql_base.cc:
Automatic repair of MyISAM tables
sql/sql_select.h:
Remove compiler warning
sql/sql_table.cc:
Clean up intendent
sql/sql_yacc.yy:
New syntax for CHECK
sql/table.cc:
Automatic repair of MyISAM tables
sql/table.h:
Automatic repair of MyISAM tables
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'mysys/charset.c')
| -rw-r--r-- | mysys/charset.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysys/charset.c b/mysys/charset.c index 54b4dd1a13e..16536b581bf 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -67,7 +67,7 @@ static char *name_from_csnum(CS_ID **cs, uint number) for (c = cs; *c; ++c) if ((*c)->number == number) return (*c)->name; - return "?"; /* this mimics find_type() */ + return (char*) "?"; /* this mimics find_type() */ } static my_bool get_word(struct simpleconfig_buf_st *fb, char *buf) @@ -487,7 +487,7 @@ char * list_charsets(myf want_flags) { CS_ID **c; char buf[FN_REFLEN]; - MY_STAT stat; + MY_STAT status; if((c=available_charsets)) for (; *c; ++c) @@ -495,7 +495,7 @@ char * list_charsets(myf want_flags) if (charset_in_string((*c)->name, &s)) continue; get_charset_conf_name((*c)->number, buf); - if (!my_stat(buf, &stat, MYF(0))) + if (!my_stat(buf, &status, MYF(0))) continue; /* conf file doesn't exist */ dynstr_append(&s, (*c)->name); dynstr_append(&s, " "); |