diff options
| author | unknown <monty@narttu.mysql.fi> | 2002-10-08 22:28:24 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2002-10-08 22:28:24 +0300 |
| commit | 40c2e7499b40a10ee2b8042e5d672b7c4d4c66fe (patch) | |
| tree | 362ce44d140ce7362c738d3068b9786f24043b0d /sql/sql_show.cc | |
| parent | 58dc03066c8b8c38cdfa47e1f3c99ee002551b4f (diff) | |
| download | mariadb-git-40c2e7499b40a10ee2b8042e5d672b7c4d4c66fe.tar.gz | |
Portability fixes to be able to compile MySQL with VC++
VC++Files/client/mysqlclient.dsp:
Updated VC++ files for 4.1
VC++Files/libmysql/libmysql.dsp:
Updated VC++ files for 4.1
VC++Files/libmysqld/libmysqld.dsp:
Updated VC++ files for 4.1
VC++Files/myisam/myisam.dsp:
Updated VC++ files for 4.1
VC++Files/mysys/mysys.dsp:
Updated VC++ files for 4.1
VC++Files/sql/mysqld.dsp:
Updated VC++ files for 4.1
VC++Files/strings/strings.dsp:
Updated VC++ files for 4.1
client/mysql.cc:
Update for windows
heap/_check.c:
Fixed wrong DBUG_PRINT() usage
include/mysql.h:
Portability fix (uint -> unsigned int)
libmysql/libmysql.def:
Removed old my_casecmp function
sql/ha_innodb.cc:
Update for windows
sql/init.cc:
Removed not used variable
sql/log.cc:
Removed not used variable
sql/net_pkg.cc:
Portability fix
sql/sql_db.cc:
Portability fixes. Removed not used variables
sql/sql_lex.h:
Portability fix
sql/sql_parse.cc:
Portability fix
sql/sql_prepare.cc:
Removed not used variables
sql/sql_select.cc:
Portability fix
sql/sql_show.cc:
Portability fix
sql/sql_union.cc:
Portability fix
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 827067c27d7..8c4c104d180 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -230,7 +230,7 @@ int mysqld_show_table_types(THD *thd) const char *option_name= show_comp_option_name[(int) *types->value]; if (*types->value == SHOW_OPTION_YES && - !strcasecmp(default_type_name, types->type)) + !my_strcasecmp(system_charset_info, default_type_name, types->type)) option_name= "DEFAULT"; net_store_data(packet, option_name); net_store_data(packet, types->comment); @@ -1398,7 +1398,6 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose) int mysqld_show_charsets(THD *thd, const char *wild) { - uint i; char buff[8192]; String packet2(buff,sizeof(buff),default_charset_info); List<Item> field_list; @@ -1425,7 +1424,7 @@ int mysqld_show_charsets(THD *thd, const char *wild) net_store_data(&packet2,convert,cs->name); net_store_data(&packet2,(uint32) cs->number); net_store_data(&packet2,(uint32) cs->strxfrm_multiply); - net_store_data(&packet2,(uint32) cs->mbmaxlen ? cs->mbmaxlen : 1); + net_store_data(&packet2,(uint32) (cs->mbmaxlen ? cs->mbmaxlen : 1)); if (my_net_write(&thd->net, (char*) packet2.ptr(),packet2.length())) goto err; |