Commits · 54dfe4a66a5bc2a17098aa0597b3a1a299cb61f0 · nexedi / MariaDB

20 Apr, 2005 3 commits
- Fixed BUG#7047: Stored procedure crash if alter procedure · 54dfe4a6
  pem@mysql.comhem.se authored Apr 20, 2005
```
  by simply disallowing alter procedure/function in an SP (as for drop).
```
  54dfe4a6
- Fixed BUG#6898: Stored procedure crash if GOTO statements exist · 189d6b50
  pem@mysql.comhem.se authored Apr 20, 2005
```
  Bug in the optimizer caused an infinite loop for weird code.
```
  189d6b50
- Fixed Bug#8046 --mysqld of mysqld_safe must contain substring "mysqld" · ff665c95
  jani@a193-229-222-105.elisa-laajakaista.fi authored Apr 20, 2005
  
  ff665c95
19 Apr, 2005 6 commits
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · dee14fdd
  joerg@mysql.com authored Apr 19, 2005
```
into mysql.com:/M50/mysql-5.0
```
  dee14fdd
- Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/push-5.0 · 91b0f861
  joerg@mysql.com authored Apr 19, 2005
  
  91b0f861
- Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 · 110025e6
  jan@hundin.mysql.fi authored Apr 19, 2005
```
into hundin.mysql.fi:/home/jan/orig/mysql-5.0
```
  110025e6
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · ba51f96e
  acurtis@xiphis.org authored Apr 19, 2005
```
into xiphis.org:/.amd_mnt/bk.anubis/host/work-acurtis/bug9496
```
  ba51f96e
- Merge changes from 4.1.x to 5.0.x. Only a style changes. · 09a425fa
  jan@hundin.mysql.fi authored Apr 19, 2005
  
  09a425fa
- Style change. Use 1 and 0 instead of true and false. · 1f994ec9
  jan@hundin.mysql.fi authored Apr 19, 2005
  
  1f994ec9
18 Apr, 2005 15 commits
- Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · ea9cbd3b
  igor@rurik.mysql.com authored Apr 18, 2005
```
into rurik.mysql.com:/home/igor/mysql-5.0
```
  ea9cbd3b
- view.result: · 60164ced
  igor@rurik.mysql.com authored Apr 18, 2005
```
  Correction after fix for bug #9902.
```
  60164ced
- Fixed Bug#6593, "Inconsistency in handling option prefixes (--skip, --disable, etc.)" · 1658d737
  jani@a193-229-222-105.elisa-laajakaista.fi authored Apr 19, 2005
  
  1658d737
- Update for VARCHAR and remove 4.1-specific actions. · 1ef7bbc7
  acurtis@xiphis.org authored Apr 18, 2005
```
by Philip Antoniades
```
  1ef7bbc7
- Post merge fix - updated the test results (BUG#9439) · 969263cf
  sergefp@mysql.com authored Apr 18, 2005
  
  969263cf
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 855d2376
  dlenev@mysql.com authored Apr 18, 2005
```
into mysql.com:/home/dlenev/src/mysql-5.0-merges
```
  855d2376
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 8d7eb82a
  dlenev@mysql.com authored Apr 18, 2005
```
into mysql.com:/home/dlenev/src/mysql-5.0-merges
```
  8d7eb82a
- ha_innodb.cc: · 69d4d438
  heikki@hundin.mysql.fi authored Apr 18, 2005
```
  Style fix
```
  69d4d438
- Fixed test results after merging fix for bug #8068 "TIMEDIFF with first · 03d8c01a
  dlenev@brandersnatch.localdomain authored Apr 18, 2005
```
negative argument gives wrong result" into 5.0 tree.
```
  03d8c01a
- Manual merge of patch for bug #8068 "TIMEDIFF with first negative · a95ede05
  dlenev@mysql.com authored Apr 18, 2005
```
argument gives wrong result" (and similar bug in ADDTIME/SUBTIME)
into 5.0 tree.
```
  a95ede05
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 91c482e4
  dlenev@brandersnatch.localdomain authored Apr 18, 2005
```
into mysql.com:/home/dlenev/src/mysql-4.1-bg8086
```
  91c482e4
- Merge mysql.com:/usr/local/bk/mysql-5.0 · c8c4ecf4
  pem@mysql.com authored Apr 18, 2005
```
into mysql.com:/home/pem/work/mysql-5.0
```
  c8c4ecf4
- Fixed a bug: deadlock without any locking, simple select and update (Bug #7975). · 384efc44
  jan@hundin.mysql.fi authored Apr 18, 2005
```
Backported from 5.0.3.
```
  384efc44
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · e66cda03
  joerg@mysql.com authored Apr 18, 2005
```
into mysql.com:/M50/mysql-5.0
```
  e66cda03
- Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/clone-5.0.4-build · 40a27eda
  joerg@mysql.com authored Apr 18, 2005
  
  40a27eda
17 Apr, 2005 6 commits
- Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4ba166e8
  sergefp@mysql.com authored Apr 17, 2005
```
into mysql.com:/home/psergey/mysql-5.0-look-range
```
  4ba166e8
- Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · 39f412d3
  sergefp@mysql.com authored Apr 17, 2005
```
into mysql.com:/home/psergey/mysql-4.1-bug9439
```
  39f412d3
- Merge fix for BUG#9439 from 4.1 · f9ec5658
  sergefp@mysql.com authored Apr 17, 2005
  
  f9ec5658
- Merge mysql.com:/space/my/mysql-4.1-build · 113c883f
  lenz@mysql.com authored Apr 17, 2005
```
into mysql.com:/space/my/mysql-5.0-build
```
  113c883f
- Merge mysql.com:/space/my/mysql-4.0-build · 5126016d
  lenz@mysql.com authored Apr 17, 2005
```
into mysql.com:/space/my/mysql-4.1-build
```
  5126016d
- - removed ReadMe.txt from CLEANFILES, as it's cleaned by Docs/Makefile.am · 4bc0a01d
  lenz@mysql.com authored Apr 17, 2005
```
  already (and that's the Makefile that acutally creates it)
```
  4bc0a01d
16 Apr, 2005 10 commits
- Post-merge fixes · ba3795f1
  sergefp@mysql.com authored Apr 17, 2005
  
  ba3795f1
- Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5147f85c
  sergefp@mysql.com authored Apr 17, 2005
```
into mysql.com:/home/psergey/mysql-4.1-look-range
```
  5147f85c
- Fix for BUG#9348: when computing union of two intervals set lower bound to · 2ef1963c
  sergefp@mysql.com authored Apr 17, 2005
```
minimum of lower bounds of two joined intervals.
```
  2ef1963c
- mysql.server script fixed to use mysqld_safe by default + lots of minor additions · 8c3312fe
  petr@mysql.com authored Apr 16, 2005
  
  8c3312fe
- Fix for BUG#9439: · 6b4e759c
  sergefp@mysql.com authored Apr 16, 2005
```
Changed type of "Sub_part" column in SHOW KEYS from TINYINT to SMALLINT (as MAX_KEY_LENGTH=1024)
(this is the final cset with proper tests)
```
  6b4e759c
- Merge mysql.com:/home/mydev/mysql-4.1-bug9188 · e6b8c528
  ingo@mysql.com authored Apr 16, 2005
```
into mysql.com:/home/mydev/mysql-5.0-bug9188
```
  e6b8c528
- Merge mysql.com:/home/mydev/mysql-4.1-bug9487 · 37537b4b
  ingo@mysql.com authored Apr 16, 2005
```
into mysql.com:/home/mydev/mysql-4.1-bug9188
```
  37537b4b
- Merge mysql.com:/home/mydev/mysql-4.1 · e2356c71
  ingo@mysql.com authored Apr 16, 2005
```
into mysql.com:/home/mydev/mysql-4.1-bug9487
```
  e2356c71
- Merge · ab0acbe1
  ingo@mysql.com authored Apr 16, 2005
  
  ab0acbe1
- Merge mysql.com:/home/mydev/mysql-4.1 · e0e3def7
  ingo@mysql.com authored Apr 16, 2005
```
into mysql.com:/home/mydev/mysql-4.1-bug9188
```
  e0e3def7