Commits · aeced431e309bf3a019c0869bba8e7ac15e95fea · Kirill Smelkov / mariadb

24 Oct, 2006 1 commit
- Merge siva.hindu.god:/usr/home/tim/m/bk/g51 · aeced431
  tsmith/tim@siva.hindu.god authored Oct 23, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/51
```
  aeced431
23 Oct, 2006 7 commits
- Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · fd759850
  andrey@example.com authored Oct 23, 2006
```
into  example.com:/work/bug23037/my51
```
  fd759850
- after merge fix · 4e3ac17f
  andrey@example.com authored Oct 23, 2006
  
  4e3ac17f
- Merge example.com:/work/bug23037/my50 · d18cb100
  andrey@example.com authored Oct 23, 2006
```
into  example.com:/work/bug23037/my51
```
  d18cb100
- Fix for bug#23037 Bug in field "Default" of query "SHOW COLUMNS FROM table" · 389c6a01
  andrey@example.com authored Oct 23, 2006
```
  
To the documentor: The DEFAULT value in SHOW COLUMNS/SELECT FROM I_S.COLUMNS
was truncated to NAME_LEN (which effectively is 64) characters.
```
  389c6a01
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 6cb52242
  ramil/ram@myoffice.izhnet.ru authored Oct 23, 2006
```
into  mysql.com:/usr/home/ram/work/bug20732/my51-bug20732
```
  6cb52242
- Merge mysql.com:/usr/home/ram/work/mysql-5.1-maint · d4c7b6da
  ramil/ram@myoffice.izhnet.ru authored Oct 23, 2006
```
into  mysql.com:/usr/home/ram/work/bug20732/my51-bug20732
```
  d4c7b6da
- Merge mysql.com:/usr/home/ram/work/bug20732/my50-bug20732 · 800d8054
  ramil/ram@myoffice.izhnet.ru authored Oct 23, 2006
```
into  mysql.com:/usr/home/ram/work/bug20732/my51-bug20732
```
  800d8054
21 Oct, 2006 1 commit
- Fix bad merge. · dae79f0a
  cmiller@zippy.cornsilk.net authored Oct 20, 2006
  
  dae79f0a
20 Oct, 2006 20 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 5a217c51
  tsmith/tim@siva.hindu.god authored Oct 20, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/51
```
  5a217c51
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-afterbreak · 5a39b273
  cmiller@zippy.cornsilk.net authored Oct 20, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  5a39b273
- Fix bad merge from #14262. · c2119709
  cmiller@zippy.cornsilk.net authored Oct 20, 2006
  
  c2119709
- Merge siva.hindu.god:/usr/home/tim/m/bk/50 · d5d1404d
  tsmith/tim@siva.hindu.god authored Oct 20, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/51
```
  d5d1404d
- Applied InnoDB snapshot 5.1-ss927 · 09e09485
  tsmith/tim@siva.hindu.god authored Oct 20, 2006
```
Fixes:
- Bug #23368: crash during insert, table has foreign key pointing into other schema,permission
```
  09e09485
- Merge siva.hindu.god:/usr/home/tim/m/bk/inno/51 · 07db2bc7
  tsmith/tim@siva.hindu.god authored Oct 20, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/51
```
  07db2bc7
- Merge siva.hindu.god:/usr/home/tim/m/bk/inno/50 · 8998ecbc
  tsmith/tim@siva.hindu.god authored Oct 20, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/50
```
  8998ecbc
- Merge siva.hindu.god:/usr/home/tim/m/bk/inno/50 · c965f537
  tsmith/tim@siva.hindu.god authored Oct 20, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/inno/51
```
  c965f537
- Apply InnoDB snapshot ss923 · 032f356f
  tsmith/tim@siva.hindu.god authored Oct 20, 2006
```
Fixes:
- Bug #18077: InnoDB uses full explicit table locks in stored FUNCTION
```
  032f356f
- Apply InnoDB snapshot ss923 · deee0204
  tsmith/tim@siva.hindu.god authored Oct 20, 2006
```
Fixes:
- Bug #18077: InnoDB uses full explicit table locks in stored FUNCTION
```
  deee0204
- Merge polly.local:/tmp/maint/bug23256/mysql-5.0-maint · fdbb0d2a
  kaa@polly.local authored Oct 20, 2006
```
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
```
  fdbb0d2a
- Merge polly.local:/tmp/maint/bug23256/mysql-5.0-maint · 6a679658
  kaa@polly.local authored Oct 20, 2006
```
into  polly.local:/tmp/maint/bug23256/mysql-5.1-maint
```
  6a679658
- Merge polly.local:/tmp/maint/bug23256/mysql-4.1-maint · 165e2f15
  kaa@polly.local authored Oct 20, 2006
```
into  polly.local:/tmp/maint/bug23256/mysql-5.0-maint
```
  165e2f15
- Fix for bug #23256 "doesn't build on alpha" · 4d930697
  kaa@polly.local authored Oct 20, 2006
```
- compilation on the Alpha platform was broken because the Alpha-specific code was not updated after replacing the SIGRETURN_FRAME_COUNT constant with a variable
```
  4d930697
- 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 11 commits
- Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · 3426b59d
  msvensson@neptunus.(none) authored Oct 19, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  3426b59d
- Merge bk-internal:/home/bk/mysql-4.1-maint · 13b9adba
  msvensson@neptunus.(none) authored Oct 19, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
```
  13b9adba
- Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · 698e0abd
  msvensson@neptunus.(none) authored Oct 19, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  698e0abd
- Adapt to running from "binary dist" · c4a570aa
  msvensson@neptunus.(none) authored Oct 19, 2006
```
Add function mtr_exe_maybe_exists to look for binaries that is optional
Skip ndb support if it's a binary dist where mysqld supports ndb but there is no ndbd
```
  c4a570aa
- Fix problem running rpl_timezone on powermacg5, it was not popular to set TZ to "" so now it's set · c950eee2
  msvensson@neptunus.(none) authored Oct 19, 2006
```
to a value wich is not our default
```
  c950eee2
- After merge fix. · 26bf6a25
  svoj@mysql.com/april.(none) authored Oct 19, 2006
  
  26bf6a25
- Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · c7710510
  msvensson@neptunus.(none) authored Oct 19, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  c7710510
- 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