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

2990 commits

Author SHA1 Message Date
kaa@kaamos.(none)
5647dee192 Merge kaamos.(none):/data/src/mysql-5.1 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-02-17 14:57:01 +03:00
istruewing@stella.local
108013f6a7 Merge stella.local:/home2/mydev/mysql-5.1-ateam 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2008-02-14 21:00:10 +01:00
istruewing@stella.local
fb20c9dd5e Merge stella.local:/home2/mydev/mysql-5.1-ateam 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2008-02-14 16:51:41 +01:00
svoj@mysql.com/april.(none)
75495093b0 After merge fix. 2008-02-14 18:23:58 +04:00
svoj@april.(none)
2ab1b8406e Merge mysql.com:/home/svoj/devel/mysql/BUG33946/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG33946/mysql-5.1-engines
 2008-02-14 16:47:46 +04:00
joerg@trift2.
51f81b0209 Merge trift2.:/MySQL/M51/clone-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2008-02-13 13:40:53 +01:00
ramil/ram@ramil.myoffice.izhnet.ru
6b3ea484e2 Merge mysql.com:/home/ram/work/b33758/b33758.5.0 
into  mysql.com:/home/ram/work/b33758/b33758.5.1
 2008-02-12 15:14:56 +04:00
tomas@poseidon.ndb.mysql.com
832b498e72 Merge poseidon.ndb.mysql.com:/home/tomas/cge-5.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2008-02-11 17:38:34 +01:00
jonas@perch.ndb.mysql.com
1eefb8c3cb Fix missing block-constructor 2008-02-10 17:50:53 +01:00
jonas@perch.ndb.mysql.com
a7d4f64be9 remove mysql-test-run from autotest 2008-02-09 07:26:34 +01:00
jonas@perch.ndb.mysql.com
29f3323e00 ndb - 
fix failing autotest-test
 2008-02-08 16:42:17 +01:00
jonas@perch.ndb.mysql.com
02a56b9e23 ndb - bug#34378 
Using more than 16g can cause record-pool ptr.i values to overflow
  Fix by splitting memory into 2 zones, lo(16g)/hi(rest)
  When record pools only use zone_lo, and datamemory, buffers etc...can use any
 2008-02-08 15:17:45 +01:00
jani@a88-113-38-195.elisa-laajakaista.fi
4f98f3e683 Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
 2008-02-08 12:13:33 +01:00
msvensson@pilot.mysql.com
ce36eea75c Merge pilot.mysql.com:/data/msvensson/mysql/bug32025/my50-bug32025 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-ndb
 2008-02-07 08:14:17 +01:00
msvensson@pilot.mysql.com
af14030eda Merge pilot.mysql.com:/data/msvensson/mysql/bug32025/my50-bug32025 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build
 2008-02-07 08:12:25 +01:00
istruewing@stella.local
c37d9d4cac Bug#31331 - MyISAM or Merge Table upgrade incompatibility with 5.1 
A table with BLOB/TEXT prefix key part, created with version 4.1,
could not be opened by a 5.1 server.

The routine check at table open, if the frm file matches the MyISAM
table, was too picky regarding old and new implementation of such
keys.

Added relaxed check for blob prefix key part.

No test case. It requires to create a table in 4.1 and open it in
5.1.
 2008-02-06 21:26:05 +01:00
mskold/marty@quadfish.(none)
5a91de955e Merge mysql.com:/home/marty/MySQL/mysql-5.0-ndb 
into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb
 2008-02-06 15:10:18 +01:00
jonas@perch.ndb.mysql.com
045c1a44ad ndb - bug#34216 
During TC-take-over (NF) the new-TC builds up a new transaction state
  And commits operation according to this state.
  However, in the new state that is build, the operations does not have to be in same order, as "real" state
  In the multi-update-case, this means that operations can be commit in "incorrect" order

  i.e update A, delete A, insert A is normally commited in same order as prepared
      but can be committed in any order

  This patch changes TUP handling of these out-order commits, and previous implementation
    could confuse the TUX triggers
 2008-02-06 13:06:05 +01:00
jonas@perch.ndb.mysql.com
83b4c04a51 ndb - bug#34216 
testcases
 2008-02-06 11:28:43 +01:00
joerg@trift2.
485a656df8 ndb_version.h.in : Fix a syntax error (variable declaration came too late). 2008-02-05 15:24:41 +01:00
msvensson@pilot.mysql.com
00d1710c08 Merge pilot.mysql.com:/data/msvensson/mysql/bug31239/my51-bug31239 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build
 2008-02-05 13:53:40 +01:00
msvensson@pilot.mysql.com
41f3d00e3f Merge pilot.mysql.com:/data/msvensson/mysql/bug31239/my50-bug31239 
into  pilot.mysql.com:/data/msvensson/mysql/bug31239/my51-bug31239
 2008-02-05 12:45:42 +01:00
pekka@sama.ndb.mysql.com
6a55195fc4 Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb 
into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb
 2008-02-04 14:36:54 +01:00
pekka@sama.ndb.mysql.com
55712dc827 Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb 
into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb
 2008-02-04 12:05:23 +01:00
jonas@perch.ndb.mysql.com
9fa1b08faa ndb - bug#33619 
make sure to alloc logspace and set bits
  if doing delete after previous update wo/ touching DD part
 2008-02-03 21:24:59 +01:00
jonas@perch.ndb.mysql.com
9bfd07917e Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
 2008-02-03 14:14:32 +01:00
jonas@perch.ndb.mysql.com
e74278ce61 ndb - bug#34260 
remove incorrect ndbrequire
 2008-02-03 14:01:31 +01:00
jmiller/root@ndbqa01.mysql.com
0848f193ad Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  mysql.com:/usr/clones/mysql-5.1-new-ndb2
 2008-02-01 13:51:55 -06:00
jmiller/root@mysql.com/ndbqa01.mysql.com
e57f55d497 NdbRepStress.cpp: 
Updated with new support function from Magnus push to dbutil
 2008-02-01 13:51:04 -06:00
pekka@sama.ndb.mysql.com
bbc26ea51f Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb
 2008-02-01 00:18:30 +01:00
pekka@sama.ndb.mysql.com
60446a30c9 ndb - bug#34107 - post-merge 2008-02-01 00:07:15 +01:00
pekka@sama.ndb.mysql.com
f67d3aa67e Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug34107 
into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug34107
 2008-01-31 23:46:07 +01:00
mskold/marty@mysql.com/quadfish.(none)
3b1556a7e0 Fixed support for specifying explicit database 2008-01-31 16:00:06 +01:00
pekka@sama.ndb.mysql.com
1ccf00f00a Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug34107 
into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug34107
 2008-01-31 14:47:50 +01:00
svoj@mysql.com/april.(none)
f2040f48c4 BUG#33871 - Duplicate "would" in Fulltext Stopwords 
Code cleanup: removed duplicate stopword.
 2008-01-30 20:14:35 +04:00
tomas@whalegate.ndb.mysql.com
07fafa2b61 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2008-01-30 16:08:25 +01:00
jonas@perch.ndb.mysql.com
aa9a3a699f Merge perch.ndb.mysql.com:/home/jonas/src/50-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
 2008-01-30 12:52:55 +01:00
gkodinov/kgeorge@macbook.gmz
2eeebda7a4 Merge bk-internal:/home/bk/mysql-5.1-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/B31326-merge-5.1-opt
 2008-01-30 13:37:57 +02:00
iggy@alf.(none)
18aba8a82c Bug#31929 Windows build fails with >=4 Parallel build threads. 
- Add GenError Dependency to storage engines that include 
mysqld_error.h
 2008-01-29 21:58:57 -05:00
pekka@sama.ndb.mysql.com
c81d485671 ndb - bug#34118 - hash index trigger vs. disk 2008-01-29 15:25:27 +01:00
istruewing@stella.local
4b2312d293 Merge stella.local:/home2/mydev/mysql-5.1-amain 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2008-01-29 10:59:32 +01:00
svoj@june.mysql.com
fba9513cfc Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG26978/mysql-5.1-engines
 2008-01-29 11:23:07 +04:00
joerg@trift2.
5ffbbfcecc Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2008-01-28 15:16:40 +01:00
pekka@sama.ndb.mysql.com
86ccc88713 ndb - bug#34046 - rename Ndbd_mem_manager::log2 to ndb_log2 2008-01-28 14:48:09 +01:00
pekka@sama.ndb.mysql.com
5b0280e721 ndb - bug#31477 post-merge fixes in 5.1 2008-01-28 13:03:27 +01:00
pekka@sama.ndb.mysql.com
fc35175806 Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug31477 
into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug31477
 2008-01-28 03:14:29 +01:00
mskold/marty@quadfish.(none)
1715bb188d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb
 2008-01-25 14:34:15 +01:00
mskold/marty@mysql.com/quadfish.(none)
94a059319c ndb_restore.result, ndb_restore.test: 
Changed to use information_schema to check auto_increment
Ndb.cpp:
  Bug #33534   Bad performance of INSERT's in auto_incremented tables: Saving highest seen value when setting auto_increment fields
ndb_auto_increment.result:
  Regenerated result
 2008-01-25 10:43:30 +01:00
istruewing@stella.local
8aebd394b8 Bug#29182 - MyISAMCHK reports wrong character set 
myisamchk did always show Character set: latin1_swedish_ci (8),
regardless what DEFAULT CHARSET the table had.

When the server created a MyISAM table, it did not copy the
characterset number into the MyISAM create info structure.

Added assignment of charset number to MI_CREATE_INFO.
 2008-01-24 18:56:42 +01:00
jonas@perch.ndb.mysql.com
37ddc79893 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
 2008-01-24 16:00:31 +01:00