Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
bugzilla
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
etersoft
bugzilla
Commits
120fc1b9
Commit
120fc1b9
authored
Sep 03, 2009
by
justdave%bugzilla.org
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug 513585: Don't trigger utf8 conversion just because there are VIEWs present in the database.
r=mkanat, a=mkanat
parent
18f5eb17
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
Mysql.pm
Bugzilla/DB/Mysql.pm
+4
-3
No files found.
Bugzilla/DB/Mysql.pm
View file @
120fc1b9
...
@@ -321,7 +321,7 @@ EOT
...
@@ -321,7 +321,7 @@ EOT
{
Columns
=>
[
1
,
2
]})
};
{
Columns
=>
[
1
,
2
]})
};
my
@isam_tables
;
my
@isam_tables
;
foreach
my
$name
(
keys
%
table_status
)
{
foreach
my
$name
(
keys
%
table_status
)
{
push
(
@isam_tables
,
$name
)
if
$table_status
{
$name
}
eq
"ISAM"
;
push
(
@isam_tables
,
$name
)
if
(
defined
(
$table_status
{
$name
})
&&
$table_status
{
$name
}
eq
"ISAM"
)
;
}
}
if
(
scalar
(
@isam_tables
))
{
if
(
scalar
(
@isam_tables
))
{
...
@@ -369,7 +369,8 @@ EOT
...
@@ -369,7 +369,8 @@ EOT
# Upgrade tables from MyISAM to InnoDB
# Upgrade tables from MyISAM to InnoDB
my
@myisam_tables
;
my
@myisam_tables
;
foreach
my
$name
(
keys
%
table_status
)
{
foreach
my
$name
(
keys
%
table_status
)
{
if
(
$table_status
{
$name
}
=~
/^MYISAM$/i
if
(
defined
(
$table_status
{
$name
})
&&
$table_status
{
$name
}
=~
/^MYISAM$/i
&&
!
grep
(
$_
eq
$name
,
Bugzilla::DB::Schema::Mysql::
MYISAM_TABLES
))
&&
!
grep
(
$_
eq
$name
,
Bugzilla::DB::Schema::Mysql::
MYISAM_TABLES
))
{
{
push
(
@myisam_tables
,
$name
)
;
push
(
@myisam_tables
,
$name
)
;
...
@@ -673,7 +674,7 @@ EOT
...
@@ -673,7 +674,7 @@ EOT
my
$utf_table_status
=
my
$utf_table_status
=
$self
->
selectall_arrayref
(
"SHOW TABLE STATUS"
,
{
Slice
=>
{}});
$self
->
selectall_arrayref
(
"SHOW TABLE STATUS"
,
{
Slice
=>
{}});
$self
->
_after_table_status
([
map
(
$_
->
{
Name
},
@$utf_table_status
)]);
$self
->
_after_table_status
([
map
(
$_
->
{
Name
},
@$utf_table_status
)]);
my
@non_utf8_tables
=
grep
(
$_
->
{
Collation
}
!~
/^utf8/
,
@$utf_table_status
);
my
@non_utf8_tables
=
grep
(
defined
(
$_
->
{
Collation
})
&&
$_
->
{
Collation
}
!~
/^utf8/
,
@$utf_table_status
);
if
(
Bugzilla
->
params
->
{
'utf8'
}
&&
scalar
@non_utf8_tables
)
{
if
(
Bugzilla
->
params
->
{
'utf8'
}
&&
scalar
@non_utf8_tables
)
{
print
<<EOT;
print
<<EOT;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment