Commits · 69d09a4a5bdb281ab72abc653c7d70818fe8210a · nexedi / MariaDB

09 Apr, 2006 2 commits
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 69d09a4a
  jonas@perch.ndb.mysql.com authored Apr 09, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
```
  69d09a4a
- Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb · 263276c5
  jonas@perch.ndb.mysql.com authored Apr 09, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
```
  263276c5
08 Apr, 2006 6 commits
- Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 50e5752e
  jonas@perch.ndb.mysql.com authored Apr 08, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  50e5752e
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 965d6ac6
  jonas@perch.ndb.mysql.com authored Apr 08, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/51-work
```
  965d6ac6
- Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 64c8342f
  jonas@perch.ndb.mysql.com authored Apr 08, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
```
  64c8342f
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new · e5de83a6
  jonas@perch.ndb.mysql.com authored Apr 08, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
```
  e5de83a6
- Merge mysql.com:/home/mydev/mysql-5.1 · 26c4e82f
  ingo@mysql.com authored Apr 08, 2006
```
into  mysql.com:/home/mydev/mysql-5.1-aid
```
  26c4e82f
- Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 2e662287
  igor@rurik.mysql.com authored Apr 07, 2006
```
into  rurik.mysql.com:/home/igor/mysql-5.1
```
  2e662287
07 Apr, 2006 32 commits
- Merge mysql.com:/home/mydev/mysql-5.1 · ddf81838
  ingo@mysql.com authored Apr 07, 2006
```
into  mysql.com:/home/mydev/mysql-5.1-aid
```
  ddf81838
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 5eefa6ec
  serg@serg.mylan authored Apr 07, 2006
```
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
```
  5eefa6ec
- plugin/fulltext/configure.in · c17d3a51
  serg@serg.mylan authored Apr 07, 2006
```
    no sense in building static library version of a plugin
plugin/fulltext/plugin_example.c
    comments clarified. everything local to a plugin was declared static
```
  c17d3a51
- Merge rurik.mysql.com:/home/igor/mysql-5.1 · 0d2e9112
  igor@rurik.mysql.com authored Apr 07, 2006
```
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
```
  0d2e9112
- ndb - bug#11034 · 739b0d67
  jonas@perch.ndb.mysql.com authored Apr 07, 2006
```
  fix mem leak (not during running of transactions, but a few bytes when shutting down)
```
  739b0d67
- ndb - bug#11033 · 7cd90d00
  jonas@perch.ndb.mysql.com authored Apr 07, 2006
```
  silent valgrind warnings 5.0, ndb_autodiscover
```
  7cd90d00
- configure.in: · 1ec91193
  bpontz@shasta.mysql.com authored Apr 07, 2006
```
  increase version number for clone
```
  1ec91193
- Merge mysql.com:/home/mydev/mysql-5.1 · 2697018c
  ingo@mysql.com authored Apr 07, 2006
```
into  mysql.com:/home/mydev/mysql-5.1-aid
```
  2697018c
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new · a663acb1
  joerg@mysql.com authored Apr 07, 2006
```
into mysql.com:/M51/merge-5.1
```
  a663acb1
- Null-merge, as the changes in question were backports from 5.1. · 24bf40ca
  joerg@mysql.com authored Apr 07, 2006
  
  24bf40ca
- Manual merge. · 945599f3
  joerg@mysql.com authored Apr 07, 2006
  
  945599f3
- mysql-test/mysql-test-run.pl : Add option "with-ndbcluster-only" (ignored). · 65f4595e
  joerg@mysql.com authored Apr 07, 2006
  
  65f4595e
- Manual merge. · df09a0ce
  joerg@mysql.com authored Apr 07, 2006
  
  df09a0ce
- Perl test script: Avoid some aborts, which made the whole build/test process terminate. · 7e4d41de
  joerg@mysql.com authored Apr 07, 2006
  
  7e4d41de
- Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 452a2fb1
  jonas@perch.ndb.mysql.com authored Apr 07, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  452a2fb1
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 26b94adc
  jonas@perch.ndb.mysql.com authored Apr 07, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
```
  26b94adc
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 8db57d7b
  serg@serg.mylan authored Apr 07, 2006
```
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
```
  8db57d7b
- rpl_ndb_delete_nowhere.test requires ndb · 16204264
  serg@serg.mylan authored Apr 07, 2006
  
  16204264
- Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 1d816d2c
  andrey@lmy004. authored Apr 07, 2006
```
into lmy004.:/work/mysql-5.1-bug17494-real
```
  1d816d2c
- mysql-test/mysql-test-run.sh : Add option "--with-ndbcluster-only" (backport from 5.1) · a0541800
  joerg@mysql.com authored Apr 07, 2006
  
  a0541800
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · a5ed8bf6
  serg@serg.mylan authored Apr 07, 2006
```
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
```
  a5ed8bf6
- Merge perch.ndb.mysql.com:/home/jonas/src/50-jonas · 878ce564
  jonas@perch.ndb.mysql.com authored Apr 07, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/51-work
```
  878ce564
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-jonas · 2d284fe0
  jonas@perch.ndb.mysql.com authored Apr 07, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/50-jonas
```
  2d284fe0
- multi node shutdown adabtions for restart of management servers · d202d89c
  tomas@poseidon.ndb.mysql.com authored Apr 07, 2006
  
  d202d89c
- update tests · bdfdd38f
  andrey@lmy004. authored Apr 07, 2006
  
  bdfdd38f
- Merge mysql.com:/home/hartmut/projects/mysql/dev/5.0 · 4a4c459f
  hartmut@mysql.com authored Apr 07, 2006
```
into  mysql.com:/home/hartmut/projects/mysql/dev/5.1
```
  4a4c459f
- fix for wrong QUARTER calculation in EXTRACT() (Bug #18100) · 7ed2c620
  hartmut@mysql.com authored Apr 07, 2006
  
  7ed2c620
- Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 · b6b06b83
  jonas@perch.ndb.mysql.com authored Apr 07, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/50-work
```
  b6b06b83
- Support for ndb multi-node shutdown · 7fd9d66c
  tomas@poseidon.ndb.mysql.com authored Apr 07, 2006
  
  7fd9d66c
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 216fb557
  serg@serg.mylan authored Apr 07, 2006
```
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
```
  216fb557
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 34aa77dd
  jonas@perch.ndb.mysql.com authored Apr 07, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/50-jonas
```
  34aa77dd
- Fix for bug#18281 group_concat changes charset to binary · 4ef7e5b5
  gluh@eagle.intranet.mysql.r18.ru authored Apr 07, 2006
```
 skip charset aggregation for order columns
```
  4ef7e5b5