diff options
| -rw-r--r-- | myisam/mi_open.c | 2 | ||||
| -rw-r--r-- | mysql-test/Makefile.am | 1 | ||||
| -rw-r--r-- | scripts/mysqlhotcopy.sh | 6 | ||||
| -rw-r--r-- | tests/grant.res | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/myisam/mi_open.c b/myisam/mi_open.c index 617b1cd8d90..d53c39daec4 100644 --- a/myisam/mi_open.c +++ b/myisam/mi_open.c @@ -204,7 +204,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags) max_data_file_length= (share->options & (HA_OPTION_PACK_RECORD | HA_OPTION_COMPRESS_RECORD)) ? (((ulonglong) 1 << (share->base.rec_reflength*8))-1) : - (mi_safe_mul(share->base.reclength, + (mi_safe_mul(share->base.pack_reclength, (ulonglong) 1 << (share->base.rec_reflength*8))-1); max_key_file_length= mi_safe_mul(MI_KEY_BLOCK_LENGTH, diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index d98c10a29a9..a91baa1538e 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -42,6 +42,7 @@ install-data-local: $(INSTALL_DATA) $(srcdir)/t/*.test $(DESTDIR)$(testdir)/t $(INSTALL_DATA) $(srcdir)/t/*.opt $(DESTDIR)$(testdir)/t $(INSTALL_DATA) $(srcdir)/r/*.result $(DESTDIR)$(testdir)/r + $(INSTALL_DATA) $(srcdir)/r/*.require $(DESTDIR)$(testdir)/r $(INSTALL_DATA) $(srcdir)/include/*.inc $(DESTDIR)$(testdir)/include $(INSTALL_DATA) $(srcdir)/std_data/*.dat $(DESTDIR)$(testdir)/std_data diff --git a/scripts/mysqlhotcopy.sh b/scripts/mysqlhotcopy.sh index 1aad5c95c25..d808ffdcaef 100644 --- a/scripts/mysqlhotcopy.sh +++ b/scripts/mysqlhotcopy.sh @@ -37,7 +37,7 @@ WARNING: THIS PROGRAM IS STILL IN BETA. Comments/patches welcome. # Documentation continued at end of file -my $VERSION = "1.16"; +my $VERSION = "1.17"; my $opt_tmpdir = $ENV{TMPDIR} || "/tmp"; @@ -388,6 +388,8 @@ foreach my $rdb ( @db_desc ) { foreach my $td ( '', @{$rdb->{raid_dirs}} ) { my $tgt_dirpath = "$rdb->{target}/$td"; + # Remove trailing slashes (needed for Mac OS X) + substr($tgt_dirpath, 1) =~ s|/+$||; if ( $opt{dryrun} ) { print "mkdir $tgt_dirpath, 0750\n"; } @@ -1001,3 +1003,5 @@ resulted in nothing being copied when a regexp was specified but no database name(s). Martin Waite - Fix to handle database name that contains space. + +Paul DuBois - Remove end '/' from directory names diff --git a/tests/grant.res b/tests/grant.res index 37266facc61..91c37a2c9f8 100644 --- a/tests/grant.res +++ b/tests/grant.res @@ -310,7 +310,7 @@ select Host, Db, User, Table_name, Grantor, Table_priv, Column_priv from mysql.t revoke GRANT OPTION on grant_test.test from grant_user@localhost Error in execute: There is no such grant defined for user 'grant_user' on host 'localhost' on table 'test' grant select(a) on grant_test.test to grant_user@localhost -show columns from test +show full columns from test a int(11) YES NULL select b int(11) YES NULL |