diff options
| author | unknown <monty@mysql.com> | 2005-03-29 12:58:31 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-03-29 12:58:31 +0300 |
| commit | a391ef8dda3326a421f804bb34b4be48782a2848 (patch) | |
| tree | 2f984965a69ff717317f2a52e7838c6e42fe54a8 /ndb | |
| parent | 73e15f57f84c2639e320c647b6830e0bab79d858 (diff) | |
| parent | 51690eca7e933f9e4164ec628b8b10419a089711 (diff) | |
| download | mariadb-git-a391ef8dda3326a421f804bb34b4be48782a2848.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
sql/sql_acl.cc:
Auto merged
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/src/ndbapi/DictCache.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ndb/src/ndbapi/DictCache.cpp b/ndb/src/ndbapi/DictCache.cpp index 9cdd68272ad..da9d5b70d47 100644 --- a/ndb/src/ndbapi/DictCache.cpp +++ b/ndb/src/ndbapi/DictCache.cpp @@ -24,7 +24,7 @@ Ndb_local_table_info * Ndb_local_table_info::create(NdbTableImpl *table_impl, Uint32 sz) { - Uint32 tot_size= sizeof(NdbTableImpl *) + ((sz+7)>>3)<<3; // round to Uint64 + Uint32 tot_size= sizeof(NdbTableImpl *) + ((sz+7) & ~7); // round to Uint64 void *data= malloc(tot_size); if (data == 0) return 0; |