Commits · 692cebf7935d26b90d44a93f4f19393e75ff555c · Kirill Smelkov / mariadb

30 Jun, 2006 4 commits
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 692cebf7
  jonas@perch.ndb.mysql.com authored Jun 30, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
```
  692cebf7
- Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1 · 68db3261
  elliot@mysql.com authored Jun 30, 2006
```
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
```
  68db3261
- Fixing windows build. · 5cd5e487
  elliot@mysql.com authored Jun 30, 2006
  
  5cd5e487
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 2356a54c
  monty@mysql.com authored Jun 30, 2006
```
into  mysql.com:/home/my/mysql-5.0
```
  2356a54c
29 Jun, 2006 36 commits
- Merge mysql.com:/home/my/mysql-4.1 · d76830fa
  monty@mysql.com authored Jun 30, 2006
```
into  mysql.com:/home/my/mysql-5.0
```
  d76830fa
- Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · d126ca80
  evgen@sunlight.local authored Jun 30, 2006
```
into sunlight.local:/local_work/autopush/merge-4.1
```
  d126ca80
- Fixed include file usage · 8e209929
  monty@mysql.com authored Jun 30, 2006
```
hp_test2 now works again
Fixed wrong cast, which caused problems with gcc 4.0 and floats in prepared statements (Bug #19694)
```
  8e209929
- Merge · 3cc6d95d
  evgen@moonbone.local authored Jun 30, 2006
  
  3cc6d95d
- Merge moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt · 9fd38baf
  evgen@moonbone.local authored Jun 30, 2006
```
into moonbone.local:/work/merge-5.0
```
  9fd38baf
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main · 5f5c3f9c
  tomas@poseidon.ndb.mysql.com authored Jun 30, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/5.0-merge
```
  5f5c3f9c
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · eb4a633a
  tomas@poseidon.ndb.mysql.com authored Jun 30, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/5.0-merge
```
  eb4a633a
- Merge mysql.com:/mnt/storeage/mysql-4.1 · 57e94d02
  iggy@mysql.com authored Jun 29, 2006
```
into  mysql.com:/mnt/storeage/mysql-4.1_bug19298
```
  57e94d02
- Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 83bc48f3
  evgen@moonbone.local authored Jun 30, 2006
```
into moonbone.local:/work/merge-4.1
```
  83bc48f3
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 747c17ff
  tomas@poseidon.ndb.mysql.com authored Jun 29, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
```
  747c17ff
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 97a19c1b
  tomas@poseidon.ndb.mysql.com authored Jun 29, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
```
  97a19c1b
- corrected merge error · 5d67b052
  tomas@poseidon.ndb.mysql.com authored Jun 29, 2006
  
  5d67b052
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 65cec4da
  tomas@poseidon.ndb.mysql.com authored Jun 29, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
```
  65cec4da
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main · 6f318d16
  tomas@poseidon.ndb.mysql.com authored Jun 29, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
```
  6f318d16
- Bug #19202 Incorrect errorhandling in select count(*) wrt temporary error · 87460ec7
  tomas@poseidon.ndb.mysql.com authored Jun 29, 2006
  
  87460ec7
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · dfce04fa
  tomas@poseidon.ndb.mysql.com authored Jun 29, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/5.0-merge
```
  dfce04fa
- Merge mysql.com:/M50/clone-5.0 into mysql.com:/M50/merge-5.0 · 7800da26
  joerg@mysql.com authored Jun 29, 2006
  
  7800da26
- Test "federated" failed because the log contains fixed port numbers. · 6f6b966d
  joerg@mysql.com authored Jun 29, 2006
```
Re-apply a patch by Knielsen in the 5.0.23 build clone: Replace port number by "SLAVE_PORT".
```
  6f6b966d
- Increment the version number. · 1054e8f6
  joerg@mysql.com authored Jun 29, 2006
  
  1054e8f6
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3a36d68f
  jonas@perch.ndb.mysql.com authored Jun 29, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
```
  3a36d68f
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 6c944a91
  jonas@perch.ndb.mysql.com authored Jun 29, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
```
  6c944a91
- Merge perch.ndb.mysql.com:/home/jonas/src/41-work · a45f572d
  jonas@perch.ndb.mysql.com authored Jun 29, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/50-work
```
  a45f572d
- ndb - autotest · f4a095a3
  jonas@perch.ndb.mysql.com authored Jun 29, 2006
```
  Fix testNodeRestart -n DuringLCP and others (add stopTest() at end of test :-))
```
  f4a095a3
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 3010430d
  konstantin@mysql.com authored Jun 29, 2006
```
into  mysql.com:/opt/local/work/mysql-5.0-runtime
```
  3010430d
- Merge mysqldev@production.mysql.com:my/mysql-5.0-release · f24851ee
  lars@mysql.com authored Jun 29, 2006
```
into  mysql.com:/users/lthalmann/bkroot/mysql-5.0-release
```
  f24851ee
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 2d9d740d
  konstantin@mysql.com authored Jun 29, 2006
```
into  mysql.com:/opt/local/work/mysql-5.0-runtime
```
  2d9d740d
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 1cb6eb00
  konstantin@mysql.com authored Jun 29, 2006
```
into  mysql.com:/opt/local/work/mysql-5.0-runtime
```
  1cb6eb00
- A post-merge fix. · 5154bc6c
  konstantin@mysql.com authored Jun 29, 2006
  
  5154bc6c
- Merge mysql.com:/home/stewart/Documents/MySQL/4.1/ndb · e343c0e2
  stewart@mysql.com authored Jun 29, 2006
```
into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
```
  e343c0e2
- Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 · 0e45d269
  lars@mysql.com authored Jun 29, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
```
  0e45d269
- Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl · 0707d475
  lars@mysql.com authored Jun 29, 2006
```
into  mysql.com:/users/lthalmann/bkroot/mysql-5.0-release
```
  0707d475
- Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb · 4e59b435
  stewart@mysql.com authored Jun 29, 2006
```
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
```
  4e59b435
- Merge mysql.com:/opt/local/work/mysql-5.0-release · 06c2f1a2
  konstantin@mysql.com authored Jun 29, 2006
```
into  mysql.com:/opt/local/work/mysql-5.0-runtime
```
  06c2f1a2
- Merge mysqldev@production.mysql.com:my/mysql-5.0-release · c6d9b5c5
  jonas@perch.ndb.mysql.com authored Jun 29, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-release
```
  c6d9b5c5
- Merge mysqldev@production.mysql.com:my/mysql-5.0-release · 48de09a4
  tomas@poseidon.ndb.mysql.com authored Jun 29, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
```
  48de09a4
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 6df1090e
  tomas@poseidon.ndb.mysql.com authored Jun 29, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
```
  6df1090e