database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-29 00:08:14 +03:00
Code Activity

Removed compiler warnings

Browse Source
This commit is contained in:
mskold/marty@mysql.com/quadfish.(none)
2007-11-06 10:28:11 +01:00
parent 4cf742a8a8
commit 022b835c67
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/ha_ndbcluster.cc
View File

@@ -4901,7 +4901,7 @@ int ha_ndbcluster::drop_table()
ulonglong ha_ndbcluster::get_auto_increment() ulonglong ha_ndbcluster::get_auto_increment()
{ {
int cache_size; uint cache_size;
Uint64 auto_value; Uint64 auto_value;
THD *thd= current_thd; THD *thd= current_thd;
Uint64 step= thd->variables.auto_increment_increment; Uint64 step= thd->variables.auto_increment_increment;
@@ -4915,15 +4915,14 @@ ulonglong ha_ndbcluster::get_auto_increment()
/* We guessed too low */ /* We guessed too low */
m_rows_to_insert+= m_autoincrement_prefetch; m_rows_to_insert+= m_autoincrement_prefetch;
} }
int remaining= m_rows_to_insert - m_rows_inserted; uint remaining= m_rows_to_insert - m_rows_inserted;
int min_prefetch= uint min_prefetch=
(remaining < thd->variables.ndb_autoincrement_prefetch_sz) ? (remaining < thd->variables.ndb_autoincrement_prefetch_sz) ?
thd->variables.ndb_autoincrement_prefetch_sz thd->variables.ndb_autoincrement_prefetch_sz
: remaining; : remaining;
cache_size= cache_size= ((remaining < m_autoincrement_prefetch) ?
(int) ((remaining < m_autoincrement_prefetch) ? min_prefetch
min_prefetch : remaining);
: remaining);
uint retries= NDB_AUTO_INCREMENT_RETRIES; uint retries= NDB_AUTO_INCREMENT_RETRIES;
int retry_sleep= 30; /* 30 milliseconds, transaction */ int retry_sleep= 30; /* 30 milliseconds, transaction */
for (;;) for (;;)