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
03042c7d
Commit
03042c7d
authored
Sep 24, 2003
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Post-merge fixes.
parent
cd8508d3
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
51 additions
and
51 deletions
+51
-51
client/mysqltest.c
client/mysqltest.c
+2
-1
libmysqld/lib_sql.cc
libmysqld/lib_sql.cc
+2
-2
mysql-test/r/distinct.result
mysql-test/r/distinct.result
+2
-2
mysql-test/r/query_cache.result
mysql-test/r/query_cache.result
+4
-4
mysql-test/r/sp-error.result
mysql-test/r/sp-error.result
+1
-1
mysql-test/r/variables.result
mysql-test/r/variables.result
+1
-1
mysql-test/t/distinct.test
mysql-test/t/distinct.test
+2
-2
mysql-test/t/sp-error.test
mysql-test/t/sp-error.test
+23
-23
sql/item.cc
sql/item.cc
+1
-1
sql/lex.h
sql/lex.h
+0
-1
sql/sp.cc
sql/sp.cc
+2
-2
sql/sp_cache.h
sql/sp_cache.h
+1
-1
sql/sql_cache.cc
sql/sql_cache.cc
+1
-1
sql/sql_insert.cc
sql/sql_insert.cc
+1
-1
sql/sql_prepare.cc
sql/sql_prepare.cc
+1
-1
sql/sql_repl.cc
sql/sql_repl.cc
+7
-7
No files found.
client/mysqltest.c
View file @
03042c7d
...
...
@@ -206,8 +206,9 @@ Q_SERVER_START, Q_SERVER_STOP,Q_REQUIRE_MANAGER,
Q_WAIT_FOR_SLAVE_TO_STOP
,
Q_REQUIRE_VERSION
,
Q_ENABLE_WARNINGS
,
Q_DISABLE_WARNINGS
,
Q_ENABLE_INFO
,
Q_DISABLE_INFO
,
Q_DELIMITER
,
Q_ENABLE_INFO
,
Q_DISABLE_INFO
,
Q_EXEC
,
Q_DELIMITER
,
Q_UNKNOWN
,
/* Unknown command. */
Q_COMMENT
,
/* Comments, ignored. */
Q_COMMENT_WITH_COMMAND
...
...
libmysqld/lib_sql.cc
View file @
03042c7d
...
...
@@ -698,7 +698,7 @@ bool Protocol::convert_str(const char *from, uint length)
bool
setup_params_data
(
st_prep_stmt
*
stmt
)
{
THD
*
thd
=
stmt
->
thd
;
List
<
Item
>
&
params
=
thd
->
lex
.
param_list
;
List
<
Item
>
&
params
=
thd
->
lex
->
param_list
;
List_iterator
<
Item
>
param_iterator
(
params
);
Item_param
*
param
;
ulong
param_no
=
0
;
...
...
@@ -728,7 +728,7 @@ bool setup_params_data(st_prep_stmt *stmt)
bool
setup_params_data_withlog
(
st_prep_stmt
*
stmt
)
{
THD
*
thd
=
stmt
->
thd
;
List
<
Item
>
&
params
=
thd
->
lex
.
param_list
;
List
<
Item
>
&
params
=
thd
->
lex
->
param_list
;
List_iterator
<
Item
>
param_iterator
(
params
);
Item_param
*
param
;
MYSQL_BIND
*
client_param
=
thd
->
client_params
;
...
...
mysql-test/r/distinct.result
View file @
03042c7d
...
...
@@ -457,10 +457,10 @@ drop table t1,t2;
CREATE TABLE t1 (
html varchar(5) default NULL,
rin int(11) default '0',
out int(11) default '0'
r
out int(11) default '0'
) TYPE=MyISAM;
INSERT INTO t1 VALUES ('1',1,0);
SELECT DISTINCT html,SUM(out)/(SUM(rin)+1) as 'prod' FROM t1 GROUP BY rin;
SELECT DISTINCT html,SUM(
r
out)/(SUM(rin)+1) as 'prod' FROM t1 GROUP BY rin;
html prod
1 0.00
drop table t1;
mysql-test/r/query_cache.result
View file @
03042c7d
...
...
@@ -715,10 +715,10 @@ Variable_name Value
Qcache_queries_in_cache 0
show status like "Qcache_inserts";
Variable_name Value
Qcache_inserts
1
Qcache_inserts
44
show status like "Qcache_hits";
Variable_name Value
Qcache_hits 1
Qcache_hits 1
2
/**/ select * from t1;
a
/**/ select * from t1;
...
...
@@ -728,8 +728,8 @@ Variable_name Value
Qcache_queries_in_cache 1
show status like "Qcache_inserts";
Variable_name Value
Qcache_inserts
2
Qcache_inserts
45
show status like "Qcache_hits";
Variable_name Value
Qcache_hits
2
Qcache_hits
13
drop table t1;
mysql-test/r/sp-error.result
View file @
03042c7d
...
...
@@ -35,7 +35,7 @@ call foo();
ERROR HY000: PROCEDURE foo does not exist
drop procedure if exists foo;
Warnings:
Warning 12
75
PROCEDURE foo does not exist
Warning 12
81
PROCEDURE foo does not exist
create procedure foo()
foo: loop
leave bar;
...
...
mysql-test/r/variables.result
View file @
03042c7d
...
...
@@ -311,7 +311,7 @@ set sql_log_bin=1;
set sql_log_off=1;
set sql_log_update=1;
Warnings:
Note 12
85
The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored.
Note 12
91
The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored.
set sql_low_priority_updates=1;
set sql_max_join_size=200;
select @@sql_max_join_size,@@max_join_size;
...
...
mysql-test/t/distinct.test
View file @
03042c7d
...
...
@@ -326,9 +326,9 @@ drop table t1,t2;
CREATE
TABLE
t1
(
html
varchar
(
5
)
default
NULL
,
rin
int
(
11
)
default
'0'
,
out
int
(
11
)
default
'0'
r
out
int
(
11
)
default
'0'
)
TYPE
=
MyISAM
;
INSERT
INTO
t1
VALUES
(
'1'
,
1
,
0
);
SELECT
DISTINCT
html
,
SUM
(
out
)
/
(
SUM
(
rin
)
+
1
)
as
'prod'
FROM
t1
GROUP
BY
rin
;
SELECT
DISTINCT
html
,
SUM
(
r
out
)
/
(
SUM
(
rin
)
+
1
)
as
'prod'
FROM
t1
GROUP
BY
rin
;
drop
table
t1
;
mysql-test/t/sp-error.test
View file @
03042c7d
...
...
@@ -32,18 +32,18 @@ create function func1() returns int
return
42
|
# Can't create recursively
--
error
127
3
--
error
127
9
create
procedure
foo
()
create
procedure
bar
()
set
@
x
=
3
|
--
error
127
3
--
error
127
9
create
procedure
foo
()
create
function
bar
()
returns
double
return
2.3
|
# Already exists
--
error
12
74
--
error
12
80
create
procedure
proc1
()
set
@
x
=
42
|
--
error
12
74
--
error
12
80
create
function
func1
()
returns
int
return
42
|
...
...
@@ -51,32 +51,32 @@ drop procedure proc1|
drop
function
func1
|
# Does not exist
--
error
12
75
--
error
12
81
alter
procedure
foo
|
--
error
12
75
--
error
12
81
alter
function
foo
|
--
error
12
75
--
error
12
81
drop
procedure
foo
|
--
error
12
75
--
error
12
81
drop
function
foo
|
--
error
12
75
--
error
12
81
call
foo
()
|
drop
procedure
if
exists
foo
|
# LEAVE/ITERATE with no match
--
error
12
78
--
error
12
84
create
procedure
foo
()
foo
:
loop
leave
bar
;
end
loop
|
--
error
12
78
--
error
12
84
create
procedure
foo
()
foo
:
loop
iterate
bar
;
end
loop
|
# Redefining label
--
error
12
79
--
error
12
85
create
procedure
foo
()
foo
:
loop
foo
:
loop
...
...
@@ -85,14 +85,14 @@ foo: loop
end
loop
foo
|
# End label mismatch
--
error
128
0
--
error
128
6
create
procedure
foo
()
foo
:
loop
set
@
x
=
2
;
end
loop
bar
|
# Referring to undef variable
--
error
128
1
--
error
128
7
create
procedure
foo
(
out
x
int
)
begin
declare
y
int
;
...
...
@@ -106,17 +106,17 @@ begin
select
name
from
mysql
.
proc
;
select
type
from
mysql
.
proc
;
end
|
--
error
128
2
--
error
128
8
call
foo
()
|
drop
procedure
foo
|
# RETURN in FUNCTION only
--
error
128
3
--
error
128
9
create
procedure
foo
()
return
42
|
# Doesn't allow queries in FUNCTIONs (for now :-( )
--
error
12
84
--
error
12
90
create
function
foo
()
returns
int
begin
declare
x
int
;
...
...
@@ -130,19 +130,19 @@ create procedure p(x int)
create
function
f
(
x
int
)
returns
int
return
x
+
42
|
--
error
12
88
--
error
12
94
call
p
()
|
--
error
12
88
--
error
12
94
call
p
(
1
,
2
)
|
--
error
12
88
--
error
12
94
select
f
()
|
--
error
12
88
--
error
12
94
select
f
(
1
,
2
)
|
drop
procedure
p
|
drop
function
f
|
--
error
12
89
--
error
12
95
create
procedure
p
(
val
int
,
out
res
int
)
begin
declare
x
int
default
0
;
...
...
@@ -156,7 +156,7 @@ begin
end
if
;
end
|
--
error
12
89
--
error
12
95
create
procedure
p
(
val
int
,
out
res
int
)
begin
declare
x
int
default
0
;
...
...
sql/item.cc
View file @
03042c7d
...
...
@@ -793,7 +793,7 @@ static void mark_as_dependent(THD *thd, SELECT_LEX *last, SELECT_LEX *current,
// store pointer on SELECT_LEX from wich item is dependent
item
->
depended_from
=
last
;
current
->
mark_as_dependent
(
last
);
if
(
thd
->
lex
.
describe
)
if
(
thd
->
lex
->
describe
)
{
char
warn_buff
[
MYSQL_ERRMSG_SIZE
];
sprintf
(
warn_buff
,
ER
(
ER_WARN_FIELD_RESOLVED
),
...
...
sql/lex.h
View file @
03042c7d
...
...
@@ -437,7 +437,6 @@ static SYMBOL symbols[] = {
{
"USE"
,
SYM
(
USE_SYM
),
0
,
0
},
{
"USE_FRM"
,
SYM
(
USE_FRM
),
0
,
0
},
{
"USER"
,
SYM
(
USER
),
0
,
0
},
{
"UNTIL"
,
SYM
(
UNTIL_SYM
),
0
,
0
},
{
"USING"
,
SYM
(
USING
),
0
,
0
},
{
"UTC_DATE"
,
SYM
(
UTC_DATE_SYM
),
0
,
0
},
{
"UTC_TIME"
,
SYM
(
UTC_TIME_SYM
),
0
,
0
},
...
...
sql/sp.cc
View file @
03042c7d
...
...
@@ -393,7 +393,7 @@ sp_add_fun_to_lex(LEX *lex, LEX_STRING fun)
ls
->
str
=
sql_strmake
(
fun
.
str
,
fun
.
length
);
ls
->
length
=
fun
.
length
;
hash_insert
(
&
lex
->
spfuns
,
(
byte
*
)
ls
);
my_
hash_insert
(
&
lex
->
spfuns
,
(
byte
*
)
ls
);
}
}
...
...
@@ -405,7 +405,7 @@ sp_merge_funs(LEX *dst, LEX *src)
LEX_STRING
*
ls
=
(
LEX_STRING
*
)
hash_element
(
&
src
->
spfuns
,
i
);
if
(
!
hash_search
(
&
dst
->
spfuns
,
(
byte
*
)
ls
->
str
,
ls
->
length
))
hash_insert
(
&
dst
->
spfuns
,
(
byte
*
)
ls
);
my_
hash_insert
(
&
dst
->
spfuns
,
(
byte
*
)
ls
);
}
}
...
...
sql/sp_cache.h
View file @
03042c7d
...
...
@@ -41,7 +41,7 @@ class sp_cache
inline
void
insert
(
sp_head
*
sp
)
{
hash_insert
(
&
m_hashtable
,
(
const
byte
*
)
sp
);
my_
hash_insert
(
&
m_hashtable
,
(
const
byte
*
)
sp
);
}
inline
sp_head
*
...
...
sql/sql_cache.cc
View file @
03042c7d
...
...
@@ -2588,7 +2588,7 @@ my_bool Query_cache::ask_handler_allowance(THD *thd,
{
DBUG_PRINT
(
"qcache"
,
(
"Handler does not allow caching for %s.%s"
,
tables_used
->
db
,
tables_used
->
alias
));
thd
->
lex
.
safe_to_cache_query
=
0
;
// Don't try to cache this
thd
->
lex
->
safe_to_cache_query
=
0
;
// Don't try to cache this
DBUG_RETURN
(
1
);
}
}
...
...
sql/sql_insert.cc
View file @
03042c7d
...
...
@@ -616,7 +616,7 @@ class delayed_insert :public ilink {
thd
.
current_tablenr
=
0
;
thd
.
version
=
refresh_version
;
thd
.
command
=
COM_DELAYED_INSERT
;
thd
.
lex
.
current_select
=
0
;
/* for my_message_sql */
thd
.
lex
->
current_select
=
0
;
/* for my_message_sql */
bzero
((
char
*
)
&
thd
.
net
,
sizeof
(
thd
.
net
));
// Safety
thd
.
system_thread
=
1
;
...
...
sql/sql_prepare.cc
View file @
03042c7d
...
...
@@ -901,7 +901,7 @@ bool mysql_stmt_prepare(THD *thd, char *packet, uint packet_length)
my_pthread_setprio
(
pthread_self
(),
WAIT_PRIOR
);
// save WHERE clause pointers to avoid damaging they by optimisation
for
(
SELECT_LEX
*
sl
=
thd
->
lex
.
all_selects_list
;
for
(
SELECT_LEX
*
sl
=
thd
->
lex
->
all_selects_list
;
sl
;
sl
=
sl
->
next_select_in_list
())
{
...
...
sql/sql_repl.cc
View file @
03042c7d
...
...
@@ -697,22 +697,22 @@ int start_slave(THD* thd , MASTER_INFO* mi, bool net_report)
{
pthread_mutex_lock
(
&
mi
->
rli
.
data_lock
);
if
(
thd
->
lex
.
mi
.
pos
)
if
(
thd
->
lex
->
mi
.
pos
)
{
mi
->
rli
.
until_condition
=
RELAY_LOG_INFO
::
UNTIL_MASTER_POS
;
mi
->
rli
.
until_log_pos
=
thd
->
lex
.
mi
.
pos
;
mi
->
rli
.
until_log_pos
=
thd
->
lex
->
mi
.
pos
;
/*
We don't check thd->lex.mi.log_file_name for NULL here
since it is checked in sql_yacc.yy
*/
strmake
(
mi
->
rli
.
until_log_name
,
thd
->
lex
.
mi
.
log_file_name
,
strmake
(
mi
->
rli
.
until_log_name
,
thd
->
lex
->
mi
.
log_file_name
,
sizeof
(
mi
->
rli
.
until_log_name
)
-
1
);
}
else
if
(
thd
->
lex
.
mi
.
relay_log_pos
)
else
if
(
thd
->
lex
->
mi
.
relay_log_pos
)
{
mi
->
rli
.
until_condition
=
RELAY_LOG_INFO
::
UNTIL_RELAY_POS
;
mi
->
rli
.
until_log_pos
=
thd
->
lex
.
mi
.
relay_log_pos
;
strmake
(
mi
->
rli
.
until_log_name
,
thd
->
lex
.
mi
.
relay_log_name
,
mi
->
rli
.
until_log_pos
=
thd
->
lex
->
mi
.
relay_log_pos
;
strmake
(
mi
->
rli
.
until_log_name
,
thd
->
lex
->
mi
.
relay_log_name
,
sizeof
(
mi
->
rli
.
until_log_name
)
-
1
);
}
else
...
...
@@ -750,7 +750,7 @@ int start_slave(THD* thd , MASTER_INFO* mi, bool net_report)
pthread_mutex_unlock
(
&
mi
->
rli
.
data_lock
);
}
else
if
(
thd
->
lex
.
mi
.
pos
||
thd
->
lex
.
mi
.
relay_log_pos
)
else
if
(
thd
->
lex
->
mi
.
pos
||
thd
->
lex
->
mi
.
relay_log_pos
)
push_warning
(
thd
,
MYSQL_ERROR
::
WARN_LEVEL_NOTE
,
ER_UNTIL_COND_IGNORED
,
ER
(
ER_UNTIL_COND_IGNORED
));
...
...
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