mirror of
https://github.com/MariaDB/server.git
synced 2025-01-27 01:04:19 +01:00
merged
This commit is contained in:
commit
56deea0dd7
17 changed files with 114 additions and 38 deletions
.bzr-mysql
include/atomic
libmysql
libmysqld
mysql-test
scripts
storage
archive
ibmdb2i
innobase
myisam
support-files
tests
|
@ -1,4 +1,4 @@
|
||||||
[MYSQL]
|
[MYSQL]
|
||||||
post_commit_to = "commits@lists.mysql.com"
|
post_commit_to = "commits@lists.mysql.com"
|
||||||
post_push_to = "commits@lists.mysql.com"
|
post_push_to = "commits@lists.mysql.com"
|
||||||
tree_name = "mysql-5.5-next-mr-bugfixing"
|
tree_name = "mysql-5.5-next-mr"
|
||||||
|
|
|
@ -108,7 +108,7 @@
|
||||||
int32 ebx=(set & 0xFFFFFFFF), ecx=(set >> 32); \
|
int32 ebx=(set & 0xFFFFFFFF), ecx=(set >> 32); \
|
||||||
asm volatile ("push %%ebx; movl %3, %%ebx;" \
|
asm volatile ("push %%ebx; movl %3, %%ebx;" \
|
||||||
LOCK_prefix "; cmpxchg8b %0; setz %2; pop %%ebx"\
|
LOCK_prefix "; cmpxchg8b %0; setz %2; pop %%ebx"\
|
||||||
: "+m" (*a), "+A" (*cmp), "=q" (ret) \
|
: "+m" (*a), "+A" (*cmp), "=c" (ret) \
|
||||||
:"m" (ebx), "c" (ecx))
|
:"m" (ebx), "c" (ecx))
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -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);
|
||||||
|
|
|
@ -104,3 +104,4 @@ EXPORTS
|
||||||
mysql_stmt_attr_get
|
mysql_stmt_attr_get
|
||||||
mysql_stmt_attr_set
|
mysql_stmt_attr_set
|
||||||
mysql_stmt_field_count
|
mysql_stmt_field_count
|
||||||
|
mysql_stmt_next_result
|
||||||
|
|
|
@ -12,7 +12,6 @@ main.lock_multi_bug38499 # Bug#47448 2009-09-19 alik main.lock_m
|
||||||
main.lock_multi_bug38691 @solaris # Bug#47792 2009-10-02 alik main.lock_multi_bug38691 times out sporadically on Solaris 10
|
main.lock_multi_bug38691 @solaris # Bug#47792 2009-10-02 alik main.lock_multi_bug38691 times out sporadically on Solaris 10
|
||||||
main.log_tables # Bug#47924 2009-10-08 alik main.log_tables times out sporadically
|
main.log_tables # Bug#47924 2009-10-08 alik main.log_tables times out sporadically
|
||||||
main.plugin # Bug#47146 Linking problem with example plugin when dtrace enabled
|
main.plugin # Bug#47146 Linking problem with example plugin when dtrace enabled
|
||||||
main.plugin_load # Bug#47146
|
|
||||||
|
|
||||||
rpl.rpl_get_master_version_and_clock* # Bug#49191 2009-12-01 Daogang rpl_get_master_version_and_clock failed on PB2: COM_REGISTER_SLAVE failed
|
rpl.rpl_get_master_version_and_clock* # Bug#49191 2009-12-01 Daogang rpl_get_master_version_and_clock failed on PB2: COM_REGISTER_SLAVE failed
|
||||||
rpl.rpl_heartbeat_basic # BUG#43828 2009-10-22 luis fails sporadically
|
rpl.rpl_heartbeat_basic # BUG#43828 2009-10-22 luis fails sporadically
|
||||||
|
|
|
@ -9,6 +9,30 @@ partition by range columns (a,b,c)
|
||||||
( partition p0 values less than (1, maxvalue, 10),
|
( partition p0 values less than (1, maxvalue, 10),
|
||||||
partition p1 values less than (1, maxvalue, maxvalue));
|
partition p1 values less than (1, maxvalue, maxvalue));
|
||||||
ERROR HY000: VALUES LESS THAN value must be strictly increasing for each partition
|
ERROR HY000: VALUES LESS THAN value must be strictly increasing for each partition
|
||||||
|
create table t1 (a varchar(5) character set ucs2 collate ucs2_bin)
|
||||||
|
partition by range columns (a)
|
||||||
|
(partition p0 values less than (0x0041));
|
||||||
|
insert into t1 values (0x00410000);
|
||||||
|
select hex(a) from t1 where a like 'A_';
|
||||||
|
hex(a)
|
||||||
|
00410000
|
||||||
|
explain partitions select hex(a) from t1 where a like 'A_';
|
||||||
|
id select_type table partitions type possible_keys key key_len ref rows Extra
|
||||||
|
1 SIMPLE t1 p0 system NULL NULL NULL NULL 1
|
||||||
|
alter table t1 remove partitioning;
|
||||||
|
select hex(a) from t1 where a like 'A_';
|
||||||
|
hex(a)
|
||||||
|
00410000
|
||||||
|
create index a on t1 (a);
|
||||||
|
select hex(a) from t1 where a like 'A_';
|
||||||
|
hex(a)
|
||||||
|
00410000
|
||||||
|
insert into t1 values ('A_');
|
||||||
|
select hex(a) from t1;
|
||||||
|
hex(a)
|
||||||
|
00410000
|
||||||
|
0041005F
|
||||||
|
drop table t1;
|
||||||
create table t1 (a varchar(1) character set latin1 collate latin1_general_ci)
|
create table t1 (a varchar(1) character set latin1 collate latin1_general_ci)
|
||||||
partition by range columns(a)
|
partition by range columns(a)
|
||||||
( partition p0 values less than ('a'),
|
( partition p0 values less than ('a'),
|
||||||
|
|
|
@ -13,3 +13,4 @@ kill : Bug#37780 2008-12-03 HHunger need some changes to be
|
||||||
query_cache_28249 : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadicallyr
|
query_cache_28249 : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadicallyr
|
||||||
innodb-autoinc : Bug#49267 2009-12-02 test fails on windows because of different case mode
|
innodb-autoinc : Bug#49267 2009-12-02 test fails on windows because of different case mode
|
||||||
innodb : Bug#49396 2009-12-03 test fails in embedded mode
|
innodb : Bug#49396 2009-12-03 test fails in embedded mode
|
||||||
|
plugin_load : Bug#42144 2009-12-21 alik plugin_load fails
|
||||||
|
|
|
@ -23,6 +23,23 @@ partition by range columns (a,b,c)
|
||||||
( partition p0 values less than (1, maxvalue, 10),
|
( partition p0 values less than (1, maxvalue, 10),
|
||||||
partition p1 values less than (1, maxvalue, maxvalue));
|
partition p1 values less than (1, maxvalue, maxvalue));
|
||||||
|
|
||||||
|
#
|
||||||
|
# BUG#48737, Search fails with ucs2
|
||||||
|
#
|
||||||
|
create table t1 (a varchar(5) character set ucs2 collate ucs2_bin)
|
||||||
|
partition by range columns (a)
|
||||||
|
(partition p0 values less than (0x0041));
|
||||||
|
insert into t1 values (0x00410000);
|
||||||
|
select hex(a) from t1 where a like 'A_';
|
||||||
|
explain partitions select hex(a) from t1 where a like 'A_';
|
||||||
|
alter table t1 remove partitioning;
|
||||||
|
select hex(a) from t1 where a like 'A_';
|
||||||
|
create index a on t1 (a);
|
||||||
|
select hex(a) from t1 where a like 'A_';
|
||||||
|
insert into t1 values ('A_');
|
||||||
|
select hex(a) from t1;
|
||||||
|
drop table t1;
|
||||||
|
|
||||||
#
|
#
|
||||||
# BUG#48161, Delivering too few records using collate syntax with partitions
|
# BUG#48161, Delivering too few records using collate syntax with partitions
|
||||||
#
|
#
|
||||||
|
|
|
@ -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
|
||||||
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 \
|
||||||
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
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
# ----------------------------------------------------------------------
|
||||||
|
|
|
@ -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:
|
||||||
$(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) $(DTRACESHAREDFILES)
|
probes_sh_mysql.o: $(DTRACEPROVIDER) $(DTRACESHAREDDEPEND)
|
||||||
$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACESHAREDFILES) -o $@
|
$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACESHAREDFILES) -o $@
|
||||||
|
|
||||||
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
|
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
|
||||||
|
|
|
@ -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()
|
||||||
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
|
||||||
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,
|
||||||
|
|
||||||
/* 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))))
|
||||||
{
|
{
|
||||||
|
|
|
@ -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,
|
||||||
|
|
||||||
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,
|
||||||
}
|
}
|
||||||
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,
|
||||||
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,
|
||||||
}
|
}
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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)
|
||||||
|
|
||||||
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)
|
||||||
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)
|
||||||
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)
|
||||||
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));
|
||||||
|
|
|
@ -86,5 +86,10 @@ IF (MYSQL_VERSION_ID GREATER "50137")
|
||||||
SET_TARGET_PROPERTIES(ha_innobase PROPERTIES OUTPUT_NAME ha_innodb)
|
SET_TARGET_PROPERTIES(ha_innobase PROPERTIES OUTPUT_NAME ha_innodb)
|
||||||
ENDIF(LIB_LOCATION)
|
ENDIF(LIB_LOCATION)
|
||||||
ELSE (MYSQL_VERSION_ID GREATER "50137")
|
ELSE (MYSQL_VERSION_ID GREATER "50137")
|
||||||
MYSQL_STORAGE_ENGINE(INNODB_PLUGIN)
|
IF (NOT SOURCE_SUBLIBS)
|
||||||
|
ADD_DEFINITIONS(-D_WIN32 -DMYSQL_SERVER)
|
||||||
|
ADD_LIBRARY(innobase STATIC ${INNOBASE_SOURCES})
|
||||||
|
# Require mysqld_error.h, which is built as part of the GenError
|
||||||
|
ADD_DEPENDENCIES(innobase GenError)
|
||||||
|
ENDIF (NOT SOURCE_SUBLIBS)
|
||||||
ENDIF (MYSQL_VERSION_ID GREATER "50137")
|
ENDIF (MYSQL_VERSION_ID GREATER "50137")
|
||||||
|
|
|
@ -41,7 +41,6 @@ ulonglong myisam_max_temp_length= MAX_FILE_SIZE;
|
||||||
ulong myisam_bulk_insert_tree_size=8192*1024;
|
ulong myisam_bulk_insert_tree_size=8192*1024;
|
||||||
ulong myisam_data_pointer_size=4;
|
ulong myisam_data_pointer_size=4;
|
||||||
ulonglong myisam_mmap_size= SIZE_T_MAX, myisam_mmap_used= 0;
|
ulonglong myisam_mmap_size= SIZE_T_MAX, myisam_mmap_used= 0;
|
||||||
mysql_mutex_t THR_LOCK_myisam_mmap;
|
|
||||||
|
|
||||||
static int always_valid(const char *filename __attribute__((unused)))
|
static int always_valid(const char *filename __attribute__((unused)))
|
||||||
{
|
{
|
||||||
|
|
|
@ -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 \
|
||||||
$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
|
||||||
%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
|
||||||
%{_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
|
||||||
%{_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
|
||||||
# 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.
|
||||||
|
|
|
@ -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 },
|
||||||
|
|
Loading…
Add table
Reference in a new issue