tsmith@quadxeon.mysql.com
99488b31b9
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-05-21 20:50:08 +02:00
msvensson@pilot.blaudden
a3bd588435
Merge pilot.blaudden:/home/msvensson/mysql/bug28401/my50-bug28401
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-05-19 18:22:08 +02:00
msvensson@pilot.blaudden
bc69d072f3
Bug #28401 mysql_upgrade Failed with STRICT_ALL_TABLES, ANSI_QUOTES and NO_ZERO_DATE
...
- The SQL commands used by mysql_upgrade are written to be run
with sql_mode set to '' - thus the scripts should change sql_mode
for the session to make sure the SQL is legal.
2007-05-19 18:15:08 +02:00
tsmith@siva.hindu.god
30bc713c77
Merge siva.hindu.god:/home/tsmith/m/bk/50
...
into siva.hindu.god:/home/tsmith/m/bk/maint/50
2007-05-17 14:17:50 -06:00
joerg@trift2.
ae801bb0ae
Fix bug#27833 "Bourne shell string comparison issue in scripts/make_win_bin_dist":
...
Several string comparisons could never yield true because they had an 'x' guard
added to the variable but not to the constant value. Fix that by guarding both sides.
2007-05-15 18:19:18 +02:00
joerg@trift2.
6511b280ca
Better distinction between "CLEANFILES" and "DISTCLEANFILES" for some generated files
...
(here: "scripts/mysql_fix_privilege_tables{.sql,_sql.c}"). Important for cross-builds.
2007-05-03 15:51:02 +02:00
joerg@trift2.
16dfab5e92
Resolve a possible timing issue with "scripts/mysql_fix_privilege_tables_sql.c" in the
...
source tarball, this is essential for cross builds, like for NetWare.
2007-05-02 20:07:01 +02:00
iggy@recycle.(none)
f4f9480785
Minor fix.
2007-05-02 12:41:36 -04:00
joerg@trift2.
0db7e9c4f1
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-05-02 17:15:48 +02:00
joerg@trift2.
bb2996f487
Format corrections for various "Makefile.am": Leading tab, no trailing blank.
2007-05-02 14:01:49 +02:00
joerg@trift2.
8b0f68331b
Necessary change for cross-builds: Include "mysql_fix_privilege_tables_sql.c" in the source tarball.
2007-04-30 17:01:00 +02:00
tsmith@quadxeon.mysql.com
33a74e41fc
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/b27653/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-04-28 01:31:15 +02:00
tsmith@quadxeon.mysql.com
b90b0c7eb2
Bug #27390 : mysqld_multi --config-file= not working as documented
...
Recognize the --no-defaults, --defaults-file and --defaults-extra-file
options. Treat old --config-file argument as if --defaults-extra-file
had been specified instead.
Plus a few other defaults-related cleanups.
2007-04-28 01:27:54 +02:00
tsmith@quadxeon.mysql.com
70a742f817
mysql_install_db.sh: Fix algorithm for finding pkgdata directory
2007-04-27 00:35:09 +02:00
tsmith@quadxeon.mysql.com
4d34614389
mysql_install_db.sh:
...
Disable broken quoting of extra arguments; proper fix requires using eval and lots more quoting throughout the script
2007-04-25 09:16:38 +02:00
msvensson@pilot.blaudden
4a1fd222ce
Don't copy any subdirs in scripts/
2007-04-23 18:16:57 +02:00
msvensson@pilot.blaudden
1561c39c5d
Add "name of struct" as first arg to comp_sql
...
Fix "make distcheck"
2007-04-23 14:01:48 +02:00
msvensson@pilot.blaudden
d1de41c59a
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-23 12:05:00 +02:00
msvensson@pilot.blaudden
da93a36a0e
mysql_upgrade portability fixes
2007-04-19 21:30:46 +02:00
msvensson@pilot.blaudden
41c41448b9
mysql_upgrade win fixes
2007-04-19 17:00:29 +02:00
msvensson@pilot.blaudden
50669c43ac
Add CMakeLists.txt to EXTRA_DIST
2007-04-18 19:34:33 +02:00
msvensson@pilot.blaudden
dd0d2146c3
Merge pilot.blaudden:/home/msvensson/mysql/my50-m-mysql_upgrade
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-18 13:22:32 +02:00
msvensson@pilot.blaudden
20e622dcf3
Bug#25452 mysql_upgrade access denied
...
- Improve mysql_upgrade and add comments describing it's logic
- Don't look for mysql and mysqlcheck randomly, use dir where mysql_upgrade
was started from
- Don't look for mysql_fix_privilege_tables.sql randomly, compile
in the mysql_fix_privilege_tables.sql file and use that to upgrade
the system tables of MySQL
- Check for any unexpected error returned from runnning the mysql_fix_privilege_tables SQL
- Fix bug#26639, bug#24248 and bug#25405
2007-04-18 13:21:39 +02:00
tomas@whalegate.ndb.mysql.com
a30755427a
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-maint
2007-04-16 14:51:08 +02:00
msvensson@pilot.blaudden
74dfba96e7
Bug#27783 mysql_install_db should be able to install again, preserving existing files.
...
- Allow mysql_install_db to be run a second time in the same
datadir to create and fill any missing system tables
2007-04-12 17:48:28 +02:00
joerg@trift2.
22f066e354
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-04-07 20:46:43 +02:00
kent@mysql.com/kent-amd64.(none)
463b34e77b
zlib.m4:
...
Only require the more recent zlibCompileFlags() when
building the server, client zlib don't need it.
Makefile.am:
Always build the bundled zlib static only
configure.in:
Look for dlopen() even if --with-mysqld-ldflags constains "-static",
as this is not the same as the flag to "ld", it just informs
"libtool" to link static with libraries created part of the build,
even if there exists shared versions.
make_binary_distribution.sh:
Real "mysqlmanager" executable might be in ".libs"
2007-04-05 08:36:56 +02:00
msvensson@pilot.blaudden
bb9a601829
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-02 10:50:39 +02:00
msvensson@pilot.blaudden
c083a8fdd5
Merge pilot.blaudden:/home/msvensson/mysql/bug27022/my50-bug27022
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-27 21:12:32 +02:00
kent@mysql.com/kent-amd64.(none)
b961d9dc06
Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-03-22 19:43:41 +01:00
kent@mysql.com/kent-amd64.(none)
a55735b964
.del-fill_func_tables.sh:
...
Delete: scripts/fill_func_tables.sh
.del-fill_help_tables.sh:
Delete: scripts/fill_help_tables.sh
.del-internals.texi:
Delete: Docs/internals.texi
2007-03-22 19:43:15 +01:00
kent@mysql.com/kent-amd64.(none)
cd1005ab04
vio.vcproj, mysqld.vcproj, mysys.vcproj, libmysqld.vcproj, mysqldemb.vcproj:
...
No need to set LICENSE or USE_SYMDIR from project files
make_win_bin_dist:
Changed location of SQL initialization files to be "share/"
2007-03-20 15:12:50 +01:00
kent@mysql.com/kent-amd64.(none)
731c3e5b20
mysys.vcproj:
...
Removed accidently added my_winsem.c
make_win_bin_dist:
Corrected test for relwithdebinfo target
mysql.sln:
Specify that comp_err depends on zlib
2007-03-19 22:41:16 +01:00
kent@mysql.com/kent-amd64.(none)
e9d65ba363
make_win_bin_dist:
...
Restore accidently removed line
2007-03-19 16:45:37 +01:00
kent@mysql.com/kent-amd64.(none)
19a6a09126
Many files:
...
Major cleanup of old Visual Studio project files, aligning engines etc
2007-03-19 16:18:10 +01:00
df@pippilotta.erinye.com
4f7677cd24
Merge dev:my/mysql-5.0-release
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-release
2007-03-19 11:30:30 +01:00
kent@mysql.com/kent-amd64.(none)
1c6fc80fdc
make_win_bin_dist:
...
- Support both "release" and "relwithdebinfo" targets
- Copy ".pdb" and ".pdb" files for the server and instance manager
- Removed the examples directory, unsupported
- Handle both old and new builds in the same script, "-debug" and "-nt"
extensions, directory "data" and "share" in different location
2007-03-18 10:47:15 +01:00
joerg@trift2.
66960bd1e7
Bug#20166 mysql-test-run.pl does not test system privilege tables creation
...
- Build sql files for netware from the mysql_system_tables*.sq files
- Fix comments about mysql_create_system_tables.sh
- Use mysql_install_db.sh to create system tables for mysql_test-run-shell
- Fix mysql-test-run.pl to also look in share/mysql for the msyql_system*.sql files
Changeset coded today by Magnus Svensson, just the application to 5.0.38 is by Joerg Bruehe.
2007-03-16 20:56:16 +01:00
msvensson@pilot.blaudden
cf0e52ea17
Bug#27022 Install fails with Duplicate entry '%-test-' for key 'PRIMARY'
...
- Bail out with error if MySQL System tables already exist
2007-03-16 11:52:30 +01:00
df@pippilotta.erinye.com
baaf7ac5da
add missing test cases to windows binary distribution
2007-03-12 13:15:43 +01:00
tsmith@quadxeon.mysql.com
de61dde90b
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50
2007-03-08 01:00:49 +01:00
msvensson@pilot.blaudden
0b4598a4b3
Bug #20166 mysql-test-run.pl does not test system privilege tables creation
...
- No .sql files in mysql-test/lib/ anymore, don't copy them
2007-02-28 20:44:49 +01:00
msvensson@pilot.blaudden
fb36bf9562
Bug#20166 mysql-test-run.pl does not test system privilege tables creation
...
- Null merge 4.1 patch
2007-02-28 15:15:38 +01:00
msvensson@pilot.blaudden
e391b86fb0
Bug#20166 mysql-test-run.pl does not test system privilege tables creation
...
- Split out initial data in mysql_system_tables.sql to it's own file
- Use file from mysql_install_db and mysql-test-run
2007-02-28 14:26:58 +01:00
joerg@trift2.
ea2261d1a1
A binary package should also contain the "mysqld-debug" server (backport from 5.1).
2007-02-28 11:23:00 +01:00
msvensson@pilot.blaudden
c66f902862
Bug#23669 mysql.proc not created in default install
...
- Remove DEFAULT values for blob's in mysql_system_tables.sql
2007-02-27 15:28:19 +01:00
msvensson@pilot.blaudden
394e9e86d6
Bug#20166 mysql-test-run.pl does not test system privilege tables creation
...
- Escape undercore character in mysql.db to only allow
access test_% and not test%
2007-02-27 14:10:27 +01:00
msvensson@pilot.blaudden
fce4cd3ec0
Remove another spurious "
2007-02-26 14:49:41 +01:00
msvensson@pilot.blaudden
386e08af1e
Remove spurious "
2007-02-26 14:48:41 +01:00
msvensson@pilot.blaudden
c550a45522
Bug#20166 mysql-test-run.pl does not test system privilege tables creation
...
- Use mysql_system_tables.sql to create MySQL system tables in
all places where we create them(mysql_install_db, mysql-test-run-pl
and mysql_fix_privilege_tables.sql)
2007-02-26 11:49:24 +01:00