Commits · 34328efe0301bf32dc59b390414268a681e55d8b · Kirill Smelkov / mariadb

24 Mar, 2006 1 commit
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 34328efe
  jonas@perch.ndb.mysql.com authored Mar 24, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
```
  34328efe
23 Mar, 2006 34 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
- ctype-utf8.c, ctype-simple.c: · 94814d73
  bar@mysql.com authored Mar 23, 2006
```
  Forgot to include into the previous changeset.
```
  94814d73
- 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
- Merge perch.ndb.mysql.com:/home/jonas/src/41-work · ca733d4e
  jonas@perch.ndb.mysql.com authored Mar 23, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/50-work
```
  ca733d4e
- ndb - · 82925040
  jonas@perch.ndb.mysql.com authored Mar 23, 2006
```
  remove bug#18385 from autotest as it only works on 2 node clusters
```
  82925040
- 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
- ndb - · 705b741a
  jonas@perch.ndb.mysql.com authored Mar 23, 2006
```
  minor fixes in test programs
```
  705b741a
- 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
- ndb - bug#17813 schema.query => blob · a2263a1f
  pekka@mysql.com authored Mar 23, 2006
  
  a2263a1f
22 Mar, 2006 5 commits
- Make usage of the MYSQL struct in shared libraries compatible with MySQL 5.0.17 and · 905dfa03
  monty@mysql.com authored Mar 23, 2006
```
5.0.18 by not reseting or accessing the info_buffer member
```
  905dfa03
- Fix unused variable warning · 465b2d38
  msvensson@neptunus.(none) authored Mar 22, 2006
  
  465b2d38
- Save core files before removing the data_dir · 02b59fd3
  msvensson@neptunus.(none) authored Mar 22, 2006
  
  02b59fd3
- Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new · 68c2dffb
  lars@mysql.com authored Mar 22, 2006
```
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
```
  68c2dffb
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 6a3b28c2
  tomas@poseidon.ndb.mysql.com authored Mar 22, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
  6a3b28c2