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
e701333b
Commit
e701333b
authored
Jul 25, 2002
by
monty@mashka.mysql.fi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
INSERT ... VALUES(DEFAULT)
parent
b71b26d1
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
125 additions
and
45 deletions
+125
-45
Docs/manual.texi
Docs/manual.texi
+10
-2
mysql-test/r/insert.result
mysql-test/r/insert.result
+26
-0
mysql-test/r/insert_set.result
mysql-test/r/insert_set.result
+0
-6
mysql-test/t/insert.test
mysql-test/t/insert.test
+26
-0
mysql-test/t/insert_set.test
mysql-test/t/insert_set.test
+0
-10
sql/field.h
sql/field.h
+8
-0
sql/item.cc
sql/item.cc
+2
-0
sql/item.h
sql/item.h
+23
-1
sql/sql_insert.cc
sql/sql_insert.cc
+12
-14
sql/sql_yacc.yy
sql/sql_yacc.yy
+18
-12
No files found.
Docs/manual.texi
View file @
e701333b
...
@@ -34456,13 +34456,13 @@ provide an interactive user interfaces to the database.
...
@@ -34456,13 +34456,13 @@ provide an interactive user interfaces to the database.
@example
@example
INSERT [LOW_PRIORITY | DELAYED] [IGNORE]
INSERT [LOW_PRIORITY | DELAYED] [IGNORE]
[INTO] tbl_name [(col_name,...)]
[INTO] tbl_name [(col_name,...)]
VALUES (
expression
,...),(...),...
VALUES (
(expression | DEFAULT)
,...),(...),...
or INSERT [LOW_PRIORITY | DELAYED] [IGNORE]
or INSERT [LOW_PRIORITY | DELAYED] [IGNORE]
[INTO] tbl_name [(col_name,...)]
[INTO] tbl_name [(col_name,...)]
SELECT ...
SELECT ...
or INSERT [LOW_PRIORITY | DELAYED] [IGNORE]
or INSERT [LOW_PRIORITY | DELAYED] [IGNORE]
[INTO] tbl_name
[INTO] tbl_name
SET col_name=
expression, col_name=expression
, ...
SET col_name=
(expression | DEFAULT)
, ...
@end example
@end example
...
@@ -34492,6 +34492,11 @@ example, if you specify a column list that doesn't name all the columns in
...
@@ -34492,6 +34492,11 @@ example, if you specify a column list that doesn't name all the columns in
the table, unnamed columns are set to their default values. Default value
the table, unnamed columns are set to their default values. Default value
assignment is described in @ref{CREATE TABLE, , @code{CREATE TABLE}}.
assignment is described in @ref{CREATE TABLE, , @code{CREATE TABLE}}.
You can also use the keyword @code{DEFAULT} to set a column to it's
defaults value. (New in MySQL 4.0.3). This makes it easier to write
insert statements as you don't have to use a field-name list just because
you don't want to set a value for a few columns.
MySQL always has a default value for all fields. This is something
MySQL always has a default value for all fields. This is something
that is imposed on MySQL to be able to work with both transactional
that is imposed on MySQL to be able to work with both transactional
and not transactional tables.
and not transactional tables.
...
@@ -50010,6 +50015,9 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}.
...
@@ -50010,6 +50015,9 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}.
@node News-4.0.3, News-4.0.2, News-4.0.x, News-4.0.x
@node News-4.0.3, News-4.0.2, News-4.0.x, News-4.0.x
@appendixsubsec Changes in release 4.0.3
@appendixsubsec Changes in release 4.0.3
@itemize @bullet
@itemize @bullet
@item
Allow @code{DEFAULT} with @code{INSERT} statement.
@item
The startup parameters @code{myisam_max_extra_sort_file_size} and
The startup parameters @code{myisam_max_extra_sort_file_size} and
@code{myisam_max_extra_sort_file_size} are now given in bytes, not megabytes.
@code{myisam_max_extra_sort_file_size} are now given in bytes, not megabytes.
@item
@item
mysql-test/r/insert.result
View file @
e701333b
...
@@ -19,3 +19,29 @@ insert into t1 values (0,"mysql a");
...
@@ -19,3 +19,29 @@ insert into t1 values (0,"mysql a");
insert into t1 values (0,"r1manic");
insert into t1 values (0,"r1manic");
insert into t1 values (0,"r1man");
insert into t1 values (0,"r1man");
drop table t1;
drop table t1;
create table t1 (a int not null auto_increment, primary key (a), t timestamp, c char(10) default "hello");
insert into t1 values (default,default,default), (default,default,default), (4,0,"a"),(default,default,default);
select a,t>0,c from t1;
a t>0 c
1 1 hello
2 1 hello
4 0 a
5 1 hello
truncate table t1;
insert into t1 set a=default,t=default,c=default;
insert into t1 set a=default,t=default,c=default;
insert into t1 set a=4,t=0,c="a";
insert into t1 set a=default,t=default,c=default;
select a,t>0,c from t1;
a t>0 c
1 1 hello
2 1 hello
4 0 a
5 1 hello
drop table t1;
drop database if exists foo;
create database foo;
use foo;
create table t1 (c int);
insert into foo.t1 set foo.t1.c = '1';
drop database foo;
mysql-test/r/insert_set.result
deleted
100644 → 0
View file @
b71b26d1
drop database if exists foo;
create database foo;
use foo;
create table b (c int);
insert into foo.b set foo.b.c = '1';
drop database foo;
mysql-test/t/insert.test
View file @
e701333b
...
@@ -22,3 +22,29 @@ insert into t1 values (0,"mysql a");
...
@@ -22,3 +22,29 @@ insert into t1 values (0,"mysql a");
insert
into
t1
values
(
0
,
"r1manic"
);
insert
into
t1
values
(
0
,
"r1manic"
);
insert
into
t1
values
(
0
,
"r1man"
);
insert
into
t1
values
(
0
,
"r1man"
);
drop
table
t1
;
drop
table
t1
;
#
# Test insert syntax
#
create
table
t1
(
a
int
not
null
auto_increment
,
primary
key
(
a
),
t
timestamp
,
c
char
(
10
)
default
"hello"
);
insert
into
t1
values
(
default
,
default
,
default
),
(
default
,
default
,
default
),
(
4
,
0
,
"a"
),(
default
,
default
,
default
);
select
a
,
t
>
0
,
c
from
t1
;
truncate
table
t1
;
insert
into
t1
set
a
=
default
,
t
=
default
,
c
=
default
;
insert
into
t1
set
a
=
default
,
t
=
default
,
c
=
default
;
insert
into
t1
set
a
=
4
,
t
=
0
,
c
=
"a"
;
insert
into
t1
set
a
=
default
,
t
=
default
,
c
=
default
;
select
a
,
t
>
0
,
c
from
t1
;
drop
table
t1
;
#
# Test of mysqld crash with fully qualified column names
#
drop
database
if
exists
foo
;
create
database
foo
;
use
foo
;
create
table
t1
(
c
int
);
insert
into
foo
.
t1
set
foo
.
t1
.
c
=
'1'
;
drop
database
foo
;
mysql-test/t/insert_set.test
deleted
100644 → 0
View file @
b71b26d1
#
# Test of mysqld crash with fully qualified column names
#
drop
database
if
exists
foo
;
create
database
foo
;
use
foo
;
create
table
b
(
c
int
);
insert
into
foo
.
b
set
foo
.
b
.
c
=
'1'
;
drop
database
foo
;
sql/field.h
View file @
e701333b
...
@@ -70,6 +70,10 @@ public:
...
@@ -70,6 +70,10 @@ public:
virtual
uint32
pack_length
()
const
{
return
(
uint32
)
field_length
;
}
virtual
uint32
pack_length
()
const
{
return
(
uint32
)
field_length
;
}
virtual
void
reset
(
void
)
{
bzero
(
ptr
,
pack_length
());
}
virtual
void
reset
(
void
)
{
bzero
(
ptr
,
pack_length
());
}
virtual
void
reset_fields
()
{}
virtual
void
reset_fields
()
{}
virtual
void
set_default
()
{
memcpy
(
ptr
,
ptr
+
table
->
rec_buff_length
,
pack_length
());
}
virtual
bool
binary
()
const
{
return
1
;
}
virtual
bool
binary
()
const
{
return
1
;
}
virtual
bool
zero_pack
()
const
{
return
1
;
}
virtual
bool
zero_pack
()
const
{
return
1
;
}
virtual
enum
ha_base_keytype
key_type
()
const
{
return
HA_KEYTYPE_BINARY
;
}
virtual
enum
ha_base_keytype
key_type
()
const
{
return
HA_KEYTYPE_BINARY
;
}
...
@@ -550,6 +554,10 @@ public:
...
@@ -550,6 +554,10 @@ public:
bool
store_for_compare
()
{
return
1
;
}
bool
store_for_compare
()
{
return
1
;
}
bool
zero_pack
()
const
{
return
0
;
}
bool
zero_pack
()
const
{
return
0
;
}
void
set_time
();
void
set_time
();
virtual
void
set_default
()
{
set_time
();
}
inline
long
get_timestamp
()
inline
long
get_timestamp
()
{
{
#ifdef WORDS_BIGENDIAN
#ifdef WORDS_BIGENDIAN
...
...
sql/item.cc
View file @
e701333b
...
@@ -383,12 +383,14 @@ void Item_datetime::make_field(Send_field *tmp_field)
...
@@ -383,12 +383,14 @@ void Item_datetime::make_field(Send_field *tmp_field)
init_make_field
(
tmp_field
,
FIELD_TYPE_DATETIME
);
init_make_field
(
tmp_field
,
FIELD_TYPE_DATETIME
);
}
}
void
Item_null
::
make_field
(
Send_field
*
tmp_field
)
void
Item_null
::
make_field
(
Send_field
*
tmp_field
)
{
{
init_make_field
(
tmp_field
,
FIELD_TYPE_NULL
);
init_make_field
(
tmp_field
,
FIELD_TYPE_NULL
);
tmp_field
->
length
=
4
;
tmp_field
->
length
=
4
;
}
}
void
Item_func
::
make_field
(
Send_field
*
tmp_field
)
void
Item_func
::
make_field
(
Send_field
*
tmp_field
)
{
{
init_make_field
(
tmp_field
,
((
result_type
()
==
STRING_RESULT
)
?
init_make_field
(
tmp_field
,
((
result_type
()
==
STRING_RESULT
)
?
...
...
sql/item.h
View file @
e701333b
...
@@ -31,7 +31,7 @@ public:
...
@@ -31,7 +31,7 @@ public:
enum
Type
{
FIELD_ITEM
,
FUNC_ITEM
,
SUM_FUNC_ITEM
,
STRING_ITEM
,
enum
Type
{
FIELD_ITEM
,
FUNC_ITEM
,
SUM_FUNC_ITEM
,
STRING_ITEM
,
INT_ITEM
,
REAL_ITEM
,
NULL_ITEM
,
VARBIN_ITEM
,
INT_ITEM
,
REAL_ITEM
,
NULL_ITEM
,
VARBIN_ITEM
,
COPY_STR_ITEM
,
FIELD_AVG_ITEM
,
COPY_STR_ITEM
,
FIELD_AVG_ITEM
,
DEFAULT_ITEM
,
PROC_ITEM
,
COND_ITEM
,
REF_ITEM
,
FIELD_STD_ITEM
,
CONST_ITEM
};
PROC_ITEM
,
COND_ITEM
,
REF_ITEM
,
FIELD_STD_ITEM
,
CONST_ITEM
};
enum
cond_result
{
COND_UNDEF
,
COND_OK
,
COND_TRUE
,
COND_FALSE
};
enum
cond_result
{
COND_UNDEF
,
COND_OK
,
COND_TRUE
,
COND_FALSE
};
...
@@ -285,6 +285,28 @@ public:
...
@@ -285,6 +285,28 @@ public:
unsigned
int
size_of
()
{
return
sizeof
(
*
this
);}
unsigned
int
size_of
()
{
return
sizeof
(
*
this
);}
};
};
/* For INSERT ... VALUES (DEFAULT) */
class
Item_default
:
public
Item
{
public:
Item_default
()
{
name
=
(
char
*
)
"DEFAULT"
;
}
enum
Type
type
()
const
{
return
DEFAULT_ITEM
;
}
void
make_field
(
Send_field
*
field
)
{}
bool
save_in_field
(
Field
*
field
)
{
field
->
set_default
();
return
0
;
}
virtual
double
val
()
{
return
0.0
;
}
virtual
longlong
val_int
()
{
return
0
;
}
virtual
String
*
val_str
(
String
*
str
)
{
return
0
;
}
bool
basic_const_item
()
const
{
return
1
;
}
unsigned
int
size_of
()
{
return
sizeof
(
*
this
);}
};
/* for show tables */
/* for show tables */
class
Item_datetime
:
public
Item_string
class
Item_datetime
:
public
Item_string
...
...
sql/sql_insert.cc
View file @
e701333b
...
@@ -60,7 +60,7 @@ check_insert_fields(THD *thd,TABLE *table,List<Item> &fields,
...
@@ -60,7 +60,7 @@ check_insert_fields(THD *thd,TABLE *table,List<Item> &fields,
if
(
grant_option
&&
if
(
grant_option
&&
check_grant_all_columns
(
thd
,
INSERT_ACL
,
table
))
check_grant_all_columns
(
thd
,
INSERT_ACL
,
table
))
return
-
1
;
return
-
1
;
table
->
time_stamp
=
0
;
// This
should be saved
table
->
time_stamp
=
0
;
// This
is saved by caller
}
}
else
else
{
// Part field list
{
// Part field list
...
@@ -178,7 +178,7 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, List<Item> &fields,
...
@@ -178,7 +178,7 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, List<Item> &fields,
}
}
its
.
rewind
();
its
.
rewind
();
/*
/*
**
Fill in the given fields and dump it to the table file
Fill in the given fields and dump it to the table file
*/
*/
info
.
records
=
info
.
deleted
=
info
.
copied
=
0
;
info
.
records
=
info
.
deleted
=
info
.
copied
=
0
;
...
@@ -204,7 +204,7 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, List<Item> &fields,
...
@@ -204,7 +204,7 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, List<Item> &fields,
thd
->
variables
.
bulk_insert_buff_size
);
thd
->
variables
.
bulk_insert_buff_size
);
}
}
while
((
values
=
its
++
))
while
((
values
=
its
++
))
{
{
if
(
fields
.
elements
||
!
value_count
)
if
(
fields
.
elements
||
!
value_count
)
{
{
...
@@ -367,7 +367,7 @@ static int last_uniq_key(TABLE *table,uint keynr)
...
@@ -367,7 +367,7 @@ static int last_uniq_key(TABLE *table,uint keynr)
/*
/*
**
Write a record to table with optional deleting of conflicting records
Write a record to table with optional deleting of conflicting records
*/
*/
...
@@ -461,9 +461,9 @@ err:
...
@@ -461,9 +461,9 @@ err:
/******************************************************************************
/******************************************************************************
Check that all fields with arn't null_fields are used
Check that all fields with arn't null_fields are used
if DONT_USE_DEFAULT_FIELDS isn't defined use default value for no
t
If DONT_USE_DEFAULT_FIELDS isn't defined use default value for not se
t
set
fields.
fields.
******************************************************************************/
******************************************************************************/
static
int
check_null_fields
(
THD
*
thd
__attribute__
((
unused
)),
static
int
check_null_fields
(
THD
*
thd
__attribute__
((
unused
)),
...
@@ -486,10 +486,8 @@ static int check_null_fields(THD *thd __attribute__((unused)),
...
@@ -486,10 +486,8 @@ static int check_null_fields(THD *thd __attribute__((unused)),
}
}
/*****************************************************************************
/*****************************************************************************
** Handling of delayed inserts
Handling of delayed inserts
**
A thread is created for each table that one uses with the DELAYED attribute.
** A thread is created for each table that one uses with the DELAYED
** attribute.
*****************************************************************************/
*****************************************************************************/
class
delayed_row
:
public
ilink
{
class
delayed_row
:
public
ilink
{
...
@@ -1272,7 +1270,7 @@ bool delayed_insert::handle_inserts(void)
...
@@ -1272,7 +1270,7 @@ bool delayed_insert::handle_inserts(void)
/***************************************************************************
/***************************************************************************
** s
tore records in INSERT ... SELECT *
S
tore records in INSERT ... SELECT *
***************************************************************************/
***************************************************************************/
int
int
...
@@ -1389,7 +1387,7 @@ bool select_insert::send_eof()
...
@@ -1389,7 +1387,7 @@ bool select_insert::send_eof()
/***************************************************************************
/***************************************************************************
**
CREATE TABLE (SELECT) ...
CREATE TABLE (SELECT) ...
***************************************************************************/
***************************************************************************/
int
int
...
@@ -1487,7 +1485,7 @@ void select_create::abort()
...
@@ -1487,7 +1485,7 @@ void select_create::abort()
/*****************************************************************************
/*****************************************************************************
**
Instansiate templates
Instansiate templates
*****************************************************************************/
*****************************************************************************/
#ifdef __GNUC__
#ifdef __GNUC__
...
...
sql/sql_yacc.yy
View file @
e701333b
...
@@ -519,7 +519,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
...
@@ -519,7 +519,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
literal text_literal insert_ident order_ident
literal text_literal insert_ident order_ident
simple_ident select_item2 expr opt_expr opt_else sum_expr in_sum_expr
simple_ident select_item2 expr opt_expr opt_else sum_expr in_sum_expr
table_wild opt_pad no_in_expr expr_expr simple_expr no_and_expr
table_wild opt_pad no_in_expr expr_expr simple_expr no_and_expr
using_list expr_or_default
using_list expr_or_default
set_expr_or_default
%type <item_list>
%type <item_list>
expr_list udf_expr_list when_list ident_list ident_list_arg
expr_list udf_expr_list when_list ident_list ident_list_arg
...
@@ -2486,7 +2486,7 @@ ident_eq_list:
...
@@ -2486,7 +2486,7 @@ ident_eq_list:
ident_eq_value;
ident_eq_value;
ident_eq_value:
ident_eq_value:
simple_ident equal expr
simple_ident equal expr
_or_default
{
{
LEX *lex=Lex;
LEX *lex=Lex;
if (lex->field_list.push_back($1) ||
if (lex->field_list.push_back($1) ||
...
@@ -2521,16 +2521,22 @@ opt_values:
...
@@ -2521,16 +2521,22 @@ opt_values:
| values;
| values;
values:
values:
values ',' expr
values ',' expr
_or_default
{
{
if (Lex->insert_list->push_back($3))
if (Lex->insert_list->push_back($3))
YYABORT;
YYABORT;
}
}
| expr
| expr_or_default
{
{
if (Lex->insert_list->push_back($1))
if (Lex->insert_list->push_back($1))
YYABORT;
YYABORT;
};
}
;
expr_or_default:
expr { $$= $1;}
| DEFAULT {$$= new Item_default(); }
;
/* Update rows in a table */
/* Update rows in a table */
...
@@ -3257,12 +3263,12 @@ option_value:
...
@@ -3257,12 +3263,12 @@ option_value:
{
{
Lex->var_list.push_back(new set_var_user(new Item_func_set_user_var($2,$4)));
Lex->var_list.push_back(new set_var_user(new Item_func_set_user_var($2,$4)));
}
}
| internal_variable_name equal expr_or_default
| internal_variable_name equal
set_
expr_or_default
{
{
LEX *lex=Lex;
LEX *lex=Lex;
lex->var_list.push_back(new set_var(lex->option_type, $1, $3));
lex->var_list.push_back(new set_var(lex->option_type, $1, $3));
}
}
| '@' '@' opt_var_ident_type internal_variable_name equal expr_or_default
| '@' '@' opt_var_ident_type internal_variable_name equal
set_
expr_or_default
{
{
LEX *lex=Lex;
LEX *lex=Lex;
lex->var_list.push_back(new set_var((enum_var_type) $3, $4, $6));
lex->var_list.push_back(new set_var((enum_var_type) $3, $4, $6));
...
@@ -3274,7 +3280,7 @@ option_value:
...
@@ -3274,7 +3280,7 @@ option_value:
find_sys_var("transaction_isolation_num"),
find_sys_var("transaction_isolation_num"),
new Item_int((int) $4)));
new Item_int((int) $4)));
}
}
| CHAR_SYM SET opt_equal expr_or_default
| CHAR_SYM SET opt_equal
set_
expr_or_default
{
{
LEX *lex=Lex;
LEX *lex=Lex;
lex->var_list.push_back(new set_var(lex->option_type,
lex->var_list.push_back(new set_var(lex->option_type,
...
@@ -3327,7 +3333,7 @@ text_or_password:
...
@@ -3327,7 +3333,7 @@ text_or_password:
};
};
expr_or_default:
set_
expr_or_default:
expr { $$=$1; }
expr { $$=$1; }
| DEFAULT { $$=0; }
| DEFAULT { $$=0; }
| ON { $$=new Item_string("ON",2); }
| ON { $$=new Item_string("ON",2); }
...
...
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