Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
34c83fba
Commit
34c83fba
authored
Aug 03, 2006
by
svoj@may.pils.ru
Browse files
Options
Browse Files
Download
Plain Diff
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
into may.pils.ru:/home/svoj/devel/mysql/BUG7391/mysql-4.1
parents
395d3c39
5fc215e2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
+9
-2
mysql-test/t/mysqlbinlog.test
mysql-test/t/mysqlbinlog.test
+4
-2
sql/mysqld.cc
sql/mysqld.cc
+5
-0
No files found.
mysql-test/t/mysqlbinlog.test
View file @
34c83fba
...
@@ -107,7 +107,8 @@ create table t4 (f text character set cp932);
...
@@ -107,7 +107,8 @@ create table t4 (f text character set cp932);
--
exec
$MYSQL
--
default
-
character
-
set
=
cp932
test
-
e
"insert into t4 values(_cp932'\');"
--
exec
$MYSQL
--
default
-
character
-
set
=
cp932
test
-
e
"insert into t4 values(_cp932'\');"
flush
logs
;
flush
logs
;
rename
table
t3
to
t03
,
t4
to
t04
;
rename
table
t3
to
t03
,
t4
to
t04
;
--
exec
$MYSQL_BINLOG
--
short
-
form
$MYSQL_TEST_DIR
/
var
/
log
/
master
-
bin
.
000004
|
$MYSQL
--
default
-
character
-
set
=
utf8
--
exec
$MYSQL_BINLOG
--
short
-
form
$MYSQL_TEST_DIR
/
var
/
log
/
master
-
bin
.
000004
>
$MYSQL_TEST_DIR
/
var
/
tmp
/
bug16217
.
sql
--
exec
$MYSQL
--
default
-
character
-
set
=
utf8
<
$MYSQL_TEST_DIR
/
var
/
tmp
/
bug16217
.
sql
# original and recovered data must be equal
# original and recovered data must be equal
select
HEX
(
f
)
from
t03
;
select
HEX
(
f
)
from
t03
;
select
HEX
(
f
)
from
t3
;
select
HEX
(
f
)
from
t3
;
...
@@ -123,7 +124,8 @@ flush logs;
...
@@ -123,7 +124,8 @@ flush logs;
# resulted binlog, parly consisting of multi-byte utf8 chars,
# resulted binlog, parly consisting of multi-byte utf8 chars,
# must be digestable for both client and server. In 4.1 the client
# must be digestable for both client and server. In 4.1 the client
# should use default-character-set same as the server.
# should use default-character-set same as the server.
--
exec
$MYSQL_BINLOG
--
short
-
form
$MYSQL_TEST_DIR
/
var
/
log
/
master
-
bin
.
000006
|
$MYSQL
--
exec
$MYSQL_BINLOG
--
short
-
form
$MYSQL_TEST_DIR
/
var
/
log
/
master
-
bin
.
000006
>
$MYSQL_TEST_DIR
/
var
/
tmp
/
bug14157
.
sql
--
exec
$MYSQL
<
$MYSQL_TEST_DIR
/
var
/
tmp
/
bug14157
.
sql
select
*
from
t5
/* must be (1),(1) */
;
select
*
from
t5
/* must be (1),(1) */
;
# clean up
# clean up
...
...
sql/mysqld.cc
View file @
34c83fba
...
@@ -2646,6 +2646,11 @@ You should consider changing lower_case_table_names to 1 or 2",
...
@@ -2646,6 +2646,11 @@ You should consider changing lower_case_table_names to 1 or 2",
mysql_real_data_home
);
mysql_real_data_home
);
lower_case_table_names
=
0
;
lower_case_table_names
=
0
;
}
}
else
{
lower_case_file_system
=
(
test_if_case_insensitive
(
mysql_real_data_home
)
==
1
);
}
/* Reset table_alias_charset, now that lower_case_table_names is set. */
/* Reset table_alias_charset, now that lower_case_table_names is set. */
table_alias_charset
=
(
lower_case_table_names
?
table_alias_charset
=
(
lower_case_table_names
?
...
...
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