Commit graph

21937 commits

Author SHA1 Message Date
joerg@trift2.
2092e0c004 Merge trift2.:/MySQL/M51/clone-5.1
into  trift2.:/MySQL/M51/tmp-5.1
2008-04-04 19:25:39 +02:00
mleich@five.local.lan
71dd9bda70 Merge five.local.lan:/work/merge/mysql-5.0-funcs_1
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
2008-04-04 18:02:55 +02:00
mleich@five.local.lan
7498f9e6b8 Backport of fix made in 5.1 to 5.0
mysql-test/Makefile.am   :    Fix a copy-paste error ...
2008-04-04 17:41:14 +02:00
joerg@trift2.
a1173ad61b mysql-test/Makefile.am : Fix a copy-paste error ... 2008-04-04 13:21:40 +02:00
cmiller@zippy.cornsilk.net
bb7d01f73d Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
2008-04-03 11:30:38 -04:00
cmiller@zippy.cornsilk.net
a296df9581 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
2008-04-03 11:28:10 -04:00
joerg@trift2.
c62e5bbe46 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2008-04-03 15:30:39 +02:00
mleich@five.local.lan
3e8657456a Merge five.local.lan:/work/merge/mysql-5.1-funcs_1
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
2008-04-02 21:30:48 +02:00
mleich@five.local.lan
d14e25bf7b Merge five.local.lan:/work/merge/mysql-5.0-funcs_1
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
2008-04-02 21:29:43 +02:00
mleich@five.local.lan
cf8e6655ab Merge five.local.lan:/work/merge/mysql-5.0-funcs_1
into  five.local.lan:/work/merge/mysql-5.1-funcs_1
2008-04-02 20:24:07 +02:00
mleich@five.local.lan
c01918948c Correct the location of the directory for
"funcs_1" data load
2008-04-02 19:47:20 +02:00
cmiller@zippy.cornsilk.net
844939eed6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
2008-04-02 10:58:37 -04:00
cmiller@zippy.cornsilk.net
c83c18c058 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
2008-04-02 10:56:49 -04:00
mleich@five.local.lan
4f4d10da03 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
2008-04-02 14:55:35 +02:00
mleich@five.local.lan
a36a3fa266 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
2008-04-02 14:50:29 +02:00
kent/mysqldev@mysql.com/production.mysql.com
fd1bd7547a mysqld.cc:
Corrects build problems embedded on Windows
Makefile.am:
  Install .sym or mysqld-debug if exists
query_cache_debug.test, query_cache_debug.result:
  Set more resonable query cache size (bug#35749)
CMakeLists.txt:
  Added missing stacktrace.c
2008-04-02 00:43:17 +02:00
mleich@five.local.lan
bc3b4a2cf9 Merge five.local.lan:/work/merge/mysql-5.1-Bug
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
2008-04-01 23:19:37 +02:00
mleich@five.local.lan
4822079f0a Merge five.local.lan:/work/merge/mysql-5.0-Bug
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
2008-04-01 23:03:23 +02:00
mleich@five.local.lan
4002e5c362 Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.1-release
into  five.local.lan:/work/mysql-5.1-24-rc
2008-04-01 19:29:29 +02:00
mleich@five.local.lan
1f26fe0815 Fixes for failing funcs_1 tests in mysql-5.1.24-rc
Problems were caused by modifications of
- the server
  - HANDLER FOR SQLSTATE '00000' is now rejected (bug fix)
    affects several ..._storedproc* tests
  - improved error message
    affects the ..._trig_03e
  - improved content of information_schema.COLUMNS about
    information_schema.REFERENTIAL_CONSTRAINTS
    affects is_columns_is
- the content of the community build (collations)
    affects charset_collation_3
2008-04-01 19:22:37 +02:00
cmiller@zippy.cornsilk.net
7a9f12e1c4 Test updated. 2008-04-01 12:26:12 -04:00
cmiller@zippy.cornsilk.net
15b1a5ff54 Bug#15776: 32-bit signed int used for length of blob
Based on contributed patch from Martin Friebe, CLA from 2007-02-24.

The parser lacked support for field sizes after signed long,
when it should extend to 2**32-1.

Now, we correct that limitation, and also make the error handling
consistent for casts.
---
Fix minor complaints of Marc Alff, for patch against B-g#15776.
---
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my51-bug15776
---
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my51-bug15776
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
---
testing
2008-04-01 12:19:20 -04:00
mats@mats-laptop.(none)
984ea1a3cb Fixes to eliminate some race conditions in tests. 2008-04-01 14:40:23 +02:00
mleich@five.local.lan
414299f4de Post merge fix for
ChangeSet@1.2583, 2008-03-31
   Merge five.local.lan:/work/merge/mysql-5.0-Bug
   into  five.local.lan:/work/merge/mysql-5.1-Bug
   Addditional manual fixes will be needed.
   MERGE: 1.1810.3667.16

   Which contains
      ChangeSet@1.1810.3667.16, 2008-03-31
      Fix for Bug
        #35335 funcs_1: Some tests fail within load_file during
                        pushbuild runs
   ...
2008-04-01 13:18:31 +02:00
mkindahl@dl145h.mysql.com
edc7090a5a Post-merge fixes. 2008-04-01 12:29:53 +02:00
mkindahl@dl145h.mysql.com
354f4d4cf6 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-04-01 08:45:24 +02:00
mkindahl@dl145h.mysql.com
fb9e8ed5e8 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
2008-04-01 08:43:15 +02:00
mleich@five.local.lan
6a835464e4 Merge five.local.lan:/work/merge/mysql-5.0-Bug
into  five.local.lan:/work/merge/mysql-5.1-Bug
Addditional manual fixes will be needed.
2008-03-31 23:39:51 +02:00
cmiller@zippy.cornsilk.net
a878c1b9c1 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my51-bug15776
2008-03-31 14:32:56 -04:00
mleich@five.local.lan
89ddc0aa52 Fix for
Bug#35335 funcs_1: Some tests fail within load_file during
                      pushbuild runs
   Solution: 1. Move files with input data used in load_file, 
                load data etc. 
                from suite/funcs_1/<whatever>
                to std_data
             2. Use for testsuite funcs_1 the server option
                --secure-file-priv=<MYSQLTEST_VARDIR>
             3. Outfiles have to be stored under MYSQLTEST_VARDIR 
+ changes according to WL#4304 Cleanup in funcs_1 tests
  - backport of fixes/improvements made in 5.1 to 5.0
    The differences between scripts in 5.0 and 5.1 cause
    much additional and annoying work during any upmerge.
  - replace error numbers with names
  - improved comments
  - improved formatting
  - Unify storage engine names so that result files for
    storage engine variants do not differ (some tests)
  - remove a script no more used (tests are done in other scripts)
2008-03-31 19:48:02 +02:00
kent/mysqldev@mysql.com/production.mysql.com
7cd32aa3ec disabled.def:
Disabled 'rpl_redirect', failure is sporadic and and the test is superfluous
rpl_packet.test, rpl_packet.result:
  Removing race conditions from rpl_packet causing test to fail
2008-03-31 19:01:56 +02:00
mkindahl@dl145h.mysql.com
b9f860f3e6 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-03-31 16:34:52 +02:00
mkindahl@dl145h.mysql.com
6c8a0887cc Removing race conditions from rpl_packet causing test to fail. 2008-03-31 16:32:45 +02:00
gkodinov/kgeorge@magare.gmz
2d7104e0c0 merge 5.1-main to 5.1-bugteam 2008-03-31 14:13:42 +03:00
gkodinov/kgeorge@magare.gmz
69b7c5fee9 Merge bk-internal:/home/bk/mysql-5.1-bugteam
into  magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam
2008-03-31 12:38:01 +03:00
mats@mats-laptop.(none)
8642b248f4 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam
into  mats-laptop.(none):/home/bk/b29020-mysql-5.1-rpl
2008-03-31 11:31:53 +02:00
mats@mats-laptop.(none)
540247f3e9 Updating commit.inc since the number of commits done for non-transactional
tables is not zero any more. For row-based logging, there is an extra commit
for sending rows changed by the statement to the binary log.
2008-03-31 11:29:03 +02:00
gkodinov/kgeorge@magare.gmz
0463ba57a5 Merge bk-internal:/home/bk/mysql-5.1
into  magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam
2008-03-31 11:57:18 +03:00
mkindahl@dl145h.mysql.com
a7fe4abc55 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
2008-03-31 09:57:29 +02:00
gkodinov/kgeorge@magare.gmz
dd62320d0e Merge bk-internal:/home/bk/mysql-5.1
into  magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam
2008-03-31 10:40:39 +03:00
aelkin/andrei@mysql1000.(none)
c7447a25c6 Merge mysql1000.(none):/home/andrei/MySQL/BARE/mysql-5.1
into  mysql1000.(none):/home/andrei/MySQL/MERGE/5.1-main2rpl
2008-03-30 14:12:27 +03:00
aelkin/andrei@mysql1000.(none)
ba7b1a7e55 Bug #35675 reset master finds assert if a binlog file can not be deleted
If a binlog file is manually replaced with a namesake directory the internal purging did
not handle the error of deleting the file so that eventually
a post-execution guards fires an assert.

Fixed with reusing a snippet of code for bug@18199 to tolerate lack of the file but no other error 
at an attempt to delete it.
The same applied to the index file deletion.

The cset carries pieces of manual merging.
2008-03-30 00:54:08 +02:00
aelkin/andrei@mysql1000.(none)
d3d0a00635 Merge mysql1000.(none):/home/andrei/MySQL/MERGE/5.0-main2rpl
into  mysql1000.(none):/home/andrei/MySQL/MERGE/5.1-main2rpl
2008-03-29 15:00:12 +02:00
aelkin/andrei@mysql1000.(none)
22536fc53e Merge mysql1000.(none):/home/andrei/MySQL/BARE/mysql-5.1
into  mysql1000.(none):/home/andrei/MySQL/MERGE/5.1-main2rpl
2008-03-29 14:19:53 +02:00
aelkin/andrei@mysql1000.(none)
c4813ae343 Fixing rpl suite disabled.def: rpl_stm_extraColmaster_ndb does not exist in the suite. 2008-03-29 14:01:56 +02:00
anozdrin/alik@quad.opbmk
ce225e7339 Fix manual merge. 2008-03-29 00:05:20 +03:00
anozdrin/alik@quad.opbmk
f5c4b91cf7 Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0-bt
into  quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1-bt-merged
2008-03-28 23:54:14 +03:00
anozdrin/alik@quad.opbmk
814e2613b0 Fix tree:
1. Use 'dat' extension, because it is handled in Makefile.am;
  2. Fix typo: the bug id is 35469, not 35649.
2008-03-28 23:39:47 +03:00
mats@mats-laptop.(none)
78a0706a08 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam
into  mats-laptop.(none):/home/bk/b29020-mysql-5.1-rpl
2008-03-28 18:58:22 +01:00
mats@mats-laptop.(none)
476a7bf2d7 Post-merge fixes to remove test failures resulting from merge. 2008-03-28 18:56:43 +01:00