1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed missing table_list->name -> table_list->alias convert

Browse Source
This commit is contained in:
monty@mashka.mysql.fi 2002-10-08 17:58:43 +03:00
parent 66646cc458
commit bae4af8a4f
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
myisam/mi_open.c
View File

@ -204,7 +204,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
max_data_file_length= max_data_file_length=
(share->options & (HA_OPTION_PACK_RECORD | HA_OPTION_COMPRESS_RECORD)) ? (share->options & (HA_OPTION_PACK_RECORD | HA_OPTION_COMPRESS_RECORD)) ?
(((ulonglong) 1 << (share->base.rec_reflength*8))-1) : (((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); (ulonglong) 1 << (share->base.rec_reflength*8))-1);
max_key_file_length= max_key_file_length=
mi_safe_mul(MI_KEY_BLOCK_LENGTH, mi_safe_mul(MI_KEY_BLOCK_LENGTH,

1
mysql-test/Makefile.am
View File

@ -42,6 +42,7 @@ install-data-local:
$(INSTALL_DATA) $(srcdir)/t/*.test $(DESTDIR)$(testdir)/t $(INSTALL_DATA) $(srcdir)/t/*.test $(DESTDIR)$(testdir)/t
$(INSTALL_DATA) $(srcdir)/t/*.opt $(DESTDIR)$(testdir)/t $(INSTALL_DATA) $(srcdir)/t/*.opt $(DESTDIR)$(testdir)/t
$(INSTALL_DATA) $(srcdir)/r/*.result $(DESTDIR)$(testdir)/r $(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)/include/*.inc $(DESTDIR)$(testdir)/include
$(INSTALL_DATA) $(srcdir)/std_data/*.dat $(DESTDIR)$(testdir)/std_data $(INSTALL_DATA) $(srcdir)/std_data/*.dat $(DESTDIR)$(testdir)/std_data

6
scripts/mysqlhotcopy.sh
View File

@ -37,7 +37,7 @@ WARNING: THIS PROGRAM IS STILL IN BETA. Comments/patches welcome.
# Documentation continued at end of file # Documentation continued at end of file
my $VERSION = "1.16"; my $VERSION = "1.17";
my $opt_tmpdir = $ENV{TMPDIR} || "/tmp"; my $opt_tmpdir = $ENV{TMPDIR} || "/tmp";
@ -388,6 +388,8 @@ foreach my $rdb ( @db_desc ) {
foreach my $td ( '', @{$rdb->{raid_dirs}} ) { foreach my $td ( '', @{$rdb->{raid_dirs}} ) {
my $tgt_dirpath = "$rdb->{target}/$td"; my $tgt_dirpath = "$rdb->{target}/$td";
# Remove trailing slashes (needed for Mac OS X)
substr($tgt_dirpath, 1) =~ s|/+$||;
if ( $opt{dryrun} ) { if ( $opt{dryrun} ) {
print "mkdir $tgt_dirpath, 0750\n"; 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). database name(s).
Martin Waite - Fix to handle database name that contains space. Martin Waite - Fix to handle database name that contains space.
Paul DuBois - Remove end '/' from directory names

2
tests/grant.res
View File

@ -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 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' 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 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 a int(11) YES NULL select
b int(11) YES NULL b int(11) YES NULL