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
2e01bfc4
Commit
2e01bfc4
authored
Nov 14, 2007
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/gluh/MySQL/Merge/4.1
into mysql.com:/home/gluh/MySQL/Merge/4.1-opt
parents
9f9ff461
9248b402
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
200 additions
and
5 deletions
+200
-5
.bzrignore
.bzrignore
+2
-0
myisam/mi_dynrec.c
myisam/mi_dynrec.c
+68
-0
mysql-test/r/almost_full.result
mysql-test/r/almost_full.result
+29
-0
mysql-test/r/func_str.result
mysql-test/r/func_str.result
+15
-3
mysql-test/r/select.result
mysql-test/r/select.result
+8
-0
mysql-test/t/almost_full.test
mysql-test/t/almost_full.test
+41
-0
mysql-test/t/func_str.test
mysql-test/t/func_str.test
+13
-0
mysql-test/t/select.test
mysql-test/t/select.test
+21
-0
sql/item.h
sql/item.h
+1
-1
sql/item_strfunc.h
sql/item_strfunc.h
+2
-1
No files found.
.bzrignore
View file @
2e01bfc4
...
@@ -1068,3 +1068,5 @@ include/check_abi
...
@@ -1068,3 +1068,5 @@ include/check_abi
include/mysql_h.ic
include/mysql_h.ic
mysql-test/r/blackhole.log
mysql-test/r/blackhole.log
mysql-test/lib/init_db.sql
mysql-test/lib/init_db.sql
libmysql_r/client_settings.h
libmysqld/ha_blackhole.cc
myisam/mi_dynrec.c
View file @
2e01bfc4
...
@@ -145,6 +145,29 @@ static int write_dynamic_record(MI_INFO *info, const byte *record,
...
@@ -145,6 +145,29 @@ static int write_dynamic_record(MI_INFO *info, const byte *record,
DBUG_ENTER
(
"write_dynamic_record"
);
DBUG_ENTER
(
"write_dynamic_record"
);
flag
=
0
;
flag
=
0
;
/*
Check if we have enough room for the new record.
First we do simplified check to make usual case faster.
Then we do more precise check for the space left.
Though it still is not absolutely precise, as
we always use MI_MAX_DYN_BLOCK_HEADER while it can be
less in the most of the cases.
*/
if
(
unlikely
(
info
->
s
->
base
.
max_data_file_length
-
info
->
state
->
data_file_length
<
reclength
+
MI_MAX_DYN_BLOCK_HEADER
))
{
if
(
info
->
s
->
base
.
max_data_file_length
-
info
->
state
->
data_file_length
+
info
->
state
->
empty
-
info
->
state
->
del
*
MI_MAX_DYN_BLOCK_HEADER
<
reclength
+
MI_MAX_DYN_BLOCK_HEADER
)
{
my_errno
=
HA_ERR_RECORD_FILE_FULL
;
DBUG_RETURN
(
1
);
}
}
do
do
{
{
if
(
_mi_find_writepos
(
info
,
reclength
,
&
filepos
,
&
length
))
if
(
_mi_find_writepos
(
info
,
reclength
,
&
filepos
,
&
length
))
...
@@ -577,6 +600,51 @@ static int update_dynamic_record(MI_INFO *info, my_off_t filepos, byte *record,
...
@@ -577,6 +600,51 @@ static int update_dynamic_record(MI_INFO *info, my_off_t filepos, byte *record,
DBUG_ENTER
(
"update_dynamic_record"
);
DBUG_ENTER
(
"update_dynamic_record"
);
flag
=
block_info
.
second_read
=
0
;
flag
=
block_info
.
second_read
=
0
;
/*
Check if we have enough room for the record.
First we do simplified check to make usual case faster.
Then we do more precise check for the space left.
Though it still is not absolutely precise, as
we always use MI_MAX_DYN_BLOCK_HEADER while it can be
less in the most of the cases.
*/
/*
compare with just the reclength as we're going
to get some space from the old replaced record
*/
if
(
unlikely
(
info
->
s
->
base
.
max_data_file_length
-
info
->
state
->
data_file_length
<
reclength
))
{
/*
let's read the old record's block to find out the length of the
old record
*/
if
((
error
=
_mi_get_block_info
(
&
block_info
,
info
->
dfile
,
filepos
))
&
(
BLOCK_DELETED
|
BLOCK_ERROR
|
BLOCK_SYNC_ERROR
|
BLOCK_FATAL_ERROR
))
{
DBUG_PRINT
(
"error"
,(
"Got wrong block info"
));
if
(
!
(
error
&
BLOCK_FATAL_ERROR
))
my_errno
=
HA_ERR_WRONG_IN_RECORD
;
goto
err
;
}
/*
if new record isn't longer, we can go on safely
*/
if
(
block_info
.
rec_len
<
reclength
)
{
if
(
info
->
s
->
base
.
max_data_file_length
-
info
->
state
->
data_file_length
+
info
->
state
->
empty
-
info
->
state
->
del
*
MI_MAX_DYN_BLOCK_HEADER
<
reclength
-
block_info
.
rec_len
+
MI_MAX_DYN_BLOCK_HEADER
)
{
my_errno
=
HA_ERR_RECORD_FILE_FULL
;
goto
err
;
}
}
block_info
.
second_read
=
0
;
}
while
(
reclength
>
0
)
while
(
reclength
>
0
)
{
{
if
(
filepos
!=
info
->
s
->
state
.
dellink
)
if
(
filepos
!=
info
->
s
->
state
.
dellink
)
...
...
mysql-test/r/almost_full.result
0 → 100644
View file @
2e01bfc4
drop table if exists t1;
set global myisam_data_pointer_size=2;
CREATE TABLE t1 (a int auto_increment primary key not null, b longtext) ENGINE=MyISAM;
DELETE FROM t1 WHERE a=1 or a=5;
INSERT INTO t1 SET b=repeat('a',600);
ERROR HY000: The table 't1' is full
CHECK TABLE t1 EXTENDED;
Table Op Msg_type Msg_text
test.t1 check warning Datafile is almost full, 65448 of 65534 used
test.t1 check status OK
UPDATE t1 SET b=repeat('a', 800) where a=10;
ERROR HY000: The table 't1' is full
CHECK TABLE t1 EXTENDED;
Table Op Msg_type Msg_text
test.t1 check warning Datafile is almost full, 65448 of 65534 used
test.t1 check status OK
INSERT INTO t1 SET b=repeat('a',400);
CHECK TABLE t1 EXTENDED;
Table Op Msg_type Msg_text
test.t1 check warning Datafile is almost full, 65448 of 65534 used
test.t1 check status OK
DELETE FROM t1 WHERE a=2 or a=6;
UPDATE t1 SET b=repeat('a', 600) where a=11;
CHECK TABLE t1 EXTENDED;
Table Op Msg_type Msg_text
test.t1 check warning Datafile is almost full, 65448 of 65534 used
test.t1 check status OK
drop table t1;
set global myisam_data_pointer_size=default;
mysql-test/r/func_str.result
View file @
2e01bfc4
...
@@ -711,9 +711,9 @@ Warning 1265 Data truncated for column 'format(130,10)' at row 1
...
@@ -711,9 +711,9 @@ Warning 1265 Data truncated for column 'format(130,10)' at row 1
show create table t1;
show create table t1;
Table Create Table
Table Create Table
t1 CREATE TABLE `t1` (
t1 CREATE TABLE `t1` (
`bin(130)` char(64)
NOT NULL default ''
,
`bin(130)` char(64)
default NULL
,
`oct(130)` char(64)
NOT NULL default ''
,
`oct(130)` char(64)
default NULL
,
`conv(130,16,10)` char(64)
NOT NULL default ''
,
`conv(130,16,10)` char(64)
default NULL
,
`hex(130)` char(6) NOT NULL default '',
`hex(130)` char(6) NOT NULL default '',
`char(130)` char(1) NOT NULL default '',
`char(130)` char(1) NOT NULL default '',
`format(130,10)` char(4) NOT NULL default '',
`format(130,10)` char(4) NOT NULL default '',
...
@@ -1075,5 +1075,17 @@ id select_type table type possible_keys key key_len ref rows Extra
...
@@ -1075,5 +1075,17 @@ id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 system NULL NULL NULL NULL 0 const row not found
1 SIMPLE t1 system NULL NULL NULL NULL 0 const row not found
Warnings:
Warnings:
Note 1003 select decode(test.t1.f1,'zxcv') AS `enc` from test.t1
Note 1003 select decode(test.t1.f1,'zxcv') AS `enc` from test.t1
drop table t1;
create table t1 (a bigint not null)engine=myisam;
insert into t1 set a = 1024*1024*1024*4;
delete from t1 order by (inet_ntoa(a)) desc limit 10;
drop table t1;
create table t1 (a char(36) not null)engine=myisam;
insert ignore into t1 set a = ' ';
insert ignore into t1 set a = ' ';
select * from t1 order by (oct(a));
a
drop table t1;
drop table t1;
End of 4.1 tests
End of 4.1 tests
mysql-test/r/select.result
View file @
2e01bfc4
...
@@ -2835,4 +2835,12 @@ FFFFFFFFFFFFFFFF 7FFFFFFFFFFFFFFF
...
@@ -2835,4 +2835,12 @@ FFFFFFFFFFFFFFFF 7FFFFFFFFFFFFFFF
FFFFFFFFFFFFFFFF 7FFFFFFFFFFFFFFF
FFFFFFFFFFFFFFFF 7FFFFFFFFFFFFFFF
8FFFFFFFFFFFFFFF 7FFFFFFFFFFFFFFF
8FFFFFFFFFFFFFFF 7FFFFFFFFFFFFFFF
drop table t1;
drop table t1;
CREATE TABLE t1 (c0 int);
CREATE TABLE t2 (c0 int);
INSERT INTO t1 VALUES(@@connect_timeout);
INSERT INTO t2 VALUES(@@connect_timeout);
SELECT * FROM t1 JOIN t2 ON t1.c0 = t2.c0 WHERE (t1.c0 <=> @@connect_timeout);
c0 c0
X X
DROP TABLE t1, t2;
End of 4.1 tests
End of 4.1 tests
mysql-test/t/almost_full.test
0 → 100644
View file @
2e01bfc4
#
# Some special cases with empty tables
#
--
disable_warnings
drop
table
if
exists
t1
;
--
enable_warnings
set
global
myisam_data_pointer_size
=
2
;
CREATE
TABLE
t1
(
a
int
auto_increment
primary
key
not
null
,
b
longtext
)
ENGINE
=
MyISAM
;
--
disable_query_log
let
$
1
=
303
;
while
(
$
1
)
{
INSERT
INTO
t1
SET
b
=
repeat
(
'a'
,
200
);
dec
$
1
;
}
--
enable_query_log
DELETE
FROM
t1
WHERE
a
=
1
or
a
=
5
;
--
error
1114
INSERT
INTO
t1
SET
b
=
repeat
(
'a'
,
600
);
CHECK
TABLE
t1
EXTENDED
;
--
error
1114
UPDATE
t1
SET
b
=
repeat
(
'a'
,
800
)
where
a
=
10
;
CHECK
TABLE
t1
EXTENDED
;
INSERT
INTO
t1
SET
b
=
repeat
(
'a'
,
400
);
CHECK
TABLE
t1
EXTENDED
;
DELETE
FROM
t1
WHERE
a
=
2
or
a
=
6
;
UPDATE
t1
SET
b
=
repeat
(
'a'
,
600
)
where
a
=
11
;
CHECK
TABLE
t1
EXTENDED
;
drop
table
t1
;
set
global
myisam_data_pointer_size
=
default
;
# End of 4.1 tests
mysql-test/t/func_str.test
View file @
2e01bfc4
...
@@ -721,4 +721,17 @@ explain extended select encode(f1,'zxcv') as 'enc' from t1;
...
@@ -721,4 +721,17 @@ explain extended select encode(f1,'zxcv') as 'enc' from t1;
explain
extended
select
decode
(
f1
,
'zxcv'
)
as
'enc'
from
t1
;
explain
extended
select
decode
(
f1
,
'zxcv'
)
as
'enc'
from
t1
;
drop
table
t1
;
drop
table
t1
;
#
# Bug #31758 inet_ntoa, oct, crashes server with null + filesort
#
create
table
t1
(
a
bigint
not
null
)
engine
=
myisam
;
insert
into
t1
set
a
=
1024
*
1024
*
1024
*
4
;
delete
from
t1
order
by
(
inet_ntoa
(
a
))
desc
limit
10
;
drop
table
t1
;
create
table
t1
(
a
char
(
36
)
not
null
)
engine
=
myisam
;
insert
ignore
into
t1
set
a
=
' '
;
insert
ignore
into
t1
set
a
=
' '
;
select
*
from
t1
order
by
(
oct
(
a
));
drop
table
t1
;
--
echo
End
of
4.1
tests
--
echo
End
of
4.1
tests
mysql-test/t/select.test
View file @
2e01bfc4
...
@@ -2353,4 +2353,25 @@ insert into t1 values (0xfffffffffffffffff, 0xfffffffffffffffff),
...
@@ -2353,4 +2353,25 @@ insert into t1 values (0xfffffffffffffffff, 0xfffffffffffffffff),
select
hex
(
a
),
hex
(
b
)
from
t1
;
select
hex
(
a
),
hex
(
b
)
from
t1
;
drop
table
t1
;
drop
table
t1
;
#
# Bug #32103: optimizer crash when join on int and mediumint with variable in
# where clause
#
CREATE
TABLE
t1
(
c0
int
);
CREATE
TABLE
t2
(
c0
int
);
# We need any variable that:
# 1. has integer type,
# 2. can be used with the "@@name" syntax
# 3. available in every server build
INSERT
INTO
t1
VALUES
(
@@
connect_timeout
);
INSERT
INTO
t2
VALUES
(
@@
connect_timeout
);
# We only need to ensure 1 row is returned to validate the results
--
replace_column
1
X
2
X
SELECT
*
FROM
t1
JOIN
t2
ON
t1
.
c0
=
t2
.
c0
WHERE
(
t1
.
c0
<=>
@@
connect_timeout
);
DROP
TABLE
t1
,
t2
;
--
echo
End
of
4.1
tests
--
echo
End
of
4.1
tests
sql/item.h
View file @
2e01bfc4
...
@@ -690,7 +690,7 @@ public:
...
@@ -690,7 +690,7 @@ public:
double
val
()
double
val
()
{
DBUG_ASSERT
(
fixed
==
1
);
return
ulonglong2double
((
ulonglong
)
value
);
}
{
DBUG_ASSERT
(
fixed
==
1
);
return
ulonglong2double
((
ulonglong
)
value
);
}
String
*
val_str
(
String
*
);
String
*
val_str
(
String
*
);
Item
*
new_item
()
{
return
new
Item_uint
(
name
,
max_length
);
}
Item
*
new_item
()
{
return
new
Item_uint
(
name
,
value
,
max_length
);
}
int
save_in_field
(
Field
*
field
,
bool
no_conversions
);
int
save_in_field
(
Field
*
field
,
bool
no_conversions
);
void
print
(
String
*
str
);
void
print
(
String
*
str
);
Item_num
*
neg
();
Item_num
*
neg
();
...
...
sql/item_strfunc.h
View file @
2e01bfc4
...
@@ -531,6 +531,7 @@ public:
...
@@ -531,6 +531,7 @@ public:
{
{
collation
.
set
(
default_charset
());
collation
.
set
(
default_charset
());
decimals
=
0
;
max_length
=
64
;
decimals
=
0
;
max_length
=
64
;
maybe_null
=
1
;
}
}
};
};
...
@@ -623,7 +624,7 @@ public:
...
@@ -623,7 +624,7 @@ public:
}
}
String
*
val_str
(
String
*
str
);
String
*
val_str
(
String
*
str
);
const
char
*
func_name
()
const
{
return
"inet_ntoa"
;
}
const
char
*
func_name
()
const
{
return
"inet_ntoa"
;
}
void
fix_length_and_dec
()
{
decimals
=
0
;
max_length
=
3
*
8
+
7
;
}
void
fix_length_and_dec
()
{
decimals
=
0
;
max_length
=
3
*
8
+
7
;
maybe_null
=
1
;
}
};
};
class
Item_func_quote
:
public
Item_str_func
class
Item_func_quote
:
public
Item_str_func
...
...
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