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
49874ff8
Commit
49874ff8
authored
Jun 10, 2011
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
more buildbot fixes
parent
f1a5c49c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
19 deletions
+10
-19
mysql-test/t/dyncol.test
mysql-test/t/dyncol.test
+8
-5
mysql-test/t/func_time.test
mysql-test/t/func_time.test
+1
-0
sql/field.h
sql/field.h
+1
-14
No files found.
mysql-test/t/dyncol.test
View file @
49874ff8
...
@@ -87,7 +87,7 @@ select column_get(column_create(1, -1212 AS int), 1 as unsigned int);
...
@@ -87,7 +87,7 @@ select column_get(column_create(1, -1212 AS int), 1 as unsigned int);
select
column_get
(
column_create
(
1
,
99999999999999999999999999999
AS
decimal
),
1
as
unsigned
int
);
select
column_get
(
column_create
(
1
,
99999999999999999999999999999
AS
decimal
),
1
as
unsigned
int
);
select
column_get
(
column_create
(
1
,
999.9999999999999999
AS
decimal
),
1
as
unsigned
int
);
select
column_get
(
column_create
(
1
,
999.9999999999999999
AS
decimal
),
1
as
unsigned
int
);
select
column_get
(
column_create
(
1
,
-
1
AS
decimal
),
1
as
unsigned
int
);
select
column_get
(
column_create
(
1
,
-
1
AS
decimal
),
1
as
unsigned
int
);
--
replace_result
1
e
+
02
9
1
e
+
29
--
replace_result
e
+
02
9
e
+
29
select
column_get
(
column_create
(
1
,
99999999999999999999999999999
AS
double
),
1
as
unsigned
int
);
select
column_get
(
column_create
(
1
,
99999999999999999999999999999
AS
double
),
1
as
unsigned
int
);
select
column_get
(
column_create
(
1
,
999.9
AS
double
),
1
as
unsigned
int
);
select
column_get
(
column_create
(
1
,
999.9
AS
double
),
1
as
unsigned
int
);
select
column_get
(
column_create
(
1
,
-
1
AS
double
),
1
as
unsigned
int
);
select
column_get
(
column_create
(
1
,
-
1
AS
double
),
1
as
unsigned
int
);
...
@@ -119,7 +119,7 @@ select column_get(column_create(1, 99999999999999999999999999999 AS decimal), 1
...
@@ -119,7 +119,7 @@ select column_get(column_create(1, 99999999999999999999999999999 AS decimal), 1
select
column_get
(
column_create
(
1
,
-
99999999999999999999999999999
AS
decimal
),
1
as
int
);
select
column_get
(
column_create
(
1
,
-
99999999999999999999999999999
AS
decimal
),
1
as
int
);
select
column_get
(
column_create
(
1
,
999.9999999999999999
AS
decimal
),
1
as
int
);
select
column_get
(
column_create
(
1
,
999.9999999999999999
AS
decimal
),
1
as
int
);
select
column_get
(
column_create
(
1
,
999.9
AS
double
),
1
as
int
);
select
column_get
(
column_create
(
1
,
999.9
AS
double
),
1
as
int
);
--
replace_result
1
e
+
02
9
1
e
+
29
--
replace_result
e
+
02
9
e
+
29
select
column_get
(
column_create
(
1
,
-
99999999999999999999999999999
AS
double
),
1
as
int
);
select
column_get
(
column_create
(
1
,
-
99999999999999999999999999999
AS
double
),
1
as
int
);
select
column_get
(
column_create
(
1
,
"-1212III"
AS
char
),
1
as
int
);
select
column_get
(
column_create
(
1
,
"-1212III"
AS
char
),
1
as
int
);
select
column_get
(
column_create
(
1
,
"1212III"
AS
char
),
1
as
int
);
select
column_get
(
column_create
(
1
,
"1212III"
AS
char
),
1
as
int
);
...
@@ -259,11 +259,12 @@ set @@sql_mode="";
...
@@ -259,11 +259,12 @@ set @@sql_mode="";
--
echo
# column get datetime truncation & warnings
--
echo
# column get datetime truncation & warnings
select
column_get
(
column_create
(
1
,
"1223.5aa"
AS
char
),
1
as
datetime
);
select
column_get
(
column_create
(
1
,
"1223.5aa"
AS
char
),
1
as
datetime
);
--
replace_result
e
+
01
9
e
+
19
select
column_get
(
column_create
(
1
,
18446744073709551615
AS
unsigned
int
),
1
as
datetime
);
select
column_get
(
column_create
(
1
,
18446744073709551615
AS
unsigned
int
),
1
as
datetime
);
select
column_get
(
column_create
(
1
,
9223372036854775807
AS
int
),
1
as
datetime
);
select
column_get
(
column_create
(
1
,
9223372036854775807
AS
int
),
1
as
datetime
);
select
column_get
(
column_create
(
1
,
-
9223372036854775808
AS
int
),
1
as
datetime
);
select
column_get
(
column_create
(
1
,
-
9223372036854775808
AS
int
),
1
as
datetime
);
select
column_get
(
column_create
(
1
,
99999999999999999999999999999
AS
decimal
(
32
,
10
)),
1
as
datetime
);
select
column_get
(
column_create
(
1
,
99999999999999999999999999999
AS
decimal
(
32
,
10
)),
1
as
datetime
);
--
replace_re
gex
/
9.9999999999999991
e
\
+
02
8
/
9.99999999999999914332e+28
/
--
replace_re
sult
e
+
02
9
e
+
29
select
column_get
(
column_create
(
1
,
99999999999999999999999999999
AS
double
),
1
as
datetime
);
select
column_get
(
column_create
(
1
,
99999999999999999999999999999
AS
double
),
1
as
datetime
);
select
column_get
(
column_create
(
1
,
"2011-02-32 8:46:06.23434"
AS
CHAR
),
1
as
datetime
);
select
column_get
(
column_create
(
1
,
"2011-02-32 8:46:06.23434"
AS
CHAR
),
1
as
datetime
);
select
column_get
(
column_create
(
1
,
"2011-13-01 8:46:06.23434"
AS
CHAR
),
1
as
datetime
);
select
column_get
(
column_create
(
1
,
"2011-13-01 8:46:06.23434"
AS
CHAR
),
1
as
datetime
);
...
@@ -305,11 +306,12 @@ set @@sql_mode="";
...
@@ -305,11 +306,12 @@ set @@sql_mode="";
--
echo
# column get date truncation & warnings
--
echo
# column get date truncation & warnings
select
column_get
(
column_create
(
1
,
"1223.5aa"
AS
char
),
1
as
date
);
select
column_get
(
column_create
(
1
,
"1223.5aa"
AS
char
),
1
as
date
);
--
replace_result
e
+
01
9
e
+
19
select
column_get
(
column_create
(
1
,
18446744073709551615
AS
unsigned
int
),
1
as
date
);
select
column_get
(
column_create
(
1
,
18446744073709551615
AS
unsigned
int
),
1
as
date
);
select
column_get
(
column_create
(
1
,
9223372036854775807
AS
int
),
1
as
date
);
select
column_get
(
column_create
(
1
,
9223372036854775807
AS
int
),
1
as
date
);
select
column_get
(
column_create
(
1
,
-
9223372036854775808
AS
int
),
1
as
date
);
select
column_get
(
column_create
(
1
,
-
9223372036854775808
AS
int
),
1
as
date
);
select
column_get
(
column_create
(
1
,
99999999999999999999999999999
AS
decimal
(
32
,
10
)),
1
as
date
);
select
column_get
(
column_create
(
1
,
99999999999999999999999999999
AS
decimal
(
32
,
10
)),
1
as
date
);
--
replace_re
gex
/
9.9999999999999991
e
\
+
02
8
/
9.99999999999999914332e+28
/
--
replace_re
sult
e
+
02
9
e
+
29
select
column_get
(
column_create
(
1
,
99999999999999999999999999999
AS
double
),
1
as
date
);
select
column_get
(
column_create
(
1
,
99999999999999999999999999999
AS
double
),
1
as
date
);
select
column_get
(
column_create
(
1
,
"2011-02-32 8:46:06.23434"
AS
CHAR
),
1
as
date
);
select
column_get
(
column_create
(
1
,
"2011-02-32 8:46:06.23434"
AS
CHAR
),
1
as
date
);
select
column_get
(
column_create
(
1
,
"2011-13-01 8:46:06.23434"
AS
CHAR
),
1
as
date
);
select
column_get
(
column_create
(
1
,
"2011-13-01 8:46:06.23434"
AS
CHAR
),
1
as
date
);
...
@@ -355,11 +357,12 @@ set @@sql_mode="";
...
@@ -355,11 +357,12 @@ set @@sql_mode="";
--
echo
# column get date truncation & warnings
--
echo
# column get date truncation & warnings
select
column_get
(
column_create
(
1
,
"1223.5aa"
AS
char
),
1
as
time
);
select
column_get
(
column_create
(
1
,
"1223.5aa"
AS
char
),
1
as
time
);
select
column_get
(
column_create
(
1
,
"1223.5aa"
AS
char
),
1
as
time
(
3
));
select
column_get
(
column_create
(
1
,
"1223.5aa"
AS
char
),
1
as
time
(
3
));
--
replace_result
e
+
01
9
e
+
19
select
column_get
(
column_create
(
1
,
18446744073709551615
AS
unsigned
int
),
1
as
time
);
select
column_get
(
column_create
(
1
,
18446744073709551615
AS
unsigned
int
),
1
as
time
);
select
column_get
(
column_create
(
1
,
9223372036854775807
AS
int
),
1
as
time
);
select
column_get
(
column_create
(
1
,
9223372036854775807
AS
int
),
1
as
time
);
select
column_get
(
column_create
(
1
,
-
9223372036854775808
AS
int
),
1
as
time
);
select
column_get
(
column_create
(
1
,
-
9223372036854775808
AS
int
),
1
as
time
);
select
column_get
(
column_create
(
1
,
99999999999999999999999999999
AS
decimal
(
32
,
10
)),
1
as
time
);
select
column_get
(
column_create
(
1
,
99999999999999999999999999999
AS
decimal
(
32
,
10
)),
1
as
time
);
--
replace_result
1
e
+
02
9
1
e
+
29
--
replace_result
e
+
02
9
e
+
29
select
column_get
(
column_create
(
1
,
99999999999999999999999999999
AS
double
),
1
as
time
);
select
column_get
(
column_create
(
1
,
99999999999999999999999999999
AS
double
),
1
as
time
);
select
column_get
(
column_create
(
1
,
"2011-02-32 8:46:06.23434"
AS
CHAR
),
1
as
time
);
select
column_get
(
column_create
(
1
,
"2011-02-32 8:46:06.23434"
AS
CHAR
),
1
as
time
);
select
column_get
(
column_create
(
1
,
"2011-13-01 8:46:06.23434"
AS
CHAR
),
1
as
time
);
select
column_get
(
column_create
(
1
,
"2011-13-01 8:46:06.23434"
AS
CHAR
),
1
as
time
);
...
...
mysql-test/t/func_time.test
View file @
49874ff8
...
@@ -18,6 +18,7 @@ select sec_to_time(9001),sec_to_time(9001)+0,time_to_sec("15:12:22"),
...
@@ -18,6 +18,7 @@ select sec_to_time(9001),sec_to_time(9001)+0,time_to_sec("15:12:22"),
select
sec_to_time
(
9001.1
),
time_to_sec
(
'15:12:22.123456'
),
time_to_sec
(
15.5566778899
);
select
sec_to_time
(
9001.1
),
time_to_sec
(
'15:12:22.123456'
),
time_to_sec
(
15.5566778899
);
select
sec_to_time
(
time_to_sec
(
'-838:59:59'
));
select
sec_to_time
(
time_to_sec
(
'-838:59:59'
));
select
sec_to_time
(
'9001.1'
),
sec_to_time
(
'1234567890123.123'
);
select
sec_to_time
(
'9001.1'
),
sec_to_time
(
'1234567890123.123'
);
--
replace_result
e
+
042
e
+
42
select
sec_to_time
(
90011
e
-
1
),
sec_to_time
(
1234567890123
e30
);
select
sec_to_time
(
90011
e
-
1
),
sec_to_time
(
1234567890123
e30
);
select
sec_to_time
(
1234567890123
),
sec_to_time
(
'99999999999999999999999999999'
);
select
sec_to_time
(
1234567890123
),
sec_to_time
(
'99999999999999999999999999999'
);
select
now
()
-
curdate
()
*
1000000
-
curtime
();
select
now
()
-
curdate
()
*
1000000
-
curtime
();
...
...
sql/field.h
View file @
49874ff8
...
@@ -1269,10 +1269,7 @@ public:
...
@@ -1269,10 +1269,7 @@ public:
{
return
Field
::
unpack
(
to
,
from
,
param_data
);
}
{
return
Field
::
unpack
(
to
,
from
,
param_data
);
}
uint
size_of
()
const
{
return
sizeof
(
*
this
);
}
uint
size_of
()
const
{
return
sizeof
(
*
this
);
}
bool
eq_def
(
Field
*
field
)
bool
eq_def
(
Field
*
field
)
{
{
return
Field_str
::
eq_def
(
field
)
&&
dec
==
field
->
decimals
();
}
return
(
Field_str
::
eq_def
(
field
)
&&
dec
==
((
Field_timestamp_hires
*
)
field
)
->
dec
);
}
};
};
...
@@ -1450,11 +1447,6 @@ public:
...
@@ -1450,11 +1447,6 @@ public:
void
sql_type
(
String
&
str
)
const
;
void
sql_type
(
String
&
str
)
const
;
void
make_field
(
Send_field
*
);
void
make_field
(
Send_field
*
);
uint
size_of
()
const
{
return
sizeof
(
*
this
);
}
uint
size_of
()
const
{
return
sizeof
(
*
this
);
}
bool
eq_def
(
Field
*
field
)
{
return
(
Field_str
::
eq_def
(
field
)
&&
dec
==
((
Field_time_hires
*
)
field
)
->
dec
);
}
};
};
class
Field_datetime
:
public
Field_temporal
{
class
Field_datetime
:
public
Field_temporal
{
...
@@ -1527,11 +1519,6 @@ public:
...
@@ -1527,11 +1519,6 @@ public:
const
uchar
*
unpack
(
uchar
*
to
,
const
uchar
*
from
,
uint
param_data
)
const
uchar
*
unpack
(
uchar
*
to
,
const
uchar
*
from
,
uint
param_data
)
{
return
Field
::
unpack
(
to
,
from
,
param_data
);
}
{
return
Field
::
unpack
(
to
,
from
,
param_data
);
}
uint
size_of
()
const
{
return
sizeof
(
*
this
);
}
uint
size_of
()
const
{
return
sizeof
(
*
this
);
}
bool
eq_def
(
Field
*
field
)
{
return
(
Field_str
::
eq_def
(
field
)
&&
dec
==
((
Field_datetime_hires
*
)
field
)
->
dec
);
}
};
};
static
inline
Field_timestamp
*
static
inline
Field_timestamp
*
...
...
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
