cbell/Chuck@mysql_cab_desk.
fc0adebe0e
BUG#21490 - No warning issued for deprecated replication parameters
...
This patch deprecates the replication startup options in the configuration
file and on the command line. The options deprecated include:
MASTER_HOST, MASTER_USER, MASTER_PASSWORD, MASTER_PORT, MASTER_CONNECT_RETRY,
MASTER_SSL, MASTER_SSL_CA, MASTER_SSL_CAPATH, MASTER_SSL_CERT, MASTER_SSL_KEY,
and MASTER_SSL_CIPHER
The code is designed to print the warning message once.
2007-01-18 13:35:49 -05:00
lars/lthalmann@mysql.com/dl145j.mysql.com
c380de50ef
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-01-12 12:22:54 +01: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
cbell/Chuck@suse.vabb.com
e4c74a6ba4
Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into suse.vabb.com:/home/Chuck/development/mysql-5.0-rpl
2007-01-10 14:45:42 -04:00
cbell/Chuck@suse.vabb.com
183c675980
BUG#22645 - LC_TIME_NAMES: Statement not replicated
...
This patch is an additional code change to the get_str_len_and_pointer
method in log_events.cc. This change is necessary to correct a problem
encountered on 64-bit SUSE where the auto_increment_* variables were
being overwritten. The change corrects a cast mismatch which caused
the problem.
2007-01-10 13:45:41 -05:00
kent@mysql.com/kent-amd64.(none)
ba7b6e86f2
configure.in:
...
Corrected default for --disable-grant-options
2007-01-10 18:19:51 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
27d56afcfc
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/d2/hf/mr10/my50-mr10
2007-01-10 20:37:22 +04:00
kent@mysql.com/kent-amd64.(none)
1768b21a14
configure.in:
...
Removed line accidently inserted when correcting bug#18526
2007-01-10 14:50:09 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
bcd4d84de9
Merge mysql.com:/d2/hf/common/my50-common
...
into mysql.com:/d2/hf/mr10/my50-mr10
2007-01-10 14:33:34 +04: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
joerg@trift2.
b63c167f66
support-files/MySQL-shared-compat.spec.sh : Dummy, irrelevant change - just trigger a new build.
2007-01-10 00:36:41 +01:00
thek@kpdesk.mysql.com
2af1ec2911
Merge kpdesk.mysql.com:/home/thek/dev/bug23010/my50-bug23010
...
into kpdesk.mysql.com:/home/thek/dev/mysql-5.0-build
2007-01-09 14:35:16 +01:00
thek@kpdesk.mysql.com
16590668f1
Merge kpdesk.mysql.com:/home/thek/dev/bug23010/my41-bug23010
...
into kpdesk.mysql.com:/home/thek/dev/bug23010/my50-bug23010
2007-01-09 12:33:02 +01:00
thek@kpdesk.mysql.com
98a9706edb
Merge kpdesk.mysql.com:/home/thek/dev/test23010/my40-bug23010
...
into kpdesk.mysql.com:/home/thek/dev/bug23010/my41-fix23010
2007-01-09 12:30:57 +01:00
thek@kpdesk.mysql.com
0906993457
Cset exclude: thek@kpdesk.mysql.com|ChangeSet|20061106104152|07628
2007-01-09 12:28:46 +01:00
guilhem@gbichot3.local
3e760410a0
Fix for BUG#19725 "Calls to SF in other database are not replicated
...
correctly in some cases".
In short, calls to a stored function located in another database
than the default database, may fail to replicate if the call was made
by SET, SELECT, or DO.
Longer: when a stored function is called from a statement which does not go
to binlog ("SET @a=somedb.myfunc()", "SELECT somedb.myfunc()",
"DO somedb.myfunc()"), this crafted statement is binlogged:
"SELECT myfunc();" (accompanied with a mention of the default database
if there is one). So, if "somedb" is not the default database,
the slave would fail to find myfunc(). The fix is to specify the
function's database name in the crafted binlogged statement, like this:
"SELECT somedb.myfunc();". Test added in rpl_sp.test.
2007-01-08 22:01:06 +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
kent@mysql.com/kent-amd64.(none)
528b457644
mysql.spec.sh, 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
2007-01-05 16:53:03 +01:00
mmj@tiger.mmj.dk
8941159ed8
Merge tiger.mmj.dk:/Users/mmj/bktrees/mysql-4.1-build
...
into tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0-build
2007-01-04 23:20:04 +01:00
mmj@tiger.mmj.dk
f61a873c60
my_global.h:
...
Patch from Alfredo for TARGET_FAT_BINARY
2007-01-04 23:18:04 +01:00
mmj@tiger.mmj.dk
f0d503a8f2
Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0-build
2007-01-04 22:33:34 +01:00
mmj@tiger.mmj.dk
37ae5bbbbe
my_global.h:
...
Add patch from Alfredo for TARGET_FAT_BINARY
2007-01-04 22:22:25 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
8c2d34c3c6
merging
2007-01-03 03:35:57 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
8ff44eaeef
mysql_upgrade disabled in embedded server
2007-01-03 03:33:26 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
988e2e4cad
Merge mysql.com:/d2/hf/common/my41-common
...
into mysql.com:/d2/hf/common/my50-common
2007-01-03 02:43:27 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
12cd7c7b3e
warning count for embedded prepared statements added
2007-01-03 02:41:14 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
a44106c07c
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/d2/hf/common/my50-common
2007-01-02 18:00:30 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
429b82bed3
Merge mysql.com:/d2/hf/common/my41-common
...
into mysql.com:/d2/hf/common/my50-common
2007-01-02 17:54:38 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
e7130631cb
merging fix
2007-01-02 17:53:55 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
56155d83e7
merging fix
2007-01-02 17:51:32 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
726a51bc77
Merge mysql.com:/d2/hf/common/my41-common
...
into mysql.com:/d2/hf/common/my50-common
2007-01-02 17:50:55 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
998167acce
embedded-server related fixes
2007-01-02 17:46:20 +04:00
kent@mysql.com/kent-amd64.(none)
499eb4d8ba
view.result:
...
Temporary work around for bug#25359
2007-01-02 11:01:48 +01:00
kent@mysql.com/kent-amd64.(none)
769e177090
Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-01-01 10:51:44 +01:00
kent@mysql.com/kent-amd64.(none)
0bc6df6a24
Many files:
...
Renamed hash_create() not to clash with imap using embedded server (bug#13859)
2007-01-01 10:50:39 +01:00
kent@mysql.com/kent-amd64.(none)
344599948d
mysqld.cc, configure.in:
...
Don't use thread priority by default on Mac OS X (bug#18526)
2007-01-01 09:54:41 +01:00
kent@mysql.com/kent-amd64.(none)
fd833d7037
configure.in:
...
Build "mysqld_error.h" even if configured --withouth-server (bug#21265)
2007-01-01 08:49:17 +01:00
kent@mysql.com/kent-amd64.(none)
1febd444a2
Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-01-01 07:23:43 +01:00
kent@mysql.com/kent-amd64.(none)
473b0c7287
configure.in:
...
Don't build server when configured --without-server (bug#23973)
2007-01-01 07:22:57 +01:00
kent@mysql.com/kent-amd64.(none)
21c7eca2bf
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-01-01 05:35:10 +01:00
kent@mysql.com/kent-amd64.(none)
efd16938ce
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kent/bk/tmp/mysql-4.1-build
2007-01-01 05:34:17 +01:00
kent@mysql.com/kent-amd64.(none)
88b3c4f03a
Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-01-01 05:31:23 +01:00
kent@mysql.com/kent-amd64.(none)
0255a1c9c2
mysql_secure_installation.sh:
...
Portable handling of "echo" without newline (bug#24605)
check-cpu:
In developer script safe to use "printf", not "echo -n"
2007-01-01 05:30:31 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
874d366500
Merge mysql.com:/d2/hf/clean/my50-clean
...
into mysql.com:/d2/hf/common/my50-common
2006-12-31 12:39:20 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
0831699f5c
Merge mysql.com:/d2/hf/clean/my41-clean
...
into mysql.com:/d2/hf/common/my41-common
2006-12-31 12:37:42 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
2ab15de7cd
Merge mysql.com:/d2/hf/common/my41-common
...
into mysql.com:/d2/hf/common/my50-common
2006-12-31 12:36:06 +04:00
kent@mysql.com/kent-amd64.(none)
1b8bd0d246
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kent/bk/main/mysql-5.0
2006-12-31 01:04:07 +01:00
kent@mysql.com/kent-amd64.(none)
6523aca729
my_strtoll10-x86.s:
...
Corrected spelling in copyright text
Makefile.am:
Don't update the files from BitKeeper
Many files:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
Many files:
Added GPL copyright text
Removed files:
Docs/Support/colspec-fix.pl
Docs/Support/docbook-fixup.pl
Docs/Support/docbook-prefix.pl
Docs/Support/docbook-split
Docs/Support/make-docbook
Docs/Support/make-makefile
Docs/Support/test-make-manual
Docs/Support/test-make-manual-de
Docs/Support/xwf
2006-12-31 01:02:27 +01:00
bar@mysql.com
2c039cccb6
log_event.cc:
...
After merge fix
2006-12-29 16:42:16 +04:00
joerg@trift2.
cb5e2b3004
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2006-12-28 18:22:43 +01:00