Commits · c15a5a2b263b0d2b9e5693ca5838b54c8f3581b7 · Kirill Smelkov / mariadb

15 Jun, 2006 3 commits
- Merge mysql.com:/usr/home/ram/work/mysql-4.1 · c15a5a2b
  ramil@mysql.com authored Jun 15, 2006
```
into  mysql.com:/usr/home/ram/work/mysql-5.0
```
  c15a5a2b
- Fix for bug#19667 group by a decimal expression yields wrong result · 00fcdf8c
  gluh@eagle.intranet.mysql.r18.ru authored Jun 15, 2006
  
  00fcdf8c
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 26fa98a2
  ramil@mysql.com authored Jun 15, 2006
```
into  mysql.com:/usr/home/ram/work/4.1.b15558
```
  26fa98a2
14 Jun, 2006 19 commits
- Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 · 94c9e172
  msvensson@devsrv-b.mysql.com authored Jun 14, 2006
```
into  devsrv-b.mysql.com:/users/msvensson/mysql-5.0
```
  94c9e172
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 476caec5
  tomas@poseidon.ndb.mysql.com authored Jun 14, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
```
  476caec5
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · a2f91ba1
  tomas@poseidon.ndb.mysql.com authored Jun 14, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
```
  a2f91ba1
- Bug#19191 Repeated crashes on OpenBSD for ssl test cases · 4fcf3290
  msvensson@neptunus.(none) authored Jun 14, 2006
```
 - Import patch from yaSSL
```
  4fcf3290
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 0c805b3f
  tomas@poseidon.ndb.mysql.com authored Jun 14, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
```
  0c805b3f
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 · 01046bb7
  tomas@poseidon.ndb.mysql.com authored Jun 14, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
```
  01046bb7
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 · ea6ed5ff
  tomas@poseidon.ndb.mysql.com authored Jun 14, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
```
  ea6ed5ff
- Bug #19493 NDB does not ignore duplicate keys when using LOAD DATA LOCAL · 47271c6b
  tomas@poseidon.ndb.mysql.com authored Jun 14, 2006
```
- correction of backport error
```
  47271c6b
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 · 220345d3
  tomas@poseidon.ndb.mysql.com authored Jun 14, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
```
  220345d3
- Bug #19493 NDB does not ignore duplicate keys when using LOAD DATA LOCAL · 2fcf737f
  tomas@poseidon.ndb.mysql.com authored Jun 14, 2006
```
- make sure to disable bulk insert when check for duplicate key is needed
```
  2fcf737f
- Merge mysql.com:/M41/bug18810-4.1 into mysql.com:/M41/mysql-4.1 · 950b6c8d
  joerg@mysql.com authored Jun 14, 2006
  
  950b6c8d
- Merge mysql.com:/M50/bug18810-5.0 into mysql.com:/M50/mysql-5.0 · 15926709
  joerg@mysql.com authored Jun 14, 2006
  
  15926709
- Merge mysql.com:/M41/bug18810-4.1 into mysql.com:/M50/bug18810-5.0 · 6448fca6
  joerg@mysql.com authored Jun 14, 2006
  
  6448fca6
- support-files/mysql.server.sh : Fix the startup sequence. bug#18810 + bug#20118 · 054cc44e
  joerg@mysql.com authored Jun 14, 2006
  
  054cc44e
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6e2be260
  tomas@poseidon.ndb.mysql.com authored Jun 14, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
```
  6e2be260
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 · 418a8e3a
  tomas@poseidon.ndb.mysql.com authored Jun 14, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
```
  418a8e3a
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 941ddafd
  tomas@poseidon.ndb.mysql.com authored Jun 14, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
```
  941ddafd
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 · 88373a02
  tomas@poseidon.ndb.mysql.com authored Jun 14, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
```
  88373a02
- Bug #18595 repeated create, insert, drop can cause MySQL table definition cache to · 7e2323ed
  tomas@poseidon.ndb.mysql.com authored Jun 14, 2006
```
corrupt
  - add infinite retry on drop table temporary error
```
  7e2323ed
13 Jun, 2006 1 commit
- ndb - bug#20406 multi-platform testing - not FIX · e071bbcb
  pekka@clam.ndb.mysql.com authored Jun 14, 2006
  
  e071bbcb
12 Jun, 2006 17 commits
- Merge mysql.com:/home/kgeorge/mysql/5.0/clean · df358201
  gkodinov@mysql.com authored Jun 12, 2006
```
into  mysql.com:/home/kgeorge/mysql/5.0/B20363
```
  df358201
- Bug #20363: Create view on just created view is now denied · eb693dcc
  gkodinov@mysql.com authored Jun 12, 2006
```
There was a wrong determination of the DB name (witch is 
not always the one in TABLE_LIST because derived tables
may be calculated using temp tables that have their db name
set to "").
The fix determines the database name according to the type 
of table reference, and calls the function check_access() 
with the correct db name so the correct set of grants is found.
```
  eb693dcc
- Added order by · 69d52db9
  mskold@mysql.com authored Jun 12, 2006
  
  69d52db9
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4242beb3
  mskold@mysql.com authored Jun 12, 2006
```
into  mysql.com:/home/marty/MySQL/mysql-5.0
```
  4242beb3
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · a590e5dc
  tomas@poseidon.ndb.mysql.com authored Jun 12, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
```
  a590e5dc
- Added order by · 47bb5699
  mskold@mysql.com authored Jun 12, 2006
  
  47bb5699
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 · 049c3e3f
  mskold@mysql.com authored Jun 12, 2006
```
into  mysql.com:/home/marty/MySQL/mysql-4.1
```
  049c3e3f
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 9ec2be74
  tomas@poseidon.ndb.mysql.com authored Jun 12, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
```
  9ec2be74
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 8d8081ff
  tomas@poseidon.ndb.mysql.com authored Jun 12, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
```
  8d8081ff
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 · 3996410c
  tomas@poseidon.ndb.mysql.com authored Jun 12, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
```
  3996410c
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 · ccd0b3e3
  tomas@poseidon.ndb.mysql.com authored Jun 12, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
```
  ccd0b3e3
- Bug #20336 CLUSTERLOG commands have no effect · 697db8f0
  tomas@poseidon.ndb.mysql.com authored Jun 12, 2006
```
- always calculate max log level on node start
- send event subscribe uncond
```
  697db8f0
- Fix for Bug #18184 SELECT ... FOR UPDATE does not work..: Skipped lock check... · d17c3d3c
  mskold@mysql.com authored Jun 12, 2006
```
 Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Skipped lock check for full table scan due to bug #20390 SELECT FOR UPDATE does not release locks of untouched rows in full table scans
```
  d17c3d3c
- Fix for Bug #18184 SELECT ... FOR UPDATE does not work..: Added missing... · 58f686f9
  mskold@mysql.com authored Jun 12, 2006
```
 Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Added missing parameter for readTuples in index scan
```
  58f686f9
- Merge mysql.com:/home/marty/MySQL/mysql-4.1 · b93ba41e
  mskold@mysql.com authored Jun 12, 2006
```
into  mysql.com:/home/marty/MySQL/mysql-5.0
```
  b93ba41e
- Fix for Bug #18184 SELECT ... FOR UPDATE does not work..: Adapted to 5.0 code changes · e7c1a57f
  mskold@mysql.com authored Jun 12, 2006
  
  e7c1a57f
- Added lock test on index scan · b89f1791
  mskold@mysql.com authored Jun 12, 2006
  
  b89f1791