Commit 450e77ad authored by unknown's avatar unknown

Removed compiler warnings

parent 5f8cdfd4
...@@ -4901,7 +4901,7 @@ int ha_ndbcluster::drop_table() ...@@ -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,13 +4915,12 @@ ulonglong ha_ndbcluster::get_auto_increment() ...@@ -4915,13 +4915,12 @@ 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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment