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

32847 commits

This branch
This branch
All branches
Author SHA1 Message Date
svoj@mysql.com/april.(none)
0830486836 After merge fix. 2006-10-08 22:34:32 +05:00
svoj@may.pils.ru
8cfef42f72 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  may.pils.ru:/home/svoj/devel/bk/mysql-5.0-engines
 2006-10-08 15:14:53 +05:00
svoj@may.pils.ru
b7f016dbd3 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  may.pils.ru:/home/svoj/devel/bk/mysql-4.1-engines
 2006-10-08 15:11:17 +05:00
jonas@perch.ndb.mysql.com
007311c6fd ndb - bug#22893 
Add checking of REDO to earlier during SR
      so take-over of node can be performed
      if it can't be restarted using logs
      (which btw is really weird...as it _should_ be able to use logs of other node in node group)

  Otherwise cluster could be started and 1 fragment on one node could not have been restored
  Making the cluster inconsisten, VERY BAD
 2006-10-06 16:05:46 +02:00
svoj@mysql.com/april.(none)
8f4b0d946a Merge mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-5.0-engines
 2006-10-06 15:29:30 +05:00
svoj@mysql.com/april.(none)
09b2a2a056 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-4.1-engines
 2006-10-06 15:18:25 +05:00
svoj@mysql.com/april.(none)
1e82044cd6 BUG#22937 - Valgrind failure in 'merge' test (ha_myisammrg.cc:329) 
This is addition to fix for bug21617. Valgrind reports an error when
opening merge table that has underlying tables with less indexes than
in a merge table itself.

Copy at most min(file->keys, table->key_parts) elements from rec_per_key array.
This fixes problems when merge table and subtables have different number of keys.
 2006-10-06 15:17:42 +05:00
svoj@mysql.com/april.(none)
60ba9f2b63 Merge mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.0-engines
 2006-10-06 14:49:21 +05:00
svoj@mysql.com/april.(none)
6a1a765b5d Per discussion with pekka removed non-deterministic test case for bug#21381. 2006-10-06 14:47:58 +05:00
svoj@mysql.com/april.(none)
ee4080f9f9 Addition to fix for bug#10974. Fixed spelling. 2006-10-06 11:03:14 +05:00
svoj@mysql.com/april.(none)
94040c54b3 Merge mysql.com:/home/svoj/devel/mysql/BUG10974/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG10974/mysql-5.0-engines
 2006-10-06 11:01:39 +05:00
svoj@mysql.com/april.(none)
c67aa031d6 Addition to fix for bug#10974. Fixed spelling. 2006-10-06 10:54:47 +05:00
svoj@mysql.com/april.(none)
d41340516f Merge mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.0-engines
 2006-10-05 19:02:29 +05:00
svoj@mysql.com/april.(none)
16c13a588f Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-4.1-engines
 2006-10-05 18:56:10 +05:00
stewart@willster.(none)
c637067f4d Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.0/bug13987-5.0_bugfixonly
 2006-10-05 23:48:38 +10:00
svoj@mysql.com/april.(none)
b141a7c1b9 BUG#21381 - Engine not notified about multi-table UPDATE IGNORE 
Though this is not storage engine specific problem, I was able to
repeat this problem with BDB and NDB engines only. That was the
reason to add a test case into ndb_update.test. As a result
different bad things could happen.

BDB has removed duplicate rows which is not expected.
NDB returns an error.

For multi table update notify storage engine about UPDATE IGNORE
as it is done in single table UPDATE.
 2006-10-05 18:23:53 +05:00
gluh@mysql.com/gluh.(none)
4f553f1d5f Merge mysql.com:/home/gluh/MySQL/Merge/4.1 
into  mysql.com:/home/gluh/MySQL/Merge/4.1-kt
 2006-10-05 16:38:21 +05:00
stewart@willster.(none)
c321ae2f0c BUG#13987 Cluster: Loss of data nodes can cause high CPU usage from ndb_mgmd 
smaller patch for 5.0.

complete patch going to 5.1 due to more intrusiveness for 'list sessions' etc
 2006-10-05 18:51:13 +10:00
gluh@mysql.com/gluh.(none)
90116d2575 Merge mysql.com:/home/gluh/MySQL/Merge/5.0 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-kt
 2006-10-05 13:41:58 +05:00
jonas@perch.ndb.mysql.com
9cad0a01b7 ndb - bug#22892 
Make sure checkKeepGci is also run on oldStoredReplicas
      to prevent keepgci to move backwards when crash node restarts
 2006-10-04 12:05:24 +02:00
jonas@perch.ndb.mysql.com
57dd1481ae Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb-bj 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2006-10-04 10:19:08 +02:00
msvensson@neptunus.(none)
225b3e480b Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-03 20:28:59 +02:00
kroki/tomash@moonlight.intranet
f6ad9e51ed Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real-bug21726-fix-2
 2006-10-03 17:42:00 +04:00
kroki/tomash@moonlight.intranet
995ac34a24 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real-bug21726-fix
 2006-10-03 17:21:28 +04:00
anozdrin/alik@booka.
ef4285c0d2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  booka.:/home/alik/MySQL/devel/5.0-rt
 2006-10-03 17:20:08 +04:00
kroki/tomash@moonlight.intranet
31a206e877 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real-bug21726-fix
 2006-10-03 17:13:30 +04:00
msvensson@neptunus.(none)
4f46f3bde7 Merge bk-internal:/home/bk/mysql-5.0-runtime 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-03 14:26:11 +02:00
msvensson@neptunus.(none)
3f8edc3706 Merge bk-internal:/home/bk/mysql-5.0-rpl 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-03 14:24:43 +02:00
msvensson@neptunus.(none)
035b54049e Merge bk-internal:/home/bk/mysql-4.1-runtime 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-03 12:55:33 +02:00
msvensson@neptunus.(none)
2ef628bfad Merge bk-internal:/home/bk/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-03 11:45:19 +02:00
jani@ua141d10.elisa.omakaista.fi
446d2c9960 Added a missing breakpoint. This could cause 
wrong results in order by in some rare cases.
 2006-10-03 12:44:59 +03:00
kroki/tomash@moonlight.intranet
8798b462b5 Fix for the patch for bug#21726: Incorrect result with multiple 
invocations of LAST_INSERT_ID.

Reding of LAST_INSERT_ID inside stored function wasn't noted by caller,
and no LAST_INSERT_ID_EVENT was issued for binary log.

The solution is to add THD::last_insert_id_used_bin_log, which is much
like THD::last_insert_id_used, but is reset only for upper-level
statements.  This new variable is used to issue LAST_INSERT_ID_EVENT.
 2006-10-03 13:38:16 +04:00
msvensson@neptunus.(none)
cc0f26c83f Merge bk-internal:/home/bk/mysql-4.1-rpl 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-03 11:20:37 +02:00
jani@ua141d10.elisa.omakaista.fi
7a6b1ca963 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
 2006-10-03 12:20:23 +03:00
msvensson@neptunus.(none)
ffeaf3eb85 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-03 11:19:00 +02:00
msvensson@shellback.(none)
9a8bc01f8c Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-03 09:05:34 +02:00
bar@mysql.com/bar.intranet.mysql.r18.ru
40bcedf4e3 Merge mysql.com:/usr/home/bar/mysql-4.1-rpl.b8663 
into  mysql.com:/usr/home/bar/mysql-5.0-rpl
 2006-10-03 12:03:35 +05:00
msvensson@shellback.(none)
b08195785c Merge bk-internal:/home/bk/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-03 09:03:28 +02:00
msvensson@shellback.(none)
60f9a9a8aa Merge bk-internal:/home/bk/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-03 08:59:00 +02:00
bar@mysql.com/bar.intranet.mysql.r18.ru
72ad606ece Merge mysql.com:/usr/home/bar/mysql-4.1.b8663 
into  mysql.com:/usr/home/bar/mysql-4.1-rpl
 2006-10-03 11:53:01 +05:00
dlenev@mockturtle.local
c30b6eafac Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mockturtle.local:/home/dlenev/src/mysql-4.1-rt-merge
 2006-10-03 08:19:06 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
f2a3f1a679 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/bug22271/my50-bug22271
 2006-10-03 09:00:03 +05:00
scottlee@calico.site
3eaee36070 Back port change from 5.1 that adds the Windows database files to the source package. 
This is needed for WiX pacakging.
 2006-10-02 23:05:52 -04:00
msvensson@shellback.(none)
5126dcc878 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-03 01:04:18 +02:00
msvensson@shellback.(none)
3bed246481 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-03 01:01:06 +02:00
msvensson@shellback.(none)
3f8686514f Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
 2006-10-03 00:58:13 +02:00
msvensson@shellback.(none)
600586c680 Merge bk-internal:/home/bk/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-03 00:51:23 +02:00
msvensson@shellback.(none)
b975b4a793 Add ATTRIBUTE_FORMAT_FPTR macro for setting format specifier also on function pointers 
This was available from gcc 3.1, so diable it before that
Update m_ctype.h to use the new macro
 2006-10-03 00:48:26 +02:00
tsmith/tim@siva.hindu.god
1d5d5a1c4a Merge siva.hindu.god:/usr/home/tim/m/bk/40 
into  siva.hindu.god:/usr/home/tim/m/bk/41
 2006-10-02 16:18:42 -06:00
tsmith/tim@siva.hindu.god
65dd6e0c1e Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  siva.hindu.god:/usr/home/tim/m/bk/41
 2006-10-02 16:16:24 -06:00