Commits · 0568175984522c082a7ef6f7fb076e1c82f8f44b · Kirill Smelkov / mariadb

24 Mar, 2006 1 commit
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 05681759
  msvensson@shellback.(none) authored Mar 24, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
```
  05681759
23 Mar, 2006 39 commits
- Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 8eab1ba0
  brian@zim.(none) authored Mar 23, 2006
```
into  zim.(none):/home/brian/mysql/dep-5.1
```
  8eab1ba0
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 5cc1da54
  tomas@poseidon.ndb.mysql.com authored Mar 23, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
  5cc1da54
- Bug #18472 race condition between multiple mysqld's when setting up cluster/schema · 57198f85
  tomas@poseidon.ndb.mysql.com authored Mar 23, 2006
```
- check that event is the correct one, and only delete if wrong version
```
  57198f85
- Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 56844bf3
  brian@zim.(none) authored Mar 23, 2006
```
into  zim.(none):/home/brian/mysql/dep-5.1
```
  56844bf3
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 2ef46f5a
  msvensson@shellback.(none) authored Mar 23, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
```
  2ef46f5a
- ctype-utf8.c, ctype-simple.c: · 94814d73
  bar@mysql.com authored Mar 23, 2006
```
  Forgot to include into the previous changeset.
```
  94814d73
- Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 · b5bea5e3
  msvensson@shellback.(none) authored Mar 23, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
```
  b5bea5e3
- Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 9fc9d0f2
  brian@zim.(none) authored Mar 23, 2006
```
into  zim.(none):/home/brian/mysql/dep-5.1
```
  9fc9d0f2
- Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · add4b40e
  bar@mysql.com authored Mar 23, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.1-new
```
  add4b40e
- Remove unused option "verbose" · f4426c0d
  msvensson@shellback.(none) authored Mar 23, 2006
  
  f4426c0d
- Moved "tmpdir" and 2vardor" to the documented flags and add some documentation · 8091b7b5
  msvensson@shellback.(none) authored Mar 23, 2006
  
  8091b7b5
- Add support fo --manual-debug, --manual-gdb and -manual-ddd · 6a65f08c
  msvensson@shellback.(none) authored Mar 23, 2006
```
Touchups
```
  6a65f08c
- Update after merge, function renamed · 5ebda1d2
  msvensson@shellback.(none) authored Mar 23, 2006
  
  5ebda1d2
- Merge shellback.(none):/home/msvensson/mysql/mysqltestrun_pl/my50-mysqltestrun_pl · e6bf664c
  msvensson@shellback.(none) authored Mar 23, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
```
  e6bf664c
- mysql-test-run.pl · 2b38c41b
  msvensson@shellback.(none) authored Mar 23, 2006
```
Add support for debuggers and impove support for valgrind
```
  2b38c41b
- Dump reject file before mysqltest in 'die' · 5ec7aa3a
  msvensson@shellback.(none) authored Mar 23, 2006
```
Makes it easier to see what happened before the failure
```
  5ec7aa3a
- Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · aced1175
  brian@zim.(none) authored Mar 23, 2006
```
into  zim.(none):/home/brian/mysql/dep-5.1
```
  aced1175
- Refactored some code to remove ifdef and removed dead code related to un-useable sync code. · bdfb7180
  brian@zim.(none) authored Mar 23, 2006
  
  bdfb7180
- Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new · 0ba9ad02
  lars@mysql.com authored Mar 23, 2006
```
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
```
  0ba9ad02
- Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new · c54b8647
  pekka@mysql.com authored Mar 23, 2006
```
into  mysql.com:/export/space/pekka/ndb/version/my51
```
  c54b8647
- Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new · 5c246eb9
  lars@mysql.com authored Mar 23, 2006
```
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
```
  5c246eb9
- Merge mysql.com:/usr/home/bar/mysql-5.0 · b2b020b3
  bar@mysql.com authored Mar 23, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.1-new
```
  b2b020b3
- Bug#15376: Unassigned multibyte codes are converted to U+0000 · 296d4b2f
  bar@mysql.com authored Mar 23, 2006
```
Mergeing changes into 5.0
```
  296d4b2f
- m_ctype.h: · 36e92839
  bar@mysql.com authored Mar 23, 2006
```
  Removing duplicate old definition.
  After merge fix for bug#15375
```
  36e92839
- Merge mysql.com:/usr/home/bar/mysql-4.1.b15376 · 1008146d
  bar@mysql.com authored Mar 23, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.0
```
  1008146d
- Merge mysql.com:/users/lthalmann/bk/mysql-5.0 · 9e357e74
  lars@mysql.com authored Mar 23, 2006
```
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
```
  9e357e74
- Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · fb7826ed
  bar@mysql.com authored Mar 23, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.1-new
```
  fb7826ed
- Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · a4d4ed9e
  bar@mysql.com authored Mar 23, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.0
```
  a4d4ed9e
- Merge mysql.com:/usr/home/bar/mysql-5.0 · e4b6264f
  bar@mysql.com authored Mar 23, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.1-new
```
  e4b6264f
- New file to remove sleeps in mysql-test-run (backported from 5.1) · a35a81c7
  lars@mysql.com authored Mar 23, 2006
  
  a35a81c7
- ctype-czech.c: · 6ed5cdfd
  bar@mysql.com authored Mar 23, 2006
```
  Fixing wrong min_sort_char.
```
  6ed5cdfd
- Merge bk-internal:/home/bk/mysql-5.1-new · 40e6821e
  msvensson@neptunus.(none) authored Mar 23, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
  40e6821e
- Merge bk-internal:/home/bk/mysql-5.0 · bc4f7bfd
  msvensson@neptunus.(none) authored Mar 23, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
```
  bc4f7bfd
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · ba2ddc86
  msvensson@neptunus.(none) authored Mar 23, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
  ba2ddc86
- Move the replcae result to before the correct select · c6e6c0d6
  msvensson@neptunus.(none) authored Mar 23, 2006
  
  c6e6c0d6
- Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · b372b28e
  bar@mysql.com authored Mar 23, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.1-new
```
  b372b28e
- Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · ddc37c54
  bar@mysql.com authored Mar 23, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.0
```
  ddc37c54
- Merge mysql.com:/usr/home/bar/mysql-5.0 · 6ab496ac
  bar@mysql.com authored Mar 23, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.1-new
```
  6ab496ac
- Merge mysql.com:/usr/home/bar/mysql-4.1.b17374 · 82de2301
  bar@mysql.com authored Mar 23, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.0
```
  82de2301