server-tools/instance-manager/commands.cc:
fix memory leak
server-tools/instance-manager/guardian.cc:
don't check pthread_mutex_lock/unlock return value, as it never returns error if properly
used (no self deadlocks) and initialized
server-tools/instance-manager/guardian.h:
prototype fixed
server-tools/instance-manager/instance_map.cc:
don't check pthread_mutex_lock/unlock status, as it never returns error if
properly used (no self deadlocks) and initialized
server-tools/instance-manager/instance_map.h:
prototype fixed
server-tools/instance-manager/listener.cc:
initialize highest-numbered descriptor to 0 for select before setting it with max(n, sockets[i]),
ifdef unix-specific code
server-tools/instance-manager/manager.cc:
remove commented stuff
server-tools/instance-manager/options.cc:
fix crash in load_defaults, which happened on all Unix systems due to
const char *Options::config_file= NULL. Check return value for GetModuleFileName.
Get rid of obscure default_config_file[FN_REFLEN]= "/etc/my.cnf"; which was never used
into fedora.(none):/home/reggie/bk/im_patch
server-tools/instance-manager/manager.cc:
Auto merged
server-tools/instance-manager/mysqlmanager.cc:
Auto merged
server-tools/instance-manager/options.h:
Auto merged
server-tools/instance-manager/commands.cc:
final merge of IM port code for Windows
server-tools/instance-manager/instance_map.cc:
final merge of IM port code for Windows
server-tools/instance-manager/options.cc:
final merge of IM port code for Windows
Back ported ndbcluster_support() from 5.0
Corrected the server id handling
mysql-test/mysql-test-run.pl:
Back ported ndbcluster_support() from 5.0
Corrected the server id handling
into deer.(none):/home/hf/work/mysql-5.0.clean
mysql-test/r/myisam.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
the rpm spec file changelog
sql/ha_innodb.cc:
- Merge: used local version (as the fix in 4.0 was a backport)
support-files/mysql.spec.sh:
- manual merge from 4.0
the MySQL-server RPM spec file (BUG#12348)
support-files/mysql.spec.sh:
- Fixed the creation of the mysql user group account in the postinstall section
(BUG#12348)
server-tools/instance-manager/IMService.cpp:
fixed tabs and spacing per JimW's review
server-tools/instance-manager/WindowsService.cpp:
fixed tabs and spacing per JimW's review
server-tools/instance-manager/WindowsService.h:
fixed tabs and spacing per JimW's review
server-tools/instance-manager/commands.cc:
fixed tabs and spacing per JimW's review
server-tools/instance-manager/instance.cc:
fixed tabs and spacing per JimW's review
server-tools/instance-manager/instance_map.cc:
fixed tabs and spacing per JimW's review
server-tools/instance-manager/listener.cc:
fixed tabs and spacing per JimW's review
server-tools/instance-manager/manager.cc:
fixed tabs and spacing per JimW's review
server-tools/instance-manager/options.cc:
fixed tabs and spacing per JimW's review
server-tools/instance-manager/user_map.cc:
fixed tabs and spacing per JimW's review
Adds --replace_column to make test results deterministic.
mysql-test/r/rpl_slave_status.result:
BUG#12330 updated result file which I missed in last changeset
This updates the test to use --replace_column to make the test
deterministic.
into mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0
configure.in:
Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
Auto merged
BitKeeper/deleted/.del-mysqlmanager.dsp~52d7a8f016396837:
Auto merged
BitKeeper/etc/config:
Auto merged
VC++Files/client/mysql.dsp:
Auto merged
VC++Files/client/mysqladmin.dsp:
Auto merged
VC++Files/client/mysqldump.dsp:
Auto merged
VC++Files/client/mysqlimport.dsp:
Auto merged
VC++Files/client/mysqlshow.dsp:
Auto merged
VC++Files/client/mysqltest.dsp:
Auto merged
VC++Files/mysql-test/mysql_test_run_new.dsp:
Auto merged
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
Auto merged
VC++Files/mysqlcheck/mysqlcheck.dsp:
Auto merged
support-files/mysql.spec.sh:
Auto merged
BitKeeper/etc/config:
Auto merged
VC++Files/client/mysql.dsp:
Auto merged
VC++Files/client/mysqladmin.dsp:
Auto merged
VC++Files/client/mysqlcheck.dsp:
Auto merged
VC++Files/client/mysqldump.dsp:
Auto merged
VC++Files/client/mysqlimport.dsp:
Auto merged
VC++Files/client/mysqlshow.dsp:
Auto merged
VC++Files/client/mysqltest.dsp:
Auto merged
VC++Files/mysql-test/mysql_test_run_new.dsp:
Auto merged
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
Auto merged
VC++Files/mysqlcheck/mysqlcheck.dsp:
Auto merged
VC++Files/mysqlmanager/mysqlmanager.dsp:
Auto merged
acinclude.m4:
Auto merged
zlib/ChangeLog:
Auto merged
zlib/FAQ:
Auto merged
zlib/INDEX:
Auto merged
zlib/README:
Auto merged
zlib/crc32.c:
Auto merged
zlib/deflate.c:
Auto merged
zlib/deflate.h:
Auto merged
zlib/gzio.c:
Auto merged
zlib/infback.c:
Auto merged
zlib/inffast.c:
Auto merged
zlib/inflate.c:
Auto merged
zlib/inftrees.c:
Auto merged
zlib/inftrees.h:
Auto merged
zlib/trees.c:
Auto merged
zlib/zconf.h:
Auto merged
zlib/zlib.3:
Auto merged
zlib/zlib.h:
Auto merged
zlib/zutil.h:
Auto merged
Fix a bug: InnoDB could in a crash recovery print a big false corruption warning if the first page of an ibdata file was 'recreated' in the buffer pool; this could happen, for example, if a table was dropped, and the page used later
innobase/buf/buf0buf.c:
Fix a bug: InnoDB could in a crash recovery print a big false corruption warning if the first page of an ibdata file was 'recreated' in the buffer pool; this could happen, for example, if a table was dropped, and the page used later
Backport of Bug #9670 to 4.0: assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED)
sql/ha_innodb.cc:
Backport of Bug #9670 to 4.0: assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED)
