mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
54012 commits 2791 branches 343 tags 1.7 GiB
Commit graph

54012 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
cmiller@zippy.cornsilk.net
ac2d693514 Fix merge problem. 2008-04-10 23:27:24 -04:00
cmiller@zippy.cornsilk.net
2f7bdf8427 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-10 17:58:58 -04:00
cmiller@zippy.cornsilk.net
c27dd4372c Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
 2008-04-10 17:48:33 -04:00
cmiller@zippy.cornsilk.net
82d8a99c05 Fix mismerge. 2008-04-10 15:55:37 -04: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
3c6591ad8f Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776-encore/my50-bug15776-encore 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
 2008-04-09 20:34:38 -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
02e6c83950 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776-encore/my50-bug15776-encore
 2008-04-09 17:14:10 -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 
#12713 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
kent/mysqldev@mysql.com/production.mysql.com
9b6ac078f6 Makefile.am: 
Add ChangeLog if it exists
  - Removed separate 'normal+rowrepl' test run, not needed any longer
  - Removed separate 'rpl' test run, included in main test run already
  - Renamed some test "comments", to use similar naming style
  - Limited one of the Cluster test runs to 'ndb' and 'rpl_ndb' suites
  - Reordered test runs, to be aligned with Windows test runs
mysql.spec.sh:
  - No longer including the "Example" storage engine
  - Added to configure "--without-ENGINE" if not to compile engine as plugin
 2008-04-08 11:44:18 +02:00
aelkin/andrei@mysql1000.(none)
725d07d559 Bug #35762 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 #35732: 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.
fa63d5d165 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2008-04-05 12:51:38 +02:00
joerg@trift2.
cca2a8ec42 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/tmp-5.1
 2008-04-04 20:03:24 +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.
a5a1fef394 Merge trift2.:/MySQL/M51/clone-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2008-04-04 19:30:52 +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
davi@mysql.com/endora.local
5d725bfdf8 Bug#35824: mysql_upgrade does not fix scheduler tables when upgrading from 5.1.23 to 5.1.24 
The problem is that when upgrading the event table, the sql_mode
column was always being added instead of being updated to list new
sql_mode values, causing upgrades of the event which already have
a sql_mode column to not be updated to the new sql_mode values.

The solution is to always add first a stub sql_mode column and
subsequently update the column to the new sql_mode values.
 2008-04-04 13:46:05 -03:00
mleich@five.local.lan
5b6e85157b 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-04 18:31:02 +02:00
mleich@five.local.lan
c780a0879a Merge five.local.lan:/work/merge/mysql-5.0-funcs_1 
into  five.local.lan:/work/merge/mysql-5.1-funcs_1
 2008-04-04 18:27:37 +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
mleich@five.local.lan
c7efce7e3b Merge five.local.lan:/work/trees/mysql-5.0-build-src-clean 
into  five.local.lan:/work/merge/mysql-5.0-build
 2008-04-04 14:51:43 +02:00
mleich@five.local.lan
40092a7932 Merge five.local.lan:/work/trees/mysql-5.1-build-src-clean 
into  five.local.lan:/work/merge/mysql-5.1-build
 2008-04-04 14:50:46 +02:00
joerg@trift2.
a1173ad61b mysql-test/Makefile.am : Fix a copy-paste error ... 2008-04-04 13:21:40 +02:00
joerg@trift2.
27e226c69f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2008-04-04 12:12:03 +02:00
joerg@trift2.
e0b54b4817 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2008-04-04 10:26:41 +02:00
joerg@trift-lap.fambruehe
b7360593f1 Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1 
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
 2008-04-03 20:58:22 +02:00
joerg@trift-lap.fambruehe
be2080f917 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
 2008-04-03 20:23:07 +02:00
cmiller@zippy.cornsilk.net
7b77e36909 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my51-bug26294 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
 2008-04-03 13:21:02 -04:00