mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 06:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
36723 commits 2781 branches 343 tags 1.6 GiB
Commit graph

36723 commits

This branch
This branch
All branches
Author SHA1 Message Date
istruewing@chilla.local
86f495d53c Merge chilla.local:/home/mydev/mysql-5.0-amain 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-06-11 17:40:01 +02:00
joerg@trift2.
d870247de1 Merge trift2.:/MySQL/M41/bug23504-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2007-06-07 16:29:59 +02:00
joerg@trift2.
0d84c3f710 netware/*.def : Allocate 128K stack for all executables (bug#23504) 2007-06-07 12:59:31 +02:00
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
acurtis/antony@ltamd64.xiphis.org
aab3427131 Merge xiphis.org:/home/antony/work2/mysql-4.1-engines.merge 
into  xiphis.org:/home/antony/work2/mysql-5.0-merge
 2007-06-06 12:22:56 -07: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@xiphis.org/ltamd64.xiphis.org
e112a475bd Merge xiphis.org:/home/antony/work2/mysql-4.1-engines 
into  xiphis.org:/home/antony/work2/mysql-4.1-engines.merge
 2007-06-06 11:51: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
tsmith@quadxeon.mysql.com
75ed2c7d16 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/41
 2007-06-06 19:00:15 +02:00
joerg@trift2.
86fbe0bdf0 Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2007-06-06 16:16:14 +02:00
joerg@trift2.
fef905d0bf Merge trift2.:/MySQL/M41/mysql-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2007-06-06 16:05:23 +02:00
joerg/mysqldev@mysql.com/production.mysql.com
0067a9cc02 Raise version number after cloning 4.1.23 2007-06-06 15:22:06 +02: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
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
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
tsmith@quadxeon.mysql.com
173d07de78 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/41 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50
 2007-06-05 22:47:14 +02: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
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
svoj@mysql.com/april.(none)
bb437f8205 BUG#27141 - Calling tell(-1) under Windows causes assertion failure in Debug mode 
Original problem was fixed by Magnus (see BUG25807).

Currently only windows debug build causes assertion failure. This patch assures
that my_tell gets correct file descriptor on any platform by DBUG_ASSERT macro.
 2007-06-05 03:16:02 +05:00
iggy@amd64.(none)
9317cd4c2d Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  amd64.(none):/src/bug24400/my41-bug24400
 2007-06-04 13:02:41 -04:00
iggy@amd64.(none)
2e892d30f2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  amd64.(none):/src/bug24400/my50-bug24400
 2007-06-04 12:56:15 -04:00
iggy@amd64.(none)
9346e9246a Merge amd64.(none):/src/bug24400/my41-bug24400 
into  amd64.(none):/src/bug24400/my50-bug24400
 2007-06-04 12:47:48 -04: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
mhansson@dl145s.mysql.com
d9fcc304d9 Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  dl145s.mysql.com:/dev/shm/mhansson/my50-bug27741
 2007-06-04 09:26:54 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
9be267cbf2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b28652/b28652.5.0
 2007-06-04 10:37:43 +05:00
igor@olga.mysql.com
44b46b73f2 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
 2007-06-03 07:58:07 -07:00
evgen@moonbone.local
27d956b5e9 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
 2007-06-03 16:00:04 +04:00
evgen@moonbone.local
88147d5cfe user_var.result: 
Corrected test case result for the bug#28494.
item_func.h, item_func.cc:
  Corrected function names after fix for the bug#28494.
 2007-06-03 15:56:48 +04:00
evgen@moonbone.local
5d695b777a Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
 2007-06-03 14:46:37 +04:00
evgen@moonbone.local
7dbe9d3318 user_var.result, user_var.test: 
Extended test case for the bug#28494.
 2007-06-03 14:46:09 +04:00
igor@olga.mysql.com
cc0eff3e63 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
 2007-06-03 00:21:42 -07:00
gkodinov/kgeorge@macbook.gmz
8fd809bfd8 Merge bk-internal:/home/bk/mysql-5.0-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/B26162-5.0-opt
 2007-06-03 10:03:37 +03:00
gkodinov/kgeorge@macbook.gmz
9a1d8adc9d Bug #26162: Trigger DML ignores low_priority_updates setting 
The value of "low-priority-updates" option and the LOW PRIORITY
prefix was taken into account at parse time.
This caused triggers (among others) to ignore this flag (if
supplied for the DML statement).
Moved reading of the LOW_PRIORITY flag at run time.
Fixed an incosistency when handling
SET GLOBAL LOW_PRIORITY_UPDATES : now it is in effect for
delayed INSERTs.
Tested by checking the effect of LOW_PRIORITY flag via a 
trigger.
 2007-06-03 09:40:00 +03:00
iggy@amd64.(none)
bc651da095 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  amd64.(none):/src/bug24732/my50-bug24732
 2007-06-02 21:26:49 -04:00
igor@olga.mysql.com
91da3132b5 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
 2007-06-02 14:37:42 -07:00
evgen@moonbone.local
f4e20490a4 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
 2007-06-03 01:25:24 +04:00
evgen@moonbone.local
162a6b42ec item_func.cc: 
Post fix for bug#28494.
  The Item_func_set_user_var::check method now silently doesn't use result_field
  if it isn't defined.
 2007-06-03 01:24:56 +04:00
igor@olga.mysql.com
55fea25de4 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
 2007-06-02 12:46:48 -07:00
evgen@moonbone.local
294ead9ac9 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
 2007-06-02 23:20:54 +04:00
evgen@moonbone.local
4934646764 Bug#28494: Grouping by Item_func_set_user_var produces incorrect result. 
This is an additional fix.
Item::val_xxx methods are supposed to use original data source and
Item::val_xxx_result methods to use the item's result field. But for the
Item_func_set_user_var class val_xxx_result methods were mapped to val_xxx
methods. This leads, in particular, to producing bad sort keys and thus
wrong order of the result set of queries with group by/order by clauses.

The set of val_xxx_result methods is added to the Item_func_set_user_var
class. It's the same as the val_xxx set of method but uses the result_field
to return a value.
 2007-06-02 23:17:46 +04:00
igor@olga.mysql.com
5cbebf0a18 Fixed bug #28728: a crash when executing EXPLAIN EXTENDED for a query 
using a derived table over a grouping subselect.

This crash happens only when materialization of the derived tables 
requires creation of auxiliary temporary table, for example when
a grouping operation is carried out with usage of a temporary table.

The crash happened because EXPLAIN EXTENDED when printing the query
expression made an attempt to use the objects created in the mem_root
of the temporary table which has been already freed by the moment
when printing is called.

This bug appeared after the method Item_field::print() had been 
introduced.
 2007-06-02 11:44:16 -07:00
msvensson@pilot.(none)
be55062f64 Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-06-02 09:05:37 +02:00
tomas@whalegate.ndb.mysql.com
96ac5527af Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-build
 2007-06-02 06:34:48 +02:00
igor@olga.mysql.com
5a5410e40e Post-merge fix. 2007-06-01 17:58:46 -07:00
ibabaev@bk-internal.mysql.com
4bc1738be0 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
 2007-06-02 00:57:25 +02:00
iggy@amd64.(none)
5fc6a73b56 Bug #24732 Executables do not include Vista manifests 
- Cleanup typo.
- Make sure to only embedded four part numberic version.
 2007-06-01 16:48:23 -04:00
msvensson@pilot.(none)
9fd2b5ffaf Move code after variable delcaration 2007-06-01 19:57:26 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
2b2a80733d Fix for bug #28652: MySQL (with-debug=full) asserts when alter table operations 
Problem: we may create a deadlock committing changes in the mysql_alter_table() when 
LOCK_open is set. Moreover, "in some variants of the ALTER TABLE commit
happens earlier, outside of LOCK_open, in other later - inside. It's no good, a storage 
engine code that is called in between could expect a consistency - either there is a 
transaction or there is not".
Fix: move the commit to happen earlier and outside of the LOCK_open.
 2007-06-01 22:53:50 +05:00
kostja@bodhi.(none)
b9a3431048 Fix more mysqltest warnings. 2007-06-01 20:05:34 +04:00
kostja@bodhi.(none)
91917311bc Do not ignore mysqltest language interpreter warnings. 2007-06-01 18:06:40 +04:00