Commits · db8a7b513cbbd3ae6c5d47cb904f7386f1215769 · nexedi / MariaDB

06 Feb, 2007 1 commit
- Excluded wrongly merged changeset. · db8a7b51
  svoj@mysql.com/april.(none) authored Feb 07, 2007
  
  db8a7b51
05 Feb, 2007 1 commit
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 · 4a6770e0
  svoj@june.mysql.com authored Feb 05, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
```
  4a6770e0
04 Feb, 2007 2 commits
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · a602d4a5
  baker@bk-internal.mysql.com authored Feb 05, 2007
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
```
  a602d4a5
- Fixed bug#26027 · 08be7c33
  brian@zim.(none) authored Feb 04, 2007
```
Just a bad copy/paste of help info
```
  08be7c33
03 Feb, 2007 3 commits
- Merge chilla.local:/home/mydev/mysql-5.0-axmrg · dde4f421
  istruewing@chilla.local authored Feb 03, 2007
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  dde4f421
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · bdf18a85
  istruewing@chilla.local authored Feb 03, 2007
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  bdf18a85
- After merge fix · b4445664
  istruewing@chilla.local authored Feb 03, 2007
  
  b4445664
02 Feb, 2007 15 commits
- Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 · cd75806b
  jani@a88-113-38-195.elisa-laajakaista.fi authored Feb 03, 2007
```
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1
```
  cd75806b
- Merge chilla.local:/home/mydev/mysql-4.1-axmrg · 77e99fe2
  istruewing@chilla.local authored Feb 02, 2007
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg
```
  77e99fe2
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 41b6b32e
  istruewing@chilla.local authored Feb 02, 2007
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg
```
  41b6b32e
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 972df14c
  istruewing@chilla.local authored Feb 02, 2007
```
into  chilla.local:/home/mydev/mysql-4.1-axmrg
```
  972df14c
- After merge fix · 177a366e
  istruewing@chilla.local authored Feb 02, 2007
  
  177a366e
- After merge fix · a6e4ada7
  istruewing@chilla.local authored Feb 02, 2007
  
  a6e4ada7
- another valgrind error fix for 4.1(backport from 5.0) · 938de5ee
  gluh@mysql.com/eagle.(none) authored Feb 02, 2007
  
  938de5ee
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · ad7b10ca
  joerg@trift2. authored Feb 02, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  ad7b10ca
- Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 9663691a
  gluh@mysql.com/eagle.(none) authored Feb 02, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
```
  9663691a
- Valgrind errors · 31c3059a
  gluh@mysql.com/eagle.(none) authored Feb 02, 2007
```
added valgrind.supp to EXTRA_SCRIPTS(for pushbuild)
```
  31c3059a
- Merge chilla.local:/home/mydev/mysql-5.0-axmrg · 80ca34c3
  istruewing@chilla.local authored Feb 02, 2007
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  80ca34c3
- after merge fix · 29e1d5f9
  gluh@mysql.com/eagle.(none) authored Feb 02, 2007
  
  29e1d5f9
- Merge chilla.local:/home/mydev/mysql-4.1-axmrg · 1616e201
  istruewing@chilla.local authored Feb 02, 2007
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg
```
  1616e201
- After merge fix · 3a664472
  istruewing@chilla.local authored Feb 02, 2007
  
  3a664472
- Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 7849d319
  gluh@eagle.(none) authored Feb 02, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
```
  7849d319
01 Feb, 2007 18 commits
- Merge chilla.local:/home/mydev/mysql-5.0-axmrg · ed099870
  istruewing@chilla.local authored Feb 01, 2007
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  ed099870
- Merge chilla.local:/home/mydev/mysql-4.1-axmrg · 5e5c1b76
  istruewing@chilla.local authored Feb 01, 2007
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg
```
  5e5c1b76
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · dae855c1
  istruewing@chilla.local authored Feb 01, 2007
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg
```
  dae855c1
- Bug#23299 Some queries against INFORMATION_SCHEMA with subqueries fail · d1185aae
  gluh@mysql.com/eagle.(none) authored Feb 01, 2007
```
additional call of file->extra() method with HA_EXTRA_NO_CACHE parameter
```
  d1185aae
- Bug#25844: "make test" does not find mysql-test-run.pl · b0e8f2b5
  istruewing@chilla.local authored Feb 01, 2007
```
Need to change directory before calling mysql-test-run.pl
```
  b0e8f2b5
- Merge trift2.:/MySQL/M51/mysql-5.1 · 9af6d01e
  joerg@trift2. authored Feb 01, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  9af6d01e
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 33e1d109
  istruewing@chilla.local authored Feb 01, 2007
```
into  chilla.local:/home/mydev/mysql-4.1-axmrg
```
  33e1d109
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 54bf789a
  istruewing@chilla.local authored Feb 01, 2007
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  54bf789a
- Valgrind error fixes · 010dc0b5
  gluh@mysql.com/eagle.(none) authored Feb 01, 2007
```
Notes:
This patch doesn't fix all issues in the tree and we need jani's fix for that
This patch shoud not be merged into 5.0
```
  010dc0b5
- Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · d9ae9ce5
  gkodinov/kgeorge@rakia.gmz authored Feb 01, 2007
```
into  rakia.gmz:/home/kgeorge/mysql/autopush/B23556-5.0-opt
```
  d9ae9ce5
- trigger.result: · 95154f86
  gkodinov/kgeorge@rakia.gmz authored Feb 01, 2007
```
  merge of the 5.0-opt tree
```
  95154f86
- Merge chilla.local:/home/mydev/mysql-4.1-axmrg · 1c342704
  istruewing@chilla.local authored Feb 01, 2007
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg
```
  1c342704
- Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · f697acb0
  gkodinov/kgeorge@rakia.gmz authored Feb 01, 2007
```
into  rakia.gmz:/home/kgeorge/mysql/autopush/B23556-5.0-opt
```
  f697acb0
- Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 1096dbd5
  gkodinov/kgeorge@rakia.gmz authored Feb 01, 2007
```
into  rakia.gmz:/home/kgeorge/mysql/autopush/B23556-5.1-opt
```
  1096dbd5
- Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 0d40608f
  gkodinov/kgeorge@rakia.gmz authored Feb 01, 2007
```
into  rakia.gmz:/home/kgeorge/mysql/autopush/B25551-5.0-opt
```
  0d40608f
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines · a3705af3
  istruewing@chilla.local authored Feb 01, 2007
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg
```
  a3705af3
- Merge chilla.local:/home/mydev/mysql-4.0-axmrg · 73e61944
  istruewing@chilla.local authored Feb 01, 2007
```
into  chilla.local:/home/mydev/mysql-4.1-axmrg
```
  73e61944
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines · 97cf413d
  istruewing@chilla.local authored Feb 01, 2007
```
into  chilla.local:/home/mydev/mysql-4.1-axmrg
```
  97cf413d