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
a6aaca7d
Commit
a6aaca7d
authored
May 22, 2006
by
igor@rurik.mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Post-review fixes for bug #19089
parent
4a27cbfd
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
3 deletions
+10
-3
mysql-test/r/view.result
mysql-test/r/view.result
+1
-1
sql/field.cc
sql/field.cc
+1
-2
sql/field.h
sql/field.h
+5
-0
sql/sql_select.cc
sql/sql_select.cc
+3
-0
No files found.
mysql-test/r/view.result
View file @
a6aaca7d
...
@@ -2716,7 +2716,7 @@ SELECT * FROM t2;
...
@@ -2716,7 +2716,7 @@ SELECT * FROM t2;
a m
a m
xxx 1
xxx 1
yyy 5
yyy 5
NULL
0
xxx
0
DROP VIEW v1;
DROP VIEW v1;
DROP TABLE t1,t2;
DROP TABLE t1,t2;
CREATE TABLE t1 (id int PRIMARY KEY, e ENUM('a','b') NOT NULL DEFAULT 'b');
CREATE TABLE t1 (id int PRIMARY KEY, e ENUM('a','b') NOT NULL DEFAULT 'b');
...
...
sql/field.cc
View file @
a6aaca7d
...
@@ -1228,12 +1228,11 @@ Field::Field(char *ptr_arg,uint32 length_arg,uchar *null_ptr_arg,
...
@@ -1228,12 +1228,11 @@ Field::Field(char *ptr_arg,uint32 length_arg,uchar *null_ptr_arg,
field_name
(
field_name_arg
),
field_name
(
field_name_arg
),
query_id
(
0
),
key_start
(
0
),
part_of_key
(
0
),
part_of_sortkey
(
0
),
query_id
(
0
),
key_start
(
0
),
part_of_key
(
0
),
part_of_sortkey
(
0
),
unireg_check
(
unireg_check_arg
),
unireg_check
(
unireg_check_arg
),
field_length
(
length_arg
),
null_bit
(
null_bit_arg
)
field_length
(
length_arg
),
null_bit
(
null_bit_arg
),
dflt_field
(
0
)
{
{
flags
=
null_ptr
?
0
:
NOT_NULL_FLAG
;
flags
=
null_ptr
?
0
:
NOT_NULL_FLAG
;
comment
.
str
=
(
char
*
)
""
;
comment
.
str
=
(
char
*
)
""
;
comment
.
length
=
0
;
comment
.
length
=
0
;
dflt_field
=
0
;
}
}
uint
Field
::
offset
()
uint
Field
::
offset
()
...
...
sql/field.h
View file @
a6aaca7d
...
@@ -53,6 +53,11 @@ public:
...
@@ -53,6 +53,11 @@ public:
char
*
ptr
;
// Position to field in record
char
*
ptr
;
// Position to field in record
uchar
*
null_ptr
;
// Byte where null_bit is
uchar
*
null_ptr
;
// Byte where null_bit is
/*
dflt_field is used only for the fields of temporary tables.
It points to the default value of the field in another table
from which this field has been created.
*/
Field
*
dflt_field
;
// Field to copy default value from
Field
*
dflt_field
;
// Field to copy default value from
/*
/*
Note that you can use table->in_use as replacement for current_thd member
Note that you can use table->in_use as replacement for current_thd member
...
...
sql/sql_select.cc
View file @
a6aaca7d
...
@@ -8697,8 +8697,11 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
...
@@ -8697,8 +8697,11 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
if
(
is_null
)
if
(
is_null
)
field
->
set_null
();
field
->
set_null
();
else
else
{
field
->
set_notnull
();
memcpy
(
field
->
ptr
,
from
,
field
->
pack_length
());
memcpy
(
field
->
ptr
,
from
,
field
->
pack_length
());
}
}
}
if
(
from_field
[
i
])
if
(
from_field
[
i
])
{
/* Not a table Item */
{
/* Not a table Item */
...
...
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