Don't use explicit calls to mysql-test-run in spec
Makefile.am:
Don't use explicit calls to mysql-test-run in spec
support-files/mysql.spec.sh:
Don't use explicit calls to mysql-test-run in spec
into trift2.:/MySQL/M50/merge-5.0
include/config-win.h:
Auto merged
mysys/my_pthread.c:
Auto merged
mysys/my_thr_init.c:
Auto merged
mysys/thr_alarm.c:
Auto merged
sql/mysqld.cc:
Auto merged
support-files/mysql.spec.sh:
SCCS merged
If inserting a GPL header, include a complete one
Makefile.am, mysql.dsw, mysql.sln:
Removed C version of mysql-test-run
mysql.spec.sh:
Specify GPL license only in GPL sources
.del-my_manage.h:
Delete: mysql-test/my_manage.h
mysql.spec.sh:
Added GPL header
.del-mysql_test_run_new.c:
Delete: mysql-test/mysql_test_run_new.c
.del-mysql_test_run_new.dsp:
Delete: VC++Files/mysql-test/mysql_test_run_new.dsp
.del-my_create_tables.c:
Delete: mysql-test/my_create_tables.c
.del-mysql_test_run_new_ia64.dsp:
Delete: VC++Files/mysql-test/mysql_test_run_new_ia64.dsp
msql2mysql.sh:
Use up-to-date GPL header
.del-mysql_test_run_new.vcproj:
Delete: VC++Files/mysql-test/mysql_test_run_new.vcproj
.del-my_manage.c:
Delete: mysql-test/my_manage.c
scripts/msql2mysql.sh:
Use up-to-date GPL header
support-files/mysql.spec.sh:
Added GPL header
sql/gen_lex_hash.cc:
If inserting a GPL header, include a complete one
BitKeeper/deleted/.del-mysql_test_run_new.c:
Delete: mysql-test/mysql_test_run_new.c
BitKeeper/deleted/.del-mysql_test_run_new.dsp:
Delete: VC++Files/mysql-test/mysql_test_run_new.dsp
BitKeeper/deleted/.del-mysql_test_run_new.vcproj:
Delete: VC++Files/mysql-test/mysql_test_run_new.vcproj
BitKeeper/deleted/.del-mysql_test_run_new_ia64.dsp:
Delete: VC++Files/mysql-test/mysql_test_run_new_ia64.dsp
BitKeeper/deleted/.del-my_create_tables.c:
Delete: mysql-test/my_create_tables.c
BitKeeper/deleted/.del-my_manage.c:
Delete: mysql-test/my_manage.c
BitKeeper/deleted/.del-my_manage.h:
Delete: mysql-test/my_manage.h
VC++Files/mysql.dsw:
Removed C version of mysql-test-run
VC++Files/mysql.sln:
Removed C version of mysql-test-run
mysql-test/Makefile.am:
Removed C version of mysql-test-run
Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
correct "libgcc.a" path is returned for the 32/64 bit architecture
scripts/make_binary_distribution.sh:
Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
correct "libgcc.a" path is returned for the 32/64 bit architecture
support-files/mysql.spec.sh:
Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
correct "libgcc.a" path is returned for the 32/64 bit architecture
Fix the move of "mysqlmanager" to section 8: Directory name was wrong.
support-files/mysql.spec.sh:
Fix the move of "mysqlmanager" to section 8: Directory name was wrong.
The Docs team has two new manpages for the "server" RPM: "my_print_defaults" and "mysql_tzinfo_to_sql".
support-files/mysql.spec.sh:
The Docs team has two new manpages for the "server" RPM: "my_print_defaults" and "mysql_tzinfo_to_sql".
support-files/mysql.spec.sh:
Explicitly note that the "MySQL-shared" RPMs (as built by MySQL AB) replace
"mysql-shared" (as distributed by SuSE) to allow easy upgrading (bug#22081).
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 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
into trift2.:/M50/merge-4.1-to-5.0
mysql-test/r/date_formats.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_locale.cc:
Auto merged
sql/item_timefunc.cc:
Merging by "ul", as asked in the original changeset.
support-files/mysql.spec.sh:
Manual merge, keeping alphabetic order.
Added new "mysql_explain_log" man page
Added missing install of "myisam_ftdump" man page
Added missing install of "mysqlman" man page
support-files/mysql.spec.sh:
Added new "mysql_explain_log" man page
Added missing install of "myisam_ftdump" man page
Added missing install of "mysqlman" man page
Command "ndb_mgm" is an optional tool, and should only be in "ndb-tools" package (bug#21058)
support-files/mysql.spec.sh:
Command "ndb_mgm" is an optional tool, and should only be in "ndb-tools" package (bug#21058)
support-files/mysql.spec.sh:
Use the Perl script to run the tests, because it will automatically check
whether the server is configured with SSL.
(The shell script needs an explicit flag, and we cannot pass that though "make".)
Disable old RPM strip
my_global.h:
Fixed wrong cast, which caused problems with gcc 4.0 and
floats in prepared statements (Bug #19694)
mysqlmanager.vcproj:
Place output files in common release/debug directory
server-tools/instance-manager/mysqlmanager.vcproj:
Place output files in common release/debug directory
include/my_global.h:
Fixed wrong cast, which caused problems with gcc 4.0 and
floats in prepared statements (Bug #19694)
support-files/mysql.spec.sh:
Disable old RPM strip
This finishes bug#18516, as far as "generic RPMs" are concerned.
support-files/mysql.spec.sh:
Revert all previous attempts to call "mysql_upgrade" during RPM upgrade,
there are some more aspects which need to be solved before this is possible.
For now, just ensure the binary "mysql_upgrade" is delivered and installed.
This finishes bug#18516, as far as "generic RPMs" are concerned.
manual merge from 4.0.
support-files/mysql.spec.sh:
Manual merge of the fix for bug#20216.
(became necessary because 4.0 and 4.1 spec files use different file sort order).
