Commits · 44f0e55ca417dbb2d0ee6c5f092f70ee1797f579 · nexedi / MariaDB

30 Sep, 2006 1 commit
- Merge siva.hindu.god:/usr/home/tim/m/bk/50 · 44f0e55c
  tsmith/tim@siva.hindu.god authored Sep 29, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/mrg/51
```
  44f0e55c
29 Sep, 2006 17 commits
- Merge siva.hindu.god:/usr/home/tim/m/bk/g51 · ca1f99bd
  tsmith/tim@siva.hindu.god authored Sep 29, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/mrg/51
```
  ca1f99bd
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 5275e243
  cmiller@zippy.cornsilk.net authored Sep 29, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
```
  5275e243
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 802292ae
  baker@bk-internal.mysql.com authored Sep 29, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
```
  802292ae
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20778/my51-bug20778 · fa438d86
  cmiller@zippy.cornsilk.net authored Sep 29, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  fa438d86
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20778/my50-bug20778 · 097d60a8
  cmiller@zippy.cornsilk.net authored Sep 29, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
```
  097d60a8
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20778/my50-bug20778 · 2a7d7dd9
  cmiller@zippy.cornsilk.net authored Sep 29, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug20778/my51-bug20778
```
  2a7d7dd9
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 94e6327d
  cmiller@zippy.cornsilk.net authored Sep 29, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  94e6327d
- Update from Stefan. 2006-09-29 msg id <451BEF1.4030506@mysql.com> · 53c14121
  cmiller@zippy.cornsilk.net authored Sep 29, 2006
  
  53c14121
- Merge rama.(none):/home/jimw/my/mysql-5.0-clean · 7a23b1ba
  jimw@rama.(none) authored Sep 28, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.1-clean
```
  7a23b1ba
- Merge bk-internal:/home/bk/mysql-5.0-maint · 2961966b
  jimw@rama.(none) authored Sep 28, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.0-clean
```
  2961966b
- Fix merge of __attribute__ cleanup. · d5d89bcf
  jimw@rama.(none) authored Sep 28, 2006
  
  d5d89bcf
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · f53e014f
  cmiller@zippy.cornsilk.net authored Sep 28, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
```
  f53e014f
- Fixed bad fix for a bad merge. · 2067fbca
  cmiller@zippy.cornsilk.net authored Sep 28, 2006
  
  2067fbca
- Merge rama.(none):/home/jimw/my/mysql-4.1-clean · 68eadc8a
  jimw@rama.(none) authored Sep 28, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.0-clean
```
  68eadc8a
- Merge rama.(none):/home/jimw/my/mysql-5.0-clean · c8801bce
  jimw@rama.(none) authored Sep 28, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.1-clean
```
  c8801bce
- Merge bk-internal:/home/bk/mysql-5.0-maint · a2e8d08b
  jimw@rama.(none) authored Sep 28, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.0-clean
```
  a2e8d08b
- Merge rama.(none):/home/jimw/my/mysql-5.0-18246 · 9c3012e6
  jimw@rama.(none) authored Sep 28, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.0-clean
```
  9c3012e6
28 Sep, 2006 22 commits
- view.test: · dead2e0f
  evgen@moonbone.local authored Sep 29, 2006
```
  After merge fix
```
  dead2e0f
- Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · ee67c4c4
  evgen@moonbone.local authored Sep 29, 2006
```
into  moonbone.local:/work/5505-bug-5.0-opt-mysql
```
  ee67c4c4
- Fixed bug#5505: Wrong error message on INSERT into a view · f6fbbf20
  evgen@moonbone.local authored Sep 29, 2006
```
On an INSERT into an updatable but non-insertable view an error message was
issued stating the view being not updatable. This can lead to a confusion of a
user.

A new error message is introduced. Is is showed when a user tries to insert
into a non-insertable view.
```
  f6fbbf20
- Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my50-bug20305 · 3f2c9aa7
  iggy@rolltop.ignatz42.dyndns.org authored Sep 28, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
```
  3f2c9aa7
- Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my51-bug20305 · 78154af6
  iggy@rolltop.ignatz42.dyndns.org authored Sep 28, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
```
  78154af6
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · fa6bd76b
  cmiller@zippy.cornsilk.net authored Sep 28, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
```
  fa6bd76b
- Fixed incorrect merge of gluh's reversion of B-g#21432. · 8dd3e7f4
  cmiller@zippy.cornsilk.net authored Sep 28, 2006
  
  8dd3e7f4
- Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug22224/my50-bug22224 · d0d057a4
  iggy@rolltop.ignatz42.dyndns.org authored Sep 28, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
```
  d0d057a4
- Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug22224/my50-bug22224 · ff66360d
  iggy@rolltop.ignatz42.dyndns.org authored Sep 28, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug22224/my51-bug22224
```
  ff66360d
- Bug#22224: Windows build depends on ib_config.h · e89c10e9
  iggy@rolltop.ignatz42.dyndns.org authored Sep 28, 2006
```
  
This change has already been made to 5.1.
```
  e89c10e9
- Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my50-bug20305 · 70dcbe3e
  iggy@rolltop.ignatz42.dyndns.org authored Sep 28, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my51-bug20305
```
  70dcbe3e
- Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my41-bug20305 · d36444a9
  iggy@rolltop.ignatz42.dyndns.org authored Sep 28, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my50-bug20305
```
  d36444a9
- Bug#20305: PROCEDURE ANALYSE() returns wrong M for FLOAT(M, D) and DOUBLE(M, D) · f063bee3
  iggy@rolltop.ignatz42.dyndns.org authored Sep 28, 2006
  
  f063bee3
- Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch · bb09a2a9
  brian@zim.(none) authored Sep 28, 2006
```
into  zim.(none):/home/brian/mysql/merge-5.1
```
  bb09a2a9
- Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21449/my50-bug21449 · 8668dfc2
  iggy@rolltop.ignatz42.dyndns.org authored Sep 28, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
```
  8668dfc2
- Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21449/my50-bug21449 · e58341f5
  iggy@rolltop.ignatz42.dyndns.org authored Sep 28, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21449/my51-bug21449
```
  e58341f5
- Bug #21449 How to Resolve Stack Trace URL in MySQLD error log is incorrect. · b7e15782
  iggy@rolltop.ignatz42.dyndns.org authored Sep 28, 2006
  
  b7e15782
- Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 · 542cf080
  brian@zim.(none) authored Sep 28, 2006
```
into  zim.(none):/home/brian/mysql/merge-5.1
```
  542cf080
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 43bdd2c2
  cmiller@zippy.cornsilk.net authored Sep 28, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  43bdd2c2
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · e72bc639
  cmiller@zippy.cornsilk.net authored Sep 28, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  e72bc639
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 7c5c8999
  cmiller@zippy.cornsilk.net authored Sep 28, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
```
  7c5c8999
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint · 733fa61e
  cmiller@zippy.cornsilk.net authored Sep 28, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
```
  733fa61e