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

35274 commits

This branch
This branch
All branches
Author SHA1 Message Date
tomas@poseidon.mysql.com
491017b15e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-02-17 16:09:32 +07:00
igor@olga.mysql.com
53d93fc30e Adjusted results after fix for bug 25971. 2007-02-16 15:43:50 -08:00
igor@olga.mysql.com
0cc8643cac Adjusted results after fix for bug 25971. 2007-02-16 14:30:25 -08:00
malff/marcsql@weblab.(none)
0bf1b708f3 Manual merge 2007-02-16 13:42:52 -07:00
igor@olga.mysql.com
f5888a8d10 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/mysql-5.0-opt
 2007-02-16 09:39:08 -08:00
jonas@perch.ndb.mysql.com
676647ad86 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-02-16 18:22:52 +01:00
jonas@perch.ndb.mysql.com
80b82d2bbd ndb - bug in my.cnf handling on resize of vector 
backport fix from 5.1
 2007-02-16 18:20:24 +01:00
jonas@perch.ndb.mysql.com
82d2c91f1f Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-02-16 18:15:10 +01:00
jonas@perch.ndb.mysql.com
33e96dc5af Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-02-16 18:11:40 +01:00
jonas@perch.ndb.mysql.com
77b8feb878 ndb - bug#26454 
make lockpages=1 run a bit earlier in startup
 2007-02-16 18:10:27 +01:00
evgen@moonbone.local
31d63b7971 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/16630-bug-5.0-opt-mysql
 2007-02-16 19:44:54 +03:00
evgen@moonbone.local
7916d9e965 Bug#16630: The update fields of the INSERT .. SELECT .. ON DUPLICATE KEY 
UPDATE contains wrong data if the SELECT employs a temporary table.

If the UPDATE values of the INSERT .. SELECT .. ON DUPLICATE KEY UPDATE
statement contains fields from the SELECT part and the select employs a
temporary table then those fields will contain wrong values because they
aren't corrected to get data from the temporary table.

The solution is to add these fields to the selects all_fields list,
to store pointers to those fields in the selects ref_pointer_array and
to access them via Item_ref objects.

The substitution for Item_ref objects is done in the new function called 
Item_field::update_value_transformer(). It is called through the
item->transform() mechanism at the end of the select_insert::prepare()
function.
 2007-02-16 19:39:28 +03:00
malff/marcsql@weblab.(none)
f8839a70bd Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
 2007-02-16 09:02:02 -07:00
joerg@trift2.
0cdbda1273 include/config-win.h : 
Companion change to this one
   ChangeSet@1.2206, 2007-01-22 02:32:07+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +8 -0
     include/my_pthread.h@1.67, 2007-01-22 02:32:06+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +31 -10
which renamed "sigset()" -> "my_sigset()" but forgot to do it for Windows ...
 2007-02-16 16:31:31 +01:00
msvensson@pilot.blaudden
ee38195c90 Use " instead of ' to avoid win problem with ' 2007-02-16 16:08:08 +01:00
msvensson@pilot.blaudden
c1c7ba0aa0 Add echo.c to be built on Windows 2007-02-16 15:25:49 +01:00
msvensson@pilot.blaudden
b57994a7c2 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-16 15:23:27 +01:00
msvensson@pilot.blaudden
dc6f9d5d1b Merge 192.168.0.10:mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
 2007-02-16 15:23:06 +01:00
msvensson@pilot.blaudden
8ba162d761 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-16 15:22:31 +01:00
msvensson@neptunus.(none)
8931166e55 Workaround for problem where cygwin's bash/sh randomly fails with error 128 which 
mainly occurs on win2003 64bit.
 - Execute "exec" commands directly with cmd.exe and replace "--exec echo ..." with "--exec .\echo.exe ..."
 2007-02-16 15:19:38 +01:00
tomas@poseidon.mysql.com
9defcbbff4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-02-16 20:07:05 +07:00
istruewing@chilla.local
97c6a6c4e8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-02-16 10:39:45 +01:00
msvensson@pilot.blaudden
486dfab32b Merge 192.168.0.10:mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-15 15:56:38 +01:00
msvensson@pilot.blaudden
5349dffb36 Merge 192.168.0.10:mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
 2007-02-15 15:56:05 +01:00
guilhem@gbichot3.local
2f75c9cd69 Backport from the Falcon tree. 
When opening/creating the transaction coordinator's log, if binlog is
used, the tc log is the binlog so we use the binlog's name; otherwise
we use the mmap-based log, named after the mandatory argument of the
--log-tc option (meant for that).
 2007-02-15 15:50:56 +01:00
guilhem@gbichot3.local
8b1609a637 Fix for BUG#25507 "multi-row insert delayed + auto increment causes 
duplicate key entries on slave" (two concurrrent connections doing
multi-row INSERT DELAYED to insert into an auto_increment column,
caused replication slave to stop with "duplicate key error" (and
binlog was wrong)), and BUG#26116 "If multi-row INSERT
DELAYED has errors, statement-based binlogging breaks" (the binlog
was not accounting for all rows inserted, or slave could stop).
The fix is that: if (statement-based) binlogging is on, a multi-row
INSERT DELAYED is silently converted to a non-delayed INSERT.
Note: it is not possible to test BUG#25507 in 5.0 (requires mysqlslap),
so it is tested only in the changeset for 5.1. However, BUG#26116
is tested here, and the fix for BUG#25507 is the same code change.
 2007-02-15 15:39:03 +01:00
msvensson@neptunus.(none)
c94085cc5d Merge neptunus.(none):/home/msvensson/mysql/bug10777/my50-bug10777 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2007-02-15 15:05:25 +01:00
msvensson@neptunus.(none)
68158c982d Merge neptunus.(none):/home/msvensson/mysql/bug10777/my41-bug10777 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2007-02-15 15:04:53 +01:00
msvensson@neptunus.(none)
cf5d849bcf Merge neptunus.(none):/home/msvensson/mysql/bug10777/my41-bug10777 
into  neptunus.(none):/home/msvensson/mysql/bug10777/my50-bug10777
 2007-02-15 14:58:24 +01:00
joerg@trift2.
8ddb3af50c Merge trift2.:/MySQL/M41/mysql-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2007-02-15 13:46:54 +01:00
msvensson@pilot.mysql.com
7771db0183 Remove the newly added space in error message, should not be there 2007-02-15 11:17:25 +01:00
igor@olga.mysql.com
a2d4a042d0 Fixed bug #25971: indexes on text columns were ignored when ref accesses 
were evaluated.
According to the new rules for string comparison partial indexes on text
columns can be used in the same cases when partial indexes on varchar
columns can be used.
 2007-02-14 22:06:41 -08:00
tsmith@siva.hindu.god
ab168f0e40 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.0 
into  siva.hindu.god:/home/tsmith/m/bk/maint/40
 2007-02-14 12:42:11 -07:00
msvensson@pilot.mysql.com
67cc343c34 Add check of format specifiers in error message strings 
Update error message text accordingly to be equal between all translations
 2007-02-14 19:31:06 +01:00
cmiller@calliope.local.cmiller/calliope.local
80a35bfd39 Merge calliope.local.cmiller:/Volumes/Source/src/mysql-4.1-maint--bug25126 
into  calliope.local.cmiller:/Volumes/Source/src/mysql-4.1-maint
 2007-02-14 12:24:11 -05:00
gkodinov/kgeorge@macbook.gmz
664f24d5c3 Bug#19717: The blackhole engine is returning an OK flag in 
index_read(), whereas it must return HA_ERR_END_OF_FILE
instead (as there are by definition no rows in a table of 
that engine.
 2007-02-14 18:35:59 +02:00
cmiller@calliope.local.cmiller/calliope.local
cbdaf5b641 Merge calliope.local.cmiller:/Volumes/Source/src/mysql-4.1-maint--bug25126 
into  calliope.local.cmiller:/Volumes/Source/src/mysql-5.0-maint
 2007-02-14 11:27:37 -05:00
msvensson@pilot.mysql.com
c01c9b8899 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-14 16:50:15 +01:00
msvensson@pilot.mysql.com
9f720bb733 Use my_vsnprintf instead of vsnprintf 2007-02-14 16:49:41 +01:00
cmiller@zippy.cornsilk.net
154f7f396e Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-02-14 10:47:39 -05:00
msvensson@pilot.mysql.com
24a242bee1 Merge pilot.mysql.com:/home/msvensson/mysql/bug18628/my50-bug18628 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-14 14:45:15 +01:00
msvensson@pilot.mysql.com
45fe5879f4 Bug#18628 mysql-test-run: security problem(part1) 
- Implement --secure-file-priv=<dir> option that limits
  "load_file", "LOAD DATA" and "SELECT .. INTO OUTFILE" to work 
  with files in specified dir.
 - Use above option for mysqld in mysql-test-run.pl
 2007-02-14 14:44:34 +01:00
msvensson@pilot.mysql.com
a34b469a38 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-14 14:01:26 +01:00
istruewing@chilla.local
f9e9bd9a0c Merge chilla.local:/home/mydev/mysql-4.1-axmrg 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-02-14 12:03:47 +01:00
istruewing@chilla.local
aba12aca0f Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-02-14 12:02:58 +01:00
stewart@willster.(none)
836c2ab9ae Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-merge
 2007-02-14 21:36:12 +11:00
tomas@poseidon.mysql.com
92f9a37dc1 ndb_config_4_node.ini, ndb_config_1_node.ini: 
new file
 2007-02-14 15:33:48 +07:00
tomas@poseidon.mysql.com
f92d3b3ab5 backport some mysql-test ndbcluster things from 5.1 
remove compiler warning EventLogger.cpp
    Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
     - partial fix
     - object map to handle failed realloc
 2007-02-14 15:26:06 +07:00
tomas@poseidon.mysql.com
b7c3aeae2c Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca 
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-02-14 15:18:15 +07:00
tomas@poseidon.mysql.com
120eaec17c Bug #21033 Error 0 in readAutoIncrementValue() 
- do not call function if table has no autoincrement
 2007-02-14 15:16:26 +07:00