diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-03-12 11:38:22 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-03-12 11:38:22 +0200 |
| commit | 4c221321b624e55238c641b515e24ad1091cdc93 (patch) | |
| tree | c217663c9f7a4fba0c5a00acb72b3e980954f780 /sql/ha_isam.cc | |
| parent | c13baf70ec937501389ed6e9f94c98635f1c1b76 (diff) | |
| download | mariadb-git-4c221321b624e55238c641b515e24ad1091cdc93.tar.gz | |
Added help for --local-infile
Fix for bug on intel where (int32) 1 << 32 == 1, which gave problems when using 32 keys.
Allow SET PASSWORD for anonymous user
Docs/manual.texi:
Changelog
client/mysql.cc:
Added help for --local-infile
client/mysqlimport.c:
Merge with 4.0.
Patch for LOCAL INFILE handling
configure.in:
cleanup
include/global.h:
Fix for bug on intel where (int32) 1 << 32 == 1
mysql-test/r/create.result:
Test of CREATE TABLE with 32 keys
mysql-test/t/create.test:
Test of CREATE TABLE with 32 keys
scripts/mysqlhotcopy.sh:
Patch for databasenames with space.
sql/ha_isam.cc:
Fix for bug on intel where (int32) 1 << 32 == 1
sql/ha_myisam.cc:
Fix for bug on intel where (int32) 1 << 32 == 1
sql/ha_myisammrg.cc:
Fix for bug on intel where (int32) 1 << 32 == 1
sql/mysqld.cc:
Added help for --local-infile
sql/sql_acl.cc:
Allow SET PASSWORD of anonymous user
sql/table.cc:
Fix for bug on intel where (int32) 1 << 32 == 1
Diffstat (limited to 'sql/ha_isam.cc')
| -rw-r--r-- | sql/ha_isam.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_isam.cc b/sql/ha_isam.cc index 746fdd2f585..ac37d09e6b4 100644 --- a/sql/ha_isam.cc +++ b/sql/ha_isam.cc @@ -191,7 +191,7 @@ void ha_isam::info(uint flag) sortkey = info.sortkey; block_size=nisam_block_size; table->keys = min(table->keys,info.keys); - table->keys_in_use= (((key_map) 1) << table->keys)- (key_map) 1; + table->keys_in_use= set_bits(key_map,table->keys); table->db_options_in_use= info.options; table->db_record_offset= (table->db_options_in_use & |