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

Merge mysql.com:/home/ram/work/mysql-5.1-maint

Browse Source 
into  mysql.com:/home/ram/work/b30679/b30679.5.1
This commit is contained in:
ramil/ram@ramil.myoffice.izhnet.ru 2007-10-31 11:40:53 +04:00
commit c41f8b65b5
3 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/mysqlcheck.c
View File

@ -557,8 +557,11 @@ static int process_all_tables_in_db(char *database)
else
{
while ((row = mysql_fetch_row(res)))
/* Skip tables with an engine of NULL (probably a view). */
if (row[1])
/*
Skip tables with an engine of NULL (probably a view)
if we don't perform renaming.
*/
if (row[1] || what_to_do == DO_UPGRADE)
{
handle_request_for_tables(row[0], fixed_name_length(row[0]));
}

18
mysql-test/r/mysqlcheck.result
View File

@ -63,3 +63,21 @@ test.t 1 OK
test.t`1 OK
drop table `t``1`, `t 1`;
End of 5.0 tests
create table t1(a int);
create view v1 as select * from t1;
show tables;
Tables_in_test
t1
v1
show tables;
Tables_in_test
t1
#mysql50#v-1
v1
show tables;
Tables_in_test
t1
v1
v-1
drop view v1, `v-1`;
drop table t1;

13
mysql-test/t/mysqlcheck.test
View File

@ -47,3 +47,16 @@ create table `t 1`(a int);
drop table `t``1`, `t 1`;
--echo End of 5.0 tests
#
# Bug #30679: 5.1 name encoding not performed for views during upgrade
#
create table t1(a int);
create view v1 as select * from t1;
show tables;
--copy_file $MYSQLTEST_VARDIR/master-data/test/v1.frm $MYSQLTEST_VARDIR/master-data/test/v-1.frm
show tables;
--exec $MYSQL_CHECK --check-upgrade --fix-table-names --databases test
show tables;
drop view v1, `v-1`;
drop table t1;