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
b64fdf88
Commit
b64fdf88
authored
Feb 16, 2005
by
dean@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dellis/mysqlab/bk/mysql-4.0
parents
87718094
c385f169
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
36 additions
and
8 deletions
+36
-8
include/config-win.h
include/config-win.h
+15
-8
mysql-test/r/delete.result
mysql-test/r/delete.result
+9
-0
mysql-test/t/delete.test
mysql-test/t/delete.test
+11
-0
sql/sql_delete.cc
sql/sql_delete.cc
+1
-0
No files found.
include/config-win.h
View file @
b64fdf88
...
@@ -23,18 +23,25 @@
...
@@ -23,18 +23,25 @@
#include <io.h>
#include <io.h>
#include <malloc.h>
#include <malloc.h>
#if defined(_
_NT__)
#if defined(_
WIN64) || defined(WIN64)
#define SYSTEM_TYPE "
NT"
#define SYSTEM_TYPE "
Win64"
#elif defined(_
_WIN2000__)
#elif defined(_
WIN32) || defined(WIN32)
#define SYSTEM_TYPE "W
IN2000"
#define SYSTEM_TYPE "W
in32"
#else
#else
#define SYSTEM_TYPE "Win
95/Win98
"
#define SYSTEM_TYPE "Win
dows
"
#endif
#endif
#if defined(_WIN64) || defined(WIN64)
#if defined(_M_IA64)
#define MACHINE_TYPE "ia64"
/* Define to machine type name */
#define MACHINE_TYPE "ia64"
#elif defined(_M_IX86)
#define MACHINE_TYPE "ia32"
#elif defined(_M_ALPHA)
#define MACHINE_TYPE "axp"
#else
#else
#define MACHINE_TYPE "i32"
/* Define to machine type name */
#define MACHINE_TYPE "unknown"
/* Define to machine type name */
#endif
#if !(defined(_WIN64) || defined(WIN64))
#ifndef _WIN32
#ifndef _WIN32
#define _WIN32
/* Compatible with old source */
#define _WIN32
/* Compatible with old source */
#endif
#endif
...
...
mysql-test/r/delete.result
View file @
b64fdf88
...
@@ -61,3 +61,12 @@ select * from t1;
...
@@ -61,3 +61,12 @@ select * from t1;
a b
a b
1 apple
1 apple
drop table t1;
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 @
b64fdf88
...
@@ -71,3 +71,14 @@ select * from t1;
...
@@ -71,3 +71,14 @@ select * from t1;
delete
t1
from
t1
,
t1
as
t2
where
t1
.
b
=
t2
.
b
and
t1
.
a
>
t2
.
a
;
delete
t1
from
t1
,
t1
as
t2
where
t1
.
b
=
t2
.
b
and
t1
.
a
>
t2
.
a
;
select
*
from
t1
;
select
*
from
t1
;
drop
table
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
;
sql/sql_delete.cc
View file @
b64fdf88
...
@@ -111,6 +111,7 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ORDER *order,
...
@@ -111,6 +111,7 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ORDER *order,
bzero
((
char
*
)
&
tables
,
sizeof
(
tables
));
bzero
((
char
*
)
&
tables
,
sizeof
(
tables
));
tables
.
table
=
table
;
tables
.
table
=
table
;
tables
.
alias
=
table_list
->
alias
;
table
->
io_cache
=
(
IO_CACHE
*
)
my_malloc
(
sizeof
(
IO_CACHE
),
table
->
io_cache
=
(
IO_CACHE
*
)
my_malloc
(
sizeof
(
IO_CACHE
),
MYF
(
MY_FAE
|
MY_ZEROFILL
));
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