database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Windows build fixups with the latest source

Browse Source
This commit is contained in:
venu@myvenu.com
2003-06-03 18:45:07 -07:00
parent e436736d29
commit 27469ec8b9
8 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
VC++Files/client/mysqlclient.dsp
View File

@ -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

12
VC++Files/libmysql/libmysql.dsp
View File

@ -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,6 +399,10 @@ SOURCE=..\sql\net_serv.cpp
# End Source File
# Begin Source File
SOURCE=.\pack.c
# End Source File
# Begin Source File
SOURCE=.\password.c
# End Source File
# Begin Source File
@ -411,10 +411,6 @@ SOURCE=..\mysys\safemalloc.c
# End Source File
# Begin Source File
SOURCE=..\client\select_test.c
# End Source File
# Begin Source File
SOURCE=..\mysys\sha1.c
# End Source File
# Begin Source File

8
VC++Files/sql/mysqld.dsp
View File

@ -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"

2
include/config-win.h
View File

@ -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"

1
sql/item_cmpfunc.cc
View File

@ -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);
}

3
sql/mysqld.cc
View File

@ -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 */

2
sql/sql_insert.cc
View File

@ -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;
}

2
sql/sql_show.cc
View File

@ -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");