msvensson@pilot.blaudden
a49d6c5f51
There is no .sql files in mysql-test/lib/ anymore, don't try to copy from there
2007-03-01 07:23:37 +01:00
msvensson@pilot.blaudden
d56d34805c
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-02-28 20:45:07 +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
9591b9e922
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-02-28 16:41:30 +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
3fc963f169
Bug#20166 mysql-test-run.pl does not test system privilege tables creation
2007-02-28 14:58:19 +01:00
msvensson@pilot.blaudden
9cfd569174
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-28 14:41:57 +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
msvensson@pilot.blaudden
2f36118018
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-27 15:29:44 +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
885e4fb5b9
Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166
...
into pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166
2007-02-27 14:25:56 +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
846e5ad8d3
Bug#20166 mysql-test-run.pl does not test system privilege tables creation
...
- Updates for 5.1
2007-02-27 11:39:29 +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
f6e31a2cd1
Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166
...
into pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166
2007-02-26 14:25:59 +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
msvensson@pilot.mysql.com
7e6e518a47
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.1
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-13 10:00:59 +01:00
msvensson@pilot.mysql.com
7dcdbdf37b
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-02-13 10:00:53 +01:00
kent@kent-amd64.(none)
f4ab936ff1
Merge mysql.com:/home/kent/bk/tmp3/mysql-5.0
...
into mysql.com:/home/kent/bk/tmp3/mysql-5.1
2007-02-12 23:37:12 +01:00
kent@mysql.com/kent-amd64.(none)
3bb1114647
make_binary_distribution.sh:
...
Copy "ndb_size.tmpl" into binary distribution (Bug#24191)
2007-02-09 00:10:40 +01:00
msvensson@neptunus.(none)
e4001b3b5a
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2007-02-06 15:46:17 +01:00
msvensson@neptunus.(none)
ede3afe470
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2007-02-06 14:45:08 +01:00
istruewing@chilla.local
ed09987083
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-02-01 19:41:04 +01:00
cmiller@zippy.cornsilk.net
522d6fb0cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-01-31 16:24:28 -05:00
cmiller@zippy.cornsilk.net
ad66e7a0dd
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-01-31 16:23:05 -05:00
kent@mysql.com/kent-amd64.(none)
e580bd6c6f
gen_lex_hash.cc:
...
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
2007-01-31 00:06:42 +01:00
mtaylor@qualinost.(none)
065ab1537a
Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
...
into qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
2007-01-26 12:13:59 -08:00
mtaylor@qualinost.(none)
58ae89cb76
User visible change - breaks some environments, per Paul DuBois. Reverting in 4.1 and 5.0.
2007-01-26 12:00:38 -08:00
svoj@april.(none)
3efc296508
Merge mysql.com:/home/svoj/devel/bk/mysql-5.1
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
2007-01-25 01:44:30 +04:00
iggy@recycle.(none)
54ce485557
Merge recycle.(none):/src/bug24496/my50-bug24496
...
into recycle.(none):/src/mysql-5.0-maint
2007-01-24 09:29:50 -05:00
iggy@recycle.(none)
d554b1f725
Merge recycle.(none):/src/bug24496/my51-bug24496
...
into recycle.(none):/src/mysql-5.1-maint
2007-01-24 09:29:05 -05:00
iggy@recycle.(none)
fc66e47247
Merge recycle.(none):/src/bug24496/my50-bug24496
...
into recycle.(none):/src/bug24496/my51-bug24496
2007-01-23 10:10:08 -05:00
iggy@recycle.(none)
a0c981d254
Bug#24496:Fresh install of mysql on windows has anonymous user with root access.
...
- Add anonymous user with no rights.
2007-01-23 10:01:56 -05:00
df@kahlann.erinye.com
96e9eee142
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work-24780
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work
2007-01-22 16:38:54 +01:00
df@kahlann.erinye.com
1b8b33bf83
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work-24780
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2007-01-22 16:34:22 +01:00
tsmith@siva.hindu.god
cc7afe2494
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
2007-01-18 08:30:35 -07:00
msvensson@pilot.mysql.com
51292deb36
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-01-17 11:53:00 +01:00
msvensson@pilot.mysql.com
8154355a07
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
2007-01-17 11:13:03 +01:00
mmj@tiger.mmj.dk
86890b8919
mysql_explain_log.sh:
...
Patch from Paul DuBois for better help messages
2007-01-12 01:04:39 +01:00
tsmith@siva.hindu.god
bc0e0ba7cc
Merge siva.hindu.god:/home/tsmith/m/bk/mysql-5.0-build
...
into siva.hindu.god:/home/tsmith/m/bk/mysql-5.1-build
2007-01-11 13:50:48 -07:00
cmiller@zippy.cornsilk.net
896e2623eb
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-01-11 09:43:44 -05:00
mmj@tiger.mmj.dk
49913f2a95
Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.0-sage
...
into tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0
2007-01-11 09:19:32 +01:00
tsmith@siva.hindu.god
bac65ee90a
WL #3670 : Compile-time option to remove GRANT-related startup options
...
- configure --disable-grant-options defines DISABLE_GRANT_OPTIONS
- configure.js/cmake also updated
- if DISABLE_GRANT_OPTIONS is defined, mysqld no longer recognizes:
--bootstrap
--init-file
--skip-grant-tables
Scripts which rely on those three options are modified to check the environment for MYSQLD_BOOTSTRAP; it should be set to the full path of a mysqld which does handle those options.
For example:
$ export MYSQLD_BOOTSTRAP
$ MYSQLD_BOOTSTRAP=/path/to/full/MySQL/bin/mysqld
$ mysql_install_db
$ make test
2007-01-09 19:22:01 -07:00
df@kahlann.erinye.com
b008f57cb7
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work-24780
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work-24780
2007-01-09 09:52:38 +01:00
df@kahlann.erinye.com
b3eadd2b74
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work-24780
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work-24780
2007-01-09 09:51:49 +01:00
df@kahlann.erinye.com
eeb82a8ed5
BUG#24780 workaround for broken installations that depend on using /etc, but were configured differently
2007-01-09 09:32:56 +01:00
cmiller@zippy.cornsilk.net
a16eaf3301
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-greener
2007-01-07 09:31:49 -05:00
kent@kent-amd64.(none)
1a0e36ea6d
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-01-05 17:30:40 +01:00
kent@mysql.com/kent-amd64.(none)
fa5a359f07
Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-01-05 16:57:23 +01:00