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
40305d7a
Commit
40305d7a
authored
Jun 16, 2006
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
After merge fixes
parent
cc542b2f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
5 deletions
+4
-5
sql/handler.cc
sql/handler.cc
+2
-0
sql/sql_class.h
sql/sql_class.h
+1
-4
sql/sql_insert.cc
sql/sql_insert.cc
+1
-1
No files found.
sql/handler.cc
View file @
40305d7a
...
@@ -53,6 +53,8 @@ st_plugin_int *hton2plugin[MAX_HA];
...
@@ -53,6 +53,8 @@ st_plugin_int *hton2plugin[MAX_HA];
static
handlerton
*
installed_htons
[
128
];
static
handlerton
*
installed_htons
[
128
];
#define BITMAP_STACKBUF_SIZE (128/8)
KEY_CREATE_INFO
default_key_create_info
=
{
HA_KEY_ALG_UNDEF
,
0
,
{
NullS
,
0
}
};
KEY_CREATE_INFO
default_key_create_info
=
{
HA_KEY_ALG_UNDEF
,
0
,
{
NullS
,
0
}
};
/* static functions defined in this file */
/* static functions defined in this file */
...
...
sql/sql_class.h
View file @
40305d7a
...
@@ -1611,14 +1611,11 @@ public:
...
@@ -1611,14 +1611,11 @@ public:
List
<
Item
>
&
select_fields
,
enum_duplicates
duplic
,
bool
ignore
)
List
<
Item
>
&
select_fields
,
enum_duplicates
duplic
,
bool
ignore
)
:
select_insert
(
NULL
,
NULL
,
&
select_fields
,
0
,
0
,
duplic
,
ignore
),
:
select_insert
(
NULL
,
NULL
,
&
select_fields
,
0
,
0
,
duplic
,
ignore
),
create_table
(
table
),
extra_fields
(
&
fields_par
),
keys
(
&
keys_par
),
create_table
(
table
),
extra_fields
(
&
fields_par
),
keys
(
&
keys_par
),
create_info
(
create_info_par
),
create_info
(
create_info_par
)
lock
(
0
)
{}
{}
int
prepare
(
List
<
Item
>
&
list
,
SELECT_LEX_UNIT
*
u
);
int
prepare
(
List
<
Item
>
&
list
,
SELECT_LEX_UNIT
*
u
);
#ifdef HAVE_ROW_BASED_REPLICATION
void
binlog_show_create_table
(
TABLE
**
tables
,
uint
count
);
void
binlog_show_create_table
(
TABLE
**
tables
,
uint
count
);
#endif
void
store_values
(
List
<
Item
>
&
values
);
void
store_values
(
List
<
Item
>
&
values
);
void
send_error
(
uint
errcode
,
const
char
*
err
);
void
send_error
(
uint
errcode
,
const
char
*
err
);
bool
send_eof
();
bool
send_eof
();
...
...
sql/sql_insert.cc
View file @
40305d7a
...
@@ -2772,7 +2772,7 @@ select_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
...
@@ -2772,7 +2772,7 @@ select_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
unit
=
u
;
unit
=
u
;
if
(
!
(
table
=
create_table_from_items
(
thd
,
create_info
,
create_table
,
if
(
!
(
table
=
create_table_from_items
(
thd
,
create_info
,
create_table
,
extra_fields
,
keys
,
&
values
,
&
lock
,
extra_fields
,
keys
,
&
values
,
&
lock
,
&
hook_ptr
)))
hook_ptr
)))
DBUG_RETURN
(
-
1
);
// abort() deletes table
DBUG_RETURN
(
-
1
);
// abort() deletes table
if
(
table
->
s
->
fields
<
values
.
elements
)
if
(
table
->
s
->
fields
<
values
.
elements
)
...
...
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