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
34ffbfeb
Commit
34ffbfeb
authored
19 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
parents
4f2fe287
8a4c773a
No related merge requests found
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
72 additions
and
5 deletions
+72
-5
BUILD/compile-pentium64-debug-max
BUILD/compile-pentium64-debug-max
+13
-0
Makefile.am
Makefile.am
+2
-2
mysql-test/mysql-test-run.sh
mysql-test/mysql-test-run.sh
+3
-3
mysql-test/r/ctype_cp932_binlog.result
mysql-test/r/ctype_cp932_binlog.result
+19
-0
mysql-test/t/ctype_cp932_binlog.test
mysql-test/t/ctype_cp932_binlog.test
+35
-0
No files found.
BUILD/compile-pentium64-debug-max
0 → 100755
View file @
34ffbfeb
#! /bin/sh
path
=
`
dirname
$0
`
.
"
$path
/SETUP.sh"
$@
--with-debug
=
full
extra_flags
=
"
$pentium64_cflags
$debug_cflags
$max_cflags
"
c_warnings
=
"
$c_warnings
$debug_extra_warnings
"
cxx_warnings
=
"
$cxx_warnings
$debug_extra_warnings
"
extra_configs
=
"
$pentium_configs
$debug_configs
$max_configs
"
extra_configs
=
"
$extra_configs
"
.
"
$path
/FINISH.sh"
This diff is collapsed.
Click to expand it.
Makefile.am
View file @
34ffbfeb
...
...
@@ -112,7 +112,7 @@ test:
test-force
:
cd
mysql-test
;
\
./mysql-test-run
--force
;
\
./mysql-test-run
--force
&&
\
./mysql-test-run
--ps-protocol
--force
# We are testing a new Perl version of the test script
...
...
@@ -123,7 +123,7 @@ test-pl:
test-force-pl
:
cd
mysql-test
;
\
./mysql-test-run.pl
--force
;
\
./mysql-test-run.pl
--force
&&
\
./mysql-test-run.pl
--ps-protocol
--force
# Don't update the files from bitkeeper
...
...
This diff is collapsed.
Click to expand it.
mysql-test/mysql-test-run.sh
View file @
34ffbfeb
...
...
@@ -223,10 +223,10 @@ MYSQL_MANAGER_USER=root
# number is to be used, 0 - 16 or similar.
#
if
[
-n
"
$MTR_BUILD_THREAD
"
]
;
then
MASTER_MYPORT
=
`
expr
$MTR_BUILD_THREAD
'*'
40 + 812
0
`
MASTER_MYPORT
=
`
expr
$MTR_BUILD_THREAD
'*'
5 + 1000
0
`
MYSQL_MANAGER_PORT
=
`
expr
$MASTER_MYPORT
+ 2
`
SLAVE_MYPORT
=
`
expr
$MASTER_MYPORT
+
16
`
NDBCLUSTER_PORT
=
`
expr
$MASTER_MYPORT
+
2
4
`
SLAVE_MYPORT
=
`
expr
$MASTER_MYPORT
+
3
`
NDBCLUSTER_PORT
=
`
expr
$MASTER_MYPORT
+ 4
`
echo
"Using MTR_BUILD_THREAD =
$MTR_BUILD_THREAD
"
echo
"Using MASTER_MYPORT =
$MASTER_MYPORT
"
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/ctype_cp932_binlog.result
0 → 100644
View file @
34ffbfeb
drop table if exists t1;
set names cp932;
set character_set_database = cp932;
RESET MASTER;
CREATE TABLE t1(f1 blob);
PREPARE stmt1 FROM 'INSERT INTO t1 VALUES(?)';
SET @var1= x'8300';
EXECUTE stmt1 USING @var1;
SHOW BINLOG EVENTS FROM 79;
Log_name Pos Event_type Server_id Orig_log_pos Info
master-bin.000001 # Query 1 # use `test`; SET ONE_SHOT CHARACTER_SET_CLIENT=95,COLLATION_CONNECTION=95,COLLATION_DATABASE=95,COLLATION_SERVER=8
master-bin.000001 # Query 1 # use `test`; CREATE TABLE t1(f1 blob)
master-bin.000001 # Query 1 # use `test`; SET ONE_SHOT CHARACTER_SET_CLIENT=95,COLLATION_CONNECTION=95,COLLATION_DATABASE=95,COLLATION_SERVER=8
master-bin.000001 # User var 1 # @`var1`=_binary 0x8300 COLLATE binary
master-bin.000001 # Query 1 # use `test`; INSERT INTO t1 VALUES(@'var1')
SELECT HEX(f1) FROM t1;
HEX(f1)
8300
DROP table t1;
This diff is collapsed.
Click to expand it.
mysql-test/t/ctype_cp932_binlog.test
0 → 100644
View file @
34ffbfeb
--
source
include
/
not_embedded
.
inc
--
source
include
/
have_cp932
.
inc
--
character_set
cp932
--
disable_warnings
drop
table
if
exists
t1
;
--
enable_warnings
set
names
cp932
;
set
character_set_database
=
cp932
;
# Test prepared statement with 0x8300 sequence in parameter while
# running with cp932 client character set.
RESET
MASTER
;
CREATE
TABLE
t1
(
f1
blob
);
PREPARE
stmt1
FROM
'INSERT INTO t1 VALUES(?)'
;
SET
@
var1
=
x
'8300'
;
# TODO: Note that this doesn't actually test the code which was added for
# bug#11338 because this syntax for prepared statements causes the PS to
# be replicated differently than if we executed the PS from C or Java.
# Using this syntax, variable names are inserted into the binlog instead
# of values. The real goal of this test is to check the code that was
# added to Item_param::query_val_str() in order to do hex encoding of
# PS parameters when the client character set is cp932;
# Bug#11338 has an example java program which can be used to verify this
# code (and I have used it to test the fix) until there is some way to
# exercise this code from mysql-test-run.
EXECUTE
stmt1
USING
@
var1
;
--
replace_column
2
# 5 #
SHOW
BINLOG
EVENTS
FROM
79
;
SELECT
HEX
(
f1
)
FROM
t1
;
DROP
table
t1
;
# end test for bug#11338
# End of 4.1 tests
This diff is collapsed.
Click to expand it.
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