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
d0b2f90d
Commit
d0b2f90d
authored
Dec 22, 2009
by
Alexander Nozdrin
Browse files
Options
Browse Files
Download
Plain Diff
Auto-merge from mysql-next-mr.
parents
ccae8245
053bccbd
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
71 additions
and
41 deletions
+71
-41
libmysql/client_settings.h
libmysql/client_settings.h
+1
-2
mysql-test/r/not_partition.result
mysql-test/r/not_partition.result
+4
-4
mysql-test/t/not_partition.test
mysql-test/t/not_partition.test
+4
-4
scripts/make_win_bin_dist
scripts/make_win_bin_dist
+19
-0
storage/archive/Makefile.am
storage/archive/Makefile.am
+5
-2
storage/ibmdb2i/db2i_charsetSupport.cc
storage/ibmdb2i/db2i_charsetSupport.cc
+6
-6
storage/ibmdb2i/db2i_constraints.cc
storage/ibmdb2i/db2i_constraints.cc
+5
-5
storage/ibmdb2i/ha_ibmdb2i.cc
storage/ibmdb2i/ha_ibmdb2i.cc
+6
-6
support-files/mysql.spec.sh
support-files/mysql.spec.sh
+20
-11
tests/mysql_client_test.c
tests/mysql_client_test.c
+1
-1
No files found.
libmysql/client_settings.h
View file @
d0b2f90d
...
@@ -27,8 +27,7 @@ extern char * mysql_unix_port;
...
@@ -27,8 +27,7 @@ extern char * mysql_unix_port;
CLIENT_TRANSACTIONS | \
CLIENT_TRANSACTIONS | \
CLIENT_PROTOCOL_41 | \
CLIENT_PROTOCOL_41 | \
CLIENT_SECURE_CONNECTION | \
CLIENT_SECURE_CONNECTION | \
CLIENT_MULTI_RESULTS | \
CLIENT_MULTI_RESULTS)
CLIENT_PS_MULTI_RESULTS)
sig_handler
my_pipe_sig_handler
(
int
sig
);
sig_handler
my_pipe_sig_handler
(
int
sig
);
void
read_user_name
(
char
*
name
);
void
read_user_name
(
char
*
name
);
...
...
mysql-test/r/not_partition.result
View file @
d0b2f90d
...
@@ -52,9 +52,9 @@ joined DATE NOT NULL
...
@@ -52,9 +52,9 @@ joined DATE NOT NULL
)
)
PARTITION BY KEY(joined)
PARTITION BY KEY(joined)
PARTITIONS 6;
PARTITIONS 6;
ERROR HY000: The 'partitioning' feature is disabled; you need MySQL built with '--with-partition' to have it working
Got one of the listed errors
ALTER TABLE t1 PARTITION BY KEY(joined) PARTITIONS 2;
ALTER TABLE t1 PARTITION BY KEY(joined) PARTITIONS 2;
ERROR HY000: The 'partitioning' feature is disabled; you need MySQL built with '--with-partition' to have it working
Got one of the listed errors
drop table t1;
drop table t1;
ERROR 42S02: Unknown table 't1'
ERROR 42S02: Unknown table 't1'
CREATE TABLE t1 (
CREATE TABLE t1 (
...
@@ -71,7 +71,7 @@ PARTITION p2 VALUES LESS THAN (1980),
...
@@ -71,7 +71,7 @@ PARTITION p2 VALUES LESS THAN (1980),
PARTITION p3 VALUES LESS THAN (1990),
PARTITION p3 VALUES LESS THAN (1990),
PARTITION p4 VALUES LESS THAN MAXVALUE
PARTITION p4 VALUES LESS THAN MAXVALUE
);
);
ERROR HY000: The 'partitioning' feature is disabled; you need MySQL built with '--with-partition' to have it working
Got one of the listed errors
drop table t1;
drop table t1;
ERROR 42S02: Unknown table 't1'
ERROR 42S02: Unknown table 't1'
CREATE TABLE t1 (id INT, purchased DATE)
CREATE TABLE t1 (id INT, purchased DATE)
...
@@ -82,7 +82,7 @@ PARTITION p0 VALUES LESS THAN (1990),
...
@@ -82,7 +82,7 @@ PARTITION p0 VALUES LESS THAN (1990),
PARTITION p1 VALUES LESS THAN (2000),
PARTITION p1 VALUES LESS THAN (2000),
PARTITION p2 VALUES LESS THAN MAXVALUE
PARTITION p2 VALUES LESS THAN MAXVALUE
);
);
ERROR HY000: The 'partitioning' feature is disabled; you need MySQL built with '--with-partition' to have it working
Got one of the listed errors
drop table t1;
drop table t1;
ERROR 42S02: Unknown table 't1'
ERROR 42S02: Unknown table 't1'
create table t1 (a varchar(10) charset latin1 collate latin1_bin);
create table t1 (a varchar(10) charset latin1 collate latin1_bin);
...
...
mysql-test/t/not_partition.test
View file @
d0b2f90d
...
@@ -31,7 +31,7 @@ ALTER TABLE t1 ENGINE Memory;
...
@@ -31,7 +31,7 @@ ALTER TABLE t1 ENGINE Memory;
ALTER
TABLE
t1
ADD
(
new
INT
);
ALTER
TABLE
t1
ADD
(
new
INT
);
DROP
TABLE
t1
;
DROP
TABLE
t1
;
--
error
ER_FEATURE_DISABLED
--
error
ER_FEATURE_DISABLED
,
ER_OPTION_PREVENTS_STATEMENT
CREATE
TABLE
t1
(
CREATE
TABLE
t1
(
firstname
VARCHAR
(
25
)
NOT
NULL
,
firstname
VARCHAR
(
25
)
NOT
NULL
,
lastname
VARCHAR
(
25
)
NOT
NULL
,
lastname
VARCHAR
(
25
)
NOT
NULL
,
...
@@ -42,13 +42,13 @@ CREATE TABLE t1 (
...
@@ -42,13 +42,13 @@ CREATE TABLE t1 (
PARTITION
BY
KEY
(
joined
)
PARTITION
BY
KEY
(
joined
)
PARTITIONS
6
;
PARTITIONS
6
;
--
error
ER_FEATURE_DISABLED
--
error
ER_FEATURE_DISABLED
,
ER_OPTION_PREVENTS_STATEMENT
ALTER
TABLE
t1
PARTITION
BY
KEY
(
joined
)
PARTITIONS
2
;
ALTER
TABLE
t1
PARTITION
BY
KEY
(
joined
)
PARTITIONS
2
;
--
error
ER_BAD_TABLE_ERROR
--
error
ER_BAD_TABLE_ERROR
drop
table
t1
;
drop
table
t1
;
--
error
ER_FEATURE_DISABLED
--
error
ER_FEATURE_DISABLED
,
ER_OPTION_PREVENTS_STATEMENT
CREATE
TABLE
t1
(
CREATE
TABLE
t1
(
firstname
VARCHAR
(
25
)
NOT
NULL
,
firstname
VARCHAR
(
25
)
NOT
NULL
,
lastname
VARCHAR
(
25
)
NOT
NULL
,
lastname
VARCHAR
(
25
)
NOT
NULL
,
...
@@ -66,7 +66,7 @@ PARTITION BY RANGE( YEAR(joined) ) (
...
@@ -66,7 +66,7 @@ PARTITION BY RANGE( YEAR(joined) ) (
--
error
ER_BAD_TABLE_ERROR
--
error
ER_BAD_TABLE_ERROR
drop
table
t1
;
drop
table
t1
;
--
error
ER_FEATURE_DISABLED
--
error
ER_FEATURE_DISABLED
,
ER_OPTION_PREVENTS_STATEMENT
CREATE
TABLE
t1
(
id
INT
,
purchased
DATE
)
CREATE
TABLE
t1
(
id
INT
,
purchased
DATE
)
PARTITION
BY
RANGE
(
YEAR
(
purchased
)
)
PARTITION
BY
RANGE
(
YEAR
(
purchased
)
)
SUBPARTITION
BY
HASH
(
TO_DAYS
(
purchased
)
)
SUBPARTITION
BY
HASH
(
TO_DAYS
(
purchased
)
)
...
...
scripts/make_win_bin_dist
View file @
d0b2f90d
...
@@ -290,6 +290,11 @@ if [ -d storage/innodb_plugin ]; then
...
@@ -290,6 +290,11 @@ if [ -d storage/innodb_plugin ]; then
cp
storage/innodb_plugin/
$TARGET
/ha_innodb_plugin.dll
\
cp
storage/innodb_plugin/
$TARGET
/ha_innodb_plugin.dll
\
$DESTDIR
/lib/plugin/
$DESTDIR
/lib/plugin/
fi
fi
if
[
-d
plugin/semisync
]
;
then
cp
plugin/semisync/
$TARGET
/semisync_master.dll
\
plugin/semisync/
$TARGET
/semisync_slave.dll
\
$DESTDIR
/lib/plugin/
fi
if
[
x
"
$TARGET
"
!=
x
"release"
]
;
then
if
[
x
"
$TARGET
"
!=
x
"release"
]
;
then
cp
libmysql/
$TARGET
/libmysql.pdb
\
cp
libmysql/
$TARGET
/libmysql.pdb
\
...
@@ -302,6 +307,11 @@ if [ x"$TARGET" != x"release" ] ; then
...
@@ -302,6 +307,11 @@ if [ x"$TARGET" != x"release" ] ; then
cp
storage/innodb_plugin/
$TARGET
/ha_innodb_plugin.pdb
\
cp
storage/innodb_plugin/
$TARGET
/ha_innodb_plugin.pdb
\
$DESTDIR
/lib/plugin/
$DESTDIR
/lib/plugin/
fi
fi
if
[
-d
plugin/semisync
]
;
then
cp
plugin/semisync/
$TARGET
/semisync_master.pdb
\
plugin/semisync/
$TARGET
/semisync_slave.pdb
\
$DESTDIR
/lib/plugin/
fi
fi
fi
...
@@ -328,6 +338,15 @@ if [ x"$PACK_DEBUG" = x"" -a -f "libmysql/debug/libmysql.lib" -o \
...
@@ -328,6 +338,15 @@ if [ x"$PACK_DEBUG" = x"" -a -f "libmysql/debug/libmysql.lib" -o \
storage/innodb_plugin/debug/ha_innodb_plugin.pdb
\
storage/innodb_plugin/debug/ha_innodb_plugin.pdb
\
$DESTDIR
/lib/plugin/debug/
$DESTDIR
/lib/plugin/debug/
fi
fi
if
[
-d
plugin/semisync
]
;
then
cp
plugin/semisync/debug/semisync_master.dll
\
plugin/semisync/debug/semisync_master.lib
\
plugin/semisync/debug/semisync_master.pdb
\
plugin/semisync/debug/semisync_slave.dll
\
plugin/semisync/debug/semisync_slave.lib
\
plugin/semisync/debug/semisync_slave.pdb
\
$DESTDIR
/lib/plugin/debug/
fi
fi
fi
# ----------------------------------------------------------------------
# ----------------------------------------------------------------------
...
...
storage/archive/Makefile.am
View file @
d0b2f90d
...
@@ -77,9 +77,12 @@ libarchive_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
...
@@ -77,9 +77,12 @@ libarchive_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
ha_archive_la_LIBADD
=
probes_sh_mysql.o
ha_archive_la_LIBADD
=
probes_sh_mysql.o
ha_archive_la_DEPENDENCIES
=
probes_sh_mysql.o dtrace_shared_files dtrace_providers
ha_archive_la_DEPENDENCIES
=
probes_sh_mysql.o dtrace_shared_files dtrace_providers
CLEANFILES
=
$(DTRACEPROVIDER)
dtrace_files dtrace_providers dtrace_shared_files
CLEANFILES
=
$(DTRACEPROVIDER)
dtrace_files dtrace_providers dtrace_shared_files
dtrace_sources
DTRACEFILES
=
libarchive_a-ha_archive.o
DTRACEFILES
=
libarchive_a-ha_archive.o
DTRACESHAREDFILES
=
.libs/ha_archive_la-ha_archive.o
DTRACESHAREDFILES
=
.libs/ha_archive_la-ha_archive.o
# Hack: We "depend" on ".libs/" but have no rule for it,
# but it is created as a byproduct of the ".lo"
DTRACESHAREDDEPEND
=
ha_archive_la-ha_archive.lo
DTRACEPROVIDER
=
probes_mysql.d
DTRACEPROVIDER
=
probes_mysql.d
dtrace_files
:
dtrace_files
:
...
@@ -93,7 +96,7 @@ probes_mysql.d:
...
@@ -93,7 +96,7 @@ probes_mysql.d:
$(CP)
$(top_srcdir)
/include/probes_mysql.d.base probes_mysql.d
$(CP)
$(top_srcdir)
/include/probes_mysql.d.base probes_mysql.d
echo
timestamp
>
dtrace_sources
echo
timestamp
>
dtrace_sources
probes_sh_mysql.o
:
$(DTRACEPROVIDER) $(DTRACESHARED
FILES
)
probes_sh_mysql.o
:
$(DTRACEPROVIDER) $(DTRACESHARED
DEPEND
)
$(DTRACE)
$(DTRACEFLAGS)
-G
-s
$(DTRACEPROVIDER)
$(DTRACESHAREDFILES)
-o
$@
$(DTRACE)
$(DTRACEFLAGS)
-G
-s
$(DTRACEPROVIDER)
$(DTRACESHAREDFILES)
-o
$@
probes_mysql.o
:
$(DTRACEPROVIDER) $(DTRACEFILES)
probes_mysql.o
:
$(DTRACEPROVIDER) $(DTRACEFILES)
...
...
storage/ibmdb2i/db2i_charsetSupport.cc
View file @
d0b2f90d
...
@@ -164,10 +164,10 @@ int32 initCharsetSupport()
...
@@ -164,10 +164,10 @@ int32 initCharsetSupport()
}
}
VOID
(
pthread_mutex_init
(
&
textDescMapHashMutex
,
MY_MUTEX_INIT_FAST
));
VOID
(
pthread_mutex_init
(
&
textDescMapHashMutex
,
MY_MUTEX_INIT_FAST
));
hash_init
(
&
textDescMapHash
,
&
my_charset_bin
,
10
,
offsetof
(
TextDescMap
,
hashKey
),
sizeof
(
TextDescMap
::
hashKey
),
0
,
0
,
HASH_UNIQUE
);
my_
hash_init
(
&
textDescMapHash
,
&
my_charset_bin
,
10
,
offsetof
(
TextDescMap
,
hashKey
),
sizeof
(
TextDescMap
::
hashKey
),
0
,
0
,
HASH_UNIQUE
);
VOID
(
pthread_mutex_init
(
&
iconvMapHashMutex
,
MY_MUTEX_INIT_FAST
));
VOID
(
pthread_mutex_init
(
&
iconvMapHashMutex
,
MY_MUTEX_INIT_FAST
));
hash_init
(
&
iconvMapHash
,
&
my_charset_bin
,
10
,
offsetof
(
IconvMap
,
hashKey
),
sizeof
(
IconvMap
::
hashKey
),
0
,
0
,
HASH_UNIQUE
);
my_
hash_init
(
&
iconvMapHash
,
&
my_charset_bin
,
10
,
offsetof
(
IconvMap
,
hashKey
),
sizeof
(
IconvMap
::
hashKey
),
0
,
0
,
HASH_UNIQUE
);
init_alloc_root
(
&
textDescMapMemroot
,
2048
,
0
);
init_alloc_root
(
&
textDescMapMemroot
,
2048
,
0
);
init_alloc_root
(
&
iconvMapMemroot
,
256
,
0
);
init_alloc_root
(
&
iconvMapMemroot
,
256
,
0
);
...
@@ -191,9 +191,9 @@ void doneCharsetSupport()
...
@@ -191,9 +191,9 @@ void doneCharsetSupport()
free_root
(
&
iconvMapMemroot
,
0
);
free_root
(
&
iconvMapMemroot
,
0
);
pthread_mutex_destroy
(
&
textDescMapHashMutex
);
pthread_mutex_destroy
(
&
textDescMapHashMutex
);
hash_free
(
&
textDescMapHash
);
my_
hash_free
(
&
textDescMapHash
);
pthread_mutex_destroy
(
&
iconvMapHashMutex
);
pthread_mutex_destroy
(
&
iconvMapHashMutex
);
hash_free
(
&
iconvMapHash
);
my_
hash_free
(
&
iconvMapHash
);
free_aligned
(
QlgCvtTextDescToDesc_sym
);
free_aligned
(
QlgCvtTextDescToDesc_sym
);
}
}
...
@@ -415,7 +415,7 @@ static int32 convertTextDesc(const int32 inType, const int32 outType, const char
...
@@ -415,7 +415,7 @@ static int32 convertTextDesc(const int32 inType, const int32 outType, const char
memcpy
(
hashKey
.
inDesc
,
inDescOverride
,
len
);
memcpy
(
hashKey
.
inDesc
,
inDescOverride
,
len
);
memset
(
hashKey
.
inDesc
+
len
,
0
,
sizeof
(
hashKey
.
inDesc
)
-
len
);
memset
(
hashKey
.
inDesc
+
len
,
0
,
sizeof
(
hashKey
.
inDesc
)
-
len
);
if
(
!
(
mapping
=
(
TextDescMap
*
)
hash_search
(
&
textDescMapHash
,
if
(
!
(
mapping
=
(
TextDescMap
*
)
my_
hash_search
(
&
textDescMapHash
,
(
const
uchar
*
)
&
hashKey
,
(
const
uchar
*
)
&
hashKey
,
sizeof
(
hashKey
))))
sizeof
(
hashKey
))))
{
{
...
@@ -748,7 +748,7 @@ int32 getConversion(enum_conversionDirection direction, const CHARSET_INFO* cs,
...
@@ -748,7 +748,7 @@ int32 getConversion(enum_conversionDirection direction, const CHARSET_INFO* cs,
/* Look for the conversion in the cache and add it if it is not there. */
/* Look for the conversion in the cache and add it if it is not there. */
IconvMap
*
mapping
;
IconvMap
*
mapping
;
if
(
!
(
mapping
=
(
IconvMap
*
)
hash_search
(
&
iconvMapHash
,
if
(
!
(
mapping
=
(
IconvMap
*
)
my_
hash_search
(
&
iconvMapHash
,
(
const
uchar
*
)
&
hashKey
,
(
const
uchar
*
)
&
hashKey
,
sizeof
(
hashKey
))))
sizeof
(
hashKey
))))
{
{
...
...
storage/ibmdb2i/db2i_constraints.cc
View file @
d0b2f90d
...
@@ -102,7 +102,7 @@ int ha_ibmdb2i::buildDB2ConstraintString(LEX* lex,
...
@@ -102,7 +102,7 @@ int ha_ibmdb2i::buildDB2ConstraintString(LEX* lex,
Foreign_key
*
fk
=
(
Foreign_key
*
)
curKey
;
Foreign_key
*
fk
=
(
Foreign_key
*
)
curKey
;
char
db2LibName
[
MAX_DB2_SCHEMANAME_LENGTH
+
1
];
char
db2LibName
[
MAX_DB2_SCHEMANAME_LENGTH
+
1
];
if
(
fk
->
name
)
if
(
fk
->
name
.
str
)
{
{
char
db2FKName
[
MAX_DB2_FILENAME_LENGTH
+
1
];
char
db2FKName
[
MAX_DB2_FILENAME_LENGTH
+
1
];
appendHere
.
append
(
STRING_WITH_LEN
(
"CONSTRAINT "
));
appendHere
.
append
(
STRING_WITH_LEN
(
"CONSTRAINT "
));
...
@@ -120,7 +120,7 @@ int ha_ibmdb2i::buildDB2ConstraintString(LEX* lex,
...
@@ -120,7 +120,7 @@ int ha_ibmdb2i::buildDB2ConstraintString(LEX* lex,
appendHere
.
append
(
'.'
);
appendHere
.
append
(
'.'
);
convertMySQLNameToDB2Name
(
fk
->
name
,
db2FKName
,
sizeof
(
db2FKName
));
convertMySQLNameToDB2Name
(
fk
->
name
.
str
,
db2FKName
,
sizeof
(
db2FKName
));
appendHere
.
append
(
db2FKName
);
appendHere
.
append
(
db2FKName
);
}
}
...
@@ -139,7 +139,7 @@ int ha_ibmdb2i::buildDB2ConstraintString(LEX* lex,
...
@@ -139,7 +139,7 @@ int ha_ibmdb2i::buildDB2ConstraintString(LEX* lex,
}
}
firstTime
=
false
;
firstTime
=
false
;
convertMySQLNameToDB2Name
(
curColumn
->
field_name
,
colName
,
sizeof
(
colName
));
convertMySQLNameToDB2Name
(
curColumn
->
field_name
.
str
,
colName
,
sizeof
(
colName
));
appendHere
.
append
(
colName
);
appendHere
.
append
(
colName
);
// DB2 requires that the sort sequence on the child table match the parent table's
// DB2 requires that the sort sequence on the child table match the parent table's
...
@@ -148,7 +148,7 @@ int ha_ibmdb2i::buildDB2ConstraintString(LEX* lex,
...
@@ -148,7 +148,7 @@ int ha_ibmdb2i::buildDB2ConstraintString(LEX* lex,
Field
**
field
=
fields
;
Field
**
field
=
fields
;
do
do
{
{
if
(
strcmp
((
*
field
)
->
field_name
,
curColumn
->
field_name
)
==
0
)
if
(
strcmp
((
*
field
)
->
field_name
,
curColumn
->
field_name
.
str
)
==
0
)
{
{
int
rc
=
updateAssociatedSortSequence
((
*
field
)
->
charset
(),
int
rc
=
updateAssociatedSortSequence
((
*
field
)
->
charset
(),
fileSortSequenceType
,
fileSortSequenceType
,
...
@@ -199,7 +199,7 @@ int ha_ibmdb2i::buildDB2ConstraintString(LEX* lex,
...
@@ -199,7 +199,7 @@ int ha_ibmdb2i::buildDB2ConstraintString(LEX* lex,
}
}
firstTime
=
false
;
firstTime
=
false
;
convertMySQLNameToDB2Name
(
curRef
->
field_name
,
colName
,
sizeof
(
colName
));
convertMySQLNameToDB2Name
(
curRef
->
field_name
.
str
,
colName
,
sizeof
(
colName
));
appendHere
.
append
(
colName
);
appendHere
.
append
(
colName
);
}
}
...
...
storage/ibmdb2i/ha_ibmdb2i.cc
View file @
d0b2f90d
...
@@ -284,8 +284,8 @@ static int ibmdb2i_init_func(void *p)
...
@@ -284,8 +284,8 @@ static int ibmdb2i_init_func(void *p)
was_ILE_inited
=
false
;
was_ILE_inited
=
false
;
ibmdb2i_hton
=
(
handlerton
*
)
p
;
ibmdb2i_hton
=
(
handlerton
*
)
p
;
VOID
(
pthread_mutex_init
(
&
ibmdb2i_mutex
,
MY_MUTEX_INIT_FAST
));
VOID
(
pthread_mutex_init
(
&
ibmdb2i_mutex
,
MY_MUTEX_INIT_FAST
));
(
void
)
hash_init
(
&
ibmdb2i_open_tables
,
table_alias_charset
,
32
,
0
,
0
,
(
void
)
my_
hash_init
(
&
ibmdb2i_open_tables
,
table_alias_charset
,
32
,
0
,
0
,
(
hash_get_key
)
ibmdb2i_get_key
,
0
,
0
);
(
my_
hash_get_key
)
ibmdb2i_get_key
,
0
,
0
);
ibmdb2i_hton
->
state
=
SHOW_OPTION_YES
;
ibmdb2i_hton
->
state
=
SHOW_OPTION_YES
;
ibmdb2i_hton
->
create
=
ibmdb2i_create_handler
;
ibmdb2i_hton
->
create
=
ibmdb2i_create_handler
;
...
@@ -340,7 +340,7 @@ static int ibmdb2i_done_func(void *p)
...
@@ -340,7 +340,7 @@ static int ibmdb2i_done_func(void *p)
doneCharsetSupport
();
doneCharsetSupport
();
hash_free
(
&
ibmdb2i_open_tables
);
my_
hash_free
(
&
ibmdb2i_open_tables
);
pthread_mutex_destroy
(
&
ibmdb2i_mutex
);
pthread_mutex_destroy
(
&
ibmdb2i_mutex
);
DBUG_RETURN
(
0
);
DBUG_RETURN
(
0
);
...
@@ -356,7 +356,7 @@ IBMDB2I_SHARE *ha_ibmdb2i::get_share(const char *table_name, TABLE *table)
...
@@ -356,7 +356,7 @@ IBMDB2I_SHARE *ha_ibmdb2i::get_share(const char *table_name, TABLE *table)
pthread_mutex_lock
(
&
ibmdb2i_mutex
);
pthread_mutex_lock
(
&
ibmdb2i_mutex
);
length
=
(
uint
)
strlen
(
table_name
);
length
=
(
uint
)
strlen
(
table_name
);
if
(
!
(
share
=
(
IBMDB2I_SHARE
*
)
hash_search
(
&
ibmdb2i_open_tables
,
if
(
!
(
share
=
(
IBMDB2I_SHARE
*
)
my_
hash_search
(
&
ibmdb2i_open_tables
,
(
uchar
*
)
table_name
,
(
uchar
*
)
table_name
,
length
)))
length
)))
{
{
...
@@ -387,7 +387,7 @@ IBMDB2I_SHARE *ha_ibmdb2i::get_share(const char *table_name, TABLE *table)
...
@@ -387,7 +387,7 @@ IBMDB2I_SHARE *ha_ibmdb2i::get_share(const char *table_name, TABLE *table)
if
(
rc
)
if
(
rc
)
{
{
delete
share
->
db2Table
;
delete
share
->
db2Table
;
hash_delete
(
&
ibmdb2i_open_tables
,
(
uchar
*
)
share
);
my_
hash_delete
(
&
ibmdb2i_open_tables
,
(
uchar
*
)
share
);
thr_lock_delete
(
&
share
->
lock
);
thr_lock_delete
(
&
share
->
lock
);
my_errno
=
rc
;
my_errno
=
rc
;
goto
error
;
goto
error
;
...
@@ -420,7 +420,7 @@ int ha_ibmdb2i::free_share(IBMDB2I_SHARE *share)
...
@@ -420,7 +420,7 @@ int ha_ibmdb2i::free_share(IBMDB2I_SHARE *share)
delete
share
->
db2Table
;
delete
share
->
db2Table
;
db2Table
=
NULL
;
db2Table
=
NULL
;
hash_delete
(
&
ibmdb2i_open_tables
,
(
uchar
*
)
share
);
my_
hash_delete
(
&
ibmdb2i_open_tables
,
(
uchar
*
)
share
);
thr_lock_delete
(
&
share
->
lock
);
thr_lock_delete
(
&
share
->
lock
);
pthread_mutex_destroy
(
&
share
->
mutex
);
pthread_mutex_destroy
(
&
share
->
mutex
);
my_free
(
share
,
MYF
(
0
));
my_free
(
share
,
MYF
(
0
));
...
...
support-files/mysql.spec.sh
View file @
d0b2f90d
...
@@ -43,6 +43,12 @@
...
@@ -43,6 +43,12 @@
%
{
?_with_cluster:%define CLUSTER_BUILD 1
}
%
{
?_with_cluster:%define CLUSTER_BUILD 1
}
%
{!
?_with_cluster:%define CLUSTER_BUILD 0
}
%
{!
?_with_cluster:%define CLUSTER_BUILD 0
}
# ----------------------------------------------------------------------
# support optional "tcmalloc" stuff (experimental)
# ----------------------------------------------------------------------
%
{
?malloc_lib_target:%define WITH_TCMALLOC 1
}
%
{!
?malloc_lib_target:%define WITH_TCMALLOC 0
}
%if %
{
STATIC_BUILD
}
%if %
{
STATIC_BUILD
}
%define release 0
%define release 0
%else
%else
...
@@ -448,7 +454,7 @@ $MBD/libtool --mode=execute install -m 755 \
...
@@ -448,7 +454,7 @@ $MBD/libtool --mode=execute install -m 755 \
$RPM_BUILD_DIR
/mysql-%
{
mysql_version
}
/mysql-debug-%
{
mysql_version
}
/sql/mysqld
\
$RPM_BUILD_DIR
/mysql-%
{
mysql_version
}
/mysql-debug-%
{
mysql_version
}
/sql/mysqld
\
$RBR
%
{
_sbindir
}
/mysqld-debug
$RBR
%
{
_sbindir
}
/mysqld-debug
%if %
{
?malloc_lib_target:1
}
%
{!
?malloc_lib_target:0
}
%if %
{
WITH_TCMALLOC
}
# Even though this is a shared library, put it under /usr/lib/mysql, so it
# Even though this is a shared library, put it under /usr/lib/mysql, so it
# doesn't conflict with possible shared lib by the same name in /usr/lib. See
# doesn't conflict with possible shared lib by the same name in /usr/lib. See
# `mysql_config --variable=pkglibdir` and mysqld_safe for how this is used.
# `mysql_config --variable=pkglibdir` and mysqld_safe for how this is used.
...
@@ -709,12 +715,10 @@ fi
...
@@ -709,12 +715,10 @@ fi
%attr
(
755, root, root
)
%
{
_bindir
}
/resolveip
%attr
(
755, root, root
)
%
{
_bindir
}
/resolveip
%attr
(
755, root, root
)
%
{
_libdir
}
/mysql/plugin/ha_example.so
*
%attr
(
755, root, root
)
%
{
_libdir
}
/mysql/plugin/ha_example.so
*
%if %
{
WITHOUT_INNODB_PLUGIN
}
%attr
(
755, root, root
)
%
{
_libdir
}
/mysql/plugin/libsemisync_master.so
*
%else
%attr
(
755, root, root
)
%
{
_libdir
}
/mysql/plugin/libsemisync_slave.so
*
%attr
(
755, root, root
)
%
{
_libdir
}
/mysql/plugin/ha_innodb_plugin.so
*
%endif
%if %
{
?malloc_lib_target:1
}
%
{!
?malloc_lib_target:0
}
%if %
{
WITH_TCMALLOC
}
%attr
(
755, root, root
)
%
{
_libdir
}
/mysql/%
{
malloc_lib_target
}
%attr
(
755, root, root
)
%
{
_libdir
}
/mysql/%
{
malloc_lib_target
}
%endif
%endif
...
@@ -833,6 +837,7 @@ fi
...
@@ -833,6 +837,7 @@ fi
%
{
_libdir
}
/mysql/libmysqlclient.la
%
{
_libdir
}
/mysql/libmysqlclient.la
%
{
_libdir
}
/mysql/libmysqlclient_r.a
%
{
_libdir
}
/mysql/libmysqlclient_r.a
%
{
_libdir
}
/mysql/libmysqlclient_r.la
%
{
_libdir
}
/mysql/libmysqlclient_r.la
%
{
_libdir
}
/mysql/libmysqlservices.a
%
{
_libdir
}
/mysql/libmystrings.a
%
{
_libdir
}
/mysql/libmystrings.a
%
{
_libdir
}
/mysql/libmysys.a
%
{
_libdir
}
/mysql/libmysys.a
%if %
{
CLUSTER_BUILD
}
%if %
{
CLUSTER_BUILD
}
...
@@ -844,11 +849,10 @@ fi
...
@@ -844,11 +849,10 @@ fi
%
{
_libdir
}
/mysql/libz.la
%
{
_libdir
}
/mysql/libz.la
%
{
_libdir
}
/mysql/plugin/ha_example.a
%
{
_libdir
}
/mysql/plugin/ha_example.a
%
{
_libdir
}
/mysql/plugin/ha_example.la
%
{
_libdir
}
/mysql/plugin/ha_example.la
%if %
{
WITHOUT_INNODB_PLUGIN
}
%
{
_libdir
}
/mysql/plugin/libsemisync_master.a
%else
%
{
_libdir
}
/mysql/plugin/libsemisync_master.la
%
{
_libdir
}
/mysql/plugin/ha_innodb_plugin.a
%
{
_libdir
}
/mysql/plugin/libsemisync_slave.a
%
{
_libdir
}
/mysql/plugin/ha_innodb_plugin.la
%
{
_libdir
}
/mysql/plugin/libsemisync_slave.la
%endif
%files shared
%files shared
%defattr
(
-, root, root, 0755
)
%defattr
(
-, root, root, 0755
)
...
@@ -878,6 +882,11 @@ fi
...
@@ -878,6 +882,11 @@ 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
*
Mon Nov 16 2009 Joerg Bruehe <joerg.bruehe@sun.com>
- Fix some problems with the directives around
"tcmalloc"
(
experimental
)
,
remove erroneous traces of the InnoDB plugin
(
that is 5.1 only
)
.
*
Fri Oct 02 2009 Alexander Nozdrin <alexander.nozdrin@sun.com>
*
Fri Oct 02 2009 Alexander Nozdrin <alexander.nozdrin@sun.com>
-
"mysqlmanager"
got removed from version 5.4, all references deleted.
-
"mysqlmanager"
got removed from version 5.4, all references deleted.
...
...
tests/mysql_client_test.c
View file @
d0b2f90d
...
@@ -19197,7 +19197,7 @@ static struct my_tests_st my_tests[]= {
...
@@ -19197,7 +19197,7 @@ static struct my_tests_st my_tests[]= {
{
"test_wl4166_3"
,
test_wl4166_3
},
{
"test_wl4166_3"
,
test_wl4166_3
},
{
"test_wl4166_4"
,
test_wl4166_4
},
{
"test_wl4166_4"
,
test_wl4166_4
},
{
"test_bug36004"
,
test_bug36004
},
{
"test_bug36004"
,
test_bug36004
},
{
"test_wl4435"
,
test_wl4435
},
/* { "test_wl4435", test_wl4435 }, */
{
"test_wl4435_2"
,
test_wl4435_2
},
{
"test_wl4435_2"
,
test_wl4435_2
},
{
"test_bug38486"
,
test_bug38486
},
{
"test_bug38486"
,
test_bug38486
},
{
"test_bug33831"
,
test_bug33831
},
{
"test_bug33831"
,
test_bug33831
},
...
...
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