istruewing@stella.local
2fe97d3428
Merge stella.local:/home2/mydev/mysql-5.1-ateam
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2007-11-25 14:51:01 +01:00
istruewing@stella.local
2cc3e56ea4
Merge stella.local:/home2/mydev/mysql-5.0-ateam
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-25 14:14:52 +01:00
istruewing@stella.local
7eeea0c324
Bug#32661 - Compiler warning in client/mysql.cc
...
The initialization to zero via LINT_INIT made mysql.test fail.
print_warnings() was suppressed where it should not.
Fixed initialization so that it fakes warnings.
2007-11-23 23:21:37 +01:00
istruewing@stella.local
6c6ee17297
Bug#32668 rpl_row_charset_innodb.test fails
...
Re-enabled test case after fix
2007-11-23 18:27:05 +01:00
istruewing@stella.local
13c4f25fcf
Bug#32668 - rpl_row_charset_innodb.test fails
...
The test case fails on "vanilla" and "no_innodb" builds.
These builds do not include InnoDB.
The test case requires InnoDB.
Added requirement for InnoDB into the test case, so that
it does not start on those builds.
2007-11-23 18:05:45 +01:00
istruewing@stella.local
32b99c5570
Bug#32668 - rpl_row_charset_innodb.test fails
...
Disabled test case
2007-11-23 17:54:19 +01:00
istruewing@stella.local
9f19e3f647
Bug#32667 lowercase_table3.test reports to error log
...
Disabled test case
2007-11-23 17:47:22 +01:00
istruewing@stella.local
bc7205bb3f
Bug#29830 Test case 'events_scheduling' fails on Mac OS X and Windows
...
Disabled the test case
2007-11-23 17:05:16 +01:00
istruewing@stella.local
6f426699e5
Bug#32664 - events.test fails randomly
...
Disabled test case
2007-11-23 16:53:31 +01:00
istruewing@stella.local
55a8f4c784
Bug#32663 binlog_multi_engine.test fails randomly
...
Disabled test case
2007-11-23 16:32:51 +01:00
istruewing@stella.local
08a757c03c
Bug#32661 - Compiler warning in client/mysql.cc
...
Compiler warned about possible use of uninitialized variable
'warnings' in com_go().
Added LINT_INIT for 'warnings'.
2007-11-23 16:02:51 +01:00
istruewing@stella.local
9e450e76cd
Bug#32659 - ndb_dd_backuprestore.test fails randomly
...
Disabled test case
2007-11-23 15:30:04 +01:00
istruewing@stella.local
75e9c20197
Merge stella.local:/home2/mydev/mysql-5.0-axmrg
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2007-11-23 15:04:39 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
7a41acfd40
Merge mysql.com:/home/ram/work/mysql-5.0-engines
...
into mysql.com:/home/ram/work/b32560/b32560.5.0
2007-11-23 17:24:54 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
2bc1e74c55
Merge mysql.com:/home/ram/work/b32560/b32560.5.0
...
into mysql.com:/home/ram/work/b32560/b32560.5.1
2007-11-23 16:43:49 +04:00
df@pippilotta.erinye.com
909fa65a1f
Fix make distcheck.
2007-11-23 13:38:59 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
51ca3235b8
Fix for bug #32560 : crash with interval function and count(*)
...
Problem: INTERVAL function implementation doesn't handle NULL range values.
Fix: skip NULL ranges looking for a proper one.
2007-11-23 16:30:06 +04:00
istruewing@stella.local
a1c5fef49a
Merge stella.local:/home2/mydev/mysql-5.0-ateam
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-23 13:09:01 +01:00
istruewing@stella.local
3b09d3708a
Bug#32654: rpl_view.test fails randomly
...
Disabled test case
2007-11-23 13:03:38 +01:00
istruewing@stella.local
695afd5d07
Bug#32653 - rpl_log.test fails randomly
...
Disabled test case
2007-11-23 12:54:05 +01:00
istruewing@stella.local
1d2a0d1d6e
BUG#31277 - myisamchk --unpack corrupts a table
...
Fixed a compiler warning on win64. Backport from 5.1.
2007-11-23 12:52:29 +01:00
mkindahl@dl145h.mysql.com
93d9d62353
Post-merge fixes.
2007-11-23 12:51:14 +01:00
istruewing@stella.local
95c63ada55
BUG#31277 - myisamchk --unpack corrupts a table
...
Fixed a compiler warning on win64
2007-11-23 12:28:36 +01:00
istruewing@stella.local
17399e7be3
Bug#32651 - grant_cache.test fails
...
Disabled test case
2007-11-23 12:06:55 +01:00
kent@kent-amd64.(none)
e80ac8a1d4
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/kent/bk/docs-cleanup/mysql-5.1-build
2007-11-23 10:20:33 +01:00
kent@mysql.com/kent-amd64.(none)
ec2e2fc187
ReadMe.txt, INSTALL-WIN-SOURCE, INSTALL-BINARY, INSTALL-SOURCE:
...
Updated links to version 5.1 of the manual
2007-11-23 10:15:55 +01:00
kent@kent-amd64.(none)
3719bf6a1c
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into mysql.com:/home/kent/bk/docs-cleanup/mysql-5.1-build
2007-11-23 10:15:22 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
a13b5e9d80
Merge mysql.com:/home/ram/work/mysql-5.0-engines
...
into mysql.com:/home/ram/work/b32558/b32558.5.0
2007-11-23 13:04:13 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
ce75b829ee
Merge mysql.com:/home/ram/work/b32558/b32558.5.0
...
into mysql.com:/home/ram/work/b32558/b32558.5.1
2007-11-23 12:35:02 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
6339719b2e
Merge mysql.com:/home/ram/work/mysql-5.1-engines
...
into mysql.com:/home/ram/work/b32557/b32557.5.1
2007-11-23 12:16:22 +04:00
istruewing@stella.local
e099b71f75
Merge stella.local:/home2/mydev/mysql-5.1-amain
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2007-11-23 09:14:49 +01:00
istruewing@stella.local
3be8cf8f3d
Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
...
corrupts a MERGE table
Post-pushbuild fix. The merge test failed on Windows.
The MoveFile() function returned the error code
ERROR_ACCESS_DENIED.
The fix is to use a different name for the file to be
deleted. This is the same trick as we use for the error
code ERROR_ALREADY_EXISTS.
Added ERROR_ACCESS_DENIED to the list of error codes that
require to change the name of the file to be deleted.
2007-11-22 21:39:28 +01:00
mkindahl@dl145h.mysql.com
29e48c4f63
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2007-11-22 20:15:42 +01:00
df@pippilotta.erinye.com
e9c0b566b2
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-11-22 18:21:06 +01:00
df@pippilotta.erinye.com
9ae1541c30
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-11-22 18:18:33 +01:00
df@pippilotta.erinye.com
bf6cf069f1
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
2007-11-22 18:07:09 +01:00
kent@kent-amd64.(none)
b60c1366ed
Merge mysql.com:/home/kent/bk/docs-cleanup/mysql-5.0-build
...
into mysql.com:/home/kent/bk/docs-cleanup/mysql-5.1-build
2007-11-22 17:53:47 +01:00
kent@kent-amd64.(none)
3a9202bd60
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/kent/bk/docs-cleanup/mysql-5.1-build
2007-11-22 17:52:36 +01:00
kent@mysql.com/kent-amd64.(none)
41778b565b
Makefile.am, configure.in:
...
Include "manual.chm" in source TAR if it exists
2007-11-22 17:48:40 +01:00
serg@janus.mylan
ad1b342b30
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-11-21 21:29:16 +01:00
mkindahl@dl145h.mysql.com
0c7f3bdeba
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2007-11-21 21:15:33 +01:00
mkindahl@dl145h.mysql.com
3cf2733086
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
2007-11-21 21:11:57 +01:00
istruewing@stella.local
8ba6ecc7e4
Merge stella.local:/home2/mydev/mysql-5.0-axmrg
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2007-11-21 20:35:02 +01:00
istruewing@stella.local
3be5815015
Merge stella.local:/home2/mydev/mysql-5.1-amain
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2007-11-21 20:32:58 +01:00
istruewing@stella.local
82bf8f36f3
Merge stella.local:/home2/mydev/mysql-4.1-axmrg
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-21 20:31:47 +01:00
istruewing@stella.local
0d76c73fd5
Merge stella.local:/home2/mydev/mysql-5.0-amain
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-21 20:30:07 +01:00
istruewing@stella.local
ca95af018e
Merge stella.local:/home2/mydev/mysql-4.1-amain
...
into stella.local:/home2/mydev/mysql-4.1-axmrg
2007-11-21 20:27:16 +01:00
df@pippilotta.erinye.com
9d8981033d
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-11-21 19:44:40 +01:00
df@pippilotta.erinye.com
f67a748ab4
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-11-21 19:44:12 +01:00
df@pippilotta.erinye.com
8c88e1faa2
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-11-21 19:42:50 +01:00