Commits · fdb645d187f25f38549d780e48e60010ce79f3d1 · nexedi / MariaDB

22 Jul, 2005 2 commits
- Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 · fdb645d1
  mronstrom@mysql.com authored Jul 22, 2005
```
into  mysql.com:/Users/mikron/mysql-5.1
```
  fdb645d1
- Fixed error in constants · 9203d355
  mronstrom@mysql.com authored Jul 22, 2005
  
  9203d355
21 Jul, 2005 38 commits
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · d9615672
  ndbdev@dl145b.mysql.com authored Jul 21, 2005
```
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
```
  d9615672
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · f5f56e49
  ndbdev@dl145b.mysql.com authored Jul 21, 2005
```
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
```
  f5f56e49
- merge fix · c1c504ab
  gluh@eagle.intranet.mysql.r18.ru authored Jul 21, 2005
  
  c1c504ab
- Fixed test cases for hash and linear hash and fixed guess in NDB API · b25cbdba
  mronstrom@mysql.com authored Jul 21, 2005
```
for this as well
```
  b25cbdba
- Merge mysql.com:/home/gluh/MySQL/Merge/4.1 · d0086f7d
  gluh@mysql.com authored Jul 21, 2005
```
into mysql.com:/home/gluh/MySQL/Merge/5.0
```
  d0086f7d
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1 · f2048cb2
  joerg@mysql.com authored Jul 21, 2005
```
into mysql.com:/M51/mysql-5.1
```
  f2048cb2
- Increase the version to 5.1.1, as 5.1.0 has been cloned off. · 28f7dc8c
  joerg@mysql.com authored Jul 21, 2005
  
  28f7dc8c
- Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · bd35a72d
  bar@mysql.com authored Jul 21, 2005
```
into  mysql.com:/usr/home/bar/mysql-4.1.b11216
```
  bd35a72d
- Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1b3df541
  hf@deer.(none) authored Jul 21, 2005
```
into deer.(none):/home/hf/work/mysql-5.0.10839
```
  1b3df541
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · d9f7fbe7
  joreland@mysql.com authored Jul 21, 2005
```
into  mysql.com:/home/jonas/src/mysql-4.1-push
```
  d9f7fbe7
- ctype-latin1.c: · 6d912fb2
  bar@mysql.com authored Jul 21, 2005
```
  removing extra empty line
  ,
```
  6d912fb2
- Bug#11216: 'show character set' describes latin1 incorrectly · 6a97af8a
  bar@mysql.com authored Jul 21, 2005
```
Index.xml:
  Fixing latin1 comment:
  it is actually cp1252, not iso-8859-1
ctype_latin1.result:
  changeing test results accordingly.
ctype-latin1.c:
  Fixed to- and from-Unicode conversion maps
  for better Unicode round trip of undefined
  characters.
```
  6a97af8a
- Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2d5cd491
  hf@deer.(none) authored Jul 21, 2005
```
into deer.(none):/home/hf/work/mysql-5.0.10839
```
  2d5cd491
- Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7f758438
  lenz@mysql.com authored Jul 21, 2005
```
into mysql.com:/space/my/mysql-4.1
```
  7f758438
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · d931417c
  ndbdev@dl145b.mysql.com authored Jul 21, 2005
```
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
```
  d931417c
- Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7a662614
  lenz@mysql.com authored Jul 21, 2005
```
into mysql.com:/space/my/mysql-5.0
```
  7a662614
- Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 · 1d11e889
  hf@deer.(none) authored Jul 21, 2005
```
into deer.(none):/home/hf/work/mysql-5.0.10839
```
  1d11e889
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 12d68208
  joreland@mysql.com authored Jul 21, 2005
```
into  mysql.com:/home/jonas/src/mysql-4.1-push
```
  12d68208
- Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6efc5da0
  lenz@mysql.com authored Jul 21, 2005
```
into mysql.com:/space/my/mysql-5.0
```
  6efc5da0
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 328f06bf
  joreland@mysql.com authored Jul 21, 2005
```
into  mysql.com:/home/jonas/src/mysql-5.0-push
```
  328f06bf
- Merge mysql.com:/home/jonas/src/mysql-5.0 · 8b0a798c
  joreland@mysql.com authored Jul 21, 2005
```
into  mysql.com:/home/jonas/src/mysql-5.0-push
```
  8b0a798c
- Merge mysql.com:/home/jonas/src/mysql-4.1 · 5faa698e
  joreland@mysql.com authored Jul 21, 2005
```
into  mysql.com:/home/jonas/src/mysql-5.0
```
  5faa698e
- Merge mysql.com:/home/jonas/src/mysql-4.1 · 5939b37f
  joreland@mysql.com authored Jul 21, 2005
```
into  mysql.com:/home/jonas/src/mysql-4.1-push
```
  5939b37f
- bug#11942 - ndb - backup during DDL · a7830ed9
  joreland@mysql.com authored Jul 21, 2005
```
  fix bug introduced in alter table
```
  a7830ed9
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · c7b20f53
  ndbdev@dl145b.mysql.com authored Jul 21, 2005
```
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
```
  c7b20f53
- Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1a305963
  lenz@mysql.com authored Jul 21, 2005
```
into mysql.com:/space/my/mysql-4.1
```
  1a305963
- Merge mysql.com:/usr/home/bar/mysql-4.1 · 568786a9
  bar@mysql.com authored Jul 21, 2005
```
into  mysql.com:/usr/home/bar/mysql-5.0
```
  568786a9
- ctype-cp932.c: · b11e7838
  bar@mysql.com authored Jul 21, 2005
```
  After backporting from 5.0 fix.
  There is no an extra argument in 4.1.
```
  b11e7838
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 99744a9f
  joreland@mysql.com authored Jul 21, 2005
```
into  mysql.com:/home/jonas/src/mysql-4.1-push
```
  99744a9f
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 121d087d
  joreland@mysql.com authored Jul 21, 2005
```
into  mysql.com:/home/jonas/src/mysql-5.0-push
```
  121d087d
- Included partitioning into embedded server · e44ee764
  pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jul 21, 2005
  
  e44ee764
- Merge mysql.com:/home/jonas/src/mysql-5.0 · faff1935
  joreland@mysql.com authored Jul 21, 2005
```
into  mysql.com:/home/jonas/src/mysql-5.0-push
```
  faff1935
- Merge mysql.com:/space/my/mysql-4.1 · 805ff291
  lenz@mysql.com authored Jul 21, 2005
```
into mysql.com:/space/my/mysql-4.1-build
```
  805ff291
- merge · a5c6ab3c
  joreland@mysql.com authored Jul 21, 2005
  
  a5c6ab3c
- Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1ff1301d
  pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jul 21, 2005
```
into  c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
```
  1ff1301d
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · f4fe2c3b
  ndbdev@dl145b.mysql.com authored Jul 21, 2005
```
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
```
  f4fe2c3b
- Fix merge mistake · 5cdaf463
  pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jul 21, 2005
  
  5cdaf463
- Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6026054e
  pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jul 21, 2005
```
into  c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
```
  6026054e