Commits · 850211eb735e0d5ed492aa1aed6743362759b5e0 · nexedi / MariaDB

23 Apr, 2005 2 commits
- Merge · 850211eb
  pekka@mysql.com authored Apr 23, 2005
  
  850211eb
- ndb - bug#10029 fix · 6778b029
  pekka@mysql.com authored Apr 23, 2005
  
  6778b029
22 Apr, 2005 11 commits
- Fixes for BUG#10039 "MEMORY engine is reported as HEAP", · b75789e3
  gbichot@quadita2.mysql.com authored Apr 23, 2005
```
BUG#9738 "SHOW VARIABLES still displays the deprecated 'log_update' in 5.0",
BUG#9542 "MySQL dies with signal 11 when it is using non-existent location of binary logs"
```
  b75789e3
- Merge mysql.com:/home/mydev/mysql-5.0 · a0c3aed7
  ingo@mysql.com authored Apr 22, 2005
```
into mysql.com:/home/mydev/mysql-5.0-5000
```
  a0c3aed7
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 · c27c54f4
  mskold@mysql.com authored Apr 22, 2005
```
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
```
  c27c54f4
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · fd717612
  mskold@mysql.com authored Apr 22, 2005
```
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
```
  fd717612
- Merge · 5411f8a6
  mskold@mysql.com authored Apr 22, 2005
  
  5411f8a6
- Bug#7806 - insert on duplicate key and auto-update of timestamp · d859eafa
  ingo@mysql.com authored Apr 22, 2005
```
Merged fix for bugfix to 5.0.
```
  d859eafa
- Fix for Bug #9318 drop database does not drop ndb tables · 94575516
  mskold@mysql.com authored Apr 22, 2005
  
  94575516
- Merge mysql.com:/usr/local/bk/mysql-5.0 · 5fcfb8a4
  pem@mysql.com authored Apr 22, 2005
```
into mysql.com:/home/pem/work/mysql-5.0
```
  5fcfb8a4
- Fixed BUG#9004: Inconsistent behaviour of SP re. warnings · 057b8aa9
  pem@mysql.comhem.se authored Apr 22, 2005
  
  057b8aa9
- Bug#7806 - insert on duplicate key and auto-update of timestamp · 0e7f6a60
  ingo@mysql.com authored Apr 22, 2005
```
A fix of the original patch.
Correctly clear a bit from an enum value.
```
  0e7f6a60
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 51ca05b6
  dlenev@mysql.com authored Apr 22, 2005
```
into mysql.com:/home/dlenev/src/mysql-5.0-bg9486
```
  51ca05b6
21 Apr, 2005 27 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 5b74b6fd
  msvensson@neptunus.(none) authored Apr 21, 2005
```
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
```
  5b74b6fd
- C99 Portability fix · 0c23f81d
  msvensson@neptunus.(none) authored Apr 21, 2005
  
  0c23f81d
- Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 · d4b4cab9
  lenz@mysql.com authored Apr 21, 2005
```
into mysql.com:/space/my/mysql-5.0
```
  d4b4cab9
- Merge mysql.com:/space/my/mysql-4.1-build · a70a3a8e
  lenz@mysql.com authored Apr 21, 2005
```
into mysql.com:/space/my/mysql-5.0-build
```
  a70a3a8e
- - added missing file config_readline.h to the source distribution · 11bb365f
  lenz@mysql.com authored Apr 21, 2005
  
  11bb365f
- C99 Portability fix · 310c3604
  acurtis@xiphis.org authored Apr 21, 2005
  
  310c3604
- Bug#8861 · a6b68d51
  acurtis@xiphis.org authored Apr 21, 2005
```
  Correct previous bugfix
```
  a6b68d51
- Merge · c5d94db3
  acurtis@xiphis.org authored Apr 21, 2005
  
  c5d94db3
- Bug#8861 - If Return is a YEAR data type, value is not shown in year format · f6750758
  acurtis@xiphis.org authored Apr 21, 2005
```
  Bug partially fixed by 9775/9102 work on SP function return.
```
  f6750758
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 · 564eb3dc
  mskold@mysql.com authored Apr 21, 2005
```
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
```
  564eb3dc
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 · 29f8460e
  mskold@mysql.com authored Apr 21, 2005
```
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
```
  29f8460e
- Fix for failing ps_7ndb.test, force write_row when batching inserts so that... · ad9fba9f
  mskold@mysql.com authored Apr 21, 2005
```
Fix for failing ps_7ndb.test, force write_row when batching inserts so that update of primary key is done before next value to insert
```
  ad9fba9f
- Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 · f0c6908a
  pekka@mysql.com authored Apr 21, 2005
```
into mysql.com:/export/space/pekka/ndb/version/my50
```
  f0c6908a
- ndb - fix typo · ae2346dd
  pekka@mysql.com authored Apr 21, 2005
  
  ae2346dd
- Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 · acfd4070
  lenz@mysql.com authored Apr 21, 2005
```
into mysql.com:/space/my/mysql-5.0
```
  acfd4070
- Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · c2a8d2c0
  sergefp@mysql.com authored Apr 21, 2005
```
into mysql.com:/home/psergey/mysql-5.0-bug9912
```
  c2a8d2c0
- Fix for BUG#9912: make the test handle both possible optimizer choices · 0e7e0624
  sergefp@mysql.com authored Apr 21, 2005
  
  0e7e0624
- Disabled test for embedded · 8ee8108c
  mskold@mysql.com authored Apr 21, 2005
  
  8ee8108c
- Re-generated · fcf18daf
  mskold@mysql.com authored Apr 21, 2005
  
  fcf18daf
- Merge mysql.com:/space/my/mysql-5.0 · 22bed100
  lenz@mysql.com authored Apr 21, 2005
```
into mysql.com:/space/my/mysql-5.0-build
```
  22bed100
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8c45ec56
  mskold@mysql.com authored Apr 21, 2005
```
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
```
  8c45ec56
- Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · f8348192
  hf@deer.(none) authored Apr 21, 2005
```
into deer.(none):/home/hf/work/mysql-5.0.clean
```
  f8348192
- After merge fix. · eeda9b3f
  ingo@mysql.com authored Apr 21, 2005
  
  eeda9b3f
- Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · f9a44aa2
  lenz@mysql.com authored Apr 21, 2005
```
into mysql.com:/space/my/mysql-4.1
```
  f9a44aa2
- Merge · b1c8e44e
  mskold@mysql.com authored Apr 21, 2005
  
  b1c8e44e
- Merging · 64f4fd2b
  hf@deer.(none) authored Apr 21, 2005
  
  64f4fd2b
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 · e0fe3e75
  mskold@mysql.com authored Apr 21, 2005
```
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
```
  e0fe3e75