Commit graph

21965 commits

Author SHA1 Message Date
kent@kent-amd64.(none)
dcd05a49eb Merge mysql.com:/home/kent/bk/mysql-5.1-release
into  mysql.com:/home/kent/bk/build/mysql-5.1-build
2008-04-16 22:01:50 +02:00
hhunger@hh-nb.hungers
a14e5f3707 Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean
into  hh-nb.hungers:/work/merge/mysql-5.1-build
2008-04-16 16:49:49 +02:00
hhunger@hh-nb.hungers
9c925be163 fifth set of fixes to bug#35988. 2008-04-16 16:32:33 +02:00
hhunger@hh-nb.hungers
b7436cb905 Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean
into  hh-nb.hungers:/work/merge/mysql-5.1-build
2008-04-16 10:50:09 +02:00
hhunger@hh-nb.hungers
eee7bdc51a fourth set of fixes for bug#35988. 2008-04-16 10:23:07 +02:00
hhunger@hh-nb.hungers
f6aa788f26 Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean
into  hh-nb.hungers:/work/merge/mysql-5.1-build
2008-04-15 15:56:11 +02:00
hhunger@hh-nb.hungers
679b907964 Third set of fixes for bug#35988. 2008-04-15 15:44:11 +02:00
cmiller@zippy.cornsilk.net
13fa535b80 Bug#35157: mysqldump should use FLUSH TABLES NO_WRITE_TO_BINLOG \
when --master-data is used

When using the --master-data option with mysqldump, mysqldump uses 
a FLUSH TABLES command.  However, this statement got replicated to 
the slave(s), which caused the slave(s) to block unnecessarily while
the FLUSH tables command completed.

Now, if the master-data option is set to one of the two "on" modes,
then use the "LOCAL" qualifier to ensure that it's not replicated.
2008-04-14 17:43:08 -04:00
hhunger@hh-nb.hungers
63b0997fd7 Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean
into  hh-nb.hungers:/work/merge/mysql-5.1-build
2008-04-14 17:31:15 +02:00
hhunger@hh-nb.hungers
913b7b8030 Second set of fixes for bug#35988. 2008-04-14 17:21:18 +02:00
hhunger@hh-nb.hungers
ea349ae170 Merge hh-nb.hungers:/work/merge/mysql-5.1-build
into  hh-nb.hungers:/work/merge/mysql-5.1-wl4288
2008-04-11 22:16:41 +02:00
hhunger@hh-nb.hungers
3e3b797d0a Fixes of system variable test programs for bug#35988. 2008-04-11 21:59:33 +02:00
hhunger@hh-nb.hungers
88451eacfd Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean
into  hh-nb.hungers:/work/merge/mysql-5.1-build
2008-04-10 18:32:37 +02:00
hhunger@hh-nb.hungers
afd90d6166 System variable tests delivered by Folio3 (see WL4288). 2008-04-10 15:14:28 +02:00
cmiller@zippy.cornsilk.net
7a4136604a Error message changed across versions. 2008-04-09 21:19:41 -04:00
cmiller@zippy.cornsilk.net
53980960ea 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-09 21:03:14 -04:00
cmiller@zippy.cornsilk.net
ff37cb0b51 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776-encore/my51-bug15776-encore
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
2008-04-09 20:38:32 -04:00
cmiller@zippy.cornsilk.net
59fc28cfc4 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my51-bug15776
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776-encore/my51-bug15776-encore
2008-04-09 18:24:50 -04:00
cmiller@zippy.cornsilk.net
cc2f6266c3 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my51-bug15776
2008-04-09 18:09:42 -04:00
cmiller@zippy.cornsilk.net
b506166a0c 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-09 12:27:51 -04:00
cmiller@zippy.cornsilk.net
3e2457b71a Follow-up to B-g#15776, test failures on 64-bit linux.
Make maximum blob size to be 2**32-1, regardless of word size.

Fix failure of timestamp with size of 2**31-1.  The method of
rounding up to the nearest even number would overflow.
2008-04-09 12:27:30 -04:00
mleich@five.local.lan
756725ab93 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-09 16:05:58 +02:00
mleich@five.local.lan
963bb655c6 Additional tests inspired by Bug
 Error in a stored function called from a
          SELECT doesn't cause ROLLBACK of statem
2008-04-09 15:56:25 +02:00
aelkin/andrei@mysql1000.(none)
7a8b1baecd Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into  mysql1000.(none):/home/andrei/MySQL/BARE/mysql-5.1-release
2008-04-08 12:52:11 +03:00
aelkin/andrei@mysql1000.(none)
725d07d559 Bug Failing CREATE-SELECT steels Table map of the following query
Among two claimed artifacts the critical one is in that the Table map of 
a query following the failing with a duplicate key error CREATE-SELECT is skipped from
instantionating (and thus binlogging). That leads to sending a "chopped" group of the data
row-events without the table map head to the slave. 
The slave can not apply the only data row events.
It's not easy to force the slave to react with an error in such a case (the second complaint
on the bug report), because the lack of a table Rows_log_event::do_apply_event the data row event
handler is a common situation which  normally designates the event has to be filtered out
basing on the repliation do/ingore rules decision.

Fixed: table map creating and binlogging is restored via deploying the standard cleanup call in
select_create::abort().
No error is reported if by chance the table map was not been binlogged.
Leaving this out to resolve with considering how to combine the do/ingore rules with the situation
when erronoulsy the Table_map is not written to binlog.
2008-04-08 10:43:00 +03:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
5397f8c90d Fix for bug : read-only blocks SELECT statements in InnoDB
Problem: SELECTs prohibited for a transactional SE in autocommit mode
if read_only is set.

Fix: allow them.
2008-04-08 10:20:58 +05:00
joerg@trift2.
0e6f1a731f Merge trift2.:/MySQL/M51/push-5.1
into  trift2.:/MySQL/M51/work-5.1
2008-04-05 13:37:05 +02:00
joerg@trift2.
0d0b67d270 Merge trift2.:/MySQL/M51/clone-5.1
into  trift2.:/MySQL/M51/tmp-5.1

Null merge - changes specific to 5.1.24-rc are superseded by better ones done in parallel.
2008-04-04 19:52:48 +02:00
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