Commits · fb0be729e69522a22e9e2896e8e86cfcd74c28ae · Kirill Smelkov / mariadb

18 Jan, 2007 1 commit
- Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1 · fb0be729
  lars/lthalmann@dl145h.mysql.com authored Jan 18, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
```
  fb0be729
17 Jan, 2007 13 commits
- Merge trift2.:/MySQL/M50/upward-5.0 · d1a61e1c
  joerg@trift2. authored Jan 17, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  d1a61e1c
- Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge · 74f74899
  lars/lthalmann@dl145k.mysql.com authored Jan 17, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
```
  74f74899
- Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge · 044bb384
  lars/lthalmann@mysql.com/dl145j.mysql.com authored Jan 17, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
```
  044bb384
- Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl · 5810ca92
  lars/lthalmann@dl145j.mysql.com authored Jan 17, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
```
  5810ca92
- Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl · b25079d6
  lars/lthalmann@mysql.com/dl145j.mysql.com authored Jan 17, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
```
  b25079d6
- Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl · bbaf3275
  lars/lthalmann@mysql.com/dl145j.mysql.com authored Jan 17, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
```
  bbaf3275
- Merge bodhi.local:/opt/local/work/mysql-5.0-runtime · 1480f9f4
  kostja@bodhi.local authored Jan 17, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
```
  1480f9f4
- Disable symlinks under valgrind builds (again), with a comment. · 15c9d8a6
  kostja@bodhi.local authored Jan 17, 2007
  
  15c9d8a6
- Merge bodhi.local:/opt/local/work/mysql-5.0-runtime · 4399e324
  kostja@bodhi.local authored Jan 17, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
```
  4399e324
- Merge bodhi.local:/opt/local/work/mysql-4.1-runtime · a9590803
  kostja@bodhi.local authored Jan 17, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-debug-max
```
  a9590803
- Fix a failure of lowercase_tables2 test on powermacg5, introduced · 6399db74
  kostja@bodhi.local authored Jan 17, 2007
```
by the patch for Bug#4968
```
  6399db74
- Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-debug-max · feb9098a
  kostja@bodhi.local authored Jan 17, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
```
  feb9098a
- Fix a ps.test failure in 5.0-runtime tree. · 17543881
  kostja@bodhi.local authored Jan 17, 2007
  
  17543881
16 Jan, 2007 11 commits
- myisam/mi_packrec.c · 88bc918b
  joerg@trift2. authored Jan 16, 2007
```
    Fix a compile error:  Macro "DBUG_ENTER" must not follow an executable statement.
```
  88bc918b
- Merge bodhi.local:/opt/local/work/mysql-5.0-runtime · 68a4327a
  kostja@bodhi.local authored Jan 16, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
```
  68a4327a
- Merge bodhi.local:/opt/local/work/mysql-4.1-runtime · 76dfe0bc
  kostja@bodhi.local authored Jan 16, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
```
  76dfe0bc
- A fix for the broken 4.1-runtime tree. · 51a2f515
  kostja@bodhi.local authored Jan 16, 2007
  
  51a2f515
- Merge bodhi.local:/opt/local/work/mysql-5.0-runtime · 485742fb
  kostja@bodhi.local authored Jan 16, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
```
  485742fb
- Merge bodhi.local:/opt/local/work/mysql-5.0-runtime · 2209dcdc
  kostja@bodhi.local authored Jan 16, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
```
  2209dcdc
- Merge bodhi.local:/opt/local/work/mysql-5.1-root · 717452fe
  kostja@bodhi.local authored Jan 16, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
```
  717452fe
- configure.in : Fix a dependency problem for "extra/" which shows up only in RPM builds. · 25c53269
  joerg@trift2. authored Jan 16, 2007
  
  25c53269
- Post-merge fixes. · 11358069
  mats@romeo.(none) authored Jan 16, 2007
  
  11358069
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 693bc6a2
  dlenev@mockturtle.local authored Jan 16, 2007
```
into  mockturtle.local:/home/dlenev/src/mysql-5.0-bg20390-2
```
  693bc6a2
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 33b86905
  dlenev@mockturtle.local authored Jan 16, 2007
```
into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg20390
```
  33b86905
15 Jan, 2007 15 commits
- Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 47dff35d
  malff/marcsql@weblab.(none) authored Jan 15, 2007
```
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-6298
```
  47dff35d
- Merge bodhi.local:/opt/local/work/tmp_merge · df18e193
  kostja@bodhi.local authored Jan 15, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.1-root
```
  df18e193
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 226fa856
  kostja@bodhi.local authored Jan 15, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
```
  226fa856
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 26c62648
  kostja@bodhi.local authored Jan 15, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
```
  26c62648
- Merge bodhi.local:/opt/local/work/mysql-4.1-runtime · 6e164584
  kostja@bodhi.local authored Jan 15, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
```
  6e164584
- A post-merge fix. · d49ac4fb
  kostja@bodhi.local authored Jan 15, 2007
  
  d49ac4fb
- Raise version number after cloning 5.0.34 · b711c554
  bteam/mysqldev@mysql.com/production.mysql.com authored Jan 15, 2007
  
  b711c554
- Merge trift2.:/MySQL/M50/mysql-5.0 · 17056a63
  joerg@trift2. authored Jan 15, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  17056a63
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 6d65d121
  dlenev@mockturtle.local authored Jan 15, 2007
```
into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg20390
```
  6d65d121
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · af838b4c
  dlenev@mockturtle.local authored Jan 15, 2007
```
into  mockturtle.local:/home/dlenev/src/mysql-5.0-bg20390-2
```
  af838b4c
- Merge bodhi.local:/opt/local/work/mysql-4.1-4968-to-push · 8659035f
  kostja@bodhi.local authored Jan 15, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.0-4968-to-push
```
  8659035f
- Manual merge. · d7a63c0f
  kostja@bodhi.local authored Jan 15, 2007
  
  d7a63c0f
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1-runtime · d53072d1
  kostja@bodhi.local authored Jan 15, 2007
```
into  bodhi.local:/opt/local/work/mysql-4.1-4968-to-push
```
  d53072d1
- Merge bodhi.local:/opt/local/work/mysql-5.0-4968-pull-from-4.1 · 49532978
  kostja@bodhi.local authored Jan 15, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.1-4968-null-merge
```
  49532978
- Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg20390-2 · c0f6023a
  dlenev@mockturtle.local authored Jan 15, 2007
```
into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg20390
```
  c0f6023a