into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822:
Auto merged
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/warnings.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/mysqlbinlog.test:
Auto merged
mysql-test/t/udf.test:
Auto merged
mysql-test/t/warnings.test:
Auto merged
BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
Auto merged
sql/field.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_class.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
mysql-test/r/sp.result:
Manual merge. Place 5.0 test before 5.1 test.
mysql-test/t/sp.test:
Manual merge. Place 5.0 test before 5.1 test.
mysys/my_bitmap.c:
Manual merge.
scripts/make_binary_distribution.sh:
Manual merge.
sql/Makefile.am:
Manual merge.
sql/slave.cc:
Manual merge.
sql/sql_class.h:
Manual merge.
sql/sql_parse.cc:
Manual merge.
sql/sql_select.cc:
Manual merge.
tests/mysql_client_test.c:
Manual merge.
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
mysql-test/Makefile.am:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
client/mysqltest.c:
Manual merge
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-merge
configure.in:
Auto merged
man/Makefile.am:
Auto merged
mysys/my_bitmap.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/field.cc:
Auto merged
sql/sql_locale.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
mysql-test/t/mysqlbinlog.test:
Manual merge.
sql/sql_select.cc:
Manual merge.
into rama.(none):/home/jimw/my/mysql-5.1-clean
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
extra/yassl/include/openssl/ssl.h:
Auto merged
extra/yassl/include/yassl_int.hpp:
Auto merged
extra/yassl/src/ssl.cpp:
Auto merged
extra/yassl/src/template_instnt.cpp:
Auto merged
extra/yassl/src/yassl_imp.cpp:
Auto merged
extra/yassl/src/yassl_int.cpp:
Auto merged
include/mysql.h:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/embedded_priv.h:
Auto merged
BitKeeper/deleted/.del-mysql_explain_log.sh~5ddc62808e16bd57:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
libmysqld/libmysqld.c:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/mysqldump-max.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_string.h:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
sql/time.cc:
Auto merged
storage/myisam/mi_create.c:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
tests/mysql_client_test.c:
Auto merged
BitKeeper/deleted/.del-have_case_sensitive_file_system.inc:
Delete: mysql-test/include/have_case_sensitive_file_system.inc
BitKeeper/deleted/.del-case_sensitive_file_system.require:
Delete: mysql-test/r/case_sensitive_file_system.require
mysql-test/lib/mtr_cases.pl:
Resolve conflict
mysql-test/mysql-test-run.pl:
Resolve conflict
mysql-test/r/mysqldump.result:
Resolve conflict
mysql-test/t/mysqldump.test:
Resolve conflict
sql/sql_parse.cc:
Resolve conflict
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
configure.in:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
support-files/mysql.spec.sh:
SCCS merged
Man page for "mysqld" command move to section 8 (bug#21220)
scripts/make_binary_distribution.sh:
Man page for "mysqld" command move to section 8 (bug#21220)
scripts/mysqlhotcopy.sh:
Defined new raid directory regular expression variable that allows a mix of two alphanumeric characters. Replaced hardcode raid directory regular expressions with new variable.
- The mysql-test/std_data/bug15328.cnf file was not copied to install or dist dir.
mysql-test/Makefile.am:
Add std_data/*.cnf files to dist_hook and install-data-local
scripts/make_win_src_distribution.sh:
Copy *.cnf files as well.
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
client/mysql.cc:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
mysql-test/t/func_str.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/time.cc:
Auto merged
Minor script changes for uniformity.
scripts/fill_func_tables.sh:
Switched to standard !@PERL@ usage. Added Copyright and more specific original author information.
scripts/mysql_install_db.sh:
Removed leading empty line.
into zippy.(none):/home/cmiller/work/mysql/m50-maint--07C2P
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
tests/mysql_client_test.c:
manual merge
into trift2.:/M51/bug20216-5.1
scripts/Makefile.am:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
support-files/mysql.spec.sh:
Auto merged
binary disctribution for Falcon.
scripts/Makefile.am:
Add the make_win_bin_dist script.
scripts/make_win_bin_dist:
New BitKeeper file ``scripts/make_win_bin_dist''
BitKeeper/deleted/.del-mysql_upgrade.sh~826da969ccf96ef:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
support-files/mysql.spec.sh:
Auto merged
scripts/Makefile.am:
Manual merge: "ul" (the shell script is already deleted in 5.1)
For compatibility, don't use {..,..} in pattern matching
make_binary_distribution.sh:
Added .dylib and .sl as shared library extensions
scripts/make_binary_distribution.sh:
Added .dylib and .sl as shared library extensions
scripts/make_sharedlib_distribution.sh:
For compatibility, don't use {..,..} in pattern matching
Delete: scripts/make_win_src_distribution.sh
Makefile.am:
Unix and Windows now shares source package
scripts/Makefile.am:
Unix and Windows now shares source package
BitKeeper/deleted/.del-make_win_src_distribution.sh~f80d8fca44e4e5f1:
Delete: scripts/make_win_src_distribution.sh
Fixed make_win_src_distribution.sh to return back dsp files
for yassl.
VC++Files/client/mysqldump.dsp:
my_user.c was missing.
VC++Files/client/mysqldump_ia64.dsp:
my_user.c was missing.
VC++Files/sql/mysqld.dsp:
my_user.c was missing.
VC++Files/sql/mysqld_ia64.dsp:
my_user.c was missing.
extra/yassl/yassl.dsp:
Added the YASSL_PREFIX flag.
scripts/make_win_src_distribution.sh:
Returned back dsp files from yassl.
1) Rename the old shell tool "mysql_upgrade", to avoid a name collision.
2) Improve the spec file, to explicitly use a temporary socket.
scripts/mysql_upgrade_shell.sh:
Rename: scripts/mysql_upgrade.sh -> scripts/mysql_upgrade_shell.sh
scripts/Makefile.am:
The old shell script "mysql_upgrade" must be renamed,
so that its name does not collide with the new binary.
support-files/mysql.spec.sh:
The previous version was incomplete, as it did not cover the case
where the DBA had configured a non-default socket file.
Solve that by creating and explicitly providing a temporary directory
for the socket just for the duration of "mysql_upgrade", which also
can be better protected than the default socket.
Make output less verbose
Make temporary directory name unique
Remove temporary directory on interrupt
scripts/make_win_src_distribution.sh:
Make output less verbose
Make temporary directory name unique
Remove temporary directory on interrupt
Include "sql_yacc.yy" for completeness (bug#20387)
scripts/make_win_src_distribution.sh:
Include "sql_yacc.yy" for completeness (bug#20387)
Improved error handling
Don't list all files packed with tar/zip unless debugging
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
BitKeeper/deleted/.del-generate_prefix_files.pl:
Delete: extra/yassl/include/openssl/generate_prefix_files.pl
BitKeeper/deleted/.del-prefix_crypto.h:
Delete: extra/yassl/include/openssl/prefix_crypto.h
BitKeeper/deleted/.del-prefix_ssl.h:
Delete: extra/yassl/include/openssl/prefix_ssl.h
BitKeeper/deleted/.del-Makefile.am~abb265028eb9b6a7:
Auto merged
BitKeeper/deleted/.del-init_db.sql~af2dfeabaa348dd7:
Auto merged
BitKeeper/deleted/.del-yassl.m4~e55e55c1e863abaf:
Auto merged
client/mysqltest.c:
Auto merged
extra/yassl/include/openssl/crypto.h:
Auto merged
extra/yassl/include/openssl/ssl.h:
Auto merged
extra/yassl/include/yassl_int.hpp:
Auto merged
extra/yassl/src/Makefile.am:
Auto merged
extra/yassl/src/ssl.cpp:
Auto merged
extra/yassl/src/template_instnt.cpp:
Auto merged
extra/yassl/src/yassl_int.cpp:
Auto merged
extra/yassl/testsuite/Makefile.am:
Auto merged
extra/yassl/yassl.vcproj:
Auto merged
include/violite.h:
Auto merged
libmysql/Makefile.am:
Auto merged
libmysql_r/Makefile.am:
Auto merged
libmysqld/examples/Makefile.am:
Auto merged
mysql-test/include/common-tests.inc:
Auto merged
mysql-test/r/analyze.result:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/r/key_cache.result:
Auto merged
mysql-test/r/preload.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/t/analyze.test:
Auto merged
mysql-test/t/explain.test:
Auto merged
mysql-test/t/grant.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
server-tools/instance-manager/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
vio/Makefile.am:
Auto merged
client/Makefile.am:
Manual merge
libmysqld/Makefile.am:
Manual merge
mysql-test/r/compress.result:
Manual merge
mysql-test/r/explain.result:
Manual merge
mysql-test/r/select.result:
Manual merge
mysql-test/r/view.result:
Manual merge
mysql-test/t/select.test:
Manual merge
mysql-test/t/view.test:
Manual merge
sql/sql_base.cc:
Manual merge
sql/sql_parse.cc:
Manual merge
mysql-test/r/mysqldump.result:
Change in output from low letter to capital letter.
Fixed test.
scripts/mysql_create_system_tables.sh:
definer was removed from part of the key.
vio/viosocket.c:
Fixed output from DBUG_PRINT() to match the style
in other parts of the code.
mysql-test/lib/init_db.sql:
remove definer from PK
mysql-test/r/events.result:
update results
mysql-test/r/system_mysql_db.result:
update results
mysql-test/t/events.test:
remove I_S.EVENTS test and move it to events_grant.test
scripts/mysql_fix_privilege_tables.sql:
change table definition
sql/event.cc:
make events non-user specific (namespace change)
sql/event.h:
make events non-user specific (namespace change)
sql/event_priv.h:
make events non-user specific (namespace change)
sql/event_scheduler.cc:
make events non-user specific (namespace change)
sql/event_timed.cc:
make events non-user specific (namespace change)
sql/sql_parse.cc:
make events non-user specific (namespace change)
sql/sql_show.cc:
SHOW EVENTS is available to everyone who has EVENT on specific schema.
No additional privileges are needed to see others' events.
- user A has events in db1 and db2
- user B has events in db1 and db3
A will see all his events from db1 and db2 as well as B's events
from db1 but not from db3.
B will see her events from db1 and db3. In addition B will see
only A's events from db1 but not db2.
- Fix mysqld_safe so that it always passes correct --log-error argument to mysqld
- A few other minor clean-ups to mysqld_safe
scripts/mysqld_safe.sh:
Bug #6061 mysql-log-rotate script - error logging doesn't use new file
- Change mysqld_safe to pass --log-error to mysqld in all cases. The old behavior was to usually "swallow" the --log-error=file.name argument, which caused mysqld to write to stderr and not be able to flush the error log file. Ironically, passing --log-error (with no file name) seemed to work fine, because mysqld_safe didn't recognize it and passed it on to mysqld as an unknown option.
- Ensure that the error log file matches what mysqld uses; in particular, add ".err" if given a --log-error argument with no extension, and add "$DATADIR" to the front of a relative path
- Various other mysqld_safe clean-ups while there - quote arguments properly, remove some redundant code
