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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
1ef49b93
Commit
1ef49b93
authored
Oct 25, 2006
by
lars/lthalmann@dl145h.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
parents
99b572b9
36de830f
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
178 additions
and
36 deletions
+178
-36
mysql-test/extra/binlog_tests/binlog.test
mysql-test/extra/binlog_tests/binlog.test
+13
-0
mysql-test/r/binlog_row_binlog.result
mysql-test/r/binlog_row_binlog.result
+26
-0
mysql-test/r/binlog_stm_binlog.result
mysql-test/r/binlog_stm_binlog.result
+20
-0
mysql-test/r/ctype_ucs.result
mysql-test/r/ctype_ucs.result
+22
-0
mysql-test/r/view.result
mysql-test/r/view.result
+19
-0
mysql-test/t/ctype_ucs.test
mysql-test/t/ctype_ucs.test
+17
-0
mysql-test/t/view.test
mysql-test/t/view.test
+19
-0
sql/parse_file.cc
sql/parse_file.cc
+12
-11
sql/sql_show.cc
sql/sql_show.cc
+3
-0
sql/sql_view.cc
sql/sql_view.cc
+17
-18
storage/myisam/mi_key.c
storage/myisam/mi_key.c
+8
-7
storage/myisam/mi_open.c
storage/myisam/mi_open.c
+2
-0
No files found.
mysql-test/extra/binlog_tests/binlog.test
View file @
1ef49b93
...
@@ -59,4 +59,17 @@ insert into t1 values(null);
...
@@ -59,4 +59,17 @@ insert into t1 values(null);
select
*
from
t1
;
select
*
from
t1
;
drop
table
t1
;
drop
table
t1
;
# bug#22027
create
table
t1
(
a
int
);
create
table
if
not
exists
t2
select
*
from
t1
;
# bug#22762
create
temporary
table
tt1
(
a
int
);
create
table
if
not
exists
t3
like
tt1
;
--
replace_column
2
# 5 #
--
replace_regex
/
table_id
:
[
0
-
9
]
+/
table_id
:
#/ /\/\* xid=.* \*\//\/* xid= *\//
show
binlog
events
from
102
;
drop
table
t1
,
t2
,
t3
,
tt1
;
--
source
extra
/
binlog_tests
/
binlog_insert_delayed
.
test
--
source
extra
/
binlog_tests
/
binlog_insert_delayed
.
test
mysql-test/r/binlog_row_binlog.result
View file @
1ef49b93
...
@@ -245,6 +245,24 @@ select * from t1;
...
@@ -245,6 +245,24 @@ select * from t1;
id
id
127
127
drop table t1;
drop table t1;
create table t1 (a int);
create table if not exists t2 select * from t1;
create temporary table tt1 (a int);
create table if not exists t3 like tt1;
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query 1 # use `test`; create table t1 (id tinyint auto_increment primary key)
master-bin.000001 # Table_map 1 # table_id: # (test.t1)
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # use `test`; drop table t1
master-bin.000001 # Query 1 # use `test`; create table t1 (a int)
master-bin.000001 # Query 1 # use `test`; CREATE TABLE IF NOT EXISTS `t2` (
`a` int(11) DEFAULT NULL
)
master-bin.000001 # Query 1 # use `test`; CREATE TABLE IF NOT EXISTS `t3` (
`a` int(11) DEFAULT NULL
)
drop table t1,t2,t3,tt1;
create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;
create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;
set @@session.auto_increment_increment=1, @@session.auto_increment_offset=1;
set @@session.auto_increment_increment=1, @@session.auto_increment_offset=1;
insert delayed into t1 values (207);
insert delayed into t1 values (207);
...
@@ -256,6 +274,14 @@ master-bin.000001 # Query 1 # use `test`; create table t1 (id tinyint auto_incre
...
@@ -256,6 +274,14 @@ master-bin.000001 # Query 1 # use `test`; create table t1 (id tinyint auto_incre
master-bin.000001 # Table_map 1 # table_id: # (test.t1)
master-bin.000001 # Table_map 1 # table_id: # (test.t1)
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # use `test`; drop table t1
master-bin.000001 # Query 1 # use `test`; drop table t1
master-bin.000001 # Query 1 # use `test`; create table t1 (a int)
master-bin.000001 # Query 1 # use `test`; CREATE TABLE IF NOT EXISTS `t2` (
`a` int(11) DEFAULT NULL
)
master-bin.000001 # Query 1 # use `test`; CREATE TABLE IF NOT EXISTS `t3` (
`a` int(11) DEFAULT NULL
)
master-bin.000001 # Query 1 # use `test`; DROP TABLE `t1`,`t2`,`t3` /* generated by server */
master-bin.000001 # Query 1 # use `test`; create table t1 (a int not null auto_increment, primary key (a)) engine=myisam
master-bin.000001 # Query 1 # use `test`; create table t1 (a int not null auto_increment, primary key (a)) engine=myisam
master-bin.000001 # Table_map 1 # table_id: # (test.t1)
master-bin.000001 # Table_map 1 # table_id: # (test.t1)
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
...
...
mysql-test/r/binlog_stm_binlog.result
View file @
1ef49b93
...
@@ -155,6 +155,21 @@ select * from t1;
...
@@ -155,6 +155,21 @@ select * from t1;
id
id
127
127
drop table t1;
drop table t1;
create table t1 (a int);
create table if not exists t2 select * from t1;
create temporary table tt1 (a int);
create table if not exists t3 like tt1;
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query 1 # use `test`; create table t1 (id tinyint auto_increment primary key)
master-bin.000001 # Intvar 1 # INSERT_ID=127
master-bin.000001 # Query 1 # use `test`; insert into t1 values(null)
master-bin.000001 # Query 1 # use `test`; drop table t1
master-bin.000001 # Query 1 # use `test`; create table t1 (a int)
master-bin.000001 # Query 1 # use `test`; create table if not exists t2 select * from t1
master-bin.000001 # Query 1 # use `test`; create temporary table tt1 (a int)
master-bin.000001 # Query 1 # use `test`; create table if not exists t3 like tt1
drop table t1,t2,t3,tt1;
create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;
create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;
set @@session.auto_increment_increment=1, @@session.auto_increment_offset=1;
set @@session.auto_increment_increment=1, @@session.auto_increment_offset=1;
insert delayed into t1 values (207);
insert delayed into t1 values (207);
...
@@ -166,6 +181,11 @@ master-bin.000001 # Query 1 # use `test`; create table t1 (id tinyint auto_incre
...
@@ -166,6 +181,11 @@ master-bin.000001 # Query 1 # use `test`; create table t1 (id tinyint auto_incre
master-bin.000001 # Intvar 1 # INSERT_ID=127
master-bin.000001 # Intvar 1 # INSERT_ID=127
master-bin.000001 # Query 1 # use `test`; insert into t1 values(null)
master-bin.000001 # Query 1 # use `test`; insert into t1 values(null)
master-bin.000001 # Query 1 # use `test`; drop table t1
master-bin.000001 # Query 1 # use `test`; drop table t1
master-bin.000001 # Query 1 # use `test`; create table t1 (a int)
master-bin.000001 # Query 1 # use `test`; create table if not exists t2 select * from t1
master-bin.000001 # Query 1 # use `test`; create temporary table tt1 (a int)
master-bin.000001 # Query 1 # use `test`; create table if not exists t3 like tt1
master-bin.000001 # Query 1 # use `test`; drop table t1,t2,t3,tt1
master-bin.000001 # Query 1 # use `test`; create table t1 (a int not null auto_increment, primary key (a)) engine=myisam
master-bin.000001 # Query 1 # use `test`; create table t1 (a int not null auto_increment, primary key (a)) engine=myisam
master-bin.000001 # Table_map 1 # table_id: # (test.t1)
master-bin.000001 # Table_map 1 # table_id: # (test.t1)
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
...
...
mysql-test/r/ctype_ucs.result
View file @
1ef49b93
...
@@ -723,6 +723,28 @@ lily
...
@@ -723,6 +723,28 @@ lily
river
river
drop table t1;
drop table t1;
deallocate prepare stmt;
deallocate prepare stmt;
create table t1 (
a char(10) unicode not null,
index a (a)
) engine=myisam;
insert into t1 values (repeat(0x201f, 10));
insert into t1 values (repeat(0x2020, 10));
insert into t1 values (repeat(0x2021, 10));
explain select hex(a) from t1 order by a;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 index NULL a 20 NULL 3 Using index
select hex(a) from t1 order by a;
hex(a)
201F201F201F201F201F201F201F201F201F201F
2020202020202020202020202020202020202020
2021202120212021202120212021202120212021
alter table t1 drop index a;
select hex(a) from t1 order by a;
hex(a)
201F201F201F201F201F201F201F201F201F201F
2020202020202020202020202020202020202020
2021202120212021202120212021202120212021
drop table t1;
CREATE TABLE t1 (id int, s char(5) CHARACTER SET ucs2 COLLATE ucs2_unicode_ci);
CREATE TABLE t1 (id int, s char(5) CHARACTER SET ucs2 COLLATE ucs2_unicode_ci);
INSERT INTO t1 VALUES (1, 'ZZZZZ'), (1, 'ZZZ'), (2, 'ZZZ'), (2, 'ZZZZZ');
INSERT INTO t1 VALUES (1, 'ZZZZZ'), (1, 'ZZZ'), (2, 'ZZZ'), (2, 'ZZZZZ');
SELECT id, MIN(s) FROM t1 GROUP BY id;
SELECT id, MIN(s) FROM t1 GROUP BY id;
...
...
mysql-test/r/view.result
View file @
1ef49b93
...
@@ -2967,3 +2967,22 @@ ERROR HY000: CHECK OPTION failed 'test.v1'
...
@@ -2967,3 +2967,22 @@ ERROR HY000: CHECK OPTION failed 'test.v1'
DROP VIEW v1;
DROP VIEW v1;
DROP TABLE t1;
DROP TABLE t1;
End of 5.0 tests.
End of 5.0 tests.
DROP DATABASE IF EXISTS `d-1`;
CREATE DATABASE `d-1`;
USE `d-1`;
CREATE TABLE `t-1` (c1 INT);
CREATE VIEW `v-1` AS SELECT c1 FROM `t-1`;
SHOW TABLES;
Tables_in_d-1
t-1
v-1
RENAME TABLE `t-1` TO `t-2`;
RENAME TABLE `v-1` TO `v-2`;
SHOW TABLES;
Tables_in_d-1
t-2
v-2
DROP TABLE `t-2`;
DROP VIEW `v-2`;
DROP DATABASE `d-1`;
USE test;
mysql-test/t/ctype_ucs.test
View file @
1ef49b93
...
@@ -454,6 +454,23 @@ select utext from t1 where utext like '%%';
...
@@ -454,6 +454,23 @@ select utext from t1 where utext like '%%';
drop
table
t1
;
drop
table
t1
;
deallocate
prepare
stmt
;
deallocate
prepare
stmt
;
#
# Bug#22052 Trailing spaces are not removed from UNICODE fields in an index
#
create
table
t1
(
a
char
(
10
)
unicode
not
null
,
index
a
(
a
)
)
engine
=
myisam
;
insert
into
t1
values
(
repeat
(
0x201f
,
10
));
insert
into
t1
values
(
repeat
(
0x2020
,
10
));
insert
into
t1
values
(
repeat
(
0x2021
,
10
));
# make sure "index read" is used
explain
select
hex
(
a
)
from
t1
order
by
a
;
select
hex
(
a
)
from
t1
order
by
a
;
alter
table
t1
drop
index
a
;
select
hex
(
a
)
from
t1
order
by
a
;
drop
table
t1
;
#
#
# Bug #20076: server crashes for a query with GROUP BY if MIN/MAX aggregation
# Bug #20076: server crashes for a query with GROUP BY if MIN/MAX aggregation
# over a 'ucs2' field uses a temporary table
# over a 'ucs2' field uses a temporary table
...
...
mysql-test/t/view.test
View file @
1ef49b93
...
@@ -2900,3 +2900,22 @@ DROP VIEW v1;
...
@@ -2900,3 +2900,22 @@ DROP VIEW v1;
DROP
TABLE
t1
;
DROP
TABLE
t1
;
--
echo
End
of
5.0
tests
.
--
echo
End
of
5.0
tests
.
#
# Bug#21370 View renaming lacks tablename_to_filename encoding
#
--
disable_warnings
DROP
DATABASE
IF
EXISTS
`d-1`
;
--
enable_warnings
CREATE
DATABASE
`d-1`
;
USE
`d-1`
;
CREATE
TABLE
`t-1`
(
c1
INT
);
CREATE
VIEW
`v-1`
AS
SELECT
c1
FROM
`t-1`
;
SHOW
TABLES
;
RENAME
TABLE
`t-1`
TO
`t-2`
;
RENAME
TABLE
`v-1`
TO
`v-2`
;
SHOW
TABLES
;
DROP
TABLE
`t-2`
;
DROP
VIEW
`v-2`
;
DROP
DATABASE
`d-1`
;
USE
test
;
sql/parse_file.cc
View file @
1ef49b93
...
@@ -368,32 +368,33 @@ my_bool rename_in_schema_file(const char *schema, const char *old_name,
...
@@ -368,32 +368,33 @@ my_bool rename_in_schema_file(const char *schema, const char *old_name,
{
{
char
old_path
[
FN_REFLEN
],
new_path
[
FN_REFLEN
],
arc_path
[
FN_REFLEN
];
char
old_path
[
FN_REFLEN
],
new_path
[
FN_REFLEN
],
arc_path
[
FN_REFLEN
];
strxnmov
(
old_path
,
FN_REFLEN
-
1
,
mysql_data_home
,
"/"
,
schema
,
"/"
,
build_table_filename
(
old_path
,
sizeof
(
old_path
)
-
1
,
old_name
,
reg_ext
,
NullS
);
schema
,
old_name
,
reg_ext
,
0
);
(
void
)
unpack_filename
(
old_path
,
old_path
);
build_table_filename
(
new_path
,
sizeof
(
new_path
)
-
1
,
schema
,
new_name
,
reg_ext
,
0
);
strxnmov
(
new_path
,
FN_REFLEN
-
1
,
mysql_data_home
,
"/"
,
schema
,
"/"
,
new_name
,
reg_ext
,
NullS
);
(
void
)
unpack_filename
(
new_path
,
new_path
);
if
(
my_rename
(
old_path
,
new_path
,
MYF
(
MY_WME
)))
if
(
my_rename
(
old_path
,
new_path
,
MYF
(
MY_WME
)))
return
1
;
return
1
;
/* check if arc_dir exists */
/* check if arc_dir exists */
strxnmov
(
arc_path
,
FN_REFLEN
-
1
,
mysql_data_home
,
"/"
,
schema
,
"/arc"
,
NullS
);
build_table_filename
(
arc_path
,
sizeof
(
arc_path
)
-
1
,
schema
,
"arc"
,
""
,
0
);
(
void
)
unpack_filename
(
arc_path
,
arc_path
);
if
(
revision
>
0
&&
!
access
(
arc_path
,
F_OK
))
if
(
revision
>
0
&&
!
access
(
arc_path
,
F_OK
))
{
{
char
old_name_buf
[
FN_REFLEN
],
new_name_buf
[
FN_REFLEN
];
ulonglong
limit
=
((
revision
>
num_view_backups
)
?
ulonglong
limit
=
((
revision
>
num_view_backups
)
?
revision
-
num_view_backups
:
0
);
revision
-
num_view_backups
:
0
);
VOID
(
tablename_to_filename
(
old_name
,
old_name_buf
,
sizeof
(
old_name_buf
)));
VOID
(
tablename_to_filename
(
new_name
,
new_name_buf
,
sizeof
(
new_name_buf
)));
for
(;
revision
>
limit
;
revision
--
)
for
(;
revision
>
limit
;
revision
--
)
{
{
my_snprintf
(
old_path
,
FN_REFLEN
,
"%s/%s%s-%04lu"
,
my_snprintf
(
old_path
,
FN_REFLEN
,
"%s/%s%s-%04lu"
,
arc_path
,
old_name
,
reg_ext
,
(
ulong
)
revision
);
arc_path
,
old_name
_buf
,
reg_ext
,
(
ulong
)
revision
);
(
void
)
unpack_filename
(
old_path
,
old_path
);
(
void
)
unpack_filename
(
old_path
,
old_path
);
my_snprintf
(
new_path
,
FN_REFLEN
,
"%s/%s%s-%04lu"
,
my_snprintf
(
new_path
,
FN_REFLEN
,
"%s/%s%s-%04lu"
,
arc_path
,
new_name
,
reg_ext
,
(
ulong
)
revision
);
arc_path
,
new_name
_buf
,
reg_ext
,
(
ulong
)
revision
);
(
void
)
unpack_filename
(
new_path
,
new_path
);
(
void
)
unpack_filename
(
new_path
,
new_path
);
my_rename
(
old_path
,
new_path
,
MYF
(
0
));
my_rename
(
old_path
,
new_path
,
MYF
(
0
));
}
}
...
...
sql/sql_show.cc
View file @
1ef49b93
...
@@ -1058,6 +1058,9 @@ int store_create_info(THD *thd, TABLE_LIST *table_list, String *packet,
...
@@ -1058,6 +1058,9 @@ int store_create_info(THD *thd, TABLE_LIST *table_list, String *packet,
packet
->
append
(
STRING_WITH_LEN
(
"CREATE TEMPORARY TABLE "
));
packet
->
append
(
STRING_WITH_LEN
(
"CREATE TEMPORARY TABLE "
));
else
else
packet
->
append
(
STRING_WITH_LEN
(
"CREATE TABLE "
));
packet
->
append
(
STRING_WITH_LEN
(
"CREATE TABLE "
));
if
(
create_info_arg
&&
(
create_info_arg
->
options
&
HA_LEX_CREATE_IF_NOT_EXISTS
))
packet
->
append
(
STRING_WITH_LEN
(
"IF NOT EXISTS "
));
if
(
table_list
->
schema_table
)
if
(
table_list
->
schema_table
)
alias
=
table_list
->
schema_table
->
table_name
;
alias
=
table_list
->
schema_table
->
table_name
;
else
else
...
...
sql/sql_view.cc
View file @
1ef49b93
...
@@ -1655,24 +1655,23 @@ mysql_rename_view(THD *thd,
...
@@ -1655,24 +1655,23 @@ mysql_rename_view(THD *thd,
const
char
*
new_name
,
const
char
*
new_name
,
TABLE_LIST
*
view
)
TABLE_LIST
*
view
)
{
{
LEX_STRING
pathstr
,
file
;
LEX_STRING
pathstr
;
File_parser
*
parser
;
File_parser
*
parser
;
char
view_path
[
FN_REFLEN
];
char
path_buff
[
FN_REFLEN
];
bool
error
=
TRUE
;
bool
error
=
TRUE
;
DBUG_ENTER
(
"mysql_rename_view"
);
DBUG_ENTER
(
"mysql_rename_view"
);
strxnmov
(
view_path
,
FN_REFLEN
-
1
,
mysql_data_home
,
"/"
,
view
->
db
,
"/"
,
pathstr
.
str
=
(
char
*
)
path_buff
;
view
->
table_name
,
reg_ext
,
NullS
);
pathstr
.
length
=
build_table_filename
(
path_buff
,
sizeof
(
path_buff
)
-
1
,
(
void
)
unpack_filename
(
view_path
,
view_path
);
view
->
db
,
view
->
table_name
,
reg_ext
,
0
);
pathstr
.
str
=
(
char
*
)
view_path
;
pathstr
.
length
=
strlen
(
view_path
);
if
((
parser
=
sql_parse_prepare
(
&
pathstr
,
thd
->
mem_root
,
1
))
&&
if
((
parser
=
sql_parse_prepare
(
&
pathstr
,
thd
->
mem_root
,
1
))
&&
is_equal
(
&
view_type
,
parser
->
type
()))
is_equal
(
&
view_type
,
parser
->
type
()))
{
{
TABLE_LIST
view_def
;
TABLE_LIST
view_def
;
char
dir_buff
[
FN_REFLEN
],
file_buff
[
FN_REFLEN
];
char
dir_buff
[
FN_REFLEN
];
LEX_STRING
dir
,
file
;
/*
/*
To be PS-friendly we should either to restore state of
To be PS-friendly we should either to restore state of
...
@@ -1695,18 +1694,18 @@ mysql_rename_view(THD *thd,
...
@@ -1695,18 +1694,18 @@ mysql_rename_view(THD *thd,
view_def
.
revision
-
1
,
num_view_backups
))
view_def
.
revision
-
1
,
num_view_backups
))
goto
err
;
goto
err
;
strxnmov
(
dir_buff
,
FN_REFLEN
-
1
,
mysql_data_home
,
"/"
,
view
->
db
,
"/"
,
dir
.
str
=
dir_buff
;
NullS
);
dir
.
length
=
build_table_filename
(
dir_buff
,
sizeof
(
dir_buff
)
-
1
,
(
void
)
unpack_filename
(
dir_buff
,
dir_buff
);
view
->
db
,
""
,
""
,
0
);
pathstr
.
str
=
(
char
*
)
dir_buff
;
pathstr
.
str
=
path_buff
;
pathstr
.
length
=
strlen
(
dir_buff
);
pathstr
.
length
=
build_table_filename
(
path_buff
,
sizeof
(
path_buff
)
-
1
,
view
->
db
,
new_name
,
reg_ext
,
0
);
file
.
str
=
file_buff
;
file
.
str
=
pathstr
.
str
+
dir
.
length
;
file
.
length
=
(
strxnmov
(
file_buff
,
FN_REFLEN
,
new_name
,
reg_ext
,
NullS
)
file
.
length
=
pathstr
.
length
-
dir
.
length
;
-
file_buff
);
if
(
sql_create_definition_file
(
&
pathst
r
,
&
file
,
view_file_type
,
if
(
sql_create_definition_file
(
&
di
r
,
&
file
,
view_file_type
,
(
gptr
)
&
view_def
,
view_parameters
,
(
gptr
)
&
view_def
,
view_parameters
,
num_view_backups
))
num_view_backups
))
{
{
...
...
storage/myisam/mi_key.c
View file @
1ef49b93
...
@@ -52,7 +52,7 @@ static int _mi_put_key_in_record(MI_INFO *info,uint keynr,byte *record);
...
@@ -52,7 +52,7 @@ static int _mi_put_key_in_record(MI_INFO *info,uint keynr,byte *record);
uint
_mi_make_key
(
register
MI_INFO
*
info
,
uint
keynr
,
uchar
*
key
,
uint
_mi_make_key
(
register
MI_INFO
*
info
,
uint
keynr
,
uchar
*
key
,
const
byte
*
record
,
my_off_t
filepos
)
const
byte
*
record
,
my_off_t
filepos
)
{
{
byte
*
pos
,
*
end
;
byte
*
pos
;
uchar
*
start
;
uchar
*
start
;
reg1
HA_KEYSEG
*
keyseg
;
reg1
HA_KEYSEG
*
keyseg
;
my_bool
is_ft
=
info
->
s
->
keyinfo
[
keynr
].
flag
&
HA_FULLTEXT
;
my_bool
is_ft
=
info
->
s
->
keyinfo
[
keynr
].
flag
&
HA_FULLTEXT
;
...
@@ -107,18 +107,17 @@ uint _mi_make_key(register MI_INFO *info, uint keynr, uchar *key,
...
@@ -107,18 +107,17 @@ uint _mi_make_key(register MI_INFO *info, uint keynr, uchar *key,
}
}
if
(
keyseg
->
flag
&
HA_SPACE_PACK
)
if
(
keyseg
->
flag
&
HA_SPACE_PACK
)
{
{
end
=
pos
+
length
;
if
(
type
!=
HA_KEYTYPE_NUM
)
if
(
type
!=
HA_KEYTYPE_NUM
)
{
{
while
(
end
>
pos
&&
end
[
-
1
]
==
' '
)
length
=
cs
->
cset
->
lengthsp
(
cs
,
pos
,
length
);
end
--
;
}
}
else
else
{
{
byte
*
end
=
pos
+
length
;
while
(
pos
<
end
&&
pos
[
0
]
==
' '
)
while
(
pos
<
end
&&
pos
[
0
]
==
' '
)
pos
++
;
pos
++
;
}
length
=
(
uint
)
(
end
-
pos
);
length
=
(
uint
)
(
end
-
pos
);
}
FIX_LENGTH
(
cs
,
pos
,
length
,
char_length
);
FIX_LENGTH
(
cs
,
pos
,
length
,
char_length
);
store_key_length_inc
(
key
,
char_length
);
store_key_length_inc
(
key
,
char_length
);
memcpy
((
byte
*
)
key
,(
byte
*
)
pos
,(
size_t
)
char_length
);
memcpy
((
byte
*
)
key
,(
byte
*
)
pos
,(
size_t
)
char_length
);
...
@@ -404,7 +403,9 @@ static int _mi_put_key_in_record(register MI_INFO *info, uint keynr,
...
@@ -404,7 +403,9 @@ static int _mi_put_key_in_record(register MI_INFO *info, uint keynr,
if
(
keyseg
->
type
!=
(
int
)
HA_KEYTYPE_NUM
)
if
(
keyseg
->
type
!=
(
int
)
HA_KEYTYPE_NUM
)
{
{
memcpy
(
pos
,
key
,(
size_t
)
length
);
memcpy
(
pos
,
key
,(
size_t
)
length
);
bfill
(
pos
+
length
,
keyseg
->
length
-
length
,
' '
);
keyseg
->
charset
->
cset
->
fill
(
keyseg
->
charset
,
pos
+
length
,
keyseg
->
length
-
length
,
' '
);
}
}
else
else
{
{
...
...
storage/myisam/mi_open.c
View file @
1ef49b93
...
@@ -348,6 +348,8 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
...
@@ -348,6 +348,8 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
goto
err
;
goto
err
;
}
}
}
}
else
if
(
pos
->
type
==
HA_KEYTYPE_BINARY
)
pos
->
charset
=
&
my_charset_bin
;
}
}
if
(
share
->
keyinfo
[
i
].
flag
&
HA_SPATIAL
)
if
(
share
->
keyinfo
[
i
].
flag
&
HA_SPATIAL
)
{
{
...
...
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