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

35492 commits

This branch
This branch
All branches
Author SHA1 Message Date
tsmith@siva.hindu.god
8abc953662 NULL MERGE this to 5.1 
Apply the following InnoDB snapshots:
innodb-5.0-ss1319
innodb-5.0-ss1331
innodb-5.0-ss1333
innodb-5.0-ss1341

Fixes:
- Bug #21409: Incorrect result returned when in READ-COMMITTED with query_cache ON
  At low transaction isolation levels we let each consistent read set
  its own snapshot.
- Bug #23666: strange Innodb_row_lock_time_% values in show status; also millisecs wrong
  On Windows ut_usectime returns secs and usecs relative to the UNIX
  epoch (which is Jan, 1 1970).

- Bug #25494: LATEST DEADLOCK INFORMATION is not always cleared
  lock_deadlock_recursive(): When the search depth or length is exceeded,
  rewind lock_latest_err_file and display the two transactions at the
  point of aborting the search.

- Bug #25927: Foreign key with ON DELETE SET NULL on NOT NULL can crash server
  Prevent ALTER TABLE ... MODIFY ... NOT NULL on columns for which
  there is a foreign key constraint ON ... SET NULL.

- Bug #26835: Repeatable corruption of utf8-enabled tables inside InnoDB
  The bug could be reproduced as follows:

  Define a table so that the first column of the clustered index is
  a VARCHAR or a UTF-8 CHAR in a collation where sequences of bytes
  of differing length are considered equivalent.

  Insert and delete a record.  Before the delete-marked record is
  purged, insert another record whose first column is of different
  length but equivalent to the first record.  Under certain conditions,
  the insertion can be incorrectly performed as update-in-place.

  Likewise, an operation that could be done as update-in-place can
  unnecessarily be performed as delete and insert, but that would not
  cause corruption but merely degraded performance.
 2007-03-22 14:40:52 -06:00
jonas@perch.ndb.mysql.com
d645496ec5 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-03-22 11:26:18 +01:00
jonas@perch.ndb.mysql.com
ca05bbf9d0 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-03-22 11:25:29 +01:00
jonas@perch.ndb.mysql.com
702b5dad63 ndb - 
fix test prg
 2007-03-22 11:12:18 +01:00
tomas@whalegate.ndb.mysql.com
8b964c2b12 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-03-22 10:34:46 +01:00
tomas@whalegate.ndb.mysql.com
6bab2f13b7 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-03-22 05:44:39 +01:00
tsmith@quadxeon.mysql.com
4981d45997 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-03-21 23:58:02 +01:00
kostja@bodhi.local
c011a25f66 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2007-03-21 23:57:12 +03:00
iggy@recycle.(none)
c1e6a4c404 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  recycle.(none):/src/bug27144/my50-bug27144
 2007-03-21 14:46:38 -04:00
iggy@recycle.(none)
a763917a6f Bug#27144 sp-destruct.test is disabled on Windows 
- Update test to run properly on Windows.
 2007-03-21 13:58:11 -04:00
iggy@recycle.(none)
9800fbf0b6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  recycle.(none):/src/bug23736/my50-bug23736
 2007-03-21 13:43:03 -04:00
jonas@perch.ndb.mysql.com
48768c6dc8 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-03-21 15:42:13 +01:00
jonas@perch.ndb.mysql.com
b950160a46 ndb - bug#27283 
Additional fix for 2-node case
 2007-03-21 15:34:47 +01:00
msvensson@pilot.blaudden
31b2f339a0 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-21 14:30:47 +01:00
tomas@whalegate.ndb.mysql.com
c01f31654b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-03-21 09:28:37 +01:00
jonas@perch.ndb.mysql.com
75e0f57e3e Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-03-21 09:06:14 +01:00
tomas@whalegate.ndb.mysql.com
37b8c96197 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-03-21 09:00:38 +01:00
jonas@perch.ndb.mysql.com
7834bd5846 ndb - bug#27286 (5.0 version) 
make sure master is sendable
 2007-03-21 08:57:14 +01:00
tomas@whalegate.ndb.mysql.com
5682efdfcf Bug #26825 MySQL Server Crashes in high load 
- initialize to NULL, to avoid call of free on uninitialized variable
 2007-03-21 08:40:24 +01:00
tsmith@quadxeon.mysql.com
1907df76f8 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50
 2007-03-21 01:02:23 +01:00
kent@mysql.com/kent-amd64.(none)
031fd30def Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-release 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-03-21 00:53:39 +01:00
tsmith@quadxeon.mysql.com
cc4ea8bba8 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/41 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50
 2007-03-20 21:35:11 +01:00
msvensson@pilot.blaudden
8f3d9cb415 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-20 21:24:20 +01:00
tsmith@quadxeon.mysql.com
fb5e4d3221 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50
 2007-03-20 21:02:03 +01:00
tsmith@quadxeon.mysql.com
2670f149d0 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50
 2007-03-20 20:59:41 +01:00
msvensson@pilot.blaudden
5b62c51a05 Remove the variables for long gone disable_ps_warnings 2007-03-20 19:43:36 +01:00
kent@mysql.com/kent-amd64.(none)
0e84886d61 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-03-20 19:23:20 +01:00
tsmith@quadxeon.mysql.com
21ed11cda2 Bug #27231: Server crash when dumping into outfile with long FIELDS ENCLOSED BY option 
- Problem: data separators were copied to a fixed-size buffer
  on the stack; memcpy was used, without bounds checking; a
  server crash could result if long FIELDS ENCLOSED BY, etc.,
  was given
- Fix: write the separators directly, instead of copying to
  a buffer first (in select_export::send_data())
 2007-03-20 19:09:28 +01:00
mtaylor@qualinost.(none)
02fc829ff6 Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-init 
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
 2007-03-20 10:58:25 -07:00
kent@mysql.com/kent-amd64.(none)
39e9a2d316 echo.c: 
Corrected GPL to be version 2 only
 2007-03-20 18:31:49 +01:00
jonas@perch.ndb.mysql.com
9ce7ad943b Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-03-20 16:26:51 +01:00
jonas@perch.ndb.mysql.com
844845c772 ndb - bug#27283 (wl2325-5.0) 
Handle race condtition between MASTER_GCPCONF and execGCP_NODEFINISH
 2007-03-20 16:16:25 +01:00
jonas@perch.ndb.mysql.com
7898079378 ndb - bug#27291 
Fix correct min-value for LockPagesInMemory
 2007-03-20 16:08:39 +01:00
iggy@recycle.(none)
988ce58052 Bug#23736 Pointer free error in mysqlbinlog 
- Mis-matched SAFEMALLOC defines caused misleading error message.
 2007-03-20 10:34:25 -04:00
kaa@polly.local
41992a2729 Merge polly.local:/tmp/maint/bug23775/my50-bug23775 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2007-03-20 17:27:49 +03:00
df@pippilotta.erinye.com
aab816e779 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-03-20 15:15:38 +01:00
kent@mysql.com/kent-amd64.(none)
cd1005ab04 vio.vcproj, mysqld.vcproj, mysys.vcproj, libmysqld.vcproj, mysqldemb.vcproj: 
No need to set LICENSE or USE_SYMDIR from project files
make_win_bin_dist:
  Changed location of SQL initialization files to be "share/"
 2007-03-20 15:12:50 +01:00
iggy@recycle.(none)
9a5f0bff4f Bug#25765 too many dbg heap assertions on windows 
- SAFEMALLOC should be defined for each project in debug Windows builds.
SAFEMALLOC was not defined for the innodb project. Debug asserts caused 
due to mixed SAFEMALLOC defines.
 2007-03-20 10:07:23 -04:00
holyfoot/hf@mysql.com/hfmain.(none)
0233b13572 tests fixed to work in embedded server 2007-03-20 17:53:55 +04:00
df@pippilotta.erinye.com
50c909128e Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-03-20 13:44:47 +01:00
df@pippilotta.erinye.com
56856d6f31 small build fix 2007-03-20 13:33:17 +01:00
msvensson@pilot.blaudden
68df4cbc5a Bug#27070 server logs are created unrequested and in wrong directory 
- Setting up a A->B->A replication causes relay logs being written
  by the master, remove them when test is finished
 2007-03-20 11:15:15 +01:00
tomas@whalegate.ndb.mysql.com
ac8592ce2c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-03-20 10:37:11 +01:00
df@pippilotta.erinye.com
e4a9917b6c Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
 2007-03-20 10:24:11 +01:00
df@pippilotta.erinye.com
bc7e1eeeba Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-03-20 10:23:11 +01:00
tsmith@quadxeon.mysql.com
9ff0553f7a Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-03-20 08:57:55 +01:00
tsmith@quadxeon.mysql.com
6252477a7b Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-03-19 23:10:58 +01:00
evgen@moonbone.local
31b9145ab3 sql_insert.cc: 
Removed wrong fix for the bug#27006.
  The bug was added by the fix for the bug#19978 and fixed by Monty on 2007/02/21.
trigger.test, trigger.result:
  Corrected test case for the bug#27006.
 2007-03-20 00:46:19 +03:00
kent@mysql.com/kent-amd64.(none)
731c3e5b20 mysys.vcproj: 
Removed accidently added my_winsem.c
make_win_bin_dist:
  Corrected test for relwithdebinfo target
mysql.sln:
  Specify that comp_err depends on zlib
 2007-03-19 22:41:16 +01:00
joerg@trift2.
90879b5737 Merge trift2.:/MySQL/M50/clone-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-03-19 22:18:31 +01:00