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
82f674f9
Commit
82f674f9
authored
Aug 04, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
parents
6b761d86
2747666d
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
67 additions
and
16 deletions
+67
-16
VC++Files/sql/mysqld.dsp
VC++Files/sql/mysqld.dsp
+7
-3
innobase/buf/buf0buf.c
innobase/buf/buf0buf.c
+9
-0
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+33
-2
mysql-test/r/rpl_slave_status.result
mysql-test/r/rpl_slave_status.result
+5
-5
mysql-test/t/rpl_slave_status.test
mysql-test/t/rpl_slave_status.test
+1
-0
ndb/src/common/portlib/NdbMutex.c
ndb/src/common/portlib/NdbMutex.c
+2
-2
ndb/src/common/portlib/NdbThread.c
ndb/src/common/portlib/NdbThread.c
+1
-1
ndb/tools/config.cpp
ndb/tools/config.cpp
+1
-1
support-files/mysql.spec.sh
support-files/mysql.spec.sh
+8
-2
No files found.
VC++Files/sql/mysqld.dsp
View file @
82f674f9
...
@@ -75,7 +75,7 @@ LINK32=xilink6.exe
...
@@ -75,7 +75,7 @@ LINK32=xilink6.exe
# PROP Ignore_Export_Lib 0
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /FD /c
# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "
HAVE_BLACKHOLE_DB" /D "
MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /FD /c
# SUBTRACT CPP /Fr /YX
# SUBTRACT CPP /Fr /YX
# ADD BASE RSC /l 0x410 /d "_DEBUG"
# ADD BASE RSC /l 0x410 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
...
@@ -130,7 +130,7 @@ LINK32=xilink6.exe
...
@@ -130,7 +130,7 @@ LINK32=xilink6.exe
# PROP Target_Dir ""
# PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT BASE CPP /YX
# SUBTRACT BASE CPP /YX
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-nt-max /FD /c
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "
HAVE_BLACKHOLE_DB" /D "
MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-nt-max /FD /c
# SUBTRACT CPP /YX
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
...
@@ -159,7 +159,7 @@ LINK32=xilink6.exe
...
@@ -159,7 +159,7 @@ LINK32=xilink6.exe
# PROP Target_Dir ""
# PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT BASE CPP /YX
# SUBTRACT BASE CPP /YX
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "NDEBUG" /D "DBUG_OFF" /D "USE_SYMDIR" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-max /FD /c
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "NDEBUG" /D "DBUG_OFF" /D "USE_SYMDIR" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "
HAVE_BLACKHOLE_DB" /D "
MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-max /FD /c
# SUBTRACT CPP /YX
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
...
@@ -451,6 +451,10 @@ SOURCE=.\gstream.cpp
...
@@ -451,6 +451,10 @@ SOURCE=.\gstream.cpp
# End Source File
# End Source File
# Begin Source File
# Begin Source File
SOURCE=.\ha_blackhole.cpp
# End Source File
# Begin Source File
SOURCE=.\ha_berkeley.cpp
SOURCE=.\ha_berkeley.cpp
# End Source File
# End Source File
# Begin Source File
# Begin Source File
...
...
innobase/buf/buf0buf.c
View file @
82f674f9
...
@@ -1762,6 +1762,15 @@ buf_page_create(
...
@@ -1762,6 +1762,15 @@ buf_page_create(
buf_flush_free_margin
();
buf_flush_free_margin
();
frame
=
block
->
frame
;
frame
=
block
->
frame
;
/* Reset to zero the file flush lsn field in the page; if the first
page of an ibdata file is 'created' in this function into the buffer
pool then we lose the original contents of the file flush lsn stamp.
Then InnoDB could in a crash recovery print a big, false, corruption
warning if the stamp contains an lsn bigger than the ib_logfile lsn. */
memset
(
frame
+
FIL_PAGE_FILE_FLUSH_LSN
,
0
,
8
);
#ifdef UNIV_DEBUG
#ifdef UNIV_DEBUG
buf_dbg_counter
++
;
buf_dbg_counter
++
;
...
...
mysql-test/mysql-test-run.pl
View file @
82f674f9
...
@@ -287,6 +287,7 @@ sub executable_setup ();
...
@@ -287,6 +287,7 @@ sub executable_setup ();
sub
environment_setup
();
sub
environment_setup
();
sub
kill_running_server
();
sub
kill_running_server
();
sub
kill_and_cleanup
();
sub
kill_and_cleanup
();
sub
ndbcluster_support
();
sub
ndbcluster_install
();
sub
ndbcluster_install
();
sub
ndbcluster_start
();
sub
ndbcluster_start
();
sub
ndbcluster_stop
();
sub
ndbcluster_stop
();
...
@@ -319,6 +320,12 @@ sub main () {
...
@@ -319,6 +320,12 @@ sub main () {
initial_setup
();
initial_setup
();
command_line_setup
();
command_line_setup
();
executable_setup
();
executable_setup
();
if
(
!
$opt_skip_ndbcluster
and
!
$opt_with_ndbcluster
)
{
$opt_with_ndbcluster
=
ndbcluster_support
();
}
environment_setup
();
environment_setup
();
signal_setup
();
signal_setup
();
...
@@ -1026,6 +1033,23 @@ sub kill_and_cleanup () {
...
@@ -1026,6 +1033,23 @@ sub kill_and_cleanup () {
#
#
##############################################################################
##############################################################################
sub
ndbcluster_support
()
{
# check ndbcluster support by testing using a switch
# that is only available in that case
if
(
mtr_run
(
$exe_mysqld
,
["
--no-defaults
",
"
--ndb-use-exact-count
",
"
--help
"],
"",
"
/dev/null
",
"
/dev/null
",
"")
!=
0
)
{
mtr_report
("
No ndbcluster support
");
return
0
;
}
mtr_report
("
Has ndbcluster support
");
return
1
;
}
# FIXME why is there a different start below?!
# FIXME why is there a different start below?!
sub
ndbcluster_install
()
{
sub
ndbcluster_install
()
{
...
@@ -1663,13 +1687,15 @@ sub mysqld_arguments ($$$$$) {
...
@@ -1663,13 +1687,15 @@ sub mysqld_arguments ($$$$$) {
if
(
$type
eq
'
master
'
)
if
(
$type
eq
'
master
'
)
{
{
my
$id
=
$idx
>
0
?
$idx
+
101
:
1
;
mtr_add_arg
(
$args
,
"
%s--log-bin=%s/log/master-bin%s
",
$prefix
,
mtr_add_arg
(
$args
,
"
%s--log-bin=%s/log/master-bin%s
",
$prefix
,
$opt_vardir
,
$sidx
);
$opt_vardir
,
$sidx
);
mtr_add_arg
(
$args
,
"
%s--pid-file=%s
",
$prefix
,
mtr_add_arg
(
$args
,
"
%s--pid-file=%s
",
$prefix
,
$master
->
[
$idx
]
->
{'
path_mypid
'});
$master
->
[
$idx
]
->
{'
path_mypid
'});
mtr_add_arg
(
$args
,
"
%s--port=%d
",
$prefix
,
mtr_add_arg
(
$args
,
"
%s--port=%d
",
$prefix
,
$master
->
[
$idx
]
->
{'
path_myport
'});
$master
->
[
$idx
]
->
{'
path_myport
'});
mtr_add_arg
(
$args
,
"
%s--server-id=
1
",
$prefix
);
mtr_add_arg
(
$args
,
"
%s--server-id=
%d
",
$prefix
,
$id
);
mtr_add_arg
(
$args
,
"
%s--socket=%s
",
$prefix
,
mtr_add_arg
(
$args
,
"
%s--socket=%s
",
$prefix
,
$master
->
[
$idx
]
->
{'
path_mysock
'});
$master
->
[
$idx
]
->
{'
path_mysock
'});
mtr_add_arg
(
$args
,
"
%s--innodb_data_file_path=ibdata1:50M
",
$prefix
);
mtr_add_arg
(
$args
,
"
%s--innodb_data_file_path=ibdata1:50M
",
$prefix
);
...
@@ -1677,6 +1703,11 @@ sub mysqld_arguments ($$$$$) {
...
@@ -1677,6 +1703,11 @@ sub mysqld_arguments ($$$$$) {
mtr_add_arg
(
$args
,
"
%s--datadir=%s
",
$prefix
,
mtr_add_arg
(
$args
,
"
%s--datadir=%s
",
$prefix
,
$master
->
[
$idx
]
->
{'
path_myddir
'});
$master
->
[
$idx
]
->
{'
path_myddir
'});
if
(
$idx
>
0
)
{
mtr_add_arg
(
$args
,
"
%s--skip-innodb
",
$prefix
);
}
if
(
$opt_skip_ndbcluster
)
if
(
$opt_skip_ndbcluster
)
{
{
mtr_add_arg
(
$args
,
"
%s--skip-ndbcluster
",
$prefix
);
mtr_add_arg
(
$args
,
"
%s--skip-ndbcluster
",
$prefix
);
...
@@ -1686,7 +1717,7 @@ sub mysqld_arguments ($$$$$) {
...
@@ -1686,7 +1717,7 @@ sub mysqld_arguments ($$$$$) {
if
(
$type
eq
'
slave
'
)
if
(
$type
eq
'
slave
'
)
{
{
my
$slave_server_id
=
2
+
$idx
;
my
$slave_server_id
=
2
+
$idx
;
my
$slave_rpl_rank
=
$
idx
>
0
?
2
:
$
slave_server_id
;
my
$slave_rpl_rank
=
$slave_server_id
;
mtr_add_arg
(
$args
,
"
%s--datadir=%s
",
$prefix
,
mtr_add_arg
(
$args
,
"
%s--datadir=%s
",
$prefix
,
$slave
->
[
$idx
]
->
{'
path_myddir
'});
$slave
->
[
$idx
]
->
{'
path_myddir
'});
...
...
mysql-test/r/rpl_slave_status.result
View file @
82f674f9
...
@@ -25,9 +25,9 @@ Master_User rpl
...
@@ -25,9 +25,9 @@ Master_User rpl
Master_Port MASTER_MYPORT
Master_Port MASTER_MYPORT
Connect_Retry 1
Connect_Retry 1
Master_Log_File master-bin.000001
Master_Log_File master-bin.000001
Read_Master_Log_Pos
357
Read_Master_Log_Pos
#
Relay_Log_File
slave-relay-bin.000001
Relay_Log_File
#
Relay_Log_Pos
401
Relay_Log_Pos
#
Relay_Master_Log_File master-bin.000001
Relay_Master_Log_File master-bin.000001
Slave_IO_Running No
Slave_IO_Running No
Slave_SQL_Running Yes
Slave_SQL_Running Yes
...
@@ -40,8 +40,8 @@ Replicate_Wild_Ignore_Table
...
@@ -40,8 +40,8 @@ Replicate_Wild_Ignore_Table
Last_Errno 0
Last_Errno 0
Last_Error
Last_Error
Skip_Counter 0
Skip_Counter 0
Exec_Master_Log_Pos
357
Exec_Master_Log_Pos
#
Relay_Log_Space
401
Relay_Log_Space
#
Until_Condition None
Until_Condition None
Until_Log_File
Until_Log_File
Until_Log_Pos 0
Until_Log_Pos 0
...
...
mysql-test/t/rpl_slave_status.test
View file @
82f674f9
...
@@ -23,6 +23,7 @@ connection slave;
...
@@ -23,6 +23,7 @@ connection slave;
stop
slave
;
stop
slave
;
start
slave
;
start
slave
;
--
replace_result
$MASTER_MYPORT
MASTER_MYPORT
--
replace_result
$MASTER_MYPORT
MASTER_MYPORT
--
replace_column
7
# 8 # 9 # 22 # 23 #
--
vertical_results
--
vertical_results
show
slave
status
;
show
slave
status
;
...
...
ndb/src/common/portlib/NdbMutex.c
View file @
82f674f9
...
@@ -23,9 +23,9 @@
...
@@ -23,9 +23,9 @@
NdbMutex
*
NdbMutex_Create
(
void
)
NdbMutex
*
NdbMutex_Create
(
void
)
{
{
DBUG_ENTER
(
"NdbMutex_Create"
);
NdbMutex
*
pNdbMutex
;
NdbMutex
*
pNdbMutex
;
int
result
;
int
result
;
DBUG_ENTER
(
"NdbMutex_Create"
);
pNdbMutex
=
(
NdbMutex
*
)
NdbMem_Allocate
(
sizeof
(
NdbMutex
));
pNdbMutex
=
(
NdbMutex
*
)
NdbMem_Allocate
(
sizeof
(
NdbMutex
));
DBUG_PRINT
(
"info"
,(
"NdbMem_Allocate 0x%lx"
,
pNdbMutex
));
DBUG_PRINT
(
"info"
,(
"NdbMem_Allocate 0x%lx"
,
pNdbMutex
));
...
@@ -42,8 +42,8 @@ NdbMutex* NdbMutex_Create(void)
...
@@ -42,8 +42,8 @@ NdbMutex* NdbMutex_Create(void)
int
NdbMutex_Destroy
(
NdbMutex
*
p_mutex
)
int
NdbMutex_Destroy
(
NdbMutex
*
p_mutex
)
{
{
DBUG_ENTER
(
"NdbMutex_Destroy"
);
int
result
;
int
result
;
DBUG_ENTER
(
"NdbMutex_Destroy"
);
if
(
p_mutex
==
NULL
)
if
(
p_mutex
==
NULL
)
DBUG_RETURN
(
-
1
);
DBUG_RETURN
(
-
1
);
...
...
ndb/src/common/portlib/NdbThread.c
View file @
82f674f9
...
@@ -71,10 +71,10 @@ struct NdbThread* NdbThread_Create(NDB_THREAD_FUNC *p_thread_func,
...
@@ -71,10 +71,10 @@ struct NdbThread* NdbThread_Create(NDB_THREAD_FUNC *p_thread_func,
const
char
*
p_thread_name
,
const
char
*
p_thread_name
,
NDB_THREAD_PRIO
thread_prio
)
NDB_THREAD_PRIO
thread_prio
)
{
{
DBUG_ENTER
(
"NdbThread_Create"
);
struct
NdbThread
*
tmpThread
;
struct
NdbThread
*
tmpThread
;
int
result
;
int
result
;
pthread_attr_t
thread_attr
;
pthread_attr_t
thread_attr
;
DBUG_ENTER
(
"NdbThread_Create"
);
(
void
)
thread_prio
;
/* remove warning for unused parameter */
(
void
)
thread_prio
;
/* remove warning for unused parameter */
...
...
ndb/tools/config.cpp
View file @
82f674f9
...
@@ -359,7 +359,7 @@ Match::eval(NdbMgmHandle h, const Iter& iter)
...
@@ -359,7 +359,7 @@ Match::eval(NdbMgmHandle h, const Iter& iter)
}
}
else
if
(
iter
.
get
(
m_key
,
&
val64
)
==
0
)
else
if
(
iter
.
get
(
m_key
,
&
val64
)
==
0
)
{
{
if
(
atoll
(
m_value
.
c_str
()
)
!=
val64
)
if
(
strtoll
(
m_value
.
c_str
(),
(
char
**
)
NULL
,
10
)
!=
val64
)
return
0
;
return
0
;
}
}
else
if
(
iter
.
get
(
m_key
,
&
valc
)
==
0
)
else
if
(
iter
.
get
(
m_key
,
&
valc
)
==
0
)
...
...
support-files/mysql.spec.sh
View file @
82f674f9
...
@@ -300,7 +300,7 @@ BuildMySQL "--enable-shared \
...
@@ -300,7 +300,7 @@ BuildMySQL "--enable-shared \
--with-innodb
\
--with-innodb
\
--with-ndbcluster
\
--with-ndbcluster
\
--with-raid
\
--with-raid
\
--with-archive
\
--with-archive
-storage-engine
\
--with-csv-storage-engine
\
--with-csv-storage-engine
\
--with-example-storage-engine
\
--with-example-storage-engine
\
--with-blackhole-storage-engine
\
--with-blackhole-storage-engine
\
...
@@ -439,7 +439,7 @@ fi
...
@@ -439,7 +439,7 @@ fi
# Create a MySQL user and group. Do not report any problems if it already
# Create a MySQL user and group. Do not report any problems if it already
# exists.
# exists.
groupadd
-r
-c
"MySQL server"
%
{
mysqld_user
}
2> /dev/null
||
true
groupadd
-r
%
{
mysqld_user
}
2> /dev/null
||
true
useradd
-M
-r
-d
$mysql_datadir
-s
/bin/bash
-c
"MySQL server"
-g
%
{
mysqld_user
}
%
{
mysqld_user
}
2> /dev/null
||
true
useradd
-M
-r
-d
$mysql_datadir
-s
/bin/bash
-c
"MySQL server"
-g
%
{
mysqld_user
}
%
{
mysqld_user
}
2> /dev/null
||
true
# Change permissions so that the user that will run the MySQL daemon
# Change permissions so that the user that will run the MySQL daemon
...
@@ -668,6 +668,12 @@ fi
...
@@ -668,6 +668,12 @@ fi
# itself - note that they must be ordered by date (important when
# itself - note that they must be ordered by date (important when
# merging BK trees)
# merging BK trees)
%changelog
%changelog
*
Thu Aug 04 2005 Lenz Grimmer <lenz@mysql.com>
- Fixed the creation of the mysql user group account
in
the postinstall
section
(
BUG 12348
)
- Fixed enabling the Archive storage engine
in
the Max binary
*
Tue Aug 02 2005 Lenz Grimmer <lenz@mysql.com>
*
Tue Aug 02 2005 Lenz Grimmer <lenz@mysql.com>
- Fixed the Requires: tag
for
the server RPM
(
BUG 12233
)
- Fixed the Requires: tag
for
the server RPM
(
BUG 12233
)
...
...
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