| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| | |
into mysql.com:/home/mysqldev/tulin/mysql-4.1
scripts/make_binary_distribution.sh:
Auto merged
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
into mysql.com:/home/jimw/my/mysql-4.1-clean
scripts/mysql_create_system_tables.sh:
Auto merged
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
case-insensitive. (Bug #7989)
mysql-test/r/system_mysql_db.result:
Update results
scripts/mysql_create_system_tables.sh:
Need to create enum and set columns with case-insensitive collation
scripts/mysql_fix_privilege_tables.sql:
Modify all enum and set columns to be case-insensitive (and re-order some of
the fix-ups to make it all happen smoothly).
|
|/ / |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
into mysql.com:/space/my/mysql-4.1-merge
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- updated mysql-copyright-2 to properly convert this new header from GPL to commercial for the
commercial distribution
Build-tools/mysql-copyright-2:
- added functionality to replace a copyright header in .sql files, too (needed for updating
scripts/fill_help_tables.sql in the commercial source distribution)
scripts/fill_help_tables.sh:
- added copyright header on top of the fill_help_tables.sql file (BUG#5772)
|
|/ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
CLIENT_LIBS in mysql_config as CLIENT_LIBS point to builddir when
we use the bundled zlib.
acinclude.m4:
Extend MYSQL_CHECK_ZLIB_WITH_COMPRESS m4 macro to substitute ZLIB_DEPS -
this is a special version of ZLIB_LIBS to use in mysql_config
configure.in:
Remove NON_THREADED_CLIENT_LIBS which weren't really
NON_THREADED_CLIENT_LIBS and use NON_THREADED_LIBS instead.
AC_SUBST NON_THREADED_LIBS and STATIC_NSS_FLAGS as they're now
needed inside mysql_config.sh
scripts/Makefile.am:
Add STATIC_NSS_FLAGS, NON_THREADED_LIBS and ZLIB_DEPS to sed
substitution list.
scripts/mysql_config.sh:
We can't use CLIENT_LIBS as in case when we use the bundled zlib
it has a reference to $(top_builddir)/zlib.
libs and libs_r now need to be specified explicitly.
zlib/Makefile.am:
Install libz.la in case it's used by MySQL: this way we guarantee
that paths printed by mysql_config are valid in all cases.
|
|
|
|
|
| |
scripts/make_binary_distribution.sh:
Make sure to copy result.es files
|
|
|
|
|
|
|
|
|
| |
binary distribution on all platforms.
scripts/make_binary_distribution.sh:
Add mysql_client_test and embedded versions to basic list of binaries
and only list libtool-produced '.libs/' versions as non-netware binaries
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- renamed the tests that use the embedded server (client_test ->
mysql_client_test_embedded, mysqltest -> mysql_test_embedded
and changed some Makefiles and scripts so they are installed in $bindir
(required to be able to run the test suite against the embedded server)
tests/mysql_client_test.c:
Rename: tests/client_test.c -> tests/mysql_client_test.c
libmysql/libmysql.c:
- renamed client_test.c to mysql_client_test.c in a comment
libmysqld/examples/Makefile.am:
- renamed client_test -> mysql_client_test_embedded
- renamed mysqltest -> mysqltest_embedded
- both will be installed in $bindir
scripts/make_binary_distribution.sh:
- install mysql_client_test, mysql_client_test_embedded and mysqltest_embedded
into bin directory
tests/Makefile.am:
- renamed client_test to mysql_client_test
BitKeeper/etc/ignore:
Added tests/mysql_client_test to the ignore list
|
|\
| |
| |
| |
| | |
scripts/mysql_install_db.sh:
Merge changes
|
| |
| |
| |
| |
| |
| |
| |
| | |
it has been specified. (Bug #7347)
scripts/mysql_install_db.sh:
When basedir is specified, look for libexecdir relative to that
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
scripts/mysqlaccess.sh:
Auto merged
|
| |/
| |
| |
| |
| |
| |
| |
| | |
reported by Javier Fernandez-Sanguino Pena
and Debian Security Audit Team (http://www.debian.org/security/audit)
|
| |
| |
| |
| |
| | |
scripts/Makefile.am:
Replace ZLIB_LIBS
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
mysql_fix_privilege_tables.sql, or they may get truncated during conversion
to utf8. (Bug #7539)
scripts/mysql_fix_privilege_tables.sql:
Reset widths of all text fields at the same time as vonersion to utf8 to avoid length changes
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
into mysql.com:/home/jwinstead2/mysql-4.1-clean
scripts/mysql_config.sh:
Auto merged
|
| | |
| | |
| | |
| | |
| | | |
scripts/mysql_config.sh:
include ZLIB_LIBS in --libs_r
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into mysql.com:/home/jwinstead2/mysql-4.1-clean
|
| | | |
| | | |
| | | |
| | | |
| | | | |
scripts/mysql_config.sh:
Add comment to clarify why we can safely only strip flags with a leading space
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
(Second commit of this patch -- first included wrong changes.)
scripts/mysql_config.sh:
Make sure we are only removing whole options (protects -Wl,-O2, for example)
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
to only look for the mysqld binary (and english error strings) and assume the
datadir from that. Then, if that datadir turns out to not exist, startup will
fail. This avoids the behavior where mysqld_safe would go off and run a totally
different binary because the data directory had been moved (even when --datadir
was specified on the command line). (Bug #7249)
scripts/mysqld_safe.sh:
Don't actually verify that datadir exists when
using relatively-located mysqld -- just assume
that it does and either let it fail when it
doesn't, or do the right thing when datadir
is then set via the command line or my.cnf file.
|
| |
| |
| |
| |
| |
| |
| |
| | |
for port and/or pid-file parameters. (Bug #5878)
scripts/mysqld_safe.sh:
Change 'ps xa' to 'ps xaww' so whole command-line is examined
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Convert @samp{c} to 'c', not c.
scripts/fill_help_tables.sh:
Convert @samp{c} to 'c', not c.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
ndb/include/Makefile.am:
Auto merged
ndb/include/kernel/LogLevel.hpp:
Auto merged
ndb/include/mgmapi/mgmapi.h:
Auto merged
ndb/include/ndbapi/NdbConnection.hpp:
Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
ndb/src/common/debugger/EventLogger.cpp:
Auto merged
ndb/src/common/logger/FileLogHandler.cpp:
Auto merged
ndb/src/common/logger/Logger.cpp:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/main.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
Auto merged
ndb/src/kernel/vm/Configuration.cpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
ndb/src/mgmsrv/Services.hpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
ndb/tools/Makefile.am:
Auto merged
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
corrected mysql_test_run_new.dsp
added dependency
corrected path of mysql_test_run_new.dsp
fixed wrong code
added my_create_tables.c
removed command_line
fixed #elif
restored NAME_MAX and MAX_FNAME
added create_system_files()
added compare() for windows
added all files of testes in script
added mysql-test in script
BitKeeper/etc/ignore:
Added mysql-4.1.8-win-src.zip to the ignore list
VC++Files/client/mysqltest.dsp:
corrected dsp file
VC++Files/mysql-test/mysql_test_run_new.dsp:
corrected mysql_test_run_new.dsp
VC++Files/mysql.dsw:
added dependency
corrected path of mysql_test_run_new.dsp
client/mysqltest.c:
fixed wrong code
mysql-test/Makefile.am:
added my_create_tables.c
mysql-test/my_manage.c:
removed command_line
fixed #elif
mysql-test/my_manage.h:
restored NAME_MAX and MAX_FNAME
mysql-test/mysql_test_run_new.c:
added create_system_files()
added compare for windows
scripts/make_win_src_distribution.sh:
added all files of testes
added mysql-test
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into mysql.com:/home/my/mysql-4.1
client/mysqldump.c:
Auto merged
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Simple, non critical, fix to mysql_fix_privilege_tables
client/mysqldump.c:
Ensure that we free memory used with --order-by-primary
mysql-test/t/system_mysql_db_fix.test:
Remove warnings when compiled with support for ISAM
scripts/mysql_fix_privilege_tables.sh:
Ensure that 'my_print_defaults' is called correctly
sql/set_var.cc:
Code style cleanups
sql/sql_db.cc:
Fixed comments
sql/udf_example.cc:
Fixed comments
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
scripts/fill_help_tables.sh:
percent_xxx variables added to avoid /0 error.
scripts/mysql_install_db.sh:
A fix (bug #5823: mysql_install_db fails due to incorrect max_allowed_packet).
--net_buffer_length=16K added.
sql/net_serv.cc:
Typo fixed.
sql/sql_parse.cc:
A fix (bug #5823: mysql_install_db fails due to incorrect max_allowed_packet).
Auto extend net buffer in bootstrap mode.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fix calls to my_print_defaults. Some how, --loose-verbose had been added before --no-defaults/defaults-file, which must be the first option.
NOTE: this may make some installations behave differently, if they depend on this broken behavior.
scripts/mysqld_safe.sh:
Fix calls to my_print_defaults. Some how, --loose-verbose had been added before --no-defaults/defaults-file, which must be the first option.
NOTE: this may make some installations behave differently, if they depend on this broken behavior.
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
BitKeeper/etc/logging_ok:
auto-union
innobase/srv/srv0srv.c:
Auto merged
mysql-test/t/select.test:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/slave.cc:
Auto merged
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
(Cleanups and better bug fixes)
mysql-test/r/select.result:
Fixed test after wrong merge
mysql-test/t/select.test:
Fixed test after wrong merge
scripts/mysql_fix_privilege_tables.sh:
Don't read defaults files
sql/item_cmpfunc.cc:
Fix wrong value for not_null_tables_cache
sql/item_cmpfunc.h:
Remove wrong patch (flags are set in fix_length_and_dec())
sql/item_func.h:
Fix wrong value for not_null_tables_cache
sql/slave.cc:
Fixed indentation
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
into mysql.com:/home/jonas/src/wl1744
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
sql/mysqld.cc:
Auto merged
|
| | |\ \
| | | |/
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-Makefile.am:
Delete: Docs/Images/Makefile.am
Build-tools/Bootstrap:
Auto merged
Docs/Makefile.am:
Auto merged
configure.in:
Auto merged
include/mysql.h:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysys/default.c:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/log.cc:
Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_table.cc:
Auto merged
client/mysqldump.c:
merge with 4.0
(This only reorders options)
sql/ha_innodb.cc:
merge with 4.0 (Keep original code)
sql/time.cc:
Note that part of this patch is done in my_time.c
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
for Solaris test, and fix if @IS_LINUX@ test in mysqld_safe itself.
configure.in:
Portability fix for FIND_PROC setting; on Solaris (and
probably others), 'ps -p $$' inside a shell script just
returns 'sh' for command line, even though $0 contains
the filename. So, use 'ps -fp $$' in the test (it shows
the full command line, e.g., 'sh configure'). Leave the
actual FIND_PROC command as-is, since mysqld itself is
not a shell script.
scripts/mysqld_safe.sh:
Portability fix for mysqld_safe on non-Linux systems. A bogus use
of 'if' and 'test' caused non-bash shells to enter a section meant
to be run only on Linux systems.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Recognize another Texinfo tag.
scripts/fill_help_tables.sh:
Recognize another Texinfo tag.
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | | |
into mysql.com:/home/jonas/src/wl1744
ndb/src/ndbapi/ndberror.c:
Auto merged
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Handle some additional Texinfo tags that were being missed.
scripts/fill_help_tables.sh:
Handle some additional Texinfo tags that were being missed.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
ndb/include/logger/SysLogHandler.hpp:
win-port
ndb/include/ndb_global.h:
win-port
ndb/include/portlib/PortDefs.h:
win-port
ndb/src/common/mgmcommon/NdbConfig.c:
win-port
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
win-port
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
win-port
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
win-port
ndb/src/kernel/main.cpp:
win-port
ndb/src/kernel/vm/Configuration.cpp:
win-port
ndb/src/kernel/vm/Emulator.cpp:
win-port
ndb/src/mgmsrv/CommandInterpreter.cpp:
win-port
ndb/src/mgmsrv/main.cpp:
win-port
scripts/make_win_src_distribution.sh:
win-port
|
|/ /
| |
| |
| |
| |
| |
| | |
Add rules for creating dsp-files
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Windows style line end \r\n on README, license, and similar essential plaintext files.
scripts/make_win_src_distribution.sh:
Some plain text files (which a Windows user might view in any editor) should have
Windows style line end \r\n (bug#5385). The tool is changed to do a systematic pass
over all files, find all relevant ones (especially "README*", "ChangeLog", "INSTALL*",
license text), and adapt them.
Included are two minor cleanups ("useless use of cat" avoided, variable setting
moved to more sensible place).
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
into mysql.com:/home/my/mysql-4.1
BitKeeper/etc/logging_ok:
auto-union
innobase/srv/srv0srv.c:
Auto merged
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into mysql.com:/home/my/mysql-4.1
BitKeeper/etc/logging_ok:
auto-union
|
| | |\ \
| | | |/
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
BitKeeper/etc/logging_ok:
auto-union
innobase/include/sync0arr.h:
Auto merged
innobase/sync/sync0arr.c:
Auto merged
scripts/mysqlhotcopy.sh:
Auto merged
innobase/srv/srv0srv.c:
SCCS merged
|
| | | |
| | | |
| | | |
| | | |
| | | | |
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
|
| | | | |
|