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
dfe8132f
Commit
dfe8132f
authored
Jan 20, 2005
by
ram@gw.mysql.r18.ru
Browse files
Options
Browse Files
Download
Plain Diff
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999
parents
c3977513
a27e3d1a
Changes
19
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
37 additions
and
51 deletions
+37
-51
mysql-test/r/join_outer.result
mysql-test/r/join_outer.result
+14
-14
mysql-test/t/join_outer.test
mysql-test/t/join_outer.test
+14
-14
ndb/include/kernel/AttributeHeader.hpp
ndb/include/kernel/AttributeHeader.hpp
+0
-1
ndb/include/ndb_constants.h
ndb/include/ndb_constants.h
+1
-1
ndb/include/ndb_global.h.in
ndb/include/ndb_global.h.in
+2
-4
ndb/src/kernel/blocks/backup/BackupInit.cpp
ndb/src/kernel/blocks/backup/BackupInit.cpp
+0
-1
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
+0
-1
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp
+0
-1
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
+0
-1
ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
+0
-1
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
+0
-1
ndb/src/kernel/blocks/dbtux/Dbtux.hpp
ndb/src/kernel/blocks/dbtux/Dbtux.hpp
+0
-1
ndb/src/kernel/blocks/grep/GrepInit.cpp
ndb/src/kernel/blocks/grep/GrepInit.cpp
+0
-1
ndb/src/kernel/blocks/suma/SumaInit.cpp
ndb/src/kernel/blocks/suma/SumaInit.cpp
+0
-1
ndb/src/kernel/vm/Emulator.cpp
ndb/src/kernel/vm/Emulator.cpp
+0
-1
ndb/src/kernel/vm/SimulatedBlock.hpp
ndb/src/kernel/vm/SimulatedBlock.hpp
+0
-1
ndb/src/mgmapi/mgmapi_configuration.cpp
ndb/src/mgmapi/mgmapi_configuration.cpp
+0
-1
ndb/src/ndbapi/NdbScanOperation.cpp
ndb/src/ndbapi/NdbScanOperation.cpp
+5
-5
sql/item_cmpfunc.h
sql/item_cmpfunc.h
+1
-0
No files found.
mysql-test/r/join_outer.result
View file @
dfe8132f
...
@@ -784,32 +784,32 @@ t2.flag_value IS NULL;
...
@@ -784,32 +784,32 @@ t2.flag_value IS NULL;
flag_name flag_value
flag_name flag_value
flag2 NULL
flag2 NULL
DROP TABLE t1,t2;
DROP TABLE t1,t2;
CREATE TABLE
invoice
(
CREATE TABLE
t1
(
id int(11) unsigned NOT NULL auto_increment,
id int(11) unsigned NOT NULL auto_increment,
text_id int(10) unsigned default NULL,
text_id int(10) unsigned default NULL,
PRIMARY KEY (id)
PRIMARY KEY (id)
);
);
INSERT INTO
invoice
VALUES("1", "0");
INSERT INTO
t1
VALUES("1", "0");
INSERT INTO
invoice
VALUES("2", "10");
INSERT INTO
t1
VALUES("2", "10");
CREATE TABLE t
ext_table
(
CREATE TABLE t
2
(
text_id char(3) NOT NULL default '',
text_id char(3) NOT NULL default '',
language_id char(3) NOT NULL default '',
language_id char(3) NOT NULL default '',
text_data text,
text_data text,
PRIMARY KEY (text_id,language_id)
PRIMARY KEY (text_id,language_id)
);
);
INSERT INTO t
ext_table
VALUES("0", "EN", "0-EN");
INSERT INTO t
2
VALUES("0", "EN", "0-EN");
INSERT INTO t
ext_table
VALUES("0", "SV", "0-SV");
INSERT INTO t
2
VALUES("0", "SV", "0-SV");
INSERT INTO t
ext_table
VALUES("10", "EN", "10-EN");
INSERT INTO t
2
VALUES("10", "EN", "10-EN");
INSERT INTO t
ext_table
VALUES("10", "SV", "10-SV");
INSERT INTO t
2
VALUES("10", "SV", "10-SV");
SELECT
invoice.id, invoice.text_id, text_table
.text_data
SELECT
t1.id, t1.text_id, t2
.text_data
FROM
invoice LEFT JOIN text_table
FROM
t1 LEFT JOIN t2
ON
invoice.text_id = text_table
.text_id
ON
t1.text_id = t2
.text_id
AND t
ext_table
.language_id = 'SV'
AND t
2
.language_id = 'SV'
WHERE (
invoice.id LIKE '%' OR text_table
.text_data LIKE '%');
WHERE (
t1.id LIKE '%' OR t2
.text_data LIKE '%');
id text_id text_data
id text_id text_data
1 0 0-SV
1 0 0-SV
2 10 10-SV
2 10 10-SV
DROP TABLE
invoice, text_table
;
DROP TABLE
t1, t2
;
CREATE TABLE t0 (a0 int PRIMARY KEY);
CREATE TABLE t0 (a0 int PRIMARY KEY);
CREATE TABLE t1 (a1 int PRIMARY KEY);
CREATE TABLE t1 (a1 int PRIMARY KEY);
CREATE TABLE t2 (a2 int);
CREATE TABLE t2 (a2 int);
...
...
mysql-test/t/join_outer.test
View file @
dfe8132f
...
@@ -554,34 +554,34 @@ SELECT t1.flag_name,t2.flag_value
...
@@ -554,34 +554,34 @@ SELECT t1.flag_name,t2.flag_value
DROP
TABLE
t1
,
t2
;
DROP
TABLE
t1
,
t2
;
CREATE
TABLE
invoice
(
CREATE
TABLE
t1
(
id
int
(
11
)
unsigned
NOT
NULL
auto_increment
,
id
int
(
11
)
unsigned
NOT
NULL
auto_increment
,
text_id
int
(
10
)
unsigned
default
NULL
,
text_id
int
(
10
)
unsigned
default
NULL
,
PRIMARY
KEY
(
id
)
PRIMARY
KEY
(
id
)
);
);
INSERT
INTO
invoice
VALUES
(
"1"
,
"0"
);
INSERT
INTO
t1
VALUES
(
"1"
,
"0"
);
INSERT
INTO
invoice
VALUES
(
"2"
,
"10"
);
INSERT
INTO
t1
VALUES
(
"2"
,
"10"
);
CREATE
TABLE
t
ext_table
(
CREATE
TABLE
t
2
(
text_id
char
(
3
)
NOT
NULL
default
''
,
text_id
char
(
3
)
NOT
NULL
default
''
,
language_id
char
(
3
)
NOT
NULL
default
''
,
language_id
char
(
3
)
NOT
NULL
default
''
,
text_data
text
,
text_data
text
,
PRIMARY
KEY
(
text_id
,
language_id
)
PRIMARY
KEY
(
text_id
,
language_id
)
);
);
INSERT
INTO
t
ext_table
VALUES
(
"0"
,
"EN"
,
"0-EN"
);
INSERT
INTO
t
2
VALUES
(
"0"
,
"EN"
,
"0-EN"
);
INSERT
INTO
t
ext_table
VALUES
(
"0"
,
"SV"
,
"0-SV"
);
INSERT
INTO
t
2
VALUES
(
"0"
,
"SV"
,
"0-SV"
);
INSERT
INTO
t
ext_table
VALUES
(
"10"
,
"EN"
,
"10-EN"
);
INSERT
INTO
t
2
VALUES
(
"10"
,
"EN"
,
"10-EN"
);
INSERT
INTO
t
ext_table
VALUES
(
"10"
,
"SV"
,
"10-SV"
);
INSERT
INTO
t
2
VALUES
(
"10"
,
"SV"
,
"10-SV"
);
SELECT
invoice
.
id
,
invoice
.
text_id
,
text_table
.
text_data
SELECT
t1
.
id
,
t1
.
text_id
,
t2
.
text_data
FROM
invoice
LEFT
JOIN
text_table
FROM
t1
LEFT
JOIN
t2
ON
invoice
.
text_id
=
text_table
.
text_id
ON
t1
.
text_id
=
t2
.
text_id
AND
t
ext_table
.
language_id
=
'SV'
AND
t
2
.
language_id
=
'SV'
WHERE
(
invoice
.
id
LIKE
'%'
OR
text_table
.
text_data
LIKE
'%'
);
WHERE
(
t1
.
id
LIKE
'%'
OR
t2
.
text_data
LIKE
'%'
);
DROP
TABLE
invoice
,
text_table
;
DROP
TABLE
t1
,
t2
;
# Test for bug #5896
# Test for bug #5896
...
...
ndb/include/kernel/AttributeHeader.hpp
View file @
dfe8132f
...
@@ -17,7 +17,6 @@
...
@@ -17,7 +17,6 @@
#ifndef ATTRIBUTE_HEADER
#ifndef ATTRIBUTE_HEADER
#define ATTRIBUTE_HEADER
#define ATTRIBUTE_HEADER
#include <new>
/**
/**
* @class AttributeHeader
* @class AttributeHeader
* @brief Header passed in front of every attribute value in AttrInfo signal
* @brief Header passed in front of every attribute value in AttrInfo signal
...
...
ndb/include/ndb_constants.h
View file @
dfe8132f
...
@@ -48,7 +48,7 @@
...
@@ -48,7 +48,7 @@
#define NDB_TYPE_BIGUNSIGNED 10
#define NDB_TYPE_BIGUNSIGNED 10
#define NDB_TYPE_FLOAT 11
#define NDB_TYPE_FLOAT 11
#define NDB_TYPE_DOUBLE 12
#define NDB_TYPE_DOUBLE 12
#define NDB_TYPE_DECIMAL 13 /
/ not used
#define NDB_TYPE_DECIMAL 13
/
* not used */
#define NDB_TYPE_CHAR 14
#define NDB_TYPE_CHAR 14
#define NDB_TYPE_VARCHAR 15
#define NDB_TYPE_VARCHAR 15
#define NDB_TYPE_BINARY 16
#define NDB_TYPE_BINARY 16
...
...
ndb/include/ndb_global.h.in
View file @
dfe8132f
...
@@ -115,10 +115,8 @@ static const char table_name_separator = '/';
...
@@ -115,10 +115,8 @@ static const char table_name_separator = '/';
#endif
#endif
#ifdef __cplusplus
#ifdef __cplusplus
#include <new>
inline void* operator new(size_t, void* __p) { return __p; }
#endif
inline void* operator new[](size_t, void* __p) { return __p; }
#ifdef __cplusplus
extern "C" {
extern "C" {
#endif
#endif
...
...
ndb/src/kernel/blocks/backup/BackupInit.cpp
View file @
dfe8132f
...
@@ -22,7 +22,6 @@
...
@@ -22,7 +22,6 @@
//===========================================================================
//===========================================================================
#include "Backup.hpp"
#include "Backup.hpp"
#include <new>
#include <Properties.hpp>
#include <Properties.hpp>
#include <Configuration.hpp>
#include <Configuration.hpp>
...
...
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
View file @
dfe8132f
...
@@ -39,7 +39,6 @@
...
@@ -39,7 +39,6 @@
#include <EventLogger.hpp>
#include <EventLogger.hpp>
#include <TimeQueue.hpp>
#include <TimeQueue.hpp>
#include <new>
#include <NdbSleep.h>
#include <NdbSleep.h>
#include <SafeCounter.hpp>
#include <SafeCounter.hpp>
...
...
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp
View file @
dfe8132f
...
@@ -18,7 +18,6 @@
...
@@ -18,7 +18,6 @@
#define DBDIH_C
#define DBDIH_C
#include "Dbdih.hpp"
#include "Dbdih.hpp"
#include <ndb_limits.h>
#include <ndb_limits.h>
#include <new>
#define DEBUG(x) { ndbout << "DIH::" << x << endl; }
#define DEBUG(x) { ndbout << "DIH::" << x << endl; }
...
...
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
View file @
dfe8132f
...
@@ -19,7 +19,6 @@
...
@@ -19,7 +19,6 @@
#define DBLQH_C
#define DBLQH_C
#include "Dblqh.hpp"
#include "Dblqh.hpp"
#include <ndb_limits.h>
#include <ndb_limits.h>
#include <new>
#define DEBUG(x) { ndbout << "LQH::" << x << endl; }
#define DEBUG(x) { ndbout << "LQH::" << x << endl; }
...
...
ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
View file @
dfe8132f
...
@@ -20,7 +20,6 @@
...
@@ -20,7 +20,6 @@
#include <ndb_limits.h>
#include <ndb_limits.h>
#include <Properties.hpp>
#include <Properties.hpp>
#include <Configuration.hpp>
#include <Configuration.hpp>
#include <new>
#define DEBUG(x) { ndbout << "TC::" << x << endl; }
#define DEBUG(x) { ndbout << "TC::" << x << endl; }
...
...
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
View file @
dfe8132f
...
@@ -31,7 +31,6 @@
...
@@ -31,7 +31,6 @@
#include <signaldata/TupKey.hpp>
#include <signaldata/TupKey.hpp>
#include <signaldata/DropTab.hpp>
#include <signaldata/DropTab.hpp>
#include <new>
#define DEBUG(x) { ndbout << "TUP::" << x << endl; }
#define DEBUG(x) { ndbout << "TUP::" << x << endl; }
...
...
ndb/src/kernel/blocks/dbtux/Dbtux.hpp
View file @
dfe8132f
...
@@ -17,7 +17,6 @@
...
@@ -17,7 +17,6 @@
#ifndef DBTUX_H
#ifndef DBTUX_H
#define DBTUX_H
#define DBTUX_H
#include <new>
#include <ndb_limits.h>
#include <ndb_limits.h>
#include <SimulatedBlock.hpp>
#include <SimulatedBlock.hpp>
#include <AttributeDescriptor.hpp>
#include <AttributeDescriptor.hpp>
...
...
ndb/src/kernel/blocks/grep/GrepInit.cpp
View file @
dfe8132f
...
@@ -15,7 +15,6 @@
...
@@ -15,7 +15,6 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#include "Grep.hpp"
#include "Grep.hpp"
#include <new>
#include <Properties.hpp>
#include <Properties.hpp>
#include <Configuration.hpp>
#include <Configuration.hpp>
...
...
ndb/src/kernel/blocks/suma/SumaInit.cpp
View file @
dfe8132f
...
@@ -16,7 +16,6 @@
...
@@ -16,7 +16,6 @@
#include "Suma.hpp"
#include "Suma.hpp"
#include <new>
#include <Properties.hpp>
#include <Properties.hpp>
#include <Configuration.hpp>
#include <Configuration.hpp>
...
...
ndb/src/kernel/vm/Emulator.cpp
View file @
dfe8132f
...
@@ -33,7 +33,6 @@
...
@@ -33,7 +33,6 @@
#include <NdbOut.hpp>
#include <NdbOut.hpp>
#include <NdbMutex.h>
#include <NdbMutex.h>
#include <NdbSleep.h>
#include <NdbSleep.h>
#include <new>
extern
"C"
{
extern
"C"
{
extern
void
(
*
ndb_new_handler
)();
extern
void
(
*
ndb_new_handler
)();
...
...
ndb/src/kernel/vm/SimulatedBlock.hpp
View file @
dfe8132f
...
@@ -36,7 +36,6 @@
...
@@ -36,7 +36,6 @@
#include <ErrorReporter.hpp>
#include <ErrorReporter.hpp>
#include <ErrorHandlingMacros.hpp>
#include <ErrorHandlingMacros.hpp>
#include <new>
#include "DLList.hpp"
#include "DLList.hpp"
#include "ArrayPool.hpp"
#include "ArrayPool.hpp"
#include "DLHashTable.hpp"
#include "DLHashTable.hpp"
...
...
ndb/src/mgmapi/mgmapi_configuration.cpp
View file @
dfe8132f
#include <ndb_types.h>
#include <ndb_types.h>
#include <mgmapi.h>
#include <mgmapi.h>
#include "mgmapi_configuration.hpp"
#include "mgmapi_configuration.hpp"
#include <new>
ndb_mgm_configuration_iterator
::
ndb_mgm_configuration_iterator
ndb_mgm_configuration_iterator
::
ndb_mgm_configuration_iterator
(
const
ndb_mgm_configuration
&
conf
,
unsigned
type_of_section
)
(
const
ndb_mgm_configuration
&
conf
,
unsigned
type_of_section
)
...
...
ndb/src/ndbapi/NdbScanOperation.cpp
View file @
dfe8132f
...
@@ -230,17 +230,17 @@ NdbScanOperation::fix_receivers(Uint32 parallel){
...
@@ -230,17 +230,17 @@ NdbScanOperation::fix_receivers(Uint32 parallel){
if
(
parallel
>
m_allocated_receivers
){
if
(
parallel
>
m_allocated_receivers
){
const
Uint32
sz
=
parallel
*
(
4
*
sizeof
(
char
*
)
+
sizeof
(
Uint32
));
const
Uint32
sz
=
parallel
*
(
4
*
sizeof
(
char
*
)
+
sizeof
(
Uint32
));
Uint
32
*
tmp
=
new
Uint32
[(
sz
+
3
)
/
4
];
Uint
64
*
tmp
=
new
Uint64
[(
sz
+
7
)
/
8
];
// Save old receivers
// Save old receivers
memcpy
(
tmp
+
parallel
,
m_receivers
,
m_allocated_receivers
*
sizeof
(
char
*
));
memcpy
(
tmp
,
m_receivers
,
m_allocated_receivers
*
sizeof
(
char
*
));
delete
[]
m_array
;
delete
[]
m_array
;
m_array
=
tmp
;
m_array
=
(
Uint32
*
)
tmp
;
m_prepared_receivers
=
tmp
;
m_receivers
=
(
NdbReceiver
**
)
tmp
;
m_receivers
=
(
NdbReceiver
**
)(
tmp
+
parallel
);
m_api_receivers
=
m_receivers
+
parallel
;
m_api_receivers
=
m_receivers
+
parallel
;
m_conf_receivers
=
m_api_receivers
+
parallel
;
m_conf_receivers
=
m_api_receivers
+
parallel
;
m_sent_receivers
=
m_conf_receivers
+
parallel
;
m_sent_receivers
=
m_conf_receivers
+
parallel
;
m_prepared_receivers
=
(
Uint32
*
)(
m_sent_receivers
+
parallel
);
// Only get/init "new" receivers
// Only get/init "new" receivers
NdbReceiver
*
tScanRec
;
NdbReceiver
*
tScanRec
;
...
...
sql/item_cmpfunc.h
View file @
dfe8132f
...
@@ -264,6 +264,7 @@ class Item_func_trig_cond: public Item_bool_func
...
@@ -264,6 +264,7 @@ class Item_func_trig_cond: public Item_bool_func
longlong
val_int
()
{
return
*
trig_var
?
args
[
0
]
->
val_int
()
:
1
;
}
longlong
val_int
()
{
return
*
trig_var
?
args
[
0
]
->
val_int
()
:
1
;
}
enum
Functype
functype
()
const
{
return
TRIG_COND_FUNC
;
};
enum
Functype
functype
()
const
{
return
TRIG_COND_FUNC
;
};
const
char
*
func_name
()
const
{
return
"trigcond"
;
};
const
char
*
func_name
()
const
{
return
"trigcond"
;
};
bool
const_item
()
const
{
return
FALSE
;
}
};
};
class
Item_func_not_all
:
public
Item_func_not
class
Item_func_not_all
:
public
Item_func_not
...
...
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