diff options
| author | unknown <jani@hynda.mysql.fi> | 2008-02-26 18:44:04 +0200 |
|---|---|---|
| committer | unknown <jani@hynda.mysql.fi> | 2008-02-26 18:44:04 +0200 |
| commit | e265b62b52c4fc4c1fbc0724bf4538ddaaf59a35 (patch) | |
| tree | ac8bceba9f844b54b27c497c9fd0a9b2cbae147d /sql/mysqld.cc | |
| parent | 27498bbaba9f40f875d62fe0bb676c8218ee2880 (diff) | |
| download | mariadb-git-e265b62b52c4fc4c1fbc0724bf4538ddaaf59a35.tar.gz | |
Reverted wrong patch, fix for Windows 32bit build.
mysys/my_getsystime.c:
Added extra parenthesis to apply cast to the whole result.
sql/mysqld.cc:
Reversed a wrong patch. This should however be made
better in the future in my_getopt.h, having own define
for GET_HA_ROWS.
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 455698d4ff4..9ca2ab5db0e 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -308,7 +308,11 @@ TYPELIB thread_handling_typelib= const char *first_keyword= "first", *binary_keyword= "BINARY"; const char *my_localhost= "localhost", *delayed_user= "DELAYED"; -#define GET_HA_ROWS (~ (ha_rows) 0) +#if SIZEOF_OFF_T > 4 && defined(BIG_TABLES) +#define GET_HA_ROWS GET_ULL +#else +#define GET_HA_ROWS GET_ULONG +#endif bool opt_large_files= sizeof(my_off_t) > 4; |