Commits · d947f1c84722b5ddfe9d0dcfe204b6bd30ba6d4e · Kirill Smelkov / mariadb

05 Nov, 2006 1 commit
- merging · d947f1c8
  holyfoot/hf@mysql.com/deer.(none) authored Nov 05, 2006
  
  d947f1c8
01 Nov, 2006 2 commits
- Merge bk@192.168.21.1:mysql-5.1-opt · f8d4202c
  holyfoot/hf@deer.(none) authored Nov 01, 2006
```
into  mysql.com:/home/hf/work/21790/my51-21790
```
  f8d4202c
- Merge mysql.com:/home/hf/work/21790/my50-21790 · 28d610df
  holyfoot/hf@deer.(none) authored Nov 01, 2006
```
into  mysql.com:/home/hf/work/21790/my51-21790
```
  28d610df
24 Oct, 2006 8 commits
- Merge mysql.com:/usersnfs/abotchkov/mysql-5.1-opt · f698210d
  holyfoot/abotchkov@production.mysql.com authored Oct 24, 2006
```
into  mysql.com:/usersnfs/abotchkov/mysql-5.1-opt1
```
  f698210d
- Merge mysql.com:/home/hf/work/current_stmt/my50-current_stmt · e203abf0
  holyfoot/hf@deer.(none) authored Oct 24, 2006
```
into  mysql.com:/home/hf/work/current_stmt/my51-current_stmt
```
  e203abf0
- Merge mysql.com:/home/hf/work/0current_stmt/my41-current_stmt · 887e6af6
  holyfoot/hf@mysql.com/deer.(none) authored Oct 24, 2006
```
into  mysql.com:/home/hf/work/current_stmt/my50-current_stmt
```
  887e6af6
- Bug #23427 (incompatible ABI change) · d0ef58b6
  holyfoot/hf@mysql.com/deer.(none) authored Oct 24, 2006
```
the incompatibility was caused by current_stmt member added to the MYSQL
structure.
It's possible to move it to THD structure instead which saves ABI
```
  d0ef58b6
- Merge mysql.com:/home/hf/work/w3475/my50-w3475 · 93346430
  holyfoot/hf@deer.(none) authored Oct 24, 2006
```
into  mysql.com:/home/hf/work/w3475/my51-w3475
```
  93346430
- Merge mysql.com:/home/hf/work/w3475/my41-w3475 · 9c7750b5
  holyfoot/hf@mysql.com/deer.(none) authored Oct 24, 2006
```
into  mysql.com:/home/hf/work/w3475/my50-w3475
```
  9c7750b5
- WL#3475 merging · 97df0fce
  holyfoot/hf@mysql.com/deer.(none) authored Oct 24, 2006
  
  97df0fce
- merging fix · 836e159f
  holyfoot/hf@mysql.com/deer.(none) authored Oct 24, 2006
  
  836e159f
23 Oct, 2006 2 commits
- Merge mysql.com:/home/hf/work/w3475/my41-w3475 · cd568454
  holyfoot/hf@mysql.com/deer.(none) authored Oct 23, 2006
```
into  mysql.com:/home/hf/work/w3475/my50-w3475
```
  cd568454
- WL#3475 (Threads for the embedded server in mysqltest) · 4d235598
  holyfoot/hf@mysql.com/deer.(none) authored Oct 23, 2006
```
Necessary code added to mysqltest.c.
Disabled tests are available now.
```
  4d235598
20 Oct, 2006 6 commits
- Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt · 99b572b9
  gkodinov@dl145s.mysql.com authored Oct 20, 2006
```
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
```
  99b572b9
- Merge bk-internal:/home/bk/mysql-5.1 · bb0422a0
  gkodinov@dl145s.mysql.com authored Oct 20, 2006
```
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
```
  bb0422a0
- Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt · 4eff5ab2
  gkodinov@dl145s.mysql.com authored Oct 20, 2006
```
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
```
  4eff5ab2
- Merge bk-internal:/home/bk/mysql-5.0 · a93cc1b7
  gkodinov@dl145s.mysql.com authored Oct 20, 2006
```
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
```
  a93cc1b7
- Merge bk-internal:/home/bk/mysql-4.1 · 0612a212
  gkodinov@dl145s.mysql.com authored Oct 20, 2006
```
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
```
  0612a212
- sql_rename.cc, sql_table.cc, type_decimal.result, mix2_myisam.result: · a0c0bbd8
  gkodinov@dl145s.mysql.com authored Oct 20, 2006
```
  merge fixes
```
  a0c0bbd8
19 Oct, 2006 19 commits
- After merge fix. · 26bf6a25
  svoj@mysql.com/april.(none) authored Oct 19, 2006
  
  26bf6a25
- Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines · 8b016867
  svoj@april.(none) authored Oct 19, 2006
```
into  mysql.com:/home/svoj/devel/mysql/engines/mysql-5.1-engines
```
  8b016867
- Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt · aaed3982
  gkodinov@dl145s.mysql.com authored Oct 19, 2006
```
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
```
  aaed3982
- Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.1 · ea8ba035
  gkodinov@dl145s.mysql.com authored Oct 19, 2006
```
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
```
  ea8ba035
- After merge fix. · afefa5d4
  svoj@mysql.com/april.(none) authored Oct 19, 2006
  
  afefa5d4
- Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-4.1-engines · 2d9e4574
  svoj@mysql.com/april.(none) authored Oct 19, 2006
```
into  mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines
```
  2d9e4574
- Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt · c77fae40
  gkodinov@dl145s.mysql.com authored Oct 19, 2006
```
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
```
  c77fae40
- Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.0 · 892495ac
  gkodinov@dl145s.mysql.com authored Oct 19, 2006
```
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
```
  892495ac
- Merge mysql.com:/home/svoj/devel/mysql/BUG23175/mysql-4.1-engines · d2fa9fd1
  svoj@mysql.com/april.(none) authored Oct 19, 2006
```
into  mysql.com:/home/svoj/devel/mysql/engines/mysql-4.1-engines
```
  d2fa9fd1
- Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-4.1 · 1dacdd4c
  gkodinov@dl145s.mysql.com authored Oct 19, 2006
```
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
```
  1dacdd4c
- Merge mysql.com:/home/svoj/devel/mysql/BUG22562/mysql-4.1-engines · b6f909bf
  svoj@mysql.com/april.(none) authored Oct 19, 2006
```
into  mysql.com:/home/svoj/devel/mysql/engines/mysql-4.1-engines
```
  b6f909bf
- Merge chilla.local:/home/mydev/mysql-5.0-merge · 8eee7654
  istruewing@chilla.local authored Oct 19, 2006
```
into  chilla.local:/home/mydev/mysql-5.1-merge
```
  8eee7654
- Bug#21476 - Lost Database Connection During Query · 9b3e7bd0
  istruewing@chilla.local authored Oct 19, 2006
```
Backport from 5.1.
Raised STACK_MIN_SIZE for Debian GNU/Linux Sid,
Linux kernel 2.6.16,
gcc version 3.3.6 (Debian 1:3.3.6-13),
libc6-dbg 2.3.6.ds1-4,
Pentium4 (x86),
BUILD/compile-pentium-debug-max
Raised about 100 Bytes above the required minimum.
```
  9b3e7bd0
- Merge chilla.local:/home/mydev/mysql-5.0-merge · d06526aa
  istruewing@chilla.local authored Oct 19, 2006
```
into  chilla.local:/home/mydev/mysql-5.1-merge
```
  d06526aa
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 5af9dfa6
  istruewing@chilla.local authored Oct 19, 2006
```
into  chilla.local:/home/mydev/mysql-5.1-merge
```
  5af9dfa6
- Merge chilla.local:/home/mydev/mysql-4.1-merge · 81625bff
  istruewing@chilla.local authored Oct 19, 2006
```
into  chilla.local:/home/mydev/mysql-5.0-merge
```
  81625bff
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 11d453cc
  istruewing@chilla.local authored Oct 19, 2006
```
into  chilla.local:/home/mydev/mysql-5.0-merge
```
  11d453cc
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 73cdbb4e
  istruewing@chilla.local authored Oct 19, 2006
```
into  chilla.local:/home/mydev/mysql-4.1-merge
```
  73cdbb4e
- Changed test case for bug 22342 to make it platform independent. · 3a4a9521
  igor@rurik.mysql.com authored Oct 18, 2006
  
  3a4a9521
18 Oct, 2006 2 commits

Merge mysql.com:/data0/bk/mysql-5.0 · 9c0b8726
holyfoot/abotchkov@bk-internal.mysql.com authored Oct 18, 2006
```
into  mysql.com:/data0/bk/mysql-5.0-kt
```
9c0b8726

BUG#23175 - MYISAM crash/repair failed during repair · a2e0059f

svoj@mysql.com/april.(none) authored Oct 18, 2006

Repair table could crash a server if there is not sufficient
memory (myisam_sort_buffer_size) to operate. Affects not only
repair, but also all statements that use create index by sort:
repair by sort, parallel repair, bulk insert.

Return an error if there is not sufficient memory to store at
least one key per BUFFPEK.

Also fixed memory leak if thr_find_all_keys returns an error.

a2e0059f