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
53745 commits 2784 branches 343 tags 1.6 GiB
Commit graph

2830 commits

Author SHA1 Message Date
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
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
jonas@perch.ndb.mysql.com
4d552dbbdf ndb - bug#34033 
remove LCP-snapshot from MM-tables,
  removing possibility of spurious 899 on MM-tables
 2008-01-24 14:21:52 +01:00
tomas@whalegate.ndb.mysql.com
24e618192d Bug#30366 (recommit) NDB fails to start on OS X, PPC, 64 bit 
- The errno variable should only be used when the previous socket
  write failed, it should be regarded as undefined at other times
 2008-01-24 12:06:40 +01:00
tomas@whalegate.ndb.mysql.com
f02562b7fb Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-bj
 2008-01-23 14:42:58 +01:00
jonas@perch.ndb.mysql.com
79e8f3e406 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
 2008-01-23 13:10:09 +01:00
jonas@perch.ndb.mysql.com
664cc992fa Merge perch.ndb.mysql.com:/home/jonas/src/50-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2008-01-23 13:05:29 +01:00
mskold/marty@mysql.com/quadfish.(none)
35d3bef712 Ndb.hpp, Ndb.cpp, ha_ndbcluster.cc: 
Add a check if setting an auto_increment field will change it's next value before retrieving tuple_id_range lock. This avoids hitting locks when updating auto_increment values to a lower value than the current maximum. This is useful in loading a table with auto_increment where one loads the highest numbered pk's first and then proceeds backwards to the first. This can then be achieved with the same performance as a normal insert without auto_increment.
ndb_restore.result:
  Updated result file
 2008-01-23 11:40:06 +01:00
jonas@perch.ndb.mysql.com
47f379d2f1 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
 2008-01-23 10:28:30 +01:00
jonas@perch.ndb.mysql.com
94378f9189 Merge perch.ndb.mysql.com:/home/jonas/src/50-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2008-01-23 10:11:40 +01:00
mskold/marty@mysql.com/quadfish.(none)
4ebf4b9670 Merge mysql.com:/home/marty/MySQL/mysql-5.0-ndb 
into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb
 2008-01-22 14:45:29 +01:00
msvensson@shellback.(none)
ddf645b19c Add SqlResultSet 2008-01-18 22:55:02 +01:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
7fe6888220 Bug#33067 
"Update of CSV row incorrect for some BLOBs"
  when reading in rows, move blob columns into temporary storage not
  allocated by Field_blob class or else row update operation will
  alter original row and make mysql think that nothing has been changed.
fix incrementing wrong statistic values.
 2008-01-17 15:37:18 -08:00
msvensson@shellback.(none)
0d514c93d7 DBU_TRUE and DBU_FALSE => TRUE/FALSE 2008-01-17 15:47:55 +01:00
msvensson@shellback.(none)
b3fe06cded Remove "#pragma once" it's already done by "#ifndef DBUTIL_HPP" 2008-01-17 15:42:50 +01:00
msvensson@pilot.mysql.com
53bdfab23e Bug#30366 NDB fails to start on OS X, PPC, 64 bit 
- The errno variable should only be used when the previous socket
     write failed, it should be regarded as undefined at other times

OutputStream.cpp:
  Only use "errno" after the attempt to write to the socket has failed
 2008-01-15 15:01:21 +01:00
istruewing@stella.local
6eee6a3090 Merge stella.local:/home2/mydev/mysql-5.0-axmrg 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2008-01-15 12:51:51 +01:00
istruewing@stella.local
7cc5885fdb Merge stella.local:/home2/mydev/mysql-5.1-bug33222 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2008-01-15 10:24:18 +01:00
tsmith@ramayana.hindu.god
54a492ecac Apply innodb-5.1-ss2146 and innodb-5.1-ss2178 snapshots. 
Fixes:

Bug #18942: DROP DATABASE does not drop an orphan FOREIGN KEY constraint
  Fix Bug#18942 by dropping all foreign key constraints at the end of
  DROP DATABASE. Usually, by then, there are no foreign constraints
  left because all of them are dropped when the relevant tables are
  dropped. This code is to ensure that any orphaned FKs are wiped too.

Bug #29157: UPDATE, changed rows incorrect
  Return HA_ERR_RECORD_IS_THE_SAME from ha_innobase::update_row() if no
  columns were updated.

Bug #32440: InnoDB free space info does not appear in SHOW TABLE STATUS or I_S
  Put information about the free space in a tablespace in
  INFORMATION_SCHEMA.TABLES.DATA_FREE. This information was previously
  available in INFORMATION_SCHEMA.TABLES.TABLE_COMMENT, but MySQL has
  removed it from there recently.
  The stored value is in kilobytes.
  This can be considered as a permanent workaround to
  http://bugs.mysql.com/32440. "Workaround" becasue that bug is about the
  data missing from TABLE_COMMENT and this is actually not solved.
 2008-01-14 22:55:50 -07:00
istruewing@stella.local
f126800b35 Bug#33222 - myisam-table drops rows when column is added 
and a char-field > 128 exists

CHECK TABLE (non-QUICK) and any form of repair table did wrongly rate
records as corrupted under the following conditions:
1. The table has dynamic row format and
2. it has a CHAR like column > 127 bytes (but not VARCHAR)
   (for multi-byte character sets this could be less than 127
   characters) and
3. it has records with > 127 bytes significant length in that column
   (a byte beyond byte position 127 must be non-space).
Affected were the statements CHECK TABLE, REPAIR TABLE, OPTIMIZE TABLE,
ALTER TABLE. CHECK TABLE reported and marked the table as crashed if any
record was present that fulfilled condition 3. The other statements
deleted these records.

The problem was a signed/unsigned compare in MyISAM code. A
char to uchar change became necessary after the big byte to uchar
change.
 2008-01-14 17:59:45 +01:00
jonas@perch.ndb.mysql.com
717f56e792 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-11 09:43:29 +01:00
jonas@perch.ndb.mysql.com
5667ee2598 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
 2008-01-11 09:31:55 +01:00
jonas@perch.ndb.mysql.com
07a1ec18eb ndb - bug#33793 
dont assume that page is "all empty"
  only as gci is acked, as release_gci might not have processed it yet
 2008-01-11 09:20:16 +01:00
jmiller/ndbdev@mysql.com/ndb15.mysql.com
1a2cb7fb79 Makefile.am: 
Updated to build NdbRepStress
 2008-01-10 19:07:24 +01:00
jmiller/ndbdev@mysql.com/ndb15.mysql.com
9ca03b093e Makefile.am: 
Updated for name chance on dbutil
 2008-01-10 18:59:44 +01:00
gni@dev3-221.dev.cn.tlan
43f31db546 Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb 
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
 2008-01-10 19:49:32 +08:00
gni@dev3-221.dev.cn.tlan
c891d92888 Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj 
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug28298
 2008-01-10 13:56:21 +08:00
gni@dev3-221.dev.cn.tlan
2351ac241d Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug28298 
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug28298
 2008-01-10 13:47:14 +08:00
jmiller/ndbdev@mysql.com/ndb15.mysql.com
3677a2dd90 NdbRepStress.cpp: 
More code improvments
 2008-01-09 19:01:31 +01:00
jmiller/ndbdev@mysql.com/ndb15.mysql.com
8b4a191645 DbUtil.hpp, DbUtil.cpp, NdbRepStress.cpp: 
More code improvments
 2008-01-09 18:54:32 +01:00
jmiller/ndbdev@mysql.com/ndb15.mysql.com
4c8a24682c NdbRepStress.cpp: 
Updated with suggestions from Magnus and other fixes and adjustments I found along the way
DbUtil.hpp, DbUtil.cpp:
  fixes and adjustments I found along the way
 2008-01-08 23:34:30 +01:00
jmiller/ndbdev@ndb15.mysql.com
7b9d5f6b91 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  mysql.com:/data0/jebs_clones/mysql-5.1-new-ndb
 2008-01-08 23:26:45 +01:00
jonas@perch.ndb.mysql.com
8b009296d4 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
 2008-01-08 13:25:54 +01:00
jonas@perch.ndb.mysql.com
9be1d56d87 ndb - bug#33739 
page need to refetched after timeslice
 2008-01-08 13:23:35 +01:00
jonas@perch.ndb.mysql.com
b2c88ff871 ndb - dict 
remove dead code
 2008-01-04 11:34:23 +01:00
jperkin/jonathan@chorlton.adsl.perkin.org.uk
e286ac998c Use pkglibdir to simplify pkgplugindir, and fix the path in a 
couple of Makefiles.  Continuation of the fix for bug#31736.
 2008-01-02 13:00:46 +00:00
serg@janus.mylan
d9ca7b670e Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
 2007-12-20 22:11:37 +01:00
jmiller/ndbdev@mysql.com/ndb15.mysql.com
d18541d946 DbUtil.cpp: 
Rename: storage/ndb/test/src/dbutil.cpp -> storage/ndb/test/src/DbUtil.cpp
DbUtil.hpp, DbUtil.cpp:
  Many changes based off a review from Magnus
DbUtil.hpp:
  Rename: storage/ndb/test/include/dbutil.hpp -> storage/ndb/test/include/DbUtil.hpp
 2007-12-20 21:06:52 +01:00
jperkin/jonathan@chorlton.adsl.perkin.org.uk
f988a7e600 Add new pkgplugindir handling to seperate plugins from libraries, 
and allow override for binary distributions.  Extend mysql_config
to print compiled-in plugin location for third-party plugins to
use.  Resolves bug#31736.
 2007-12-19 13:24:43 +00:00
knielsen@loke.(none)
cdc302fdbe Merge bk-internal:/home/bk/mysql-5.1-new-ndb 
into  loke.(none):/home/knielsen/devel/mysql-5.1-new-ndb-bug33061
 2007-12-18 16:00:31 +01:00
knielsen@ymer.(none)
0ae0c1333b Bug #33061: ORDER BY DESC becomes ASC in NDB partition pruning to one partition 
When partition pruning resulted in an ordered index scan spanning only
one partition, any descending flag for the scan was wrongly discarded,
turning ORDER BY DESC into ORDER BY ASC, and similar problems.

Fixed by correctly passing descending flag in SCAN_TABREQ signal sent
to data nodes.
 2007-12-18 13:40:35 +01:00
tomas@whalegate.ndb.mysql.com
e26b2987d2 Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-12-18 07:15:40 +01:00
kostja@bodhi.(none)
bffc615e6c Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-12-15 16:59:43 +03:00
tomas@whalegate.ndb.mysql.com
c629bd3361 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1
 2007-12-15 09:23:49 +01:00
cmiller@zippy.cornsilk.net
edbacd3a99 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-forcollapseandmerge 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2007-12-14 13:42:09 -05:00
anozdrin/alik@station.
151444c626 Merge station.:/mnt/raid/alik/MySQL/devel/5.1 
into  station.:/mnt/raid/alik/MySQL/devel/5.1-rt
 2007-12-14 16:30:22 +03:00
gkodinov/kgeorge@macbook.gmz
1a8935f466 Bug #31326: No compile check of order of initializations 
fixed -Wreorder warnings
 2007-12-14 15:21:37 +02:00
tomas@whalegate.ndb.mysql.com
0bd2a86e90 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-12-14 06:55:44 +01:00
kostja@bodhi.(none)
7c8fe302c3 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-12-13 23:59:47 +03:00
kostja@bodhi.(none)
5b80d6a11b Fix broken embedded build (broken by the patch for Bug#12713, first part). 2007-12-13 23:58:55 +03:00
tomas@whalegate.ndb.mysql.com
a2486e0d14 Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-12-13 21:51:03 +01:00
tomas@whalegate.ndb.mysql.com
e9466462e8 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1
 2007-12-13 21:32:45 +01:00
tomas@whalegate.ndb.mysql.com
4b5e9edd69 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-12-13 14:26:57 +01:00
gluh@eagle.(none)
4f5868114a Merge mysql.com:/home/gluh/MySQL/Merge/5.1 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-12-13 15:56:04 +04:00
tomas@whalegate.ndb.mysql.com
6bc455e353 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1
 2007-12-13 12:04:00 +01:00
svoj@mysql.com/june.mysql.com
62fb86207a BUG#26978 - s->z_err not assigned a value? 
azio didn't handle situation when my_read() returns error.

Added handling of situation when my_read() returns error.

No test case for this fix.
 2007-12-12 17:16:59 +04:00
istruewing@stella.local
65fda831ce Merge stella.local:/home2/mydev/mysql-5.1-bug30273 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2007-12-11 21:38:08 +01:00
istruewing@stella.local
03d99c5956 Merge stella.local:/home2/mydev/mysql-5.1-amain 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2007-12-11 21:37:33 +01:00
tomas@whalegate.ndb.mysql.com
824d17ba77 bug#33142: access after free() for blob replication and online alter table 2007-12-11 16:04:33 +01:00