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
b32f693e
Commit
b32f693e
authored
Feb 16, 2005
by
kent@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
parents
50fe0ccb
8e93873d
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
26 additions
and
2 deletions
+26
-2
configure.in
configure.in
+2
-2
mysql-test/r/delete.result
mysql-test/r/delete.result
+9
-0
mysql-test/t/delete.test
mysql-test/t/delete.test
+11
-0
mysql-test/t/rpl_multi_query.test
mysql-test/t/rpl_multi_query.test
+3
-0
sql/sql_delete.cc
sql/sql_delete.cc
+1
-0
No files found.
configure.in
View file @
b32f693e
...
...
@@ -5,7 +5,7 @@ AC_INIT(sql/mysqld.cc)
AC_CANONICAL_SYSTEM
# The Docs Makefile.am parses this line!
# remember to also change ndb version below and update version.c in ndb
AM_INIT_AUTOMAKE
(
mysql, 4.1.1
0
)
AM_INIT_AUTOMAKE
(
mysql, 4.1.1
1
)
AM_CONFIG_HEADER
(
config.h
)
PROTOCOL_VERSION
=
10
...
...
@@ -16,7 +16,7 @@ SHARED_LIB_VERSION=14:0:0
# ndb version
NDB_VERSION_MAJOR
=
4
NDB_VERSION_MINOR
=
1
NDB_VERSION_BUILD
=
1
0
NDB_VERSION_BUILD
=
1
1
NDB_VERSION_STATUS
=
""
# Set all version vars based on $VERSION. How do we do this more elegant ?
...
...
mysql-test/r/delete.result
View file @
b32f693e
...
...
@@ -163,3 +163,12 @@ select * from t1;
a b
7 7
drop table t1;
CREATE TABLE t1 ( a int PRIMARY KEY );
DELETE FROM t1 WHERE t1.a > 0 ORDER BY t1.a;
INSERT INTO t1 VALUES (0),(1),(2);
DELETE FROM t1 WHERE t1.a > 0 ORDER BY t1.a LIMIT 1;
SELECT * FROM t1;
a
0
2
DROP TABLE t1;
mysql-test/t/delete.test
View file @
b32f693e
...
...
@@ -141,3 +141,14 @@ delete t1 from t1 where a = 3;
check
table
t1
;
select
*
from
t1
;
drop
table
t1
;
#
# Bug #8392: delete with ORDER BY containing a direct reference to the table
#
CREATE
TABLE
t1
(
a
int
PRIMARY
KEY
);
DELETE
FROM
t1
WHERE
t1
.
a
>
0
ORDER
BY
t1
.
a
;
INSERT
INTO
t1
VALUES
(
0
),(
1
),(
2
);
DELETE
FROM
t1
WHERE
t1
.
a
>
0
ORDER
BY
t1
.
a
LIMIT
1
;
SELECT
*
FROM
t1
;
DROP
TABLE
t1
;
mysql-test/t/rpl_multi_query.test
View file @
b32f693e
...
...
@@ -3,6 +3,9 @@
# CLIENT_MULTI_STATEMENTS) will be binlogged ONE-query-per-event (not
# one binlog event containing all queries)
# PS doesn't support multi-statements
--
disable_ps_protocol
source
include
/
master
-
slave
.
inc
;
--
disable_warnings
drop
database
if
exists
mysqltest
;
...
...
sql/sql_delete.cc
View file @
b32f693e
...
...
@@ -117,6 +117,7 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, SQL_LIST *order,
bzero
((
char
*
)
&
tables
,
sizeof
(
tables
));
tables
.
table
=
table
;
tables
.
alias
=
table_list
->
alias
;
table
->
sort
.
io_cache
=
(
IO_CACHE
*
)
my_malloc
(
sizeof
(
IO_CACHE
),
MYF
(
MY_FAE
|
MY_ZEROFILL
));
...
...
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