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

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into mysql.com:/home/my/mysql-5.0
This commit is contained in:
monty@mysql.com
2005-06-06 19:43:07 +03:00
parent 22d20f89e5 80fbb13e97
commit b46f2ecf2f
6 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,10 +147,6 @@ SOURCE="..\strings\ctype-czech.c"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE="..\strings\ctype-cp932.c"
# End Source File
# Begin Source File
SOURCE="..\strings\ctype-euc_kr.c" SOURCE="..\strings\ctype-euc_kr.c"
# End Source File # End Source File
# Begin Source File # Begin Source File

4
netware/BUILD/mwenv
View File

@ -19,9 +19,9 @@ export AR='mwldnlm'
export AR_FLAGS='-type library -o' export AR_FLAGS='-type library -o'
export AS='mwasmnlm' export AS='mwasmnlm'
export CC='mwccnlm -gccincludes' export CC='mwccnlm -gccincludes'
export CFLAGS='-O3 -align 8 -proc 686 -relax_pointers -dialect c' export CFLAGS='-enum int -O3 -align 8 -proc 686 -relax_pointers -dialect c'
export CXX='mwccnlm -gccincludes' export CXX='mwccnlm -gccincludes'
export CXXFLAGS='-O3 -align 8 -proc 686 -relax_pointers -dialect c++ -bool on -wchar_t on -D_WCHAR_T' export CXXFLAGS='-enum int -O3 -align 8 -proc 686 -relax_pointers -dialect c++ -bool on -wchar_t on -D_WCHAR_T'
export LD='mwldnlm' export LD='mwldnlm'
export LDFLAGS='-entry _LibCPrelude -exit _LibCPostlude -map -flags pseudopreemption' export LDFLAGS='-entry _LibCPrelude -exit _LibCPostlude -map -flags pseudopreemption'
export RANLIB=: export RANLIB=:

2
netware/mysqld_safe.c
View File

@ -666,7 +666,6 @@ void mysql_start(int argc, char *argv[])
if (!strnicmp(argv[i], private_options[j], strlen(private_options[j]))) if (!strnicmp(argv[i], private_options[j], strlen(private_options[j])))
{ {
skip= TRUE; skip= TRUE;
consoleprintf("The argument skipped is %s\n", argv[i]);
break; break;
} }
} }
@ -674,7 +673,6 @@ void mysql_start(int argc, char *argv[])
if (!skip) if (!skip)
{ {
add_arg(&al, "%s", argv[i]); add_arg(&al, "%s", argv[i]);
consoleprintf("The final argument is %s\n", argv[i]);
} }
} }
// spawn // spawn

1
sql/item_func.cc
View File

@ -4725,7 +4725,6 @@ Item_func_sp::func_name() const
Field * Field *
Item_func_sp::sp_result_field(void) const Item_func_sp::sp_result_field(void) const
{ {
Field *field;
DBUG_ENTER("Item_func_sp::sp_result_field"); DBUG_ENTER("Item_func_sp::sp_result_field");
if (!m_sp) if (!m_sp)

2
sql/sql_select.cc
View File

@ -7996,7 +7996,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
bool using_unique_constraint= 0; bool using_unique_constraint= 0;
bool use_packed_rows= 0; bool use_packed_rows= 0;
bool not_all_columns= !(select_options & TMP_TABLE_ALL_COLUMNS); bool not_all_columns= !(select_options & TMP_TABLE_ALL_COLUMNS);
char *tmpname,path[FN_REFLEN], filename[FN_REFLEN]; char *tmpname,path[FN_REFLEN];
byte *pos,*group_buff; byte *pos,*group_buff;
uchar *null_flags; uchar *null_flags;
Field **reg_field, **from_field; Field **reg_field, **from_field;

2
sql/unireg.cc
View File

@ -668,7 +668,7 @@ static bool make_empty_rec(THD *thd, File file,enum db_type table_type,
{ {
int error; int error;
Field::utype type; Field::utype type;
uint firstpos, null_count; uint null_count;
uchar *buff,*null_pos; uchar *buff,*null_pos;
TABLE table; TABLE table;
create_field *field; create_field *field;