diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 16 | ||||
| -rw-r--r-- | sql/sql_select.cc | 3 |
2 files changed, 18 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 7c4b88d0170..e252920d36e 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -152,6 +152,22 @@ static uint handler_count; static bool opt_console=0,start_mode=0; #endif +/* Set prefix for windows binary */ +#ifdef __WIN__ +#undef MYSQL_SERVER_SUFFIX +#ifdef __NT__ +#if defined(HAVE_INNOBASE_DB) || defined(HAVE_BERKELEY_DB) +#define MYSQL_SERVER_SUFFIX "-max-nt" +#else +#define MYSQL_SERVER_SUFFIX "-nt" +#endif /* ...DB */ +#elif defined(HAVE_INNOBASE_DB) || defined(HAVE_BERKELEY_DB) +#define MYSQL_SERVER_SUFFIX "-max" +#else +#define MYSQL_SERVER_SUFFIX "" +#endif /* __NT__ */ +#endif + #ifdef HAVE_BERKELEY_DB SHOW_COMP_OPTION have_berkeley_db=SHOW_OPTION_YES; #else diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 95a87e06f2b..641ce5b3d64 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -5371,7 +5371,8 @@ static int remove_dup_with_compare(THD *thd, TABLE *table, Field **first_field, ulong offset, Item *having) { handler *file=table->file; - char *org_record,*new_record, *record; + char *org_record,*new_record; + byte *record; int error; ulong reclength=table->reclength-offset; DBUG_ENTER("remove_dup_with_compare"); |