diff options
| author | unknown <konstantin@mysql.com> | 2004-03-15 22:39:36 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2004-03-15 22:39:36 +0300 |
| commit | 2e0d5eace576b2470c4bdc2649227a47994c4129 (patch) | |
| tree | ba7fc5cf4c332be3608b598166cd8dae2b856d02 /sql/sql_class.h | |
| parent | ef44fb9af3ee729de5897f290c13437bbbc09da5 (diff) | |
| download | mariadb-git-2e0d5eace576b2470c4bdc2649227a47994c4129.tar.gz | |
Fix of compilation failure of latest 4.1 tree: new constants in mysqld.cc
exceed unsigned long limit.
include/config-win.h:
implementation of ULL macro for Windows
include/my_global.h:
ULL macro defined: we need this macro because ULL qualifier is not defined
on systems withoug unsigned long long
sql/item_func.cc:
new ULL macro caused conflict with class for user level lock ULL.
ULL renamed to User_level_lock
sql/item_func.h:
ULL -> User_level_lock
sql/mysql_priv.h:
merge error fixed: LL defined in my_global.h
sql/mysqld.cc:
ULL macro used for long long constants to fix compilation failure on gcc 3.*
sql/sql_class.h:
ULL renamed to User_level_lock
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 567135b1378..33684f93d93 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -657,7 +657,7 @@ public: points to a lock object if the lock is present. See item_func.cc and chapter 'Miscellaneous functions', for functions GET_LOCK, RELEASE_LOCK. */ - ULL *ull; + User_level_lock *ull; #ifndef DBUG_OFF uint dbug_sentry; // watch out for memory corruption #endif |