mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
56478 commits 2784 branches 343 tags 1.6 GiB
Commit graph

1809 commits

Author SHA1 Message Date
Luis Soares
9d8c117598 merge: 5.1 -> 5.1-rpl 
conflicts:
  Text conflict in mysql-test/lib/mtr_report.pm
  Text conflict in mysql-test/mysql-test-run.pl
 2009-01-08 19:03:56 +00:00
Build Team
d2c4816716 mysql-test/r/partition.result 
mysql-test/t/partition.test
sql/ha_partition.cc
  Bug#40954: Crash in MyISAM index code with concurrency test using partitioned tables
  Problem was usage of read_range_first with an empty key.
  Solution was to not to give a key if it was empty. (real author Mattias Jonsson)

storage/archive/archive_reader.c
client/mysqlslap.c
  Aligned the copyright texts output from "--version" of tools, to
  let internal tools be able to change them if needed.

storage/ndb/test/tools/connect.cpp
storage/ndb/test/run-test/atrt.hpp
  Corrected a few GPL headers not restricted to GPL version 2

Makefile.am
  Added missing --report-features to the 'test-bt-fast' target

support-files/mysql.spec.sh
  Reversed the removal of the "%define license GPL" in as internal
  tools depended on it
 2008-11-25 03:04:58 +01:00
kent.boortz@sun.com
906e12124c Changes of copyright output from "--version" and similar. 
Changes of copyright in RPM spec file.
 2008-11-14 17:29:38 +01:00
msvensson@pilot.mysql.com
83283d8371 Revert faulty commit 2008-04-27 19:06:27 +02:00
msvensson@pilot.mysql.com
6f2e5dbf5a Add supression for expected warning(s) in slaves error log 2008-04-27 16:13:08 +02:00
joerg@trift2.
2db55bf938 Merge trift2.:/MySQL/M51/ndb-decl-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2008-03-27 13:20:24 +01:00
tsmith@rhel5-ia64-a.mysql.com
3069db1da7 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  rhel5-ia64-a.mysql.com:/data0/tsmith/build/51
 2008-03-27 08:20:25 +01:00
anozdrin/alik@quad.opbmk
fa6ed3cf36 Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1 
into  quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
 2008-03-18 13:51:17 +03:00
joerg@trift2.
e784898959 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2008-03-14 14:41:08 +01:00
kaa@kaamos.(none)
0a7052e4d3 Merge kaamos.(none):/data/src/mysql-5.1 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-03-12 11:19:46 +03:00
andrey@whirlpool.hristov.com
78945e304a Fix for Bug #34786 Compiling ndb on Mac OS X 10.5.2 (Intel) fails 2008-03-05 14:57:13 +01:00
kent@kent-amd64.(none)
f3daf8ad80 Merge mysql.com:/home/kent/bk/build/mysql-5.0-build 
into  mysql.com:/home/kent/bk/build/mysql-5.1-build
 2008-02-26 18:38:43 +01:00
joerg@trift2.
25ab6afc03 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2008-02-22 16:14:27 +01: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
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
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
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
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
pekka@sama.ndb.mysql.com
c81d485671 ndb - bug#34118 - hash index trigger vs. disk 2008-01-29 15:25:27 +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
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
jonas@perch.ndb.mysql.com
ff31dcc0c3 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
 2008-01-24 15:31:42 +01:00
jonas@perch.ndb.mysql.com
f7be6faac3 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
 2008-01-24 15:13:42 +01:00
jonas@perch.ndb.mysql.com
9763d0d0d1 ndb - jamify (better) DbtupDiskAlloc 2008-01-24 15:10:46 +01:00