Commits · 583675f292bd0c045ba50107a2800421e1a2a1ea · Kirill Smelkov / mariadb

03 Aug, 2006 15 commits
- Merge bk-internal:/home/bk/mysql-5.0-maint · 583675f2
  msvensson@neptunus.(none) authored Aug 03, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  583675f2
- Merge rama.(none):/home/jimw/my/mysql-5.0-10668 · b876cf57
  jimw@rama.(none) authored Aug 03, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.0-clean
```
  b876cf57
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · 620a1792
  msvensson@neptunus.(none) authored Aug 03, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  620a1792
- Bug#20190 Unixware 7.13 port and make test errors · 2469667e
  msvensson@neptunus.(none) authored Aug 03, 2006
```
   - Thanks to cerber for the patch!
```
  2469667e
- Make test case for bug#21215repeateble by calling "reset master" · b9b2ef9c
  msvensson@neptunus.(none) authored Aug 03, 2006
  
  b9b2ef9c
- Update result after merge, since the function Item::tmp_table_field_from_field_type() · ac4e03a3
  msvensson@neptunus.(none) authored Aug 03, 2006
```
now takes mbmaxlen into account when calculating max_length of new field. 
```
  ac4e03a3
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · 10a7b8ce
  msvensson@neptunus.(none) authored Aug 03, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  10a7b8ce
- Remove double error printout in mysqldump · 61c5d973
  msvensson@neptunus.(none) authored Aug 03, 2006
  
  61c5d973
- Merge neptunus.(none):/home/msvensson/mysql/my41-bug21218 · c71ac0ef
  msvensson@neptunus.(none) authored Aug 03, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  c71ac0ef
- Merge neptunus.(none):/home/msvensson/mysql/my50-m-bug21215 · 74394840
  msvensson@neptunus.(none) authored Aug 03, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
```
  74394840
- Removing disabling of lowercase_fs_off · 1572bead
  msvensson@neptunus.(none) authored Aug 03, 2006
  
  1572bead
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · 7280f631
  msvensson@neptunus.(none) authored Aug 03, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  7280f631
- Merge rama.(none):/home/jimw/my/mysql-5.0-19147 · 9d67aace
  jimw@rama.(none) authored Aug 02, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.0-16502
```
  9d67aace
- Merge rama.(none):/home/jimw/my/mysql-5.0-16881 · 41956bee
  jimw@rama.(none) authored Aug 02, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.0-16502
```
  41956bee
- Merge bk-internal:/home/bk/mysql-5.0-maint · 95b3b2ea
  jimw@rama.(none) authored Aug 02, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.0-16502
```
  95b3b2ea
02 Aug, 2006 16 commits
- Disable a failing test case (filed a p1 bug) · 35af3d55
  kostja@bodhi.local authored Aug 02, 2006
  
  35af3d55
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 1b145118
  kostja@bodhi.local authored Aug 02, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
```
  1b145118
- A post-merge fix. · 3d3bf24a
  kostja@bodhi.local authored Aug 02, 2006
  
  3d3bf24a
- Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 83896aa8
  evgen@moonbone.local authored Aug 02, 2006
```
into  moonbone.local:/work/tmp_merge-5.0-opt-mysql
```
  83896aa8
- Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 90f23a25
  evgen@moonbone.local authored Aug 02, 2006
```
into  moonbone.local:/work/tmp_merge-5.0-opt-mysql
```
  90f23a25
- Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql · 7f0a0806
  evgen@moonbone.local authored Aug 02, 2006
```
into  moonbone.local:/work/tmp_merge-5.0-opt-mysql
```
  7f0a0806
- Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 67c85a17
  evgen@moonbone.local authored Aug 02, 2006
```
into  moonbone.local:/work/tmp_merge-5.0-opt-mysql
```
  67c85a17
- Merge moonbone.local:/work/tmp_merge-4.1 · cac5ad03
  evgen@moonbone.local authored Aug 02, 2006
```
into  moonbone.local:/work/tmp_merge-4.1-opt-mysql
```
  cac5ad03
- Merge moonbone.local:/work/tmp_merge-4.1 · 40a1fbdf
  evgen@moonbone.local authored Aug 02, 2006
```
into  moonbone.local:/work/tmp_merge-4.1-opt-mysql
```
  40a1fbdf
- Merge bk@192.168.21.1:mysql-4.1 · 2119067e
  holyfoot/hf@mysql.com/deer.(none) authored Aug 02, 2006
```
into  mysql.com:/home/hf/work/mysql-4.1.20317
```
  2119067e
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 4bfc67fc
  kostja@bodhi.local authored Aug 02, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
```
  4bfc67fc
- Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6cbc44c4
  georg@lmy002.wdf.sap.corp authored Aug 02, 2006
```
into  lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
```
  6cbc44c4
- Fix a compilation failiure on QNX · 60783848
  kostja@bodhi.local authored Aug 02, 2006
  
  60783848
- Bug #21396: Wrong error number generated for a missing table · 5f5c7bad
  georg@lmy002.wdf.sap.corp authored Aug 02, 2006
  
  5f5c7bad
- Disable test case for for bug 21042 · 502498ed
  msvensson@neptunus.(none) authored Aug 02, 2006
  
  502498ed
- .del-sp.test.orig: · 438b94e2
  tsmith@maint1.mysql.com authored Aug 02, 2006
```
  Delete: mysql-test/t/sp.test.orig
```
  438b94e2
01 Aug, 2006 9 commits
- Applied innodb-5.0-ss677 snapshot. · 951eb48a
  tsmith@maint1.mysql.com authored Aug 01, 2006
```
Fixes:
- bug #19834: Using cursors when running in READ-COMMITTED can cause InnoDB to crash
- bug #21112: InnoDB slow with > 100,000 .ibd files
- bug #21113: Duplicate printout in SHOW INNODB STATUS
```
  951eb48a
- Merge 192.168.0.20:mysql/mysql-5.0-maint · 396a51b4
  msvensson@neptunus.(none) authored Aug 01, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  396a51b4
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · 31be565d
  msvensson@neptunus.(none) authored Aug 01, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  31be565d
- Import latest version of yaSSL · 116feb00
  msvensson@shellback.(none) authored Aug 01, 2006
  
  116feb00
- Merge bk-internal:/home/bk/mysql-4.1 · 587b9caa
  msvensson@neptunus.(none) authored Aug 01, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
```
  587b9caa
- Merge bk-internal:/home/bk/mysql-5.0-maint · 09a36146
  msvensson@neptunus.(none) authored Aug 01, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  09a36146
- Add missing $ · c1f0f4dc
  msvensson@neptunus.(none) authored Aug 01, 2006
  
  c1f0f4dc
- Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · ff3a640e
  igreenhoe@maint1.mysql.com authored Aug 01, 2006
```
into  maint1.mysql.com:/data/localhome/igreenhoe/mysql-5.0-maint
```
  ff3a640e
- Bug#21367 IM tests do not recognize "win2003-amd64" as Windows · 111513f0
  msvensson@neptunus.(none) authored Aug 01, 2006
```
 - Disable Instance manager on Windows
```
  111513f0