Commits · f4d4cc6e7bfcfbf6d1ebd4d2b2a4f573f91c1b60 · nexedi / MariaDB

18 Jan, 2006 1 commit
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · f4d4cc6e
  joerg@mysql.com authored Jan 18, 2006
```
into mysql.com:/M50/merge-5.0
```
  f4d4cc6e
17 Jan, 2006 12 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · e55af527
  msvensson@neptunus.(none) authored Jan 17, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
```
  e55af527
- Bug#15206: "Misleading message "No data to FETCH": · 8d6c98ed
  konstantin@mysql.com authored Jan 17, 2006
```
reword the misleading message.
```
  8d6c98ed
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · f729ad7d
  msvensson@neptunus.(none) authored Jan 17, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
```
  f729ad7d
- Fix for connection not being added to connection pool if "disable_abort_on_error" was used. · 8b243b37
  msvensson@neptunus.(none) authored Jan 17, 2006
  
  8b243b37
- Merge mysql.com:/extern/mysql/bk/mysql-5.0 · ef68a070
  pem@mysql.com authored Jan 17, 2006
```
into  mysql.com:/extern/mysql/work/bug15231/mysql-5.0
```
  ef68a070
- Post-review fix. (BUG#15231) · ba01e04a
  pem@mysql.com authored Jan 17, 2006
  
  ba01e04a
- Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2df00e30
  jani@hundin.mysql.fi authored Jan 17, 2006
```
into  hundin.mysql.fi:/home/jani/mysql-5.0
```
  2df00e30
- Merge mysql.com:/extern/mysql/bk/mysql-5.0 · 7817b998
  pem@mysql.com authored Jan 17, 2006
```
into  mysql.com:/extern/mysql/work/bug15231/mysql-5.0
```
  7817b998
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · 802c578c
  joerg@mysql.com authored Jan 17, 2006
```
into mysql.com:/M50/merge-5.0
```
  802c578c
- Merge jani@193.229.222.105:/my/bk/mysql-5.0 · 14661602
  jani@hundin.mysql.fi authored Jan 17, 2006
```
into  hundin.mysql.fi:/home/jani/mysql-5.0
```
  14661602
- Merge mysql.com:/extern/mysql/bk/mysql-5.0 · 2f44b607
  pem@mysql.com authored Jan 17, 2006
```
into  mysql.com:/extern/mysql/work/bug14498/mysql-5.0
```
  2f44b607
- Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0168444a
  jani@a193-229-222-105.elisa-laajakaista.fi authored Jan 17, 2006
```
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
```
  0168444a
16 Jan, 2006 27 commits
- Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8b7bfe14
  jani@hundin.mysql.fi authored Jan 17, 2006
```
into  hundin.mysql.fi:/home/jani/mysql-5.0
```
  8b7bfe14
- A post-merge fix. · 4fd615ab
  konstantin@mysql.com authored Jan 17, 2006
  
  4fd615ab
- Merge mysql.com:/opt/local/work/mysql-4.1-root · c05b3f3b
  konstantin@mysql.com authored Jan 17, 2006
```
into  mysql.com:/opt/local/work/mysql-5.0-root
```
  c05b3f3b
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 59b1c9c8
  konstantin@mysql.com authored Jan 17, 2006
```
into  mysql.com:/opt/local/work/mysql-4.1-root
```
  59b1c9c8
- A fix for Bug#13337 "ps test fails if configure wo/ usc2" · 739ba76d
  konstantin@mysql.com authored Jan 17, 2006
  
  739ba76d
- Merge mysql.com:/opt/local/work/mysql-4.1-root · 34c37d1a
  konstantin@mysql.com authored Jan 17, 2006
```
into  mysql.com:/opt/local/work/mysql-5.0-root
```
  34c37d1a
- A test case for Bug#6073 "ALTER TABLE minor glitch" (can't repeat) · 3d167583
  konstantin@mysql.com authored Jan 17, 2006
  
  3d167583
- Changed condition similar to code in 4.1. · 41ff5c80
  jani@a193-229-222-105.elisa-laajakaista.fi authored Jan 16, 2006
  
  41ff5c80
- Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6eef0534
  jani@a193-229-222-105.elisa-laajakaista.fi authored Jan 16, 2006
```
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
```
  6eef0534
- Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 · b948c294
  jani@a193-229-222-105.elisa-laajakaista.fi authored Jan 16, 2006
```
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
```
  b948c294
- A test case for Bug#7670 "Loss of precision for some integer · f693473f
  konstantin@mysql.com authored Jan 16, 2006
```
values stored into DOUBLE column" (Can't repeat)
```
  f693473f
- Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 · 2659e797
  jani@a193-229-222-105.elisa-laajakaista.fi authored Jan 16, 2006
```
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
```
  2659e797
- Post-merge fixes (BUG#14498) · 5863337b
  pem@mysql.com authored Jan 16, 2006
  
  5863337b
- extra/comp_err.c : Fix a merge error. · 5da306b5
  joerg@mysql.com authored Jan 16, 2006
  
  5da306b5
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 905fdbf1
  msvensson@neptunus.(none) authored Jan 16, 2006
```
into  neptunus.(none):/home/msvensson/mysql/bug6554/my50-bug6554
```
  905fdbf1
- Manual merge of the fix for bug#16106. · fa91e05b
  joerg@mysql.com authored Jan 16, 2006
```
Currently failing tests (for me) in non-debug build:
blackhole fulltext fulltext_cache fulltext_left_join fulltext_multi
```
  fa91e05b
- Merge · 7b2238d4
  andrey@lmy004. authored Jan 16, 2006
  
  7b2238d4
- Merge mysql.com:/usr/local/mysql/mysql-5.x-win-test-fixes · 638aef7f
  knielsen@mysql.com authored Jan 16, 2006
```
into  mysql.com:/usr/local/mysql/mysql-5.0-win-test-fixes
```
  638aef7f
- Merge mysql.com:/extern/mysql/bk/mysql-5.0 · 559a2436
  pem@mysql.com authored Jan 16, 2006
```
into  mysql.com:/extern/mysql/work/bug14498/mysql-5.0
```
  559a2436
- Two minor fixes to be able to run tests from within a Windows Max · 1b75cf8a
  knielsen@mysql.com authored Jan 16, 2006
```
build directory.
```
  1b75cf8a
- Post-review fix (BUG#14498). · a1b2960a
  pem@mysql.com authored Jan 16, 2006
  
  a1b2960a
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 9c2a5cc8
  msvensson@neptunus.(none) authored Jan 16, 2006
```
into  neptunus.(none):/home/msvensson/mysql/bug6554/my50-bug6554
```
  9c2a5cc8
- Restore fix for bug #15108 (by ramil) erroneously erased · 442dcf8b
  aivanov@mysql.com authored Jan 16, 2006
```
 by applying innodb-5.0-ss115 snapshot.
```
  442dcf8b
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 8238f355
  msvensson@neptunus.(none) authored Jan 16, 2006
```
into  neptunus.(none):/home/msvensson/mysql/bug6554/my41-bug6554
```
  8238f355
- Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0efdc24a
  aivanov@mysql.com authored Jan 16, 2006
```
into  mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss115
```
  0efdc24a
- Merge bk-internal:/home/bk/mysql-4.0 · 81cef460
  msvensson@neptunus.(none) authored Jan 16, 2006
```
into  neptunus.(none):/home/msvensson/mysql/bug6554/my40-bug6554
```
  81cef460
- Merge neptunus.(none):/home/msvensson/mysql/bug6554/my41-bug6554 · 19fd64d1
  msvensson@neptunus.(none) authored Jan 16, 2006
```
into  neptunus.(none):/home/msvensson/mysql/bug6554/my50-bug6554
```
  19fd64d1