mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 19:41:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
52116 commits 2793 branches 343 tags 1.7 GiB
Commit graph

52116 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
joerg@trift2.
a0fbcc0326 Merge trift2.:/MySQL/M50/merge-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-12-21 13:13:22 +01:00
joerg@trift2.
9f96125023 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-12-21 12:53:05 +01:00
joerg@trift2.
bf1ba3d416 Merge trift2.:/MySQL/M50/clone-5.0 
into  trift2.:/MySQL/M50/merge-5.0
 2007-12-21 12:48:14 +01:00
df@pippilotta.erinye.com
bea1bfd5c7 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-12-21 09:44:08 +01:00
df@pippilotta.erinye.com
f25c6ffaee Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-33288-33057 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-12-21 09:40:53 +01:00
df@pippilotta.erinye.com
f7527b7856 BUG#33057 mysql command line client slows down and uses 100% CPU when restoring dump 2007-12-20 21:37:21 +01:00
brian@zim.(none)
97e3c6cbf4 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  zim.(none):/home/bk/mysql-5.1-arch
 2007-12-20 12:32:16 -08:00
brian@zim.(none)
4316829b75 client_priv.h: 
Removed dead option
mysqlslap.c:
  Updates from Paul for help.
  Removed dead option
 2007-12-20 12:23:35 -08:00
df@pippilotta.erinye.com
92de4d5e78 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-12-17 19:08:55 +01:00
df@pippilotta.erinye.com
01b6c78fbe Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-12-17 19:01:14 +01:00
joerg@trift2.
e591fc7cb8 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-12-17 14:10:01 +01:00
joerg@trift2.
af73c6c867 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-12-17 13:40:06 +01:00
joerg@trift2.
7bd4ac4df7 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-12-17 13:36:17 +01:00
kostja@bodhi.(none)
16f0bd712e Try to fix assertion failures at slave shutdown when running 
rpl_ndb tests on sapsrv1.
 2007-12-15 22:24:01 +03:00
kostja@bodhi.(none)
2e82e66677 Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-12-15 17:05:39 +03:00
kostja@bodhi.(none)
4bb503568d Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
 2007-12-15 17:00:18 +03: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
malff@lambda.hsd1.co.comcast.net.
0488056ca8 WL#4165 (Prepared statements: validation) 
Adding the tests cases alone for WL#4165, disabled
 2007-12-14 17:46:24 -07:00
iggy@amd64.(none)
6bb288b6b7 Bug#26811 Symbolic links don't work in Windows Vista 
- Enable check for symbolic link files.
 2007-12-14 15:49:51 -05:00
kent/mysqldev@mysql.com/production.mysql.com
fb8cceb06e sp_head.cc: 
Corrected typo
 2007-12-14 21:38:58 +01:00
kent/mysqldev@mysql.com/production.mysql.com
7ca11181ac sp_head.cc: 
Made sp_head::operator delete() match prototype, added throw()
mysql_test_run.c, mysqld_safe.c:
  Include "mysql_version.h" to get MYSQL_PORT defined
 2007-12-14 18:23:11 +01:00
tomas@whalegate.ndb.mysql.com
2db742573d 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-14 18:05:15 +01:00
tomas@whalegate.ndb.mysql.com
1a3bf7333e Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
 2007-12-14 18:03:44 +01:00
tomas@whalegate.ndb.mysql.com
d2a93fd60b Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
 2007-12-14 17:49:58 +01:00
jperkin/jonathan@chorlton.adsl.perkin.org.uk
8105bd467b Merge chorlton.adsl.perkin.org.uk:/Users/jonathan/work/bk/mysql-5.0 
into  chorlton.adsl.perkin.org.uk:/Users/jonathan/work/bk/mysql-5.1
 2007-12-14 16:02:31 +00:00
kent/mysqldev@mysql.com/production.mysql.com
028ed33610 Raise version number after cloning 5.0.54 2007-12-14 16:58:12 +01:00
jperkin/jonathan@chorlton.adsl.perkin.org.uk
2a404c23ba Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  chorlton.adsl.perkin.org.uk:/Users/jonathan/work/bk/mysql-5.0
 2007-12-14 15:46:19 +00:00
jperkin/jonathan@chorlton.adsl.perkin.org.uk
89153ffa1b post-commit: 
Rationalise setting $FROM.
 2007-12-14 15:43:54 +00:00
anozdrin/alik@station.
6ebedc8635 Merge station.:/mnt/raid/alik/MySQL/devel/5.0-rt 
into  station.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-5.0-rt
 2007-12-14 16:45:17 +03: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
anozdrin/alik@station.
61b903f896 Merge station.:/mnt/raid/alik/MySQL/devel/5.0 
into  station.:/mnt/raid/alik/MySQL/devel/5.0-rt
 2007-12-14 15:57:36 +03:00
tsmith@ramayana.hindu.god
3a6b30527b Merge ramayana.hindu.god:/home/tsmith/m/bk/build/b33192/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
 2007-12-14 04:26:06 -07:00
df@pippilotta.erinye.com
04d815cf39 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-12-14 10:52:21 +01:00
df@pippilotta.erinye.com
26bd6a2cf1 typo 2007-12-14 10:51:05 +01:00
df@pippilotta.erinye.com
be2d78e397 BUG#31880 make test failure from public bk tree 2007-12-14 10:47:01 +01:00
tomas@whalegate.ndb.mysql.com
0f58ed97c1 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-12-14 08:20:07 +01: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
tomas@whalegate.ndb.mysql.com
70902cdd86 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
 2007-12-14 06:53:55 +01:00
kostja@bodhi.(none)
614b0f6884 Remove an unused argument of sql_update::do_updates(). 2007-12-14 02:23:42 +03: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
4bc90fe469 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
 2007-12-13 21:50:17 +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
3a89198273 Bug #33168 Incorrectly handled parameters can make the TC crash during node failure 
- during commit deadlock timeout needs to be at least 5 times db hearbeat
 2007-12-13 21:31:38 +01:00
gluh@eagle.(none)
27dcbc2577 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-12-13 23:48:13 +04:00
gluh@mysql.com/eagle.(none)
8be07b88df additional fix 2007-12-13 23:46:29 +04:00
dkatz@damien-katzs-computer.local
af6db482d5 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  damien-katzs-computer.local:/Users/dkatz/51runtime
 2007-12-13 14:31:20 -05:00
davi@endora.local
d099e6a257 Merge mysql.com:/Users/davi/mysql/bugs/32395-5.1 
into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
 2007-12-13 16:33:04 -02:00