diff options
| author | unknown <gluh@eagle.(none)> | 2007-10-23 18:51:43 +0500 |
|---|---|---|
| committer | unknown <gluh@eagle.(none)> | 2007-10-23 18:51:43 +0500 |
| commit | 8479eb1db7d1c8ccfbaa62077c54b7f5af714324 (patch) | |
| tree | d36465f86e78c442a44942849b7280eab8d10bf8 /sql/ha_innodb.cc | |
| parent | fb9a562b1cc2b9048eff094bb7004fb3db0e7fd0 (diff) | |
| parent | c448d2ed5d2a7efd1f77b956f46d8f1e48b17350 (diff) | |
| download | mariadb-git-8479eb1db7d1c8ccfbaa62077c54b7f5af714324.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
client/mysqldump.c:
Auto merged
include/config-win.h:
Auto merged
libmysql/libmysql.c:
Auto merged
myisam/sort.c:
Auto merged
mysql-test/r/func_sapdb.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/field.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
tests/mysql_client_test.c:
Auto merged
mysql-test/r/type_datetime.result:
manual merge
mysql-test/r/type_decimal.result:
manual merge
mysql-test/t/type_datetime.test:
manual merge
mysql-test/t/type_decimal.test:
manual merge
sql/item.cc:
manual merge
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 86d3e930122..6b5e89848c3 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -5477,7 +5477,7 @@ ha_innobase::info( table->key_info[i].rec_per_key[j]= rec_per_key >= ~(ulong) 0 ? ~(ulong) 0 : - rec_per_key; + (ulong) rec_per_key; } index = dict_table_get_next_index_noninline(index); |