Commits · 4ea7377356186ba2d49aaf2d983d271daec48925 · nexedi / MariaDB

14 Mar, 2008 5 commits
- Post-merge fixes · 4ea73773
  istruewing@stella.local authored Mar 14, 2008
  
  4ea73773
- Merge stella.local:/home2/mydev/mysql-5.0-axmrg · 857dd49a
  istruewing@stella.local authored Mar 14, 2008
```
into  stella.local:/home2/mydev/mysql-5.1-axmrg
```
  857dd49a
- Post-merge fix. Moved the symlink handling from sql_parse.cc here. · ed89b81b
  istruewing@stella.local authored Mar 14, 2008
  
  ed89b81b
- Manual merge · eabe082d
  istruewing@stella.local authored Mar 14, 2008
  
  eabe082d
- Merge stella.local:/home2/mydev/mysql-5.0-amain · d0b86d23
  istruewing@stella.local authored Mar 14, 2008
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg
```
  d0b86d23
13 Mar, 2008 3 commits

Bug#33756 - query cache with concurrent_insert=0 appears broken · d5390b2d

istruewing@stella.local authored Mar 13, 2008

When concurrent inserts were disabled, statements after an INSERT
were not put into the query cache. This happened because we do not
save the current data file length at statement start when
concurrent inserts are disabled. But we checked the always zero
local length against the real file length anyway.

Fixed by doing the check only if concurrent inserts are not diabled.

d5390b2d

Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · eac3a26e
kaa@kaamos.(none) authored Mar 13, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
```
eac3a26e
Bug#35103 mysql_client_test::test_bug29948 causes sporadic failures · 3bff5b59
kaa@kaamos.(none) authored Mar 13, 2008
```
  
Disable test case for bug 29948, which is causing sporadically
failures in other tests inside mysql_client_test.
```
3bff5b59

12 Mar, 2008 11 commits
- Bug#35247 - rpl_transaction.test produces warnings files · 4a5e91cc
  istruewing@stella.local authored Mar 12, 2008
```
The test file tried to use a mysqltest command '--warning'
but there is no such command.

Changed '--warning' to '#--warning'.
```
  4a5e91cc
- Fixed test failures caused by insufficient cleanups in the tests for · 06bf29cf
  kaa@kaamos.(none) authored Mar 12, 2008
```
bug12713.
```
  06bf29cf
- Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.1-opt · 11c336b8
  kaa@kaamos.(none) authored Mar 12, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
```
  11c336b8
- Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · 28b4988e
  kaa@kaamos.(none) authored Mar 12, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
```
  28b4988e
- Post-merge fix. · 9c811dde
  kaa@kaamos.(none) authored Mar 12, 2008
  
  9c811dde
- Re-enabled the test for mysql_insert_id() after merging from main. · a48f1d24
  kaa@kaamos.(none) authored Mar 12, 2008
  
  a48f1d24
- Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · ae93d258
  kaa@kaamos.(none) authored Mar 12, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
```
  ae93d258
- Merge kaamos.(none):/data/src/mysql-5.1 · 0a7052e4
  kaa@kaamos.(none) authored Mar 12, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
```
  0a7052e4
- Merge kaamos.(none):/data/src/opt/mysql-4.1-opt · 815898f3
  kaa@kaamos.(none) authored Mar 12, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
```
  815898f3
- Merge kaamos.(none):/data/src/mysql-5.0 · d0eb9050
  kaa@kaamos.(none) authored Mar 12, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
```
  d0eb9050
- Merge kaamos.(none):/data/src/mysql-4.1 · 9510da19
  kaa@kaamos.(none) authored Mar 12, 2008
```
into  kaamos.(none):/data/src/opt/mysql-4.1-opt
```
  9510da19
11 Mar, 2008 4 commits
- Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · 7e365efa
  kaa@kaamos.(none) authored Mar 11, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
```
  7e365efa
- Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt · 3d87b263
  mhansson/martin@riffraff.(none) authored Mar 11, 2008
```
into  riffraff.(none):/data0/martin/bug34367/my51-bug34367-pushee
```
  3d87b263
- Merge stella.local:/home2/mydev/mysql-5.1-ateam · df059d9c
  istruewing@stella.local authored Mar 11, 2008
```
into  stella.local:/home2/mydev/mysql-5.1-axmrg
```
  df059d9c
- Merge bk@192.168.21.1:mysql-5.1-opt · e0851650
  holyfoot/hf@hfmain.(none) authored Mar 11, 2008
```
into  mysql.com:/home/hf/work/32801/my51-32801
```
  e0851650
10 Mar, 2008 7 commits
- Bug#31331 - MyISAM or Merge Table upgrade incompatibility with 5.1 · 17a10cb4
  istruewing@stella.local authored Mar 10, 2008
```
Post-pushbuild fixes. Added purecov comments.
```
  17a10cb4
- Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · f5b93ab9
  tnurnberg@white.intern.koehntopp.de authored Mar 10, 2008
```
into  mysql.com:/misc/mysql/34749/51-34749
```
  f5b93ab9
- Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 3a87bbfe
  tnurnberg@white.intern.koehntopp.de authored Mar 10, 2008
```
into  mysql.com:/misc/mysql/34749/50-34749
```
  3a87bbfe
- Merge mysql.com:/misc/mysql/34749/50-34749 · fd2bae99
  tnurnberg@white.intern.koehntopp.de authored Mar 10, 2008
```
into  mysql.com:/misc/mysql/34749/51-34749
```
  fd2bae99
- Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 10bf47ab
  tnurnberg@white.intern.koehntopp.de authored Mar 10, 2008
```
into  mysql.com:/misc/mysql/29645/51-29645
```
  10bf47ab
- Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · f2b153a2
  tnurnberg@white.intern.koehntopp.de authored Mar 10, 2008
```
into  mysql.com:/misc/mysql/29645/50-29645
```
  f2b153a2
- Merge mysql.com:/misc/mysql/29645/50-29645 · 6ad2340f
  tnurnberg@white.intern.koehntopp.de authored Mar 10, 2008
```
into  mysql.com:/misc/mysql/29645/51-29645
```
  6ad2340f
08 Mar, 2008 3 commits
- Merge kaamos.(none):/data/src/opt/bug34889/my51 · 71d67f7f
  kaa@kaamos.(none) authored Mar 08, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
```
  71d67f7f
- Merge kaamos.(none):/data/src/opt/bug34889/my50 · ace50226
  kaa@kaamos.(none) authored Mar 08, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
```
  ace50226
- Merge kaamos.(none):/data/src/opt/bug34889/my50 · 88a1ab6c
  kaa@kaamos.(none) authored Mar 08, 2008
```
into  kaamos.(none):/data/src/opt/bug34889/my51
```
  88a1ab6c
07 Mar, 2008 7 commits
- Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-engines · bdc74bbd
  antony@pcg5ppc.xiphis.org authored Mar 07, 2008
```
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1
```
  bdc74bbd
- Merge... · bfa8eeaf
  antony@pcg5ppc.xiphis.org authored Mar 07, 2008
```
Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.0
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1
```
  bfa8eeaf
- Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines · 820068f1
  antony@pcg5ppc.xiphis.org authored Mar 07, 2008
```
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1
```
  820068f1
- Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.0-engines · 9c4e4640
  antony@pcg5ppc.xiphis.org authored Mar 07, 2008
```
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.0
```
  9c4e4640
- Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-engines · ba600ac1
  bar@bar.myoffice.izhnet.ru authored Mar 08, 2008
```
into  mysql.com:/home/bar/mysql-work/mysql-5.1.b27580
```
  ba600ac1
- After merge fix · 84e6d960
  bar@mysql.com/bar.myoffice.izhnet.ru authored Mar 08, 2008
  
  84e6d960
- Merge mysql.com:/home/svoj/devel/mysql/BUG34656/mysql-5.1-engines · 38f91fc2
  svoj@june.mysql.com authored Mar 07, 2008
```
into  mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.1-engines
```
  38f91fc2