Commits · c53c3b11187255430b6994ba61e3005b2e71162b · nexedi / MariaDB

11 Apr, 2005 12 commits
- Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · c53c3b11
  petr@mysql.com authored Apr 11, 2005
```
into mysql.com:/home/cps/mysql/trees/mysql-5.0
```
  c53c3b11
- Merge mysqldev@production.mysql.com:my/mysql-5.0-build · 9c015f2a
  petr@mysql.com authored Apr 11, 2005
```
into mysql.com:/home/cps/mysql/trees/mysql-5.0
```
  9c015f2a
- make server logs less frightening, when using IM · da1d3030
  petr@mysql.com authored Apr 11, 2005
  
  da1d3030
- Fix for bug #9808 · 48b3332b
  petr@mysql.com authored Apr 11, 2005
  
  48b3332b
- Fix for Bug #9589 · ace47c77
  petr@mysql.com authored Apr 11, 2005
  
  ace47c77
- Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · c6e1a482
  bar@mysql.com authored Apr 11, 2005
```
into mysql.com:/usr/home/bar/mysql-5.0
```
  c6e1a482
- ndb - csc#4847 - manual merge 4.1->5.0 · fd5b9f7e
  pekka@mysql.com authored Apr 11, 2005
  
  fd5b9f7e
- merge · 71f530c4
  bar@mysql.com authored Apr 11, 2005
  
  71f530c4
- Manual transfer of the change in "configure.in" (4.1) to "config/ac-macros/character_sets.m4". · fc0e6aa2
  joerg@mysql.com authored Apr 11, 2005
  
  fc0e6aa2
- Proper handling of "utf8-general-cs" clollation: Missing parts in configuration. · 198b6117
  joerg@mysql.com authored Apr 11, 2005
  
  198b6117
- Merge mysql.com:/home/jonas/src/mysql-4.1 · 588559e3
  joreland@mysql.com authored Apr 11, 2005
```
into mysql.com:/home/jonas/src/mysql-5.0
```
  588559e3
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · ed951583
  joreland@mysql.com authored Apr 11, 2005
```
into mysql.com:/home/jonas/src/mysql-5.0
```
  ed951583
10 Apr, 2005 2 commits
- ctype_collate.result, ctype_collate.test, union.result, union.test: · 16e18677
  bar@mysql.com authored Apr 10, 2005
```
  fixing tests accordingly
item.cc:
  Allow mixing non-binary collation and binary collation
  even if coercibility is the same. 
  For easier 4.0 -> 4.1 migrating.
```
  16e18677
- ndb - testOIBasic.cpp: 4.1->5.0 fix · dbae73bf
  pekka@mysql.com authored Apr 10, 2005
  
  dbae73bf
09 Apr, 2005 3 commits
- New versions of mail_to_db.pl and pmail.pl. · b47f7902
  jani@a193-229-222-105.elisa-laajakaista.fi authored Apr 09, 2005
```
Added email threading capabilities to both
programs.
```
  b47f7902
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · aae638bb
  acurtis@xiphis.org authored Apr 09, 2005
```
into xiphis.org:/.amd_mnt/bk.anubis/host/work-acurtis/bug6776.1
```
  aae638bb
- Fix warning and error when compiling on Windows. · 9b4f1060
  jimw@mysql.com authored Apr 09, 2005
  
  9b4f1060
08 Apr, 2005 23 commits
- Merge xiphis.org:/var/db/bk/work-acurtis/bug6776.1 · dcc40a08
  acurtis@xiphis.org authored Apr 09, 2005
```
into xiphis.org:/var/db/bk/work-acurtis/bug6776.2
```
  dcc40a08
- Fix typos in Bug#6776 · 0998ec42
  acurtis@xiphis.org authored Apr 09, 2005
  
  0998ec42
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · 402ceb32
  mskold@mysql.com authored Apr 08, 2005
```
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
```
  402ceb32
- Merge xiphis.org:/var/db/bk/work-acurtis/bug6776 · e82edda6
  acurtis@xiphis.org authored Apr 08, 2005
```
into xiphis.org:/var/db/bk/work-acurtis/bug6776.1
```
  e82edda6
- Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 · a0af6bb7
  marko@hundin.mysql.fi authored Apr 08, 2005
```
into hundin.mysql.fi:/home/marko/mysql-4.1
```
  a0af6bb7
- Fixed BUG#9073: Able to declare two handlers for same condition in same scope · 2038ced4
  pem@mysql.comhem.se authored Apr 08, 2005
  
  2038ced4
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0ee6e48b
  mskold@mysql.com authored Apr 08, 2005
```
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
```
  0ee6e48b
- Merge · e8f45332
  mskold@mysql.com authored Apr 08, 2005
  
  e8f45332
- Merge mysql.com:/usr/local/bk/mysql-5.0 · e6d72f1c
  pem@mysql.com authored Apr 08, 2005
```
into mysql.com:/home/pem/work/mysql-5.0
```
  e6d72f1c
- Fixed BUG#6900: Stored procedure inner handler ignored · ce2e40ac
  pem@mysql.comhem.se authored Apr 08, 2005
```
  and BUG#9074: STORED PROC: The scope of every handler declared is not properly applied
```
  ce2e40ac
- Merge from fix of Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage · 497f2684
  mskold@mysql.com authored Apr 08, 2005
  
  497f2684
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 · ea39dffb
  joerg@mysql.com authored Apr 08, 2005
```
into mysql.com:/M41/mysql-4.1
```
  ea39dffb
- Fixed BUG#7299: Stored procedures: exception handler catches not-found conditions · e99da54f
  pem@mysql.comhem.se authored Apr 08, 2005
  
  e99da54f
- Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/clone-4.1.11 · 55ee7b92
  joerg@mysql.com authored Apr 08, 2005
  
  55ee7b92
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · d8a5305d
  joreland@mysql.com authored Apr 08, 2005
```
into mysql.com:/home/jonas/src/mysql-4.1
```
  d8a5305d
- bug#9749 - ndb · 72d89cc2
  joreland@mysql.com authored Apr 08, 2005
```
  test case for case 9749, ndb lock upgrade via NDBAPI
```
  72d89cc2
- Add missing parts for the "Cybozu" custom build, to avoid future manual patches. · 6bd1bea7
  joerg@mysql.com authored Apr 08, 2005
  
  6bd1bea7
- Fixed broken auto_increment · 20a82a1a
  mskold@mysql.com authored Apr 08, 2005
  
  20a82a1a
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7c38f9d8
  mskold@mysql.com authored Apr 08, 2005
```
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
```
  7c38f9d8
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 · 817f2c6a
  mskold@mysql.com authored Apr 08, 2005
```
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
```
  817f2c6a
- Added more tests for auto_increment · 813cc0ea
  mskold@mysql.com authored Apr 08, 2005
  
  813cc0ea
- Test result fixed · eae3f5ba
  hf@deer.(none) authored Apr 08, 2005
  
  eae3f5ba
- Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 33cd3168
  hf@deer.(none) authored Apr 08, 2005
```
into deer.(none):/home/hf/work/mysql-5.0.errmsg
```
  33cd3168