mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 12:01:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
47680 commits 2793 branches 343 tags 1.5 GiB
Commit graph

18410 commits

Author SHA1 Message Date
svoj@june.mysql.com
c45b4cf893 Merge 81.176.158.240:devel/mysql/BUG26976/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-engines
 2007-06-07 12:07:41 +05:00
kaa@polly.local
c674243497 Merge polly.local:/home/kaa/src/maint/bug28895/my50-bug28895 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2007-06-07 10:26:04 +04:00
kaa@polly.local
8303cfd9e3 Merge polly.local:/home/kaa/src/maint/bug28895/my51-bug28895 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2007-06-06 23:47:43 +04:00
acurtis/antony@ltamd64.xiphis.org
af72b54f3e Merge xiphis.org:/home/antony/work2/mysql-5.0-engines 
into  xiphis.org:/home/antony/work2/mysql-5.0-engines.merge
 2007-06-06 12:03:54 -07:00
acurtis/antony@ltamd64.xiphis.org
5a7f1f8a68 Merge xiphis.org:/home/antony/work2/mysql-5.1-engines 
into  xiphis.org:/home/antony/work2/mysql-5.1-engines.merge
 2007-06-06 12:00:35 -07:00
joerg@trift2.
d8c385c397 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-06-06 20:06:59 +02:00
joerg@trift2.
449cd28598 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-06-06 19:59:18 +02:00
jimw@rama.(none)
3c93323d28 Bug #28842 Different 'duplicate key' error code between 5.0 and 5.1 
The patch for WL 1563 added a new duplicate key error message so that the
  key name could be provided instead of the key number. But the error code
  for the new message was used even though that did not need to change.

  This could cause unnecessary problems for applications that used the old
  ER_DUP_ENTRY error code to detect duplicate key errors.
 2007-06-06 10:57:07 -07:00
kaa@polly.local
c48b9d6cff Merge polly.local:/home/kaa/src/maint/bug28895/my50-bug28895 
into  polly.local:/home/kaa/src/maint/bug28895/my51-bug28895
 2007-06-06 21:44:05 +04:00
tomas@whalegate.ndb.mysql.com
016cf69867 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build
 2007-06-06 16:51:04 +02:00
gluh@mysql.com/eagle.(none)
cf41df22f8 after merge fix 2007-06-06 18:55:21 +05:00
gluh@eagle.(none)
026f402674 Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-06-06 18:33:04 +05:00
gluh@mysql.com/eagle.(none)
466da4ccf1 Bug#28553 mysqld crash in "purge master log before(select time from information_schema)" 
forbid the use of subselect in PURGE LOGS BEFORE command
 2007-06-06 18:29:15 +05:00
gluh@mysql.com/eagle.(none)
52d267dabb Bug#28007 Wrong default value for I_S.PARTITIONS.PARTITION_COMMENT 
The value of the PARTITION_COMMENT column is an empty string if there is no partition comment.
 2007-06-06 17:47:02 +05:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
89639e7679 yellow warnings on pb. Setting the plug of a harmless warning. 2007-06-06 14:34:17 +03:00
gluh@mysql.com/eagle.(none)
4cd4a3d314 Bug#28580 Repeatation of status variables 
removed duplicated variable declarations
 2007-06-06 15:59:20 +05:00
joerg@trift2.
3d95b80da9 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-06-06 12:02:07 +02:00
tsmith@quadxeon.mysql.com
13adcedc90 mtr_report.pl: 
Add another exception to the acceptable mysqld errors, for test case for bug 28436
 2007-06-06 03:49:24 +02:00
svoj@mysql.com/april.(none)
bd8f81f470 BUG#26976 - Missing table in merge not noted in related error msg + 
SHOW CREATE TABLE fails

Underlying table names, that merge engine fails to open were not
reported.

With this fix CHECK TABLE issued against merge table reports all
underlying table names that it fails to open. Other statements
are unaffected, that is underlying table names are not included
into error message.

This fix doesn't solve SHOW CREATE TABLE issue.
 2007-06-06 04:42:41 +05:00
tsmith@quadxeon.mysql.com
0ca0984f59 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51
 2007-06-05 23:06:43 +02:00
tsmith@quadxeon.mysql.com
d2fe24d1ef Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50
 2007-06-05 23:04:40 +02:00
evgen@moonbone.local
0a91c7ccca Bug#28778: Wrong result of BETWEEN when comparing a DATETIME field with an 
integer constants.

This bug is introduced by the fix for bug#16377. Before the fix the 
Item_func_between::fix_length_and_dec method converted the second and third
arguments to the type of the first argument if they were constant and the first
argument is of the DATE/DATETIME type. That approach worked well for integer
constants and sometimes produced bad result for string constants. The fix for
the bug#16377 wrongly removed that code at all and as a result of this the
comparison of a DATETIME field and an integer constant was carried out in a
wrong way and sometimes led to wrong result sets.

Now the Item_func_between::fix_length_and_dec method converts the second and
third arguments to the type of the first argument if they are constant, the
first argument is of the DATE/DATETIME type and the DATETIME comparator isn't
applicable.
 2007-06-06 00:25:06 +04:00
skozlov/ksm@mysql.com/virtop.localdomain
69e2b72522 WL#3694, fix for events 2007-06-05 23:59:05 +04:00
istruewing@chilla.local
a28abc0554 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-06-05 21:40:46 +02:00
kaa@polly.local
35dd1fc535 Fix for bug #28895 "Test 'information_schema_db' fails on i5/OS 32 bit". 
In acl_getroot_no_password(), use a separate variable for traversing the acl_users list so that the last entry is not used when no matching entries are found.
 2007-06-05 22:18:07 +04:00
istruewing@chilla.local
594c39bc6f Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-06-05 19:56:57 +02:00
tomas@poseidon.mysql.com
8fd5212a9f Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-06-05 18:00:42 +02:00
tomas@poseidon.mysql.com
ce93bc3d13 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
 2007-06-05 17:51:53 +02:00
tsmith@quadxeon.mysql.com
4b93804592 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51
 2007-06-05 17:51:30 +02:00
tomas@poseidon.mysql.com
47d5fb91d2 Bug #28751 Lots of memory locked in memory causes high kswapd 
- add odirect option for lcp+backup+redo log to lower CPU/kswapd usage
- writing odirect removes need for kernel write buffers avoiding kswapd to kick in
 2007-06-05 17:29:50 +02:00
tsmith@quadxeon.mysql.com
502320ef05 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50
 2007-06-05 17:28:49 +02:00
joerg@trift2.
7c9a81687b Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-06-05 10:39:02 +02:00
gkodinov/kgeorge@magare.gmz
0c0201c9a7 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B28488-5.1-opt
 2007-06-05 10:42:47 +03:00
lars/lthalmann@dl145h.mysql.com
98501127fb Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-06-05 01:15:07 +02:00
lars/lthalmann@dl145h.mysql.com
b53b448d45 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-06-05 01:14:10 +02:00
tomas@whalegate.ndb.mysql.com
c5e13ae053 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build
 2007-06-04 22:23:14 +02:00
skozlov/ksm@mysql.com/virtop.localdomain
caa1560408 WL#3694 2007-06-04 20:44:25 +04:00
gkodinov/kgeorge@macbook.gmz
f081188fcb Bug #28488: Incorrect information in file: './test/t1_test#.frm' 
While executing ALTER TABLE ... PARTITION the server uses 
a temporary "shadow" table to create the updated table.
This shadow table then gets renamed as the original table.
The shadow table was not prefixed with the special prefix that
marks temporary tables so it was picked up by SHOW TABLE STATUS.
Fixed by isolating the code to create the shadow table name in a
separate function and prefixing the shadow table name with the
special prefix to exclude it from the list of user tables.
See bug 18775 and WL1324 for details.
 2007-06-04 18:56:29 +03:00
igor@olga.mysql.com
d0cb11e6ba Post-merge fix. 2007-06-04 05:55:27 -07:00
skozlov/ksm@mysql.com/virtop.localdomain
789088fc5b WL#3694, updated by pushbuild errors 2007-06-04 16:50:29 +04:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
4137125f34 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 
into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0
 2007-06-04 15:08:55 +03:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
f544286789 Bug #27716 multi-update did partially and has not binlogged 
manual merge with 5.0: automatic merge went incorrectly; fixing tests in rbr mode.
 2007-06-04 15:02:40 +03:00
skozlov/ksm@mysql.com/virtop.localdomain
ed427617cf WL#3694, Added option files for master/slave 2007-06-04 14:45:36 +04:00
skozlov/ksm@mysql.com/virtop.localdomain
62610402bf WL#3694, Result file for test case moved to proper directory 2007-06-04 14:39:34 +04:00
skozlov/ksm@mysql.com/virtop.localdomain
da4dfefa5e WL#3694 Replication of Invocation and Invoked Features Testing 2007-06-04 14:18:22 +04:00
igor@olga.mysql.com
a5011de0a8 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/mysql-5.1-opt-merge
 2007-06-04 03:16:17 -07:00
igor@olga.mysql.com
31c57a1efc Post-merge fix. 2007-06-04 03:03:15 -07:00
joerg@trift2.
724307b7ab Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-06-04 12:00:57 +02:00
joerg@trift2.
d822cf03e5 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-06-04 11:24:49 +02:00
jonas@perch.ndb.mysql.com
eab3e836e8 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-06-04 10:29:57 +02:00