joerg@trift2.
86674bc412
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-11-14 15:26:38 +01:00
mattiasj@mattiasj-laptop.(none)
7491e15f21
Merge mattiasj@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.0-engines_with_main
2007-11-12 22:47:48 +01:00
mattiasj@mattiasj-laptop.(none)
f4c100135b
Merge mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.0-main
...
into mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.0-engines_with_main
2007-11-12 21:42:27 +01:00
svoj@june.mysql.com
9799d6c479
Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-5.0-engines
2007-11-12 21:54:04 +04:00
svoj@mysql.com/june.mysql.com
ed8f506d29
symlink.test, symlink.result:
...
Use proper variable for test.
2007-11-12 21:52:30 +04:00
kent@kent-amd64.(none)
af7d3963b2
Merge mysql.com:/home/kent/bk/bug30069/mysql-4.1-build
...
into mysql.com:/home/kent/bk/bug30069/mysql-5.0-build
2007-11-12 13:13:43 +01:00
kent@mysql.com/kent-amd64.(none)
3bb7cac84b
bigint.test, bigint.result:
...
Test case for Bug#30069
2007-11-12 12:52:03 +01:00
svoj@june.mysql.com
5e44309422
Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-5.0-engines
2007-11-12 15:16:00 +04:00
svoj@mysql.com/june.mysql.com
40a78cd390
After merge fix.
2007-11-12 15:15:16 +04:00
svoj@mysql.com/june.mysql.com
a6def1f4ab
Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.0
...
into mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.1-engines
2007-11-12 15:02:42 +04:00
tsmith@ramayana.hindu.god
339b3217eb
Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50-fix
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/50
2007-11-09 18:44:08 -07:00
tsmith@ramayana.hindu.god
faf9d4e922
Fix Windows build problems.
2007-11-09 18:27:20 -07:00
kent@kent-amd64.(none)
8a20af716a
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into mysql.com:/home/kent/bk/bug25205/mysql-5.0-build
2007-11-08 18:16:58 +01:00
joerg@trift2.
df8e60ae01
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-11-08 10:33:57 +01:00
tsmith@ramayana.hindu.god
30b56973cb
Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/b20748/50
2007-11-07 16:26:29 -07:00
tsmith@ramayana.hindu.god
ef59ca3d78
Bug #20748 : Configuration files should not be read more than once
...
A user could not override system-wide settings in their ~/.my.cnf,
because the DEFAULT_SYSCONFDIR was being searched last. Also, in
some configurations (especially when the --sysconfdir compile-time
option is set to /etc or /etc/mysql), the system-wide my.cnf file
was read multiple times, causing confusion and potential problems.
Rearrange default directories to conform to the manual and logic.
Move --sysconfdir=<path> (DEFAULT_SYSCONFDIR) from the last default
directory to the middle of the list. $HOME/.my.cnf should be last,
so the user is able to override the system-wide settings.
Change init_default_directories() to remove duplicates from the
list.
2007-11-07 15:23:50 -07:00
svoj@mysql.com/june.mysql.com
d06e2f9223
BUG#32111 - Security Breach via DATA/INDEX DIRECORY and RENAME TABLE
...
RENAME TABLE against a table with DATA/INDEX DIRECTORY overwrites
the file to which the symlink points.
This is security issue, because it is possible to create a table with
some name in some non-system database and set DATA/INDEX DIRECTORY
to mysql system database. Renaming this table to one of mysql system
tables (e.g. user, host) would overwrite the system table.
Return an error when the file to which the symlink points exist.
2007-11-06 18:09:33 +04:00
istruewing@stella.local
0c9c041fde
Merge stella.local:/home2/mydev/mysql-5.0-amain
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-06 13:56:15 +01:00
istruewing@stella.local
fbe3e32b58
Merge stella.local:/home2/mydev/mysql-5.0-ateam
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-06 13:55:42 +01:00
istruewing@stella.local
30b409bd6f
Bug#4692 - DISABLE/ENABLE KEYS waste a space
...
Disabling and enabling indexes on a non-empty table grows the
index file.
Disabling indexes just sets a flag per non-unique index and does not
free the index blocks of the affected indexes. Re-enabling indexes
creates new indexes with new blocks. The old blocks remain unused
in the index file.
Fixed by dropping and re-creating all indexes if non-empty disabled
indexes exist when enabling indexes. Dropping all indexes resets
the internal end-of-file marker to the end of the index file header.
It also clears the root block pointers of every index and clears the
deleted blocks chains. This way all blocks are declared as free.
2007-11-06 13:41:32 +01:00
svoj@june.mysql.com
1cce1a0be1
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG31950/mysql-5.0-engines
2007-11-06 11:54:56 +04:00
malff@lambda.hsd1.co.comcast.net.
00f1af47e4
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-base
...
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge
2007-11-05 09:50:09 -07:00
jperkin@production.mysql.com
51be103e13
Provide better feedback to the user when unable to find MySQL files
...
usually caused by a bad basedir setting.
2007-11-05 17:48:11 +01:00
istruewing@stella.local
2481d2c1e3
Bug#32108 - subselect.test produces warnings files
...
Comment sign of -- at line begin in test files lead to warnings
from mysqltest.
Changed -- to #.
2007-11-05 14:44:38 +01:00
istruewing@stella.local
aac68041ef
Bug#32107 - ctype_uca.test produces warnings files
...
Comment sign of -- at line begin in test files lead to warnings
from mysqltest.
Changed -- to #.
2007-11-05 14:37:00 +01:00
tomas@whalegate.ndb.mysql.com
e981c427d8
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2007-11-02 23:33:25 +01:00
tomas@whalegate.ndb.mysql.com
ca0cbdd8ee
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2007-11-02 23:31:23 +01:00
iggy@alf.(none)
f9518db25f
Bug#31319 CMake build does not check for minimum required version
...
- Add check
2007-11-02 15:16:45 -04:00
istruewing@stella.local
f193dd22fe
Merge stella.local:/home2/mydev/mysql-4.1-axmrg
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-02 15:10:40 +01:00
istruewing@stella.local
6e7c0f8a65
Merge stella.local:/home2/mydev/mysql-5.0-ateam
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-02 15:10:13 +01:00
istruewing@stella.local
377f187066
Merge stella.local:/home2/mydev/mysql-4.1-ateam
...
into stella.local:/home2/mydev/mysql-4.1-axmrg
2007-11-02 14:48:36 +01:00
kent@mysql.com/kent-amd64.(none)
01903380d5
Makefile.am:
...
Removed place holder for 'manual.chm'
.del-manual.chm:
Delete: Docs/manual.chm
2007-11-02 13:16:23 +01:00
kent@kent-amd64.(none)
278ddff257
Merge mysql.com:/home/kent/bk/bug25205/mysql-4.1-build
...
into mysql.com:/home/kent/bk/bug25205/mysql-5.0-build
2007-11-02 13:14:45 +01:00
kent@mysql.com/kent-amd64.(none)
45cfe6b424
Merge mysql.com:/home/kent/bk/bug25205/mysql-4.0
...
into mysql.com:/home/kent/bk/bug25205/mysql-4.1-build
2007-11-02 13:13:55 +01:00
kent@mysql.com/kent-amd64.(none)
2bced2297c
Makefile.am:
...
Don't install INSTALL-BINARY, handled by build scripts
2007-11-02 13:12:19 +01:00
kent@mysql.com/kent-amd64.(none)
ee295affba
Makefile.am:
...
Added manual.chm to EXTRA_DIST
Removed install of INSTALL-BINARY, handled
by install scripts.
ReadMe.txt, INSTALL-WIN-SOURCE, INSTALL-BINARY, INSTALL-SOURCE:
Updated links to version 5.0 of the manual
2007-11-02 12:59:45 +01:00
kent@mysql.com/kent-amd64.(none)
3a5a151a86
Merge mysql.com:/home/kent/bk/bug25205/mysql-4.1-build
...
into mysql.com:/home/kent/bk/bug25205/mysql-5.0-build
2007-11-02 12:44:48 +01:00
kent@mysql.com/kent-amd64.(none)
e22bb190d7
INSTALL-WIN-SOURCE:
...
BitKeeper file /home/kent/bk/bug25205/mysql-4.1-build/INSTALL-WIN-SOURCE
2007-11-02 12:36:44 +01:00
kent@mysql.com/kent-amd64.(none)
aacb5fa447
Merge mysql.com:/home/kent/bk/bug25205/mysql-4.0
...
into mysql.com:/home/kent/bk/bug25205/mysql-4.1-build
2007-11-02 12:33:16 +01:00
kent@mysql.com/kent-amd64.(none)
fe129ce235
mysql.info, INSTALL-BINARY, INSTALL-SOURCE, ReadMe.txt, Docs/Makefile.am:
...
Let place holders for real documentation have text that
makes sense to the user (Bug#25205)
2007-11-02 12:29:13 +01:00
istruewing@stella.local
9cddfaf272
Merge stella.local:/home2/mydev/mysql-4.1-axmrg
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-02 10:15:02 +01:00
istruewing@stella.local
7819ec9f0e
Merge stella.local:/home2/mydev/mysql-5.0-amain
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-02 10:14:26 +01:00
istruewing@stella.local
8d4b8423f7
Bug#31030 - rpl000015.test fails if $MYSQL_TCP_PORT != 3306
...
Preliminarily disabled test case
2007-11-02 10:11:26 +01:00
svoj@june.mysql.com
0ea269caac
Merge mysql.com:/home/svoj/devel/mysql/BUG11392/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG11392/mysql-5.0-engines
2007-11-02 12:58:20 +04:00
istruewing@stella.local
82a27e84db
Merge stella.local:/home2/mydev/mysql-4.1-amain
...
into stella.local:/home2/mydev/mysql-4.1-axmrg
2007-11-02 06:50:34 +01:00
mleich@four.local.lan
080b3f51ee
Merge four.local.lan:/WORK2/merge/mysql-5.0-31408
...
into four.local.lan:/WORK/mysql-5.0-build/src-clean
2007-11-01 21:00:31 +01:00
istruewing@stella.local
fc888bc932
Merge stella.local:/home2/mydev/mysql-5.0-amain
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-01 15:07:00 +01:00
istruewing@stella.local
1b165ef41f
Post-merge fix
2007-11-01 15:04:23 +01:00
istruewing@stella.local
382f62b10b
Bug#31909 - New gis.test creates warnings files
...
Comment sign of -- at line begin in test files lead to warnings
from mysqltest.
Changed -- to #.
2007-11-01 15:03:09 +01:00
malff@lambda.hsd1.co.comcast.net.
5bcb976bc2
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-base
...
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge
2007-11-01 06:35:22 -06:00