diff options
| -rw-r--r-- | VC++Files/client/mysqlclient.dsp | 4 | ||||
| -rw-r--r-- | VC++Files/libmysql/libmysql.dsp | 10 | ||||
| -rw-r--r-- | VC++Files/sql/mysqld.dsp | 8 | ||||
| -rw-r--r-- | include/config-win.h | 2 | ||||
| -rw-r--r-- | sql/item_cmpfunc.cc | 1 | ||||
| -rw-r--r-- | sql/mysqld.cc | 3 | ||||
| -rw-r--r-- | sql/sql_insert.cc | 2 | ||||
| -rw-r--r-- | sql/sql_show.cc | 2 |
8 files changed, 15 insertions, 17 deletions
diff --git a/VC++Files/client/mysqlclient.dsp b/VC++Files/client/mysqlclient.dsp index 89976d7f77f..95821052f8d 100644 --- a/VC++Files/client/mysqlclient.dsp +++ b/VC++Files/client/mysqlclient.dsp @@ -430,10 +430,6 @@ SOURCE=..\mysys\safemalloc.c # End Source File # Begin Source File -SOURCE=.\select_test.c -# End Source File -# Begin Source File - SOURCE=..\mysys\sha1.c # End Source File # Begin Source File diff --git a/VC++Files/libmysql/libmysql.dsp b/VC++Files/libmysql/libmysql.dsp index bccb6d57c7f..24c85f403f7 100644 --- a/VC++Files/libmysql/libmysql.dsp +++ b/VC++Files/libmysql/libmysql.dsp @@ -215,10 +215,6 @@ SOURCE=.\libmysql.c # End Source File # Begin Source File -SOURCE=.\pack.c -# End Source File -# Begin Source File - SOURCE=.\Libmysql.def # End Source File # Begin Source File @@ -403,15 +399,15 @@ SOURCE=..\sql\net_serv.cpp # End Source File # Begin Source File -SOURCE=.\password.c +SOURCE=.\pack.c # End Source File # Begin Source File -SOURCE=..\mysys\safemalloc.c +SOURCE=.\password.c # End Source File # Begin Source File -SOURCE=..\client\select_test.c +SOURCE=..\mysys\safemalloc.c # End Source File # Begin Source File diff --git a/VC++Files/sql/mysqld.dsp b/VC++Files/sql/mysqld.dsp index e15d443a3b7..d548a44550c 100644 --- a/VC++Files/sql/mysqld.dsp +++ b/VC++Files/sql/mysqld.dsp @@ -486,6 +486,10 @@ SOURCE=.\item_func.cpp # End Source File # Begin Source File +SOURCE=.\item_geofunc.cpp +# End Source File +# Begin Source File + SOURCE=.\item_row.cpp # End Source File # Begin Source File @@ -742,6 +746,10 @@ SOURCE=.\OPT_SUM.cpp # End Source File # Begin Source File +SOURCE=.\pack.c +# End Source File +# Begin Source File + SOURCE=.\password.c !IF "$(CFG)" == "mysqld - Win32 Release" diff --git a/include/config-win.h b/include/config-win.h index b0a30353196..d76233c39f2 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -333,3 +333,5 @@ inline double ulonglong2double(ulonglong value) #define shared_memory_buffer_length 16000 #define default_shared_memory_base_name "MYSQL" +#define MYSQL_DEFAULT_CHARSET_NAME "latin1" +#define MYSQL_DEFAULT_COLLATION_NAME "latin1_swedish_ci" diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 4f55357f288..3dbdc36a92d 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -246,7 +246,6 @@ void Item_bool_func2::fix_length_and_dec() We must set cmp_charset here as we may be called from for an automatic generated item, like in natural join */ -end: set_cmp_charset(args[0]->charset(), args[0]->coercibility, args[1]->charset(), args[1]->coercibility); } diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 0f4e689d55b..5dc1c4159e5 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -423,7 +423,7 @@ Query_cache query_cache; #endif #ifdef HAVE_SMEM char *shared_memory_base_name= default_shared_memory_base_name; -my_bool opt_enable_shared_memory; +bool opt_enable_shared_memory; #endif #include "sslopt-vars.h" @@ -471,7 +471,6 @@ static void close_connections(void) #ifdef EXTRA_DEBUG int count=0; #endif - NET net; DBUG_ENTER("close_connections"); /* Clear thread cache */ diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 1908f898a27..c3a399cd5a7 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -188,7 +188,7 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, if (duplic == DUP_UPDATE && !table->insert_values) { /* it should be allocated before Item::fix_fields() */ - table->insert_values=alloc_root(&table->mem_root, table->rec_buff_length); + table->insert_values=(byte *)alloc_root(&table->mem_root, table->rec_buff_length); if (!table->insert_values) goto abort; } diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 16934e33798..7cf4d1a9ff4 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1449,7 +1449,6 @@ int mysqld_show_collations(THD *thd, const char *wild) List<Item> field_list; CHARSET_INFO **cs; Protocol *protocol= thd->protocol; - char flags[64]; DBUG_ENTER("mysqld_show_charsets"); @@ -1501,7 +1500,6 @@ int mysqld_show_charsets(THD *thd, const char *wild) List<Item> field_list; CHARSET_INFO **cs; Protocol *protocol= thd->protocol; - char flags[64]; DBUG_ENTER("mysqld_show_charsets"); |