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
f74303af
Commit
f74303af
authored
Oct 22, 2004
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
parents
8c391e7c
2f6dc470
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
24 additions
and
18 deletions
+24
-18
configure.in
configure.in
+1
-0
ndb/include/kernel/signaldata/UpgradeStartup.hpp
ndb/include/kernel/signaldata/UpgradeStartup.hpp
+2
-0
ndb/include/ndb_global.h
ndb/include/ndb_global.h
+3
-0
ndb/include/ndb_types.h
ndb/include/ndb_types.h
+1
-1
ndb/include/ndbapi/Ndb.hpp
ndb/include/ndbapi/Ndb.hpp
+1
-0
ndb/include/ndbapi/NdbReceiver.hpp
ndb/include/ndbapi/NdbReceiver.hpp
+2
-0
ndb/include/ndbapi/NdbScanOperation.hpp
ndb/include/ndbapi/NdbScanOperation.hpp
+1
-0
ndb/src/common/util/ConfigValues.cpp
ndb/src/common/util/ConfigValues.cpp
+2
-5
ndb/src/kernel/blocks/backup/restore/Restore.hpp
ndb/src/kernel/blocks/backup/restore/Restore.hpp
+1
-1
ndb/src/kernel/blocks/dbtup/Dbtup.hpp
ndb/src/kernel/blocks/dbtup/Dbtup.hpp
+8
-8
ndb/src/mgmsrv/SignalQueue.cpp
ndb/src/mgmsrv/SignalQueue.cpp
+1
-2
ndb/tools/waiter.cpp
ndb/tools/waiter.cpp
+1
-1
No files found.
configure.in
View file @
f74303af
...
@@ -1144,6 +1144,7 @@ dnl Is this the right match for DEC OSF on alpha?
...
@@ -1144,6 +1144,7 @@ dnl Is this the right match for DEC OSF on alpha?
# gethostbyname_r is deprecated and doesn't work ok on OSF1
# gethostbyname_r is deprecated and doesn't work ok on OSF1
CFLAGS
=
"
$CFLAGS
-DUNDEF_HAVE_GETHOSTBYNAME_R"
CFLAGS
=
"
$CFLAGS
-DUNDEF_HAVE_GETHOSTBYNAME_R"
CXXFLAGS
=
"
$CXXFLAGS
-DUNDEF_HAVE_GETHOSTBYNAME_R"
CXXFLAGS
=
"
$CXXFLAGS
-DUNDEF_HAVE_GETHOSTBYNAME_R"
ndb_cxxflags_fix
=
"
$ndb_cxxflags_fix
-I/usr/include.dtk"
;;
;;
*
netware
*
)
*
netware
*
)
# No need for curses library so set it to null
# No need for curses library so set it to null
...
...
ndb/include/kernel/signaldata/UpgradeStartup.hpp
View file @
f74303af
#ifndef NDB_UPGRADE_STARTUP
#ifndef NDB_UPGRADE_STARTUP
#define NDB_UPGRADE_STARTUP
#define NDB_UPGRADE_STARTUP
class
Ndbcntr
;
struct
UpgradeStartup
{
struct
UpgradeStartup
{
static
void
installEXEC
(
SimulatedBlock
*
);
static
void
installEXEC
(
SimulatedBlock
*
);
...
...
ndb/include/ndb_global.h
View file @
f74303af
...
@@ -13,6 +13,9 @@
...
@@ -13,6 +13,9 @@
#undef NDB_WIN32
#undef NDB_WIN32
#endif
#endif
#ifdef _AIX
#undef _H_STRINGS
#endif
#include <m_string.h>
#include <m_string.h>
#include <m_ctype.h>
#include <m_ctype.h>
#include <ndb_types.h>
#include <ndb_types.h>
...
...
ndb/include/ndb_types.h
View file @
f74303af
...
@@ -33,7 +33,7 @@ typedef unsigned int UintR;
...
@@ -33,7 +33,7 @@ typedef unsigned int UintR;
#ifdef __SIZE_TYPE__
#ifdef __SIZE_TYPE__
typedef
__SIZE_TYPE__
UintPtr
;
typedef
__SIZE_TYPE__
UintPtr
;
#else
#else
#include <
my
_global.h>
#include <
ndb
_global.h>
#ifdef HAVE_STDINT_H
#ifdef HAVE_STDINT_H
#include <stdint.h>
#include <stdint.h>
#endif
#endif
...
...
ndb/include/ndbapi/Ndb.hpp
View file @
f74303af
...
@@ -881,6 +881,7 @@ class Table;
...
@@ -881,6 +881,7 @@ class Table;
class
BaseString
;
class
BaseString
;
class
NdbEventOperation
;
class
NdbEventOperation
;
class
NdbBlob
;
class
NdbBlob
;
class
NdbReceiver
;
typedef
void
(
*
NdbEventCallback
)(
NdbEventOperation
*
,
Ndb
*
,
void
*
);
typedef
void
(
*
NdbEventCallback
)(
NdbEventOperation
*
,
Ndb
*
,
void
*
);
...
...
ndb/include/ndbapi/NdbReceiver.hpp
View file @
f74303af
...
@@ -22,6 +22,8 @@
...
@@ -22,6 +22,8 @@
#include <ndb_global.h>
#include <ndb_global.h>
class
Ndb
;
class
Ndb
;
class
NdbConnection
;
class
NdbReceiver
class
NdbReceiver
{
{
friend
class
Ndb
;
friend
class
Ndb
;
...
...
ndb/include/ndbapi/NdbScanOperation.hpp
View file @
f74303af
...
@@ -32,6 +32,7 @@
...
@@ -32,6 +32,7 @@
#include <NdbOperation.hpp>
#include <NdbOperation.hpp>
class
NdbBlob
;
class
NdbBlob
;
class
NdbResultSet
;
/**
/**
* @class NdbScanOperation
* @class NdbScanOperation
...
...
ndb/src/common/util/ConfigValues.cpp
View file @
f74303af
#include <ndb_global.h>
#include <ConfigValues.hpp>
#include <ConfigValues.hpp>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include <new>
#include <NdbOut.hpp>
#include <NdbOut.hpp>
#include <NdbTCP.h>
#include <NdbTCP.h>
...
...
ndb/src/kernel/blocks/backup/restore/Restore.hpp
View file @
f74303af
...
@@ -91,7 +91,7 @@ class TupleS {
...
@@ -91,7 +91,7 @@ class TupleS {
private:
private:
friend
class
RestoreDataIterator
;
friend
class
RestoreDataIterator
;
TableS
*
m_currentTable
;
class
TableS
*
m_currentTable
;
AttributeData
*
allAttrData
;
AttributeData
*
allAttrData
;
bool
prepareRecord
(
TableS
&
);
bool
prepareRecord
(
TableS
&
);
...
...
ndb/src/kernel/blocks/dbtup/Dbtup.hpp
View file @
f74303af
...
@@ -35,14 +35,6 @@
...
@@ -35,14 +35,6 @@
#define ZMIN_PAGE_LIMIT_TUPKEYREQ 5
#define ZMIN_PAGE_LIMIT_TUPKEYREQ 5
#define ZTUP_VERSION_BITS 15
#define ZTUP_VERSION_BITS 15
typedef
bool
(
Dbtup
::*
ReadFunction
)(
Uint32
*
,
AttributeHeader
*
,
Uint32
,
Uint32
);
typedef
bool
(
Dbtup
::*
UpdateFunction
)(
Uint32
*
,
Uint32
,
Uint32
);
#ifdef DBTUP_C
#ifdef DBTUP_C
//------------------------------------------------------------------
//------------------------------------------------------------------
// Jam Handling:
// Jam Handling:
...
@@ -351,6 +343,14 @@ typedef bool (Dbtup::* UpdateFunction)(Uint32*,
...
@@ -351,6 +343,14 @@ typedef bool (Dbtup::* UpdateFunction)(Uint32*,
class
Dbtup
:
public
SimulatedBlock
{
class
Dbtup
:
public
SimulatedBlock
{
public:
public:
typedef
bool
(
Dbtup
::*
ReadFunction
)(
Uint32
*
,
AttributeHeader
*
,
Uint32
,
Uint32
);
typedef
bool
(
Dbtup
::*
UpdateFunction
)(
Uint32
*
,
Uint32
,
Uint32
);
// State values
// State values
enum
State
{
enum
State
{
NOT_INITIALIZED
=
0
,
NOT_INITIALIZED
=
0
,
...
...
ndb/src/mgmsrv/SignalQueue.cpp
View file @
f74303af
...
@@ -14,8 +14,7 @@
...
@@ -14,8 +14,7 @@
along with this program; if not, write to the Free Software
along with this program; if not, write to the Free Software
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 <string.h>
#include <ndb_global.h>
#include "SignalQueue.hpp"
#include "SignalQueue.hpp"
SignalQueue
::
SignalQueue
()
{
SignalQueue
::
SignalQueue
()
{
...
...
ndb/tools/waiter.cpp
View file @
f74303af
...
@@ -15,8 +15,8 @@
...
@@ -15,8 +15,8 @@
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 <ndb_global.h>
#include <mgmapi.h>
#include <mgmapi.h>
#include <string.h>
#include <NdbMain.h>
#include <NdbMain.h>
#include <NdbOut.hpp>
#include <NdbOut.hpp>
#include <NdbSleep.h>
#include <NdbSleep.h>
...
...
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