diff options
| author | unknown <ndbdev@dl145b.mysql.com> | 2005-06-15 20:07:31 +0200 |
|---|---|---|
| committer | unknown <ndbdev@dl145b.mysql.com> | 2005-06-15 20:07:31 +0200 |
| commit | 634a6bebedd690d884daf7b0ccc2f181afaf3350 (patch) | |
| tree | d7d1e5fc0e2c71cdea39f6dcfc07949843391d24 /sql/ha_myisammrg.cc | |
| parent | a9ba149a4ffbcdd925ccf83de8910e103fb828b2 (diff) | |
| parent | fc465d1497ce598d07ec75eeaafc7ca84b578ee6 (diff) | |
| download | mariadb-git-634a6bebedd690d884daf7b0ccc2f181afaf3350.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
mysql-test/r/ps_6bdb.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
mysys/default.c:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_select.cc:
Auto merged
storage/heap/hp_hash.c:
Auto merged
storage/heap/hp_update.c:
Auto merged
storage/ndb/include/transporter/TransporterDefinitions.hpp:
Auto merged
storage/ndb/src/common/mgmcommon/IPCConfig.cpp:
Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
support-files/mysql.spec.sh:
Auto merged
Diffstat (limited to 'sql/ha_myisammrg.cc')
| -rw-r--r-- | sql/ha_myisammrg.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc index ec185c43fb8..794f1c62dd7 100644 --- a/sql/ha_myisammrg.cc +++ b/sql/ha_myisammrg.cc @@ -466,7 +466,7 @@ void ha_myisammrg::append_create_info(String *packet) MYRG_TABLE *open_table,*first; current_db= table->s->db; - db_length= strlen(current_db); + db_length= (uint) strlen(current_db); for (first=open_table=file->open_tables ; open_table != file->end_table ; |