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
39fe2f6a
Commit
39fe2f6a
authored
21 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-udf-5.0
parents
bb9a92cc
2f468db7
Branches unavailable
Tags unavailable
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
9 deletions
+26
-9
BitKeeper/etc/logging_ok
BitKeeper/etc/logging_ok
+1
-0
scripts/mysql_fix_privilege_tables.sql
scripts/mysql_fix_privilege_tables.sql
+17
-0
sql/sql_class.cc
sql/sql_class.cc
+8
-9
No files found.
BitKeeper/etc/logging_ok
View file @
39fe2f6a
...
@@ -73,6 +73,7 @@ monty@donna.mysql.fi
...
@@ -73,6 +73,7 @@ monty@donna.mysql.fi
monty@hundin.mysql.fi
monty@hundin.mysql.fi
monty@mashka.(none)
monty@mashka.(none)
monty@mashka.mysql.fi
monty@mashka.mysql.fi
monty@mishka.mysql.fi
monty@narttu.
monty@narttu.
monty@narttu.mysql.fi
monty@narttu.mysql.fi
monty@rescue.
monty@rescue.
...
...
This diff is collapsed.
Click to expand it.
scripts/mysql_fix_privilege_tables.sql
View file @
39fe2f6a
...
@@ -99,3 +99,20 @@ ADD Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL;
...
@@ -99,3 +99,20 @@ ADD Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL;
ALTER
TABLE
host
ALTER
TABLE
host
ADD
Create_tmp_table_priv
enum
(
'N'
,
'Y'
)
DEFAULT
'N'
NOT
NULL
,
ADD
Create_tmp_table_priv
enum
(
'N'
,
'Y'
)
DEFAULT
'N'
NOT
NULL
,
ADD
Lock_tables_priv
enum
(
'N'
,
'Y'
)
DEFAULT
'N'
NOT
NULL
;
ADD
Lock_tables_priv
enum
(
'N'
,
'Y'
)
DEFAULT
'N'
NOT
NULL
;
#
#
Create
proc
table
if
it
doesn
't exists
#
CREATE TABLE IF NOT EXISTS proc (
name char(64) binary DEFAULT
''
NOT NULL,
type enum('
function
','
procedure
') NOT NULL,
body blob DEFAULT
''
NOT NULL,
creator char(77) binary DEFAULT
''
NOT NULL,
modified timestamp,
created timestamp,
suid enum ('
N
', '
Y
') DEFAULT '
Y
' NOT NULL,
comment char(64) binary DEFAULT
''
NOT NULL,
PRIMARY KEY (name,type)
) comment='
Stored
Procedures
';
This diff is collapsed.
Click to expand it.
sql/sql_class.cc
View file @
39fe2f6a
...
@@ -1076,28 +1076,26 @@ int select_dumpvar::prepare(List<Item> &list, SELECT_LEX_UNIT *u)
...
@@ -1076,28 +1076,26 @@ int select_dumpvar::prepare(List<Item> &list, SELECT_LEX_UNIT *u)
List_iterator_fast
<
Item
>
li
(
list
);
List_iterator_fast
<
Item
>
li
(
list
);
List_iterator_fast
<
my_var
>
gl
(
var_list
);
List_iterator_fast
<
my_var
>
gl
(
var_list
);
Item
*
item
;
Item
*
item
;
my_var
*
mv
;
LEX_STRING
*
ls
;
local_vars
.
empty
();
// Clear list if SP
unit
=
u
;
row_count
=
0
;
row_count
=
0
;
if
(
var_list
.
elements
!=
list
.
elements
)
if
(
var_list
.
elements
!=
list
.
elements
)
{
{
my_error
(
ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT
,
MYF
(
0
));
my_error
(
ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT
,
MYF
(
0
));
return
1
;
return
1
;
}
}
unit
=
u
;
while
((
item
=
li
++
))
while
((
item
=
li
++
))
{
{
mv
=
gl
++
;
my_var
*
mv
=
gl
++
;
ls
=
&
mv
->
s
;
if
(
mv
->
local
)
if
(
mv
->
local
)
{
(
void
)
local_vars
.
push_back
(
new
Item_splocal
(
mv
->
offset
));
(
void
)
local_vars
.
push_back
(
new
Item_splocal
(
mv
->
offset
));
}
else
else
{
{
Item_func_set_user_var
*
xx
=
new
Item_func_set_user_var
(
*
ls
,
item
);
Item_func_set_user_var
*
xx
=
new
Item_func_set_user_var
(
mv
->
s
,
item
);
xx
->
fix_fields
(
thd
,(
TABLE_LIST
*
)
thd
->
lex
->
select_lex
.
table_list
.
first
,
&
item
);
xx
->
fix_fields
(
thd
,
(
TABLE_LIST
*
)
thd
->
lex
->
select_lex
.
table_list
.
first
,
&
item
);
xx
->
fix_length_and_dec
();
xx
->
fix_length_and_dec
();
vars
.
push_back
(
xx
);
vars
.
push_back
(
xx
);
}
}
...
@@ -1105,6 +1103,7 @@ int select_dumpvar::prepare(List<Item> &list, SELECT_LEX_UNIT *u)
...
@@ -1105,6 +1103,7 @@ int select_dumpvar::prepare(List<Item> &list, SELECT_LEX_UNIT *u)
return
0
;
return
0
;
}
}
bool
select_dumpvar
::
send_data
(
List
<
Item
>
&
items
)
bool
select_dumpvar
::
send_data
(
List
<
Item
>
&
items
)
{
{
List_iterator_fast
<
Item_func_set_user_var
>
li
(
vars
);
List_iterator_fast
<
Item_func_set_user_var
>
li
(
vars
);
...
...
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