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
045a8adc
Commit
045a8adc
authored
18 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
parents
9afa051a
b8fe6206
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
265 additions
and
14 deletions
+265
-14
myisam/mi_check.c
myisam/mi_check.c
+10
-4
mysql-test/r/ctype_ucs.result
mysql-test/r/ctype_ucs.result
+21
-0
mysql-test/r/ps.result
mysql-test/r/ps.result
+47
-0
mysql-test/r/subselect.result
mysql-test/r/subselect.result
+36
-0
mysql-test/t/ctype_ucs.test
mysql-test/t/ctype_ucs.test
+21
-0
mysql-test/t/ps.test
mysql-test/t/ps.test
+52
-0
mysql-test/t/subselect.test
mysql-test/t/subselect.test
+37
-0
mysys/my_chsize.c
mysys/my_chsize.c
+3
-1
sql/field.h
sql/field.h
+2
-0
sql/item.cc
sql/item.cc
+1
-0
sql/sql_select.cc
sql/sql_select.cc
+3
-2
sql/unireg.cc
sql/unireg.cc
+32
-7
No files found.
myisam/mi_check.c
View file @
045a8adc
...
@@ -1153,9 +1153,12 @@ int chk_data_link(MI_CHECK *param, MI_INFO *info,int extend)
...
@@ -1153,9 +1153,12 @@ int chk_data_link(MI_CHECK *param, MI_INFO *info,int extend)
/* We don't need to lock the key tree here as we don't allow
/* We don't need to lock the key tree here as we don't allow
concurrent threads when running myisamchk
concurrent threads when running myisamchk
*/
*/
int
search_result
=
(
keyinfo
->
flag
&
HA_SPATIAL
)
?
int
search_result
=
#ifdef HAVE_RTREE_KEYS
(
keyinfo
->
flag
&
HA_SPATIAL
)
?
rtree_find_first
(
info
,
key
,
info
->
lastkey
,
key_length
,
rtree_find_first
(
info
,
key
,
info
->
lastkey
,
key_length
,
MBR_EQUAL
|
MBR_DATA
)
:
MBR_EQUAL
|
MBR_DATA
)
:
#endif
_mi_search
(
info
,
keyinfo
,
info
->
lastkey
,
key_length
,
_mi_search
(
info
,
keyinfo
,
info
->
lastkey
,
key_length
,
SEARCH_SAME
,
info
->
s
->
state
.
key_root
[
key
]);
SEARCH_SAME
,
info
->
s
->
state
.
key_root
[
key
]);
if
(
search_result
)
if
(
search_result
)
...
@@ -1366,7 +1369,8 @@ int mi_repair(MI_CHECK *param, register MI_INFO *info,
...
@@ -1366,7 +1369,8 @@ int mi_repair(MI_CHECK *param, register MI_INFO *info,
param
->
temp_filename
);
param
->
temp_filename
);
goto
err
;
goto
err
;
}
}
if
(
filecopy
(
param
,
new_file
,
info
->
dfile
,
0L
,
new_header_length
,
if
(
new_header_length
&&
filecopy
(
param
,
new_file
,
info
->
dfile
,
0L
,
new_header_length
,
"datafile-header"
))
"datafile-header"
))
goto
err
;
goto
err
;
info
->
s
->
state
.
dellink
=
HA_OFFSET_ERROR
;
info
->
s
->
state
.
dellink
=
HA_OFFSET_ERROR
;
...
@@ -2063,7 +2067,8 @@ int mi_repair_by_sort(MI_CHECK *param, register MI_INFO *info,
...
@@ -2063,7 +2067,8 @@ int mi_repair_by_sort(MI_CHECK *param, register MI_INFO *info,
param
->
temp_filename
);
param
->
temp_filename
);
goto
err
;
goto
err
;
}
}
if
(
filecopy
(
param
,
new_file
,
info
->
dfile
,
0L
,
new_header_length
,
if
(
new_header_length
&&
filecopy
(
param
,
new_file
,
info
->
dfile
,
0L
,
new_header_length
,
"datafile-header"
))
"datafile-header"
))
goto
err
;
goto
err
;
if
(
param
->
testflag
&
T_UNPACK
)
if
(
param
->
testflag
&
T_UNPACK
)
...
@@ -2431,7 +2436,8 @@ int mi_repair_parallel(MI_CHECK *param, register MI_INFO *info,
...
@@ -2431,7 +2436,8 @@ int mi_repair_parallel(MI_CHECK *param, register MI_INFO *info,
param
->
temp_filename
);
param
->
temp_filename
);
goto
err
;
goto
err
;
}
}
if
(
filecopy
(
param
,
new_file
,
info
->
dfile
,
0L
,
new_header_length
,
if
(
new_header_length
&&
filecopy
(
param
,
new_file
,
info
->
dfile
,
0L
,
new_header_length
,
"datafile-header"
))
"datafile-header"
))
goto
err
;
goto
err
;
if
(
param
->
testflag
&
T_UNPACK
)
if
(
param
->
testflag
&
T_UNPACK
)
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/ctype_ucs.result
View file @
045a8adc
...
@@ -747,6 +747,27 @@ select export_set(5, name, upper(name), ",", 5) from bug20536;
...
@@ -747,6 +747,27 @@ select export_set(5, name, upper(name), ",", 5) from bug20536;
export_set(5, name, upper(name), ",", 5)
export_set(5, name, upper(name), ",", 5)
test1,TEST1,test1,TEST1,TEST1
test1,TEST1,test1,TEST1,TEST1
'test\_2','TEST\_2','test\_2','TEST\_2','TEST\_2'
'test\_2','TEST\_2','test\_2','TEST\_2','TEST\_2'
CREATE TABLE t1 (
status enum('active','passive') collate latin1_general_ci
NOT NULL default 'passive'
);
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`status` enum('active','passive') character set latin1 collate latin1_general_ci NOT NULL default 'passive'
) ENGINE=MyISAM DEFAULT CHARSET=latin1
ALTER TABLE t1 ADD a int NOT NULL AFTER status;
CREATE TABLE t2 (
status enum('active','passive') collate ucs2_turkish_ci
NOT NULL default 'passive'
);
SHOW CREATE TABLE t2;
Table Create Table
t2 CREATE TABLE `t2` (
`status` enum('active','passive') character set ucs2 collate ucs2_turkish_ci NOT NULL default 'passive'
) ENGINE=MyISAM DEFAULT CHARSET=latin1
ALTER TABLE t2 ADD a int NOT NULL AFTER status;
DROP TABLE t1,t2;
select password(name) from bug20536;
select password(name) from bug20536;
password(name)
password(name)
????????????????????
????????????????????
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/ps.result
View file @
045a8adc
...
@@ -889,3 +889,50 @@ create temporary table if not exists t1 (a1 int);
...
@@ -889,3 +889,50 @@ create temporary table if not exists t1 (a1 int);
execute stmt;
execute stmt;
drop temporary table t1;
drop temporary table t1;
deallocate prepare stmt;
deallocate prepare stmt;
CREATE TABLE t1(
ID int(10) unsigned NOT NULL auto_increment,
Member_ID varchar(15) NOT NULL default '',
Action varchar(12) NOT NULL,
Action_Date datetime NOT NULL,
Track varchar(15) default NULL,
User varchar(12) default NULL,
Date_Updated timestamp NOT NULL default CURRENT_TIMESTAMP on update
CURRENT_TIMESTAMP,
PRIMARY KEY (ID),
KEY Action (Action),
KEY Action_Date (Action_Date)
);
INSERT INTO t1(Member_ID, Action, Action_Date, Track) VALUES
('111111', 'Disenrolled', '2006-03-01', 'CAD' ),
('111111', 'Enrolled', '2006-03-01', 'CAD' ),
('111111', 'Disenrolled', '2006-07-03', 'CAD' ),
('222222', 'Enrolled', '2006-03-07', 'CAD' ),
('222222', 'Enrolled', '2006-03-07', 'CHF' ),
('222222', 'Disenrolled', '2006-08-02', 'CHF' ),
('333333', 'Enrolled', '2006-03-01', 'CAD' ),
('333333', 'Disenrolled', '2006-03-01', 'CAD' ),
('444444', 'Enrolled', '2006-03-01', 'CAD' ),
('555555', 'Disenrolled', '2006-03-01', 'CAD' ),
('555555', 'Enrolled', '2006-07-21', 'CAD' ),
('555555', 'Disenrolled', '2006-03-01', 'CHF' ),
('666666', 'Enrolled', '2006-02-09', 'CAD' ),
('666666', 'Enrolled', '2006-05-12', 'CHF' ),
('666666', 'Disenrolled', '2006-06-01', 'CAD' );
PREPARE STMT FROM
"SELECT GROUP_CONCAT(Track SEPARATOR ', ') FROM t1
WHERE Member_ID=? AND Action='Enrolled' AND
(Track,Action_Date) IN (SELECT Track, MAX(Action_Date) FROM t1
WHERE Member_ID=?
GROUP BY Track
HAVING Track>='CAD' AND
MAX(Action_Date)>'2006-03-01')";
SET @id='111111';
EXECUTE STMT USING @id,@id;
GROUP_CONCAT(Track SEPARATOR ', ')
NULL
SET @id='222222';
EXECUTE STMT USING @id,@id;
GROUP_CONCAT(Track SEPARATOR ', ')
CAD
DEALLOCATE PREPARE STMT;
DROP TABLE t1;
This diff is collapsed.
Click to expand it.
mysql-test/r/subselect.result
View file @
045a8adc
...
@@ -2946,3 +2946,39 @@ ORDER BY t2.c, t2.b LIMIT 1) WHERE t1.a = 10;
...
@@ -2946,3 +2946,39 @@ ORDER BY t2.c, t2.b LIMIT 1) WHERE t1.a = 10;
a a b
a a b
10 1 359
10 1 359
drop table t1,t2;
drop table t1,t2;
CREATE TABLE t1 (
field1 int NOT NULL,
field2 int NOT NULL,
field3 int NOT NULL,
PRIMARY KEY (field1,field2,field3)
);
CREATE TABLE t2 (
fieldA int NOT NULL,
fieldB int NOT NULL,
PRIMARY KEY (fieldA,fieldB)
);
INSERT INTO t1 VALUES
(1,1,1), (1,1,2), (1,2,1), (1,2,2), (1,2,3), (1,3,1);
INSERT INTO t2 VALUES (1,1), (1,2), (1,3);
SELECT field1, field2, COUNT(*)
FROM t1 GROUP BY field1, field2;
field1 field2 COUNT(*)
1 1 2
1 2 3
1 3 1
SELECT field1, field2
FROM t1
GROUP BY field1, field2
HAVING COUNT(*) >= ALL (SELECT fieldB
FROM t2 WHERE fieldA = field1);
field1 field2
1 2
SELECT field1, field2
FROM t1
GROUP BY field1, field2
HAVING COUNT(*) < ANY (SELECT fieldB
FROM t2 WHERE fieldA = field1);
field1 field2
1 1
1 3
DROP TABLE t1, t2;
This diff is collapsed.
Click to expand it.
mysql-test/t/ctype_ucs.test
View file @
045a8adc
...
@@ -482,6 +482,27 @@ select make_set(3, name, upper(name)) from bug20536;
...
@@ -482,6 +482,27 @@ select make_set(3, name, upper(name)) from bug20536;
select
export_set
(
5
,
name
,
upper
(
name
))
from
bug20536
;
select
export_set
(
5
,
name
,
upper
(
name
))
from
bug20536
;
select
export_set
(
5
,
name
,
upper
(
name
),
","
,
5
)
from
bug20536
;
select
export_set
(
5
,
name
,
upper
(
name
),
","
,
5
)
from
bug20536
;
#
# Bug #20108: corrupted default enum value for a ucs2 field
#
CREATE
TABLE
t1
(
status
enum
(
'active'
,
'passive'
)
collate
latin1_general_ci
NOT
NULL
default
'passive'
);
SHOW
CREATE
TABLE
t1
;
ALTER
TABLE
t1
ADD
a
int
NOT
NULL
AFTER
status
;
CREATE
TABLE
t2
(
status
enum
(
'active'
,
'passive'
)
collate
ucs2_turkish_ci
NOT
NULL
default
'passive'
);
SHOW
CREATE
TABLE
t2
;
ALTER
TABLE
t2
ADD
a
int
NOT
NULL
AFTER
status
;
DROP
TABLE
t1
,
t2
;
# Some broken functions: add these tests just to document current behavior.
# Some broken functions: add these tests just to document current behavior.
# PASSWORD and OLD_PASSWORD don't work with UCS2 strings, but to fix it would
# PASSWORD and OLD_PASSWORD don't work with UCS2 strings, but to fix it would
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/ps.test
View file @
045a8adc
...
@@ -951,4 +951,56 @@ execute stmt;
...
@@ -951,4 +951,56 @@ execute stmt;
drop
temporary
table
t1
;
drop
temporary
table
t1
;
deallocate
prepare
stmt
;
deallocate
prepare
stmt
;
#
# BUG#22085: Crash on the execution of a prepared statement that
# uses an IN subquery with aggregate functions in HAVING
#
CREATE
TABLE
t1
(
ID
int
(
10
)
unsigned
NOT
NULL
auto_increment
,
Member_ID
varchar
(
15
)
NOT
NULL
default
''
,
Action
varchar
(
12
)
NOT
NULL
,
Action_Date
datetime
NOT
NULL
,
Track
varchar
(
15
)
default
NULL
,
User
varchar
(
12
)
default
NULL
,
Date_Updated
timestamp
NOT
NULL
default
CURRENT_TIMESTAMP
on
update
CURRENT_TIMESTAMP
,
PRIMARY
KEY
(
ID
),
KEY
Action
(
Action
),
KEY
Action_Date
(
Action_Date
)
);
INSERT
INTO
t1
(
Member_ID
,
Action
,
Action_Date
,
Track
)
VALUES
(
'111111'
,
'Disenrolled'
,
'2006-03-01'
,
'CAD'
),
(
'111111'
,
'Enrolled'
,
'2006-03-01'
,
'CAD'
),
(
'111111'
,
'Disenrolled'
,
'2006-07-03'
,
'CAD'
),
(
'222222'
,
'Enrolled'
,
'2006-03-07'
,
'CAD'
),
(
'222222'
,
'Enrolled'
,
'2006-03-07'
,
'CHF'
),
(
'222222'
,
'Disenrolled'
,
'2006-08-02'
,
'CHF'
),
(
'333333'
,
'Enrolled'
,
'2006-03-01'
,
'CAD'
),
(
'333333'
,
'Disenrolled'
,
'2006-03-01'
,
'CAD'
),
(
'444444'
,
'Enrolled'
,
'2006-03-01'
,
'CAD'
),
(
'555555'
,
'Disenrolled'
,
'2006-03-01'
,
'CAD'
),
(
'555555'
,
'Enrolled'
,
'2006-07-21'
,
'CAD'
),
(
'555555'
,
'Disenrolled'
,
'2006-03-01'
,
'CHF'
),
(
'666666'
,
'Enrolled'
,
'2006-02-09'
,
'CAD'
),
(
'666666'
,
'Enrolled'
,
'2006-05-12'
,
'CHF'
),
(
'666666'
,
'Disenrolled'
,
'2006-06-01'
,
'CAD'
);
PREPARE
STMT
FROM
"SELECT GROUP_CONCAT(Track SEPARATOR ', ') FROM t1
WHERE Member_ID=? AND Action='Enrolled' AND
(Track,Action_Date) IN (SELECT Track, MAX(Action_Date) FROM t1
WHERE Member_ID=?
GROUP BY Track
HAVING Track>='CAD' AND
MAX(Action_Date)>'2006-03-01')"
;
SET
@
id
=
'111111'
;
EXECUTE
STMT
USING
@
id
,
@
id
;
SET
@
id
=
'222222'
;
EXECUTE
STMT
USING
@
id
,
@
id
;
DEALLOCATE
PREPARE
STMT
;
DROP
TABLE
t1
;
# End of 4.1 tests
# End of 4.1 tests
This diff is collapsed.
Click to expand it.
mysql-test/t/subselect.test
View file @
045a8adc
...
@@ -1911,4 +1911,41 @@ SELECT sql_no_cache t1.a, r.a, r.b FROM t1 LEFT JOIN t2 r
...
@@ -1911,4 +1911,41 @@ SELECT sql_no_cache t1.a, r.a, r.b FROM t1 LEFT JOIN t2 r
drop
table
t1
,
t2
;
drop
table
t1
,
t2
;
#
# Bug #21853: assert failure for a grouping query with
# an ALL/ANY quantified subquery in HAVING
#
CREATE
TABLE
t1
(
field1
int
NOT
NULL
,
field2
int
NOT
NULL
,
field3
int
NOT
NULL
,
PRIMARY
KEY
(
field1
,
field2
,
field3
)
);
CREATE
TABLE
t2
(
fieldA
int
NOT
NULL
,
fieldB
int
NOT
NULL
,
PRIMARY
KEY
(
fieldA
,
fieldB
)
);
INSERT
INTO
t1
VALUES
(
1
,
1
,
1
),
(
1
,
1
,
2
),
(
1
,
2
,
1
),
(
1
,
2
,
2
),
(
1
,
2
,
3
),
(
1
,
3
,
1
);
INSERT
INTO
t2
VALUES
(
1
,
1
),
(
1
,
2
),
(
1
,
3
);
SELECT
field1
,
field2
,
COUNT
(
*
)
FROM
t1
GROUP
BY
field1
,
field2
;
SELECT
field1
,
field2
FROM
t1
GROUP
BY
field1
,
field2
HAVING
COUNT
(
*
)
>=
ALL
(
SELECT
fieldB
FROM
t2
WHERE
fieldA
=
field1
);
SELECT
field1
,
field2
FROM
t1
GROUP
BY
field1
,
field2
HAVING
COUNT
(
*
)
<
ANY
(
SELECT
fieldB
FROM
t2
WHERE
fieldA
=
field1
);
DROP
TABLE
t1
,
t2
;
# End of 4.1 tests
# End of 4.1 tests
This diff is collapsed.
Click to expand it.
mysys/my_chsize.c
View file @
045a8adc
...
@@ -44,7 +44,9 @@ int my_chsize(File fd, my_off_t newlength, int filler, myf MyFlags)
...
@@ -44,7 +44,9 @@ int my_chsize(File fd, my_off_t newlength, int filler, myf MyFlags)
DBUG_PRINT
(
"my"
,(
"fd: %d length: %lu MyFlags: %d"
,
fd
,(
ulong
)
newlength
,
DBUG_PRINT
(
"my"
,(
"fd: %d length: %lu MyFlags: %d"
,
fd
,(
ulong
)
newlength
,
MyFlags
));
MyFlags
));
oldsize
=
my_seek
(
fd
,
0L
,
MY_SEEK_END
,
MYF
(
MY_WME
+
MY_FAE
));
if
((
oldsize
=
my_seek
(
fd
,
0L
,
MY_SEEK_END
,
MYF
(
MY_WME
+
MY_FAE
)))
==
newlength
)
DBUG_RETURN
(
0
);
DBUG_PRINT
(
"info"
,(
"old_size: %ld"
,
(
ulong
)
oldsize
));
DBUG_PRINT
(
"info"
,(
"old_size: %ld"
,
(
ulong
)
oldsize
));
if
(
oldsize
>
newlength
)
if
(
oldsize
>
newlength
)
...
...
This diff is collapsed.
Click to expand it.
sql/field.h
View file @
045a8adc
...
@@ -1192,6 +1192,8 @@ public:
...
@@ -1192,6 +1192,8 @@ public:
uint
decimals
,
flags
,
pack_length
;
uint
decimals
,
flags
,
pack_length
;
Field
::
utype
unireg_check
;
Field
::
utype
unireg_check
;
TYPELIB
*
interval
;
// Which interval to use
TYPELIB
*
interval
;
// Which interval to use
TYPELIB
*
save_interval
;
// Temporary copy for the above
// Used only for UCS2 intervals
List
<
String
>
interval_list
;
List
<
String
>
interval_list
;
CHARSET_INFO
*
charset
;
CHARSET_INFO
*
charset
;
Field
::
geometry_type
geom_type
;
Field
::
geometry_type
geom_type
;
...
...
This diff is collapsed.
Click to expand it.
sql/item.cc
View file @
045a8adc
...
@@ -387,6 +387,7 @@ void Item::split_sum_func2(THD *thd, Item **ref_pointer_array,
...
@@ -387,6 +387,7 @@ void Item::split_sum_func2(THD *thd, Item **ref_pointer_array,
}
}
else
if
((
type
()
==
SUM_FUNC_ITEM
||
else
if
((
type
()
==
SUM_FUNC_ITEM
||
(
used_tables
()
&
~
PARAM_TABLE_BIT
))
&&
(
used_tables
()
&
~
PARAM_TABLE_BIT
))
&&
type
()
!=
SUBSELECT_ITEM
&&
type
()
!=
REF_ITEM
)
type
()
!=
REF_ITEM
)
{
{
/*
/*
...
...
This diff is collapsed.
Click to expand it.
sql/sql_select.cc
View file @
045a8adc
...
@@ -290,8 +290,6 @@ JOIN::prepare(Item ***rref_pointer_array,
...
@@ -290,8 +290,6 @@ JOIN::prepare(Item ***rref_pointer_array,
select_lex
->
having_fix_field
=
0
;
select_lex
->
having_fix_field
=
0
;
if
(
having_fix_rc
||
thd
->
net
.
report_error
)
if
(
having_fix_rc
||
thd
->
net
.
report_error
)
DBUG_RETURN
(
-
1
);
/* purecov: inspected */
DBUG_RETURN
(
-
1
);
/* purecov: inspected */
if
(
having
->
with_sum_func
)
having
->
split_sum_func2
(
thd
,
ref_pointer_array
,
all_fields
,
&
having
);
}
}
// Is it subselect
// Is it subselect
...
@@ -306,6 +304,9 @@ JOIN::prepare(Item ***rref_pointer_array,
...
@@ -306,6 +304,9 @@ JOIN::prepare(Item ***rref_pointer_array,
}
}
}
}
if
(
having
&&
having
->
with_sum_func
)
having
->
split_sum_func2
(
thd
,
ref_pointer_array
,
all_fields
,
&
having
);
if
(
setup_ftfuncs
(
select_lex
))
/* should be after having->fix_fields */
if
(
setup_ftfuncs
(
select_lex
))
/* should be after having->fix_fields */
DBUG_RETURN
(
-
1
);
DBUG_RETURN
(
-
1
);
...
...
This diff is collapsed.
Click to expand it.
sql/unireg.cc
View file @
045a8adc
...
@@ -190,13 +190,19 @@ bool mysql_create_frm(THD *thd, my_string file_name,
...
@@ -190,13 +190,19 @@ bool mysql_create_frm(THD *thd, my_string file_name,
goto
err3
;
goto
err3
;
{
{
/* Unescape all UCS2 intervals: were escaped in pack_headers */
/*
Restore all UCS2 intervals.
HEX representation of them is not needed anymore.
*/
List_iterator
<
create_field
>
it
(
create_fields
);
List_iterator
<
create_field
>
it
(
create_fields
);
create_field
*
field
;
create_field
*
field
;
while
((
field
=
it
++
))
while
((
field
=
it
++
))
{
{
if
(
field
->
interval
&&
field
->
charset
->
mbminlen
>
1
)
if
(
field
->
save_interval
)
unhex_type2
(
field
->
interval
);
{
field
->
interval
=
field
->
save_interval
;
field
->
save_interval
=
0
;
}
}
}
}
}
DBUG_RETURN
(
0
);
DBUG_RETURN
(
0
);
...
@@ -452,18 +458,36 @@ static bool pack_header(uchar *forminfo, enum db_type table_type,
...
@@ -452,18 +458,36 @@ static bool pack_header(uchar *forminfo, enum db_type table_type,
reclength
=
(
uint
)
(
field
->
offset
+
data_offset
+
length
);
reclength
=
(
uint
)
(
field
->
offset
+
data_offset
+
length
);
n_length
+=
(
ulong
)
strlen
(
field
->
field_name
)
+
1
;
n_length
+=
(
ulong
)
strlen
(
field
->
field_name
)
+
1
;
field
->
interval_id
=
0
;
field
->
interval_id
=
0
;
field
->
save_interval
=
0
;
if
(
field
->
interval
)
if
(
field
->
interval
)
{
{
uint
old_int_count
=
int_count
;
uint
old_int_count
=
int_count
;
if
(
field
->
charset
->
mbminlen
>
1
)
if
(
field
->
charset
->
mbminlen
>
1
)
{
{
/* Escape UCS2 intervals using HEX notation */
/*
Escape UCS2 intervals using HEX notation to avoid
problems with delimiters between enum elements.
As the original representation is still needed in
the function make_empty_rec to create a record of
filled with default values it is saved in save_interval
The HEX representation is created from this copy.
*/
field
->
save_interval
=
field
->
interval
;
field
->
interval
=
(
TYPELIB
*
)
sql_alloc
(
sizeof
(
TYPELIB
));
*
field
->
interval
=
*
field
->
save_interval
;
field
->
interval
->
type_names
=
(
const
char
**
)
sql_alloc
(
sizeof
(
char
*
)
*
(
field
->
interval
->
count
+
1
));
field
->
interval
->
type_names
[
field
->
interval
->
count
]
=
0
;
field
->
interval
->
type_lengths
=
(
uint
*
)
sql_alloc
(
sizeof
(
uint
)
*
field
->
interval
->
count
);
for
(
uint
pos
=
0
;
pos
<
field
->
interval
->
count
;
pos
++
)
for
(
uint
pos
=
0
;
pos
<
field
->
interval
->
count
;
pos
++
)
{
{
char
*
dst
;
char
*
dst
;
uint
length
=
field
->
interval
->
type_lengths
[
pos
],
hex_length
;
uint
length
=
field
->
save_
interval
->
type_lengths
[
pos
],
hex_length
;
const
char
*
src
=
field
->
interval
->
type_names
[
pos
];
const
char
*
src
=
field
->
save_
interval
->
type_names
[
pos
];
const
char
*
srcend
=
src
+
length
;
const
char
*
srcend
=
src
+
length
;
hex_length
=
length
*
2
;
hex_length
=
length
*
2
;
field
->
interval
->
type_lengths
[
pos
]
=
hex_length
;
field
->
interval
->
type_lengths
[
pos
]
=
hex_length
;
...
@@ -715,6 +739,7 @@ static bool make_empty_rec(File file,enum db_type table_type,
...
@@ -715,6 +739,7 @@ static bool make_empty_rec(File file,enum db_type table_type,
field
->
charset
,
field
->
charset
,
field
->
geom_type
,
field
->
geom_type
,
field
->
unireg_check
,
field
->
unireg_check
,
field
->
save_interval
?
field
->
save_interval
:
field
->
interval
,
field
->
interval
,
field
->
field_name
,
field
->
field_name
,
&
table
);
&
table
);
...
...
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