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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
9fea6f6d
Commit
9fea6f6d
authored
19 years ago
by
jimw@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean
parents
67c9b331
d88b7587
Branches unavailable
Tags unavailable
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
26 deletions
+23
-26
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.cc
+2
-2
sql/item_func.cc
sql/item_func.cc
+19
-19
sql/item_func.h
sql/item_func.h
+1
-4
sql/sql_lex.h
sql/sql_lex.h
+1
-1
No files found.
sql/ha_ndbcluster.cc
View file @
9fea6f6d
...
@@ -416,9 +416,9 @@ void ha_ndbcluster::invalidateDictionaryCache()
...
@@ -416,9 +416,9 @@ void ha_ndbcluster::invalidateDictionaryCache()
NDBDICT
*
dict
=
get_ndb
()
->
getDictionary
();
NDBDICT
*
dict
=
get_ndb
()
->
getDictionary
();
DBUG_PRINT
(
"info"
,
(
"invalidating %s"
,
m_tabname
));
DBUG_PRINT
(
"info"
,
(
"invalidating %s"
,
m_tabname
));
dict
->
invalidateTable
(
m_tabname
);
dict
->
invalidateTable
(
m_tabname
);
table
->
version
=
0L
;
/* Free when thread is ready */
table
->
s
->
version
=
0L
;
/* Free when thread is ready */
/* Invalidate indexes */
/* Invalidate indexes */
for
(
uint
i
=
0
;
i
<
table
->
keys
;
i
++
)
for
(
uint
i
=
0
;
i
<
table
->
s
->
keys
;
i
++
)
{
{
NDBINDEX
*
index
=
(
NDBINDEX
*
)
m_index
[
i
].
index
;
NDBINDEX
*
index
=
(
NDBINDEX
*
)
m_index
[
i
].
index
;
NDBINDEX
*
unique_index
=
(
NDBINDEX
*
)
m_index
[
i
].
unique_index
;
NDBINDEX
*
unique_index
=
(
NDBINDEX
*
)
m_index
[
i
].
unique_index
;
...
...
This diff is collapsed.
Click to expand it.
sql/item_func.cc
View file @
9fea6f6d
...
@@ -4368,33 +4368,19 @@ longlong Item_func_row_count::val_int()
...
@@ -4368,33 +4368,19 @@ longlong Item_func_row_count::val_int()
Item_func_sp
::
Item_func_sp
(
sp_name
*
name
)
Item_func_sp
::
Item_func_sp
(
sp_name
*
name
)
:
Item_func
(),
m_name
(
name
),
m_sp
(
NULL
)
:
Item_func
(),
m_name
(
name
),
m_sp
(
NULL
)
{
{
char
*
empty_name
=
(
char
*
)
""
;
maybe_null
=
1
;
maybe_null
=
1
;
m_name
->
init_qname
(
current_thd
);
m_name
->
init_qname
(
current_thd
);
bzero
(
&
dummy_table
,
sizeof
(
dummy_table
));
dummy_table
=
(
TABLE
*
)
sql_alloc
(
sizeof
(
TABLE
));
dummy_table
.
share
.
table_cache_key
=
empty_name
;
bzero
(
dummy_table
,
sizeof
(
TABLE
));
dummy_table
.
share
.
table_name
=
empty_name
;
dummy_table
.
table
.
alias
=
empty_name
;
dummy_table
.
share
.
table_name
=
empty_name
;
dummy_table
.
table
.
maybe_null
=
maybe_null
;
dummy_table
.
table
.
in_use
=
current_thd
;
dummy_table
.
table
.
s
=
&
dummy_table
.
share
;
}
}
Item_func_sp
::
Item_func_sp
(
sp_name
*
name
,
List
<
Item
>
&
list
)
Item_func_sp
::
Item_func_sp
(
sp_name
*
name
,
List
<
Item
>
&
list
)
:
Item_func
(
list
),
m_name
(
name
),
m_sp
(
NULL
)
:
Item_func
(
list
),
m_name
(
name
),
m_sp
(
NULL
)
{
{
char
*
empty_name
=
(
char
*
)
""
;
maybe_null
=
1
;
maybe_null
=
1
;
m_name
->
init_qname
(
current_thd
);
m_name
->
init_qname
(
current_thd
);
bzero
(
&
dummy_table
,
sizeof
(
dummy_table
));
dummy_table
=
(
TABLE
*
)
sql_alloc
(
sizeof
(
TABLE
));
dummy_table
.
share
.
table_cache_key
=
empty_name
;
bzero
(
dummy_table
,
sizeof
(
TABLE
));
dummy_table
.
share
.
table_name
=
empty_name
;
dummy_table
.
table
.
alias
=
empty_name
;
dummy_table
.
share
.
table_name
=
empty_name
;
dummy_table
.
table
.
maybe_null
=
maybe_null
;
dummy_table
.
table
.
in_use
=
current_thd
;
dummy_table
.
table
.
s
=
&
dummy_table
.
share
;
}
}
const
char
*
const
char
*
...
@@ -4426,7 +4412,21 @@ Item_func_sp::sp_result_field(void) const
...
@@ -4426,7 +4412,21 @@ Item_func_sp::sp_result_field(void) const
THD
*
thd
=
current_thd
;
THD
*
thd
=
current_thd
;
DBUG_ENTER
(
"Item_func_sp::sp_result_field"
);
DBUG_ENTER
(
"Item_func_sp::sp_result_field"
);
if
(
m_sp
)
if
(
m_sp
)
field
=
m_sp
->
make_field
(
max_length
,
name
,
&
dummy_table
.
table
);
{
if
(
dummy_table
->
s
==
NULL
)
{
char
*
empty_name
=
(
char
*
)
""
;
TABLE_SHARE
*
share
;
dummy_table
->
s
=
share
=
&
dummy_table
->
share_not_to_be_used
;
dummy_table
->
alias
=
empty_name
;
dummy_table
->
maybe_null
=
maybe_null
;
dummy_table
->
in_use
=
current_thd
;
share
->
table_cache_key
=
empty_name
;
share
->
table_name
=
empty_name
;
share
->
table_name
=
empty_name
;
}
field
=
m_sp
->
make_field
(
max_length
,
name
,
dummy_table
);
}
DBUG_RETURN
(
field
);
DBUG_RETURN
(
field
);
}
}
...
...
This diff is collapsed.
Click to expand it.
sql/item_func.h
View file @
9fea6f6d
...
@@ -1252,10 +1252,7 @@ class Item_func_sp :public Item_func
...
@@ -1252,10 +1252,7 @@ class Item_func_sp :public Item_func
private:
private:
sp_name
*
m_name
;
sp_name
*
m_name
;
mutable
sp_head
*
m_sp
;
mutable
sp_head
*
m_sp
;
mutable
struct
{
TABLE
*
dummy_table
;
TABLE
table
;
TABLE_SHARE
share
;
}
dummy_table
;
int
execute
(
Item
**
itp
);
int
execute
(
Item
**
itp
);
Field
*
sp_result_field
(
void
)
const
;
Field
*
sp_result_field
(
void
)
const
;
...
...
This diff is collapsed.
Click to expand it.
sql/sql_lex.h
View file @
9fea6f6d
...
@@ -860,7 +860,7 @@ typedef struct st_lex
...
@@ -860,7 +860,7 @@ typedef struct st_lex
inline
bool
requires_prelocking
()
inline
bool
requires_prelocking
()
{
{
return
query_tables_own_last
;
return
test
(
query_tables_own_last
)
;
}
}
inline
void
mark_as_requiring_prelocking
(
TABLE_LIST
**
tables_own_last
)
inline
void
mark_as_requiring_prelocking
(
TABLE_LIST
**
tables_own_last
)
{
{
...
...
This diff is collapsed.
Click to expand it.
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